ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/cfperl.xs
(Generate patch)

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.253 by root, Mon Sep 10 17:24:36 2007 UTC vs.
Revision 1.274 by root, Thu Apr 10 15:35:16 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann 5 * Copyright (©) 2001-2005,2007 by Chachkoff Yann
6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de> 6 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include "autoconf.h" 24#include "autoconf.h"
25 25
26#define PLUGIN_NAME "perl" 26#define PLUGIN_NAME "perl"
27#define PLUGIN_VERSION "cfperl 0.5" 27#define PLUGIN_VERSION "cfperl 0.5"
28
29#define CEDES_PER_TICK 5
30 28
31#if HAVE_EXECINFO_H 29#if HAVE_EXECINFO_H
32# include <execinfo.h> 30# include <execinfo.h>
33#endif 31#endif
34 32
35#include <plugin_common.h>
36#include <sounds.h>
37#include <cstdarg> 33#include <cstdarg>
38#include <sproto.h>
39 34
35#include "global.h"
40#include "loader.h" 36#include "loader.h"
37#include "../random_maps/random_map.h"
41#include "cfperl.h" 38#include "evthread.h"
42#include "shstr.h" 39#include "sproto.h"
43 40
44#include <unistd.h> 41#include <unistd.h>
45#if _POSIX_MEMLOCK 42#if _POSIX_MEMLOCK
46# include <sys/mman.h> 43# include <sys/mman.h>
44#endif
45
46#if HAVE_MALLOC_H
47# include <malloc.h>
47#endif 48#endif
48 49
49#include <EXTERN.h> 50#include <EXTERN.h>
50#include <perl.h> 51#include <perl.h>
51#include <XSUB.h> 52#include <XSUB.h>
68 typedef double val64; 69 typedef double val64;
69# define newSVval64 newSVnv 70# define newSVval64 newSVnv
70# define SvVAL64 SvNV 71# define SvVAL64 SvNV
71#endif 72#endif
72 73
73static f_plug_api gethook = cfapi_get_hooks;
74static f_plug_api object_insert = cfapi_object_insert;
75
76static PerlInterpreter *perl; 74static PerlInterpreter *perl;
77 75
78tstamp NOW, runtime; 76tstamp NOW, runtime;
77
78static int tick_inhibit;
79static int tick_pending;
79 80
80global gbl_ev; 81global gbl_ev;
81static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 82static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
82static SV *sv_runtime, *sv_next_tick; 83static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
83 84
84bitset<NUM_EVENT_TYPES> ev_want_event; 85bitset<NUM_EVENT_TYPES> ev_want_event;
85bitset<NUM_TYPES> ev_want_type; 86bitset<NUM_TYPES> ev_want_type;
86 87
87static HV 88static HV
590 va_end (ap); 591 va_end (ap);
591 592
592 return sv; 593 return sv;
593} 594}
594 595
595static SV *
596newSVcfapi (int type, ...)
597{
598 SV *sv;
599
600 va_list ap;
601 va_start (ap, type);
602
603 switch (type)
604 {
605 case CFAPI_INT: sv = newSViv (*va_arg (ap, int * )); break;
606 case CFAPI_LONG: sv = newSVval64 (*va_arg (ap, sint64 *)); break;
607 case CFAPI_DOUBLE: sv = newSVnv (*va_arg (ap, double *)); break;
608 case CFAPI_STRING: sv = newSVdt_va (ap, DT_STRING); break;
609 case CFAPI_POBJECT: sv = newSVdt_va (ap, DT_OBJECT); break;
610 case CFAPI_PMAP: sv = newSVdt_va (ap, DT_MAP ); break;
611 case CFAPI_PPLAYER: sv = newSVdt_va (ap, DT_PLAYER); break;
612 case CFAPI_PARCH: sv = newSVdt_va (ap, DT_ARCH ); break;
613 case CFAPI_PPARTY: sv = newSVdt_va (ap, DT_PARTY ); break;
614 case CFAPI_PREGION: sv = newSVdt_va (ap, DT_REGION); break;
615
616 default:
617 assert (("unhandled type in newSVcfapi", 0));
618 }
619
620 va_end (ap);
621
622 return sv;
623}
624
625////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 596//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
626 597
627SV * 598SV *
628registry (attachable *ext) 599registry (attachable *ext)
629{ 600{
633 return newRV_inc ((SV *)ext->cb); 604 return newRV_inc ((SV *)ext->cb);
634} 605}
635 606
636///////////////////////////////////////////////////////////////////////////// 607/////////////////////////////////////////////////////////////////////////////
637 608
638extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
639{
640 return 0;
641}
642
643static CommArray_s rtn_cmd;
644
645static int
646runPluginCommand (object *obj, char *params)
647{
648 return -1;
649}
650
651extern "C" void *cfperl_getPluginProperty (int *type, ...)
652{
653 va_list args;
654 char *propname;
655 int i;
656 va_start (args, type);
657 propname = va_arg (args, char *);
658 //printf ("Property name: %s\n", propname);
659
660 if (!strcmp (propname, "command?"))
661 return NULL;
662 else if (!strcmp (propname, "Identification"))
663 {
664 va_end (args);
665 return (void *)PLUGIN_NAME;
666 }
667 else if (!strcmp (propname, "FullName"))
668 {
669 va_end (args);
670 return (void *)PLUGIN_VERSION;
671 }
672 else
673 va_end (args);
674
675 return NULL;
676}
677
678extern "C" int cfperl_postInitPlugin ()
679{
680 int hooktype = 1;
681 int rtype = 0;
682
683 cf_init_plugin (gethook);
684
685 return 0;
686}
687
688extern "C" int cfperl_closePlugin ()
689{
690 return 0;
691}
692
693void 609void
694cfperl_init () 610cfperl_init ()
695{ 611{
612 extern char **environ;
613
696 PERL_SYS_INIT3 (&settings.argc, &settings.argv, 0); 614 PERL_SYS_INIT3 (&settings.argc, &settings.argv, &environ);
697 perl = perl_alloc (); 615 perl = perl_alloc ();
698 perl_construct (perl); 616 perl_construct (perl);
699 617
700 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 618 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
701 619
702 const char *argv[] = { 620 const char *argv[] = {
703 settings.argv [0], 621 settings.argv [0],
704 "-e" 622 "-e"
705 "use Event; use Coro;" // required for bootstrap 623 "use EV; use Coro;" // required for bootstrap
706 "cf->bootstrap;" // required for datadir :*> 624 "cf->bootstrap;" // required for datadir :*>
707 "unshift @INC, cf::datadir ();" 625 "unshift @INC, cf::datadir ();"
708 "require cf;" 626 "require cf;"
709 }; 627 };
710 628
711 if (perl_parse (perl, xs_init, 2, (char **)argv, (char **)NULL) 629 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
712 || perl_run (perl)) 630 || perl_run (perl))
713 { 631 {
714 printf ("unable to initialize perl-interpreter, aborting.\n"); 632 printf ("unable to initialize perl-interpreter, aborting.\n");
715 exit (EXIT_FAILURE); 633 exit (EXIT_FAILURE);
716 } 634 }
993} 911}
994 912
995///////////////////////////////////////////////////////////////////////////// 913/////////////////////////////////////////////////////////////////////////////
996// various c++ => perl glue functions 914// various c++ => perl glue functions
997 915
916void cfperl_tick ()
917{
918 tick_pending = 1;
919
920 if (tick_inhibit)
921 return;
922
923 tick_pending = 0;
924
925 dSP;
926
927 PUSHMARK (SP);
928 PUTBACK;
929 call_pv ("cf::tick", G_DISCARD | G_VOID);
930
931 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
932}
933
998void 934void
999cfperl_emergency_save () 935cfperl_emergency_save ()
1000{ 936{
1001 CALL_BEGIN (0); 937 CALL_BEGIN (0);
1002 CALL_CALL ("cf::emergency_save", G_VOID); 938 CALL_CALL ("cf::emergency_save", G_VOID);
1185#endif 1121#endif
1186} 1122}
1187 1123
1188///////////////////////////////////////////////////////////////////////////// 1124/////////////////////////////////////////////////////////////////////////////
1189 1125
1190struct EventAPI *watcher_base::GEventAPI; 1126struct EVAPI *evapi::GEVAPI;
1191struct CoroAPI *coroapi::GCoroAPI; 1127struct CoroAPI *coroapi::GCoroAPI;
1192
1193int coroapi::cede_counter;
1194tstamp coroapi::next_cede;
1195 1128
1196void coroapi::do_cede_to_tick () 1129void coroapi::do_cede_to_tick ()
1197{ 1130{
1198 cede_counter = 0; 1131 cede_pending = 0;
1199
1200 cede (); 1132 cede ();
1201
1202 next_cede += (TICK / CEDES_PER_TICK) * 0.99;
1203 if (next_cede > SvNV (sv_next_tick) - 0.02)
1204 next_cede = SvNV (sv_next_tick);
1205}
1206
1207void coroapi::do_cede_every ()
1208{
1209 cede_counter = 0;
1210
1211 if (coroapi::nready ())
1212 coroapi::cede ();
1213}
1214
1215void coroapi::do_cede_to_tick_every ()
1216{
1217 cede_counter = 0;
1218
1219 cede_to_tick ();
1220} 1133}
1221 1134
1222void 1135void
1223coroapi::wait_for_tick () 1136coroapi::wait_for_tick ()
1224{ 1137{
1233 CALL_BEGIN (0); 1146 CALL_BEGIN (0);
1234 CALL_CALL ("cf::wait_for_tick_begin", G_DISCARD); 1147 CALL_CALL ("cf::wait_for_tick_begin", G_DISCARD);
1235 CALL_END; 1148 CALL_END;
1236} 1149}
1237 1150
1238static void
1239iw_dispatch (pe_event *ev)
1240{
1241 iw *w = (iw *)ev->ext_data;
1242 w->call (*w);
1243}
1244
1245void
1246iw::alloc ()
1247{
1248 pe = GEventAPI->new_idle (0, 0);
1249
1250 WaREENTRANT_off (pe);
1251 pe->base.callback = (void *)iw_dispatch;
1252 pe->base.ext_data = (void *)this;
1253}
1254
1255static void iow_dispatch (pe_event *ev)
1256{
1257 iow *w = (iow *)ev->ext_data;
1258 w->call (*w, ((pe_ioevent *)ev)->got);
1259}
1260
1261void
1262iow::alloc ()
1263{
1264 pe = GEventAPI->new_io (0, 0);
1265
1266 WaREENTRANT_off (pe);
1267 pe->base.callback = (void *)iow_dispatch;
1268 pe->base.ext_data = (void *)this;
1269
1270 pe->fd = -1;
1271 pe->poll = 0;
1272}
1273
1274void
1275iow::fd (int fd)
1276{
1277 pe->fd = fd;
1278}
1279
1280int
1281iow::poll ()
1282{
1283 return pe->poll;
1284}
1285
1286void 1151void
1287iow::poll (int events) 1152iow::poll (int events)
1288{ 1153{
1289 if (pe->poll != events) 1154 if (events != this->events)
1290 { 1155 {
1156 int active = ev_is_active ((ev_io *)this);
1291 if (pe->poll) stop (); 1157 if (active) stop ();
1292 pe->poll = events; 1158 ev_io_set ((ev_io *)this, fd, events);
1293 if (pe->poll) start (); 1159 if (active) start ();
1294 } 1160 }
1295} 1161}
1296 1162
1297void 1163void
1298_connect_to_perl () 1164_connect_to_perl ()
1299{ 1165{
1300 stash_cf = gv_stashpv ("cf" , 1); 1166 stash_cf = gv_stashpv ("cf", 1);
1301 1167
1302 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1168 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1303 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1169 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1304 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1170 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1305 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1171 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
1307 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1173 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1308 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1174 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1309 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1175 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1310 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1176 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1311 1177
1178 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1312 sv_runtime = get_sv ("cf::RUNTIME" , 1); sv_upgrade (sv_runtime , SVt_NV); 1179 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV);
1180 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV);
1313 sv_next_tick = get_sv ("cf::NEXT_TICK", 1); sv_upgrade (sv_next_tick, SVt_NV); 1181 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
1314 1182
1315 cb_global = get_av ("cf::CB_GLOBAL", 1); 1183 cb_global = get_av ("cf::CB_GLOBAL", 1);
1316 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1); 1184 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1);
1317 cb_object = get_av ("cf::CB_OBJECT", 1); 1185 cb_object = get_av ("cf::CB_OBJECT", 1);
1318 cb_player = get_av ("cf::CB_PLAYER", 1); 1186 cb_player = get_av ("cf::CB_PLAYER", 1);
1323 1191
1324MODULE = cf PACKAGE = cf PREFIX = cf_ 1192MODULE = cf PACKAGE = cf PREFIX = cf_
1325 1193
1326BOOT: 1194BOOT:
1327{ 1195{
1328 I_EVENT_API (PACKAGE); watcher_base::GEventAPI = GEventAPI; 1196 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1329 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1197 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1330 1198
1331 _connect_to_perl (); 1199 _connect_to_perl ();
1332 1200
1333 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1201 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1334 1202
1352 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1220 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1353 1221
1354 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1222 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1355 1223
1356 const_iv (MAX_TIME) 1224 const_iv (MAX_TIME)
1225 const_iv (MAXSOCKBUF)
1357 1226
1358 const_iv (NUM_BODY_LOCATIONS) 1227 const_iv (NUM_BODY_LOCATIONS)
1359 const_iv (body_range) const_iv (body_shield) const_iv (body_combat) 1228 const_iv (body_range) const_iv (body_shield) const_iv (body_combat)
1360 const_iv (body_arm) const_iv (body_torso) const_iv (body_head) 1229 const_iv (body_arm) const_iv (body_torso) const_iv (body_head)
1361 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger) 1230 const_iv (body_neck) const_iv (body_skill) const_iv (body_finger)
1506 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1375 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1507 1376
1508 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE) 1377 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1509 1378
1510 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON) 1379 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1511 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR) const_iv (INS_MAP_LOAD) 1380 const_iv (INS_ON_TOP) const_iv (INS_BELOW_ORIGINATOR)
1512 1381
1513 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL) 1382 const_iv (WILL_APPLY_HANDLE) const_iv (WILL_APPLY_TREASURE) const_iv (WILL_APPLY_EARTHWALL)
1514 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD) 1383 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1515 1384
1516 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1385 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1665 } 1534 }
1666 1535
1667 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1536 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1668} 1537}
1669 1538
1539void evthread_start (int aiofd)
1540
1670void _post_tick () 1541void cede_to_tick ()
1671 CODE: 1542 CODE:
1672 coroapi::next_cede = SvNV (sv_next_tick) - TICK * (1. - 1. / CEDES_PER_TICK); 1543 coroapi::cede_to_tick ();
1673 1544
1674NV till_cede () 1545NV till_tick ()
1675 CODE: 1546 CODE:
1676 RETVAL = coroapi::next_cede - now (); 1547 RETVAL = SvNVX (sv_next_tick) - now ();
1677 OUTPUT: 1548 OUTPUT:
1678 RETVAL 1549 RETVAL
1679 1550
1680NV till_tick () 1551int tick_inhibit ()
1681 CODE: 1552 CODE:
1682 RETVAL = SvNV (sv_next_tick) - now (); 1553 RETVAL = tick_inhibit;
1683 OUTPUT: 1554 OUTPUT:
1684 RETVAL 1555 RETVAL
1556
1557void tick_inhibit_inc ()
1558 CODE:
1559 ++tick_inhibit;
1560
1561void tick_inhibit_dec ()
1562 CODE:
1563 if (!--tick_inhibit)
1564 if (tick_pending)
1565 {
1566 ev_async_send (EV_DEFAULT, &tick_watcher);
1567 coroapi::cede ();
1568 }
1569
1570void server_tick ()
1571 CODE:
1572{
1573 NOW = ev_now (EV_DEFAULT);
1574 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1575 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1576 runtime = SvNVX (sv_runtime);
1577
1578 server_tick ();
1579
1580 NOW = ev_time ();
1581 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1582 runtime += TICK;
1583 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1584}
1685 1585
1686NV floor (NV x) 1586NV floor (NV x)
1687 1587
1688NV ceil (NV x) 1588NV ceil (NV x)
1689 1589
1709 CODE: 1609 CODE:
1710 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1610 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1711 OUTPUT: 1611 OUTPUT:
1712 RETVAL 1612 RETVAL
1713 1613
1714void cede_to_tick () 1614void weaken (...)
1715 CODE: 1615 PROTOTYPE: @
1716 coroapi::cede_to_tick (); 1616 CODE:
1717 1617 while (items > 0)
1718void server_tick () 1618 sv_rvweaken (ST (--items));
1719 CODE:
1720 NOW = now ();
1721 runtime = SvNVx (sv_runtime);
1722 server_tick ();
1723 1619
1724void 1620void
1725log_backtrace (utf8_string msg) 1621log_backtrace (utf8_string msg)
1726 1622
1727void 1623void
1732octet_string path_combine (octet_string base, octet_string path) 1628octet_string path_combine (octet_string base, octet_string path)
1733 PROTOTYPE: $$ 1629 PROTOTYPE: $$
1734 1630
1735octet_string path_combine_and_normalize (octet_string base, octet_string path) 1631octet_string path_combine_and_normalize (octet_string base, octet_string path)
1736 PROTOTYPE: $$ 1632 PROTOTYPE: $$
1633
1634void
1635mallinfo ()
1636 PPCODE:
1637{
1638#if __GLIBC__
1639 struct mallinfo mai = mallinfo ();
1640 EXTEND (SP, 10*2);
1641 PUSHs (sv_2mortal (newSVpv ("arena" , 0))); PUSHs (sv_2mortal (newSViv (mai.arena)));
1642 PUSHs (sv_2mortal (newSVpv ("ordblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.ordblks)));
1643 PUSHs (sv_2mortal (newSVpv ("smblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.smblks)));
1644 PUSHs (sv_2mortal (newSVpv ("hblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblks)));
1645 PUSHs (sv_2mortal (newSVpv ("hblkhd" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblkhd)));
1646 PUSHs (sv_2mortal (newSVpv ("usmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.usmblks)));
1647 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1648 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1649 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1650 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1651#endif
1652 EXTEND (SP, 2*2);
1653 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1654 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1655}
1737 1656
1738void 1657void
1739sub_generation_inc () 1658sub_generation_inc ()
1740 CODE: 1659 CODE:
1741 PL_sub_generation++; 1660 PL_sub_generation++;
1766 1685
1767void abort () 1686void abort ()
1768 1687
1769void reset_signals () 1688void reset_signals ()
1770 1689
1771void fork_abort (octet_string cause = "cf::fork_abort") 1690void fork_abort (const_octet_string cause = "cf::fork_abort")
1772 1691
1773void cleanup (octet_string cause, bool make_core = false) 1692void cleanup (const_octet_string cause, bool make_core = false)
1774 1693
1775void emergency_save () 1694void emergency_save ()
1776 1695
1777void _exit (int status = EXIT_SUCCESS) 1696void _exit (int status = EXIT_SUCCESS)
1778 1697
1779UV sv_2watcher (SV *w)
1780 CODE:
1781 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1782 OUTPUT:
1783 RETVAL
1784
1785#if _POSIX_MEMLOCK 1698#if _POSIX_MEMLOCK
1786 1699
1787int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1700int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1701 INIT:
1702 mallopt (M_PERTURB, 0xaa); // bug-workaround for linux glibc+mlockall+calloc
1788 1703
1789int munlockall () 1704int munlockall ()
1790 1705
1791#endif 1706#endif
1792 1707
1834 RETVAL = newSVpv (resist_plus[atnr], 0); 1749 RETVAL = newSVpv (resist_plus[atnr], 0);
1835 else 1750 else
1836 XSRETURN_UNDEF; 1751 XSRETURN_UNDEF;
1837 OUTPUT: RETVAL 1752 OUTPUT: RETVAL
1838 1753
1754SV *
1755uuid_cur ()
1756 CODE:
1757 RETVAL = to_sv (UUID::cur);
1758 OUTPUT:
1759 RETVAL
1760
1761SV *
1762uuid_gen ()
1763 CODE:
1764 RETVAL = to_sv (UUID::gen ());
1765 OUTPUT:
1766 RETVAL
1767
1768void
1769coin_names ()
1770 PPCODE:
1771 EXTEND (SP, NUM_COINS);
1772 for (int i = 0; i < NUM_COINS; ++i)
1773 PUSHs (sv_2mortal (newSVpv (coins [i], 0)));
1774
1775void
1776coin_archetypes ()
1777 PPCODE:
1778 EXTEND (SP, NUM_COINS);
1779 for (int i = 0; i < NUM_COINS; ++i)
1780 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i]))));
1781
1839bool 1782bool
1840load_resource_file (octet_string filename) 1783load_resource_file (octet_string filename)
1841 1784
1842MODULE = cf PACKAGE = cf::attachable 1785MODULE = cf PACKAGE = cf::attachable
1843 1786
1939void 1882void
1940inv (object *obj) 1883inv (object *obj)
1941 PROTOTYPE: $ 1884 PROTOTYPE: $
1942 PPCODE: 1885 PPCODE:
1943{ 1886{
1944 object *o;
1945 for (o = obj->inv; o; o = o->below) 1887 for (object *o = obj->inv; o; o = o->below)
1946 XPUSHs (sv_2mortal (to_sv (o))); 1888 XPUSHs (sv_2mortal (to_sv (o)));
1947} 1889}
1948 1890
1949void 1891void
1950set_animation (object *op, int idx) 1892set_animation (object *op, int idx)
1982 1924
1983int need_identify (object *obj); 1925int need_identify (object *obj);
1984 1926
1985int apply_shop_mat (object *shop_mat, object *op); 1927int apply_shop_mat (object *shop_mat, object *op);
1986 1928
1987int move_player (object *op, int dir)
1988 CODE:
1989 RETVAL = move_player (op, dir);
1990 OUTPUT:
1991 RETVAL
1992
1993int move (object *op, int dir, object *originator = op) 1929int move (object *op, int dir, object *originator = op)
1994 CODE: 1930 CODE:
1995 RETVAL = move_ob (op, dir, originator); 1931 RETVAL = move_ob (op, dir, originator);
1996 OUTPUT: 1932 OUTPUT:
1997 RETVAL 1933 RETVAL
2003void apply_below (object *op) 1939void apply_below (object *op)
2004 CODE: 1940 CODE:
2005 player_apply_below (op); 1941 player_apply_below (op);
2006 1942
2007int cast_heal (object *op, object *caster, object *spell, int dir = 0) 1943int cast_heal (object *op, object *caster, object *spell, int dir = 0)
2008
2009object *cf_object_present_archname_inside (object *op, utf8_string whatstr)
2010
2011int cf_object_transfer (object *op, int x, int y, int r = 0, object_ornull *orig = 0)
2012
2013int cf_object_change_map (object *op, int x, int y, maptile *map)
2014 1944
2015#//TODO 1945#//TODO
2016object *clone_ (object *op, int recursive = 0) 1946object *clone_ (object *op, int recursive = 0)
2017 CODE: 1947 CODE:
2018 if (recursive) 1948 if (recursive)
2065 1995
2066void drop (object *who, object *op) 1996void drop (object *who, object *op)
2067 1997
2068void pick_up (object *who, object *op) 1998void pick_up (object *who, object *op)
2069 1999
2070int cf_object_teleport (object *op, maptile *map, int x, int y)
2071
2072void update_object (object *op, int action) 2000void update_object (object *op, int action)
2073 2001
2074object *cf_create_object_by_name (utf8_string name)
2075
2076void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2002void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0)
2077 2003
2078void player_lvl_adj (object *who, object *skill = 0) 2004void player_lvl_adj (object *who, object *skill = 0)
2079 2005
2080int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2006int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2091 2017
2092void handle_apply_yield (object *op); 2018void handle_apply_yield (object *op);
2093 2019
2094 2020
2095MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2021MODULE = cf PACKAGE = cf::object PREFIX = cf_
2096
2097object *cf_insert_ob_in_ob (object *ob, object *where)
2098 2022
2099# no clean way to get an object from an archetype - stupid idiotic 2023# no clean way to get an object from an archetype - stupid idiotic
2100# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2024# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
2101 2025
2102object *new (utf8_string archetype = 0) 2026object *new (utf8_string archetype = 0)
2111# TODO: nuke 2035# TODO: nuke
2112object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y) 2036object *insert_ob_in_map_at (object *ob, maptile *where, object_ornull *orig, int flag, int x, int y)
2113 PROTOTYPE: $$$$$$ 2037 PROTOTYPE: $$$$$$
2114 CODE: 2038 CODE:
2115{ 2039{
2116 int unused_type; 2040 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2117 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
2118} 2041}
2119 2042
2120const_utf8_string get_ob_key_value (object *op, utf8_string key) 2043const_utf8_string get_ob_key_value (object *op, utf8_string key)
2121 2044
2122bool set_ob_key_value (object *op, utf8_string key, utf8_string value = 0, int add_key = 1) 2045bool set_ob_key_value (object *op, utf8_string key, utf8_string value = 0, int add_key = 1)
2135 EXTEND (SP, 5); 2058 EXTEND (SP, 5);
2136 PUSHs (newSVuv (rv.distance)); 2059 PUSHs (newSVuv (rv.distance));
2137 PUSHs (newSViv (rv.distance_x)); 2060 PUSHs (newSViv (rv.distance_x));
2138 PUSHs (newSViv (rv.distance_y)); 2061 PUSHs (newSViv (rv.distance_y));
2139 PUSHs (newSViv (rv.direction)); 2062 PUSHs (newSViv (rv.direction));
2140 PUSHs (newSVcfapi (CFAPI_POBJECT, rv.part)); 2063 PUSHs (to_sv (rv.part));
2141} 2064}
2142 2065
2143bool on_same_map_as (object *ob, object *other) 2066bool on_same_map_as (object *ob, object *other)
2144 CODE: 2067 CODE:
2145 RETVAL = on_same_map (ob, other); 2068 RETVAL = on_same_map (ob, other);
2151 RETVAL = query_base_name (op, plural); 2074 RETVAL = query_base_name (op, plural);
2152 OUTPUT: RETVAL 2075 OUTPUT: RETVAL
2153 2076
2154object *decrease_ob_nr (object *op, unsigned long i) 2077object *decrease_ob_nr (object *op, unsigned long i)
2155 2078
2079# return the tail of an object, excluding itself
2080void
2081tail (object *op)
2082 PPCODE:
2083 while ((op = op->more))
2084 XPUSHs (sv_2mortal (to_sv (op)));
2085
2156MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 2086MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
2157 2087
2158player *player (object *op) 2088player *player (object *op)
2159 CODE: 2089 CODE:
2160 RETVAL = op->contr; 2090 RETVAL = op->contr;
2161 OUTPUT: RETVAL 2091 OUTPUT: RETVAL
2162 2092
2093bool move_player (object *op, int dir)
2094
2163void check_score (object *op) 2095void check_score (object *op)
2164 2096
2165void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE) 2097void message (object *op, utf8_string txt, int flags = NDI_ORANGE | NDI_UNIQUE)
2166 CODE: 2098 CODE:
2167 new_draw_info (flags, 0, op, txt); 2099 new_draw_info (flags, 0, op, txt);
2168 2100
2169void kill_player (object *op) 2101void kill_player (object *op)
2170 2102
2103void esrv_send_item (object *pl, object *item)
2104
2171void esrv_update_item (object *op, int what, object *item) 2105void esrv_update_item (object *pl, int what, object *item)
2172 C_ARGS: what, op, item 2106 C_ARGS: what, pl, item
2107
2108void esrv_del_item (object *pl, int tag)
2109 C_ARGS: pl->contr, tag
2173 2110
2174int command_summon (object *op, utf8_string params) 2111int command_summon (object *op, utf8_string params)
2175 2112
2176int command_arrest (object *op, utf8_string params) 2113int command_arrest (object *op, utf8_string params)
2177 2114
2198 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2135 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2199 pl->orig_stats = pl->ob->stats; 2136 pl->orig_stats = pl->ob->stats;
2200 2137
2201void clear_los (player *pl) 2138void clear_los (player *pl)
2202 2139
2203void cf_player_move (player *pl, int dir)
2204
2205bool 2140bool
2206cell_visible (player *pl, int dx, int dy) 2141cell_visible (player *pl, int dx, int dy)
2207 CODE: 2142 CODE:
2208 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2143 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
2209 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]; 2144 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2215 CODE: 2150 CODE:
2216{ 2151{
2217 STRLEN len; 2152 STRLEN len;
2218 char *buf = SvPVbyte (packet, len); 2153 char *buf = SvPVbyte (packet, len);
2219 2154
2155 if (len > MAXSOCKBUF)
2156 pl->failmsg ("[packet too long for client]");
2220 if (pl->ns) 2157 else if (pl->ns)
2221 pl->ns->send_packet (buf, len); 2158 pl->ns->send_packet (buf, len);
2222} 2159}
2223 2160
2224int 2161int
2225listening (player *pl, int new_value = -1) 2162listening (player *pl, int new_value = -1)
2261 RETVAL = map->invoke ((event_type)event, ARG_AV (av), DT_END); 2198 RETVAL = map->invoke ((event_type)event, ARG_AV (av), DT_END);
2262 OUTPUT: RETVAL 2199 OUTPUT: RETVAL
2263 2200
2264SV *registry (maptile *map) 2201SV *registry (maptile *map)
2265 2202
2203void
2204find_tagged_objects (maptile *map, utf8_string tag = 0)
2205 PPCODE:
2206{
2207 if (!map->spaces)
2208 XSRETURN_EMPTY;
2209
2210 if (tag)
2211 {
2212 shstr_cmp tag_ (tag);
2213
2214 for (mapspace *ms = map->spaces + map->size (); ms-- > map->spaces; )
2215 for (object *op = ms->bot; op; op = op->above)
2216 if (op->tag == tag_)
2217 XPUSHs (sv_2mortal (to_sv (op)));
2218 }
2219 else
2220 {
2221 for (mapspace *ms = map->spaces + map->size (); ms-- > map->spaces; )
2222 for (object *op = ms->bot; op; op = op->above)
2223 if (op->tag)
2224 XPUSHs (sv_2mortal (to_sv (op)));
2225 }
2226}
2227
2266INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2228INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2267 2229
2268void 2230void
2269maptile::instantiate () 2231maptile::instantiate ()
2270 2232
2401get_connection (maptile *map, long connection) 2363get_connection (maptile *map, long connection)
2402 PPCODE: 2364 PPCODE:
2403 oblinkpt *obp = get_connection_links (map, connection); 2365 oblinkpt *obp = get_connection_links (map, connection);
2404 if (obp) 2366 if (obp)
2405 for (objectlink *ol = obp->link; ol; ol = ol->next) 2367 for (objectlink *ol = obp->link; ol; ol = ol->next)
2406 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, (object *)ol->ob))); 2368 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2407
2408object *cf_map_insert_object_there (maptile *where, object *op, object *originator, int flags)
2409
2410object *cf_map_insert_object (maptile *where, object* op, int x, int y)
2411
2412object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2413 C_ARGS: str, map, nx, ny
2414 2369
2415void 2370void
2416get_map_flags (maptile *map, int x, int y) 2371get_map_flags (maptile *map, int x, int y)
2417 PPCODE: 2372 PPCODE:
2418{ 2373{
2423 EXTEND (SP, 4); 2378 EXTEND (SP, 4);
2424 PUSHs (sv_2mortal (newSViv (flags))); 2379 PUSHs (sv_2mortal (newSViv (flags)));
2425 2380
2426 if (GIMME_V == G_ARRAY) 2381 if (GIMME_V == G_ARRAY)
2427 { 2382 {
2428 PUSHs (sv_2mortal (newSVcfapi (CFAPI_PMAP, nmap))); 2383 PUSHs (sv_2mortal (to_sv (nmap)));
2429 PUSHs (sv_2mortal (newSViv (nx))); 2384 PUSHs (sv_2mortal (newSViv (nx)));
2430 PUSHs (sv_2mortal (newSViv (ny))); 2385 PUSHs (sv_2mortal (newSViv (ny)));
2431 } 2386 }
2432} 2387}
2433 2388
2442 2397
2443 get_map_flags (map, &nmap, x, y, &nx, &ny); 2398 get_map_flags (map, &nmap, x, y, &nx, &ny);
2444 2399
2445 if (nmap) 2400 if (nmap)
2446 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2401 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above)
2447 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o))); 2402 XPUSHs (sv_2mortal (to_sv (o)));
2448} 2403}
2449 2404
2450SV * 2405SV *
2451bot_at (maptile *obj, unsigned int x, unsigned int y) 2406bot_at (maptile *obj, unsigned int x, unsigned int y)
2452 PROTOTYPE: $$$ 2407 PROTOTYPE: $$$
2461 INIT: 2416 INIT:
2462 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF; 2417 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2463 CODE: 2418 CODE:
2464 switch (ix) 2419 switch (ix)
2465 { 2420 {
2466 case 0: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_OB (obj, x, y)); break; 2421 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break;
2467 case 1: RETVAL = newSVcfapi (CFAPI_POBJECT, GET_MAP_TOP (obj, x, y)); break; 2422 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break;
2468 case 2: RETVAL = newSVuv ( GET_MAP_FLAGS (obj, x, y)); break; 2423 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break;
2469 case 3: RETVAL = newSViv ( GET_MAP_LIGHT (obj, x, y)); break; 2424 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break;
2470 case 4: RETVAL = newSVuv ( GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2425 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break;
2471 case 5: RETVAL = newSVuv ( GET_MAP_MOVE_SLOW (obj, x, y)); break; 2426 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break;
2472 case 6: RETVAL = newSVuv ( GET_MAP_MOVE_ON (obj, x, y)); break; 2427 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break;
2473 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break; 2428 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break;
2474 } 2429 }
2475 OUTPUT: RETVAL 2430 OUTPUT: RETVAL
2476 2431
2477void fix_walls (maptile *map, int x, int y) 2432void fix_walls (maptile *map, int x, int y)
2478 2433
2659 CODE: 2614 CODE:
2660{ 2615{
2661 STRLEN len; 2616 STRLEN len;
2662 char *buf = SvPVbyte (packet, len); 2617 char *buf = SvPVbyte (packet, len);
2663 2618
2619 if (len > MAXSOCKBUF)
2620 {
2621 // ugly
2622 if (THIS->pl)
2623 THIS->pl->failmsg ("[packet too long for client]");
2624 }
2625 else
2664 THIS->send_packet (buf, len); 2626 THIS->send_packet (buf, len);
2665} 2627}
2666 2628
2667faceidx 2629faceidx
2668client::need_face (utf8_string name, int pri = 0) 2630client::need_face (utf8_string name, int pri = 0)
2669 CODE: 2631 CODE:
2768 } 2730 }
2769} 2731}
2770 2732
2771int get_data_size (faceidx idx, int faceset = 0) 2733int get_data_size (faceidx idx, int faceset = 0)
2772 CODE: 2734 CODE:
2773 facedata *d = face_data (idx, faceset); assert (d); 2735 facedata *d = face_data (idx, faceset);
2736 if (!d) XSRETURN_UNDEF;
2774 RETVAL = d->data.size (); 2737 RETVAL = d->data.size ();
2775 OUTPUT: 2738 OUTPUT:
2776 RETVAL 2739 RETVAL
2777 2740
2778SV *get_chksum (faceidx idx, int faceset = 0) 2741SV *get_chksum (faceidx idx, int faceset = 0)
2779 CODE: 2742 CODE:
2780 facedata *d = face_data (idx, faceset); assert (d); 2743 facedata *d = face_data (idx, faceset);
2744 if (!d) XSRETURN_UNDEF;
2781 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2745 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE);
2746 OUTPUT:
2747 RETVAL
2748
2749SV *get_data (faceidx idx, int faceset = 0)
2750 CODE:
2751 facedata *d = face_data (idx, faceset);
2752 if (!d) XSRETURN_UNDEF;
2753 RETVAL = newSVpvn (d->data.data (), d->data.length ());
2782 OUTPUT: 2754 OUTPUT:
2783 RETVAL 2755 RETVAL
2784 2756
2785void invalidate (faceidx idx) 2757void invalidate (faceidx idx)
2786 CODE: 2758 CODE:
2874 sv_to (sv, self); 2846 sv_to (sv, self);
2875 delete self; 2847 delete self;
2876 2848
2877void 2849void
2878extract_tags (object_thawer *self) 2850extract_tags (object_thawer *self)
2879 CODE: 2851 PPCODE:
2880 while (self->kw != KW_EOF) 2852 while (self->kw != KW_EOF)
2881 { 2853 {
2854 PUTBACK;
2882 coroapi::cede_to_tick_every (5000); 2855 coroapi::cede_to_tick ();
2856 SPAGAIN;
2883 2857
2884 if (self->kw == KW_tag) 2858 if (self->kw == KW_tag)
2885 XPUSHs (sv_2mortal (to_sv (self->get_str ()))); 2859 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
2886 2860
2887 self->skip (); 2861 self->skip ();
2888 } 2862 }
2889 2863

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines