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.257 by root, Sun Sep 30 16:24:31 2007 UTC vs.
Revision 1.272 by root, Wed Apr 2 11:13:56 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 <cstdarg> 33#include <cstdarg>
36 34
37#include "global.h" 35#include "global.h"
38#include "loader.h" 36#include "loader.h"
39#include "../random_maps/random_map.h" 37#include "../random_maps/random_map.h"
38#include "evthread.h"
40#include <sproto.h> 39#include "sproto.h"
41 40
42#include <unistd.h> 41#include <unistd.h>
43#if _POSIX_MEMLOCK 42#if _POSIX_MEMLOCK
44# include <sys/mman.h> 43# include <sys/mman.h>
44#endif
45
46#if HAVE_MALLOC_H
47# include <malloc.h>
45#endif 48#endif
46 49
47#include <EXTERN.h> 50#include <EXTERN.h>
48#include <perl.h> 51#include <perl.h>
49#include <XSUB.h> 52#include <XSUB.h>
… …
70 73
71static PerlInterpreter *perl; 74static PerlInterpreter *perl;
72 75
73tstamp NOW, runtime; 76tstamp NOW, runtime;
74 77
78static int tick_inhibit;
79static int tick_pending;
80
75global gbl_ev; 81global gbl_ev;
76static 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;
77static SV *sv_runtime, *sv_next_tick; 83static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
78 84
79bitset<NUM_EVENT_TYPES> ev_want_event; 85bitset<NUM_EVENT_TYPES> ev_want_event;
80bitset<NUM_TYPES> ev_want_type; 86bitset<NUM_TYPES> ev_want_type;
81 87
82static HV 88static HV
… …
601///////////////////////////////////////////////////////////////////////////// 607/////////////////////////////////////////////////////////////////////////////
602 608
603void 609void
604cfperl_init () 610cfperl_init ()
605{ 611{
612 extern char **environ;
613
606 PERL_SYS_INIT3 (&settings.argc, &settings.argv, 0); 614 PERL_SYS_INIT3 (&settings.argc, &settings.argv, &environ);
607 perl = perl_alloc (); 615 perl = perl_alloc ();
608 perl_construct (perl); 616 perl_construct (perl);
609 617
610 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 618 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
611 619
612 const char *argv[] = { 620 const char *argv[] = {
613 settings.argv [0], 621 settings.argv [0],
614 "-e" 622 "-e"
615 "use Event; use Coro;" // required for bootstrap 623 "use EV; use Coro;" // required for bootstrap
616 "cf->bootstrap;" // required for datadir :*> 624 "cf->bootstrap;" // required for datadir :*>
617 "unshift @INC, cf::datadir ();" 625 "unshift @INC, cf::datadir ();"
618 "require cf;" 626 "require cf;"
619 }; 627 };
620 628
621 if (perl_parse (perl, xs_init, 2, (char **)argv, (char **)NULL) 629 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
622 || perl_run (perl)) 630 || perl_run (perl))
623 { 631 {
624 printf ("unable to initialize perl-interpreter, aborting.\n"); 632 printf ("unable to initialize perl-interpreter, aborting.\n");
625 exit (EXIT_FAILURE); 633 exit (EXIT_FAILURE);
626 } 634 }
… …
903} 911}
904 912
905///////////////////////////////////////////////////////////////////////////// 913/////////////////////////////////////////////////////////////////////////////
906// various c++ => perl glue functions 914// various c++ => perl glue functions
907 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
908void 934void
909cfperl_emergency_save () 935cfperl_emergency_save ()
910{ 936{
911 CALL_BEGIN (0); 937 CALL_BEGIN (0);
912 CALL_CALL ("cf::emergency_save", G_VOID); 938 CALL_CALL ("cf::emergency_save", G_VOID);
… …
1095#endif 1121#endif
1096} 1122}
1097 1123
1098///////////////////////////////////////////////////////////////////////////// 1124/////////////////////////////////////////////////////////////////////////////
1099 1125
1100struct EventAPI *watcher_base::GEventAPI; 1126struct EVAPI *evapi::GEVAPI;
1101struct CoroAPI *coroapi::GCoroAPI; 1127struct CoroAPI *coroapi::GCoroAPI;
1102
1103int coroapi::cede_counter;
1104tstamp coroapi::next_cede;
1105 1128
1106void coroapi::do_cede_to_tick () 1129void coroapi::do_cede_to_tick ()
1107{ 1130{
1108 cede_counter = 0; 1131 cede_pending = 0;
1109
1110 cede (); 1132 cede ();
1111
1112 next_cede += (TICK / CEDES_PER_TICK) * 0.99;
1113 if (next_cede > SvNV (sv_next_tick) - 0.02)
1114 next_cede = SvNV (sv_next_tick);
1115}
1116
1117void coroapi::do_cede_every ()
1118{
1119 cede_counter = 0;
1120
1121 if (coroapi::nready ())
1122 coroapi::cede ();
1123}
1124
1125void coroapi::do_cede_to_tick_every ()
1126{
1127 cede_counter = 0;
1128
1129 cede_to_tick ();
1130} 1133}
1131 1134
1132void 1135void
1133coroapi::wait_for_tick () 1136coroapi::wait_for_tick ()
1134{ 1137{
… …
1143 CALL_BEGIN (0); 1146 CALL_BEGIN (0);
1144 CALL_CALL ("cf::wait_for_tick_begin", G_DISCARD); 1147 CALL_CALL ("cf::wait_for_tick_begin", G_DISCARD);
1145 CALL_END; 1148 CALL_END;
1146} 1149}
1147 1150
1148static void
1149iw_dispatch (pe_event *ev)
1150{
1151 iw *w = (iw *)ev->ext_data;
1152 w->call (*w);
1153}
1154
1155void
1156iw::alloc ()
1157{
1158 pe = GEventAPI->new_idle (0, 0);
1159
1160 WaREENTRANT_off (pe);
1161 pe->base.callback = (void *)iw_dispatch;
1162 pe->base.ext_data = (void *)this;
1163}
1164
1165static void iow_dispatch (pe_event *ev)
1166{
1167 iow *w = (iow *)ev->ext_data;
1168 w->call (*w, ((pe_ioevent *)ev)->got);
1169}
1170
1171void
1172iow::alloc ()
1173{
1174 pe = GEventAPI->new_io (0, 0);
1175
1176 WaREENTRANT_off (pe);
1177 pe->base.callback = (void *)iow_dispatch;
1178 pe->base.ext_data = (void *)this;
1179
1180 pe->fd = -1;
1181 pe->poll = 0;
1182}
1183
1184void
1185iow::fd (int fd)
1186{
1187 pe->fd = fd;
1188}
1189
1190int
1191iow::poll ()
1192{
1193 return pe->poll;
1194}
1195
1196void 1151void
1197iow::poll (int events) 1152iow::poll (int events)
1198{ 1153{
1199 if (pe->poll != events) 1154 if (events != this->events)
1200 { 1155 {
1156 int active = ev_is_active ((ev_io *)this);
1201 if (pe->poll) stop (); 1157 if (active) stop ();
1202 pe->poll = events; 1158 ev_io_set ((ev_io *)this, fd, events);
1203 if (pe->poll) start (); 1159 if (active) start ();
1204 } 1160 }
1205} 1161}
1206 1162
1207void 1163void
1208_connect_to_perl () 1164_connect_to_perl ()
1209{ 1165{
1210 stash_cf = gv_stashpv ("cf" , 1); 1166 stash_cf = gv_stashpv ("cf", 1);
1211 1167
1212 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1168 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1213 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);
1214 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1170 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1215 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1171 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
… …
1217 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1173 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1218 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1174 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1219 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1175 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1220 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1176 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1221 1177
1178 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1222 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);
1223 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);
1224 1182
1225 cb_global = get_av ("cf::CB_GLOBAL", 1); 1183 cb_global = get_av ("cf::CB_GLOBAL", 1);
1226 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1); 1184 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1);
1227 cb_object = get_av ("cf::CB_OBJECT", 1); 1185 cb_object = get_av ("cf::CB_OBJECT", 1);
1228 cb_player = get_av ("cf::CB_PLAYER", 1); 1186 cb_player = get_av ("cf::CB_PLAYER", 1);
… …
1233 1191
1234MODULE = cf PACKAGE = cf PREFIX = cf_ 1192MODULE = cf PACKAGE = cf PREFIX = cf_
1235 1193
1236BOOT: 1194BOOT:
1237{ 1195{
1238 I_EVENT_API (PACKAGE); watcher_base::GEventAPI = GEventAPI; 1196 I_EV_API (PACKAGE); evapi::GEVAPI = GEVAPI;
1239 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1197 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1240 1198
1241 _connect_to_perl (); 1199 _connect_to_perl ();
1242 1200
1243 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1201 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1244 1202
… …
1262 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1220 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1263 1221
1264 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1222 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1265 1223
1266 const_iv (MAX_TIME) 1224 const_iv (MAX_TIME)
1225 const_iv (MAXSOCKBUF)
1267 1226
1268 const_iv (NUM_BODY_LOCATIONS) 1227 const_iv (NUM_BODY_LOCATIONS)
1269 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)
1270 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)
1271 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)
… …
1416 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)
1417 1376
1418 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)
1419 1378
1420 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)
1421 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)
1422 1381
1423 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)
1424 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD) 1383 const_iv (WILL_APPLY_DOOR) const_iv (WILL_APPLY_FOOD)
1425 1384
1426 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1385 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
… …
1575 } 1534 }
1576 1535
1577 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1536 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1578} 1537}
1579 1538
1539void evthread_start ()
1540
1580void _post_tick () 1541void cede_to_tick ()
1581 CODE: 1542 CODE:
1582 coroapi::next_cede = SvNV (sv_next_tick) - TICK * (1. - 1. / CEDES_PER_TICK); 1543 coroapi::cede_to_tick ();
1583 1544
1584NV till_cede () 1545NV till_tick ()
1585 CODE: 1546 CODE:
1586 RETVAL = coroapi::next_cede - now (); 1547 RETVAL = SvNVX (sv_next_tick) - now ();
1587 OUTPUT: 1548 OUTPUT:
1588 RETVAL 1549 RETVAL
1589 1550
1590NV till_tick () 1551int tick_inhibit ()
1591 CODE: 1552 CODE:
1592 RETVAL = SvNV (sv_next_tick) - now (); 1553 RETVAL = tick_inhibit;
1593 OUTPUT: 1554 OUTPUT:
1594 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}
1595 1585
1596NV floor (NV x) 1586NV floor (NV x)
1597 1587
1598NV ceil (NV x) 1588NV ceil (NV x)
1599 1589
… …
1619 CODE: 1609 CODE:
1620 RETVAL = lerp (value, min_in, max_in, min_out, max_out); 1610 RETVAL = lerp (value, min_in, max_in, min_out, max_out);
1621 OUTPUT: 1611 OUTPUT:
1622 RETVAL 1612 RETVAL
1623 1613
1624void cede_to_tick () 1614void weaken (...)
1625 CODE: 1615 PROTOTYPE: @
1626 coroapi::cede_to_tick (); 1616 CODE:
1627 1617 while (items > 0)
1628void server_tick () 1618 sv_rvweaken (ST (--items));
1629 CODE:
1630 NOW = now ();
1631 runtime = SvNVx (sv_runtime);
1632 server_tick ();
1633 1619
1634void 1620void
1635log_backtrace (utf8_string msg) 1621log_backtrace (utf8_string msg)
1636 1622
1637void 1623void
… …
1642octet_string path_combine (octet_string base, octet_string path) 1628octet_string path_combine (octet_string base, octet_string path)
1643 PROTOTYPE: $$ 1629 PROTOTYPE: $$
1644 1630
1645octet_string path_combine_and_normalize (octet_string base, octet_string path) 1631octet_string path_combine_and_normalize (octet_string base, octet_string path)
1646 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}
1647 1656
1648void 1657void
1649sub_generation_inc () 1658sub_generation_inc ()
1650 CODE: 1659 CODE:
1651 PL_sub_generation++; 1660 PL_sub_generation++;
… …
1676 1685
1677void abort () 1686void abort ()
1678 1687
1679void reset_signals () 1688void reset_signals ()
1680 1689
1681void fork_abort (octet_string cause = "cf::fork_abort") 1690void fork_abort (const_octet_string cause = "cf::fork_abort")
1682 1691
1683void cleanup (octet_string cause, bool make_core = false) 1692void cleanup (const_octet_string cause, bool make_core = false)
1684 1693
1685void emergency_save () 1694void emergency_save ()
1686 1695
1687void _exit (int status = EXIT_SUCCESS) 1696void _exit (int status = EXIT_SUCCESS)
1688 1697
1689UV sv_2watcher (SV *w)
1690 CODE:
1691 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1692 OUTPUT:
1693 RETVAL
1694
1695#if _POSIX_MEMLOCK 1698#if _POSIX_MEMLOCK
1696 1699
1697int 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
1698 1703
1699int munlockall () 1704int munlockall ()
1700 1705
1701#endif 1706#endif
1702 1707
… …
2117 CODE: 2122 CODE:
2118{ 2123{
2119 STRLEN len; 2124 STRLEN len;
2120 char *buf = SvPVbyte (packet, len); 2125 char *buf = SvPVbyte (packet, len);
2121 2126
2127 if (len > MAXSOCKBUF)
2128 pl->failmsg ("[packet too long for client]");
2122 if (pl->ns) 2129 else if (pl->ns)
2123 pl->ns->send_packet (buf, len); 2130 pl->ns->send_packet (buf, len);
2124} 2131}
2125 2132
2126int 2133int
2127listening (player *pl, int new_value = -1) 2134listening (player *pl, int new_value = -1)
… …
2579 CODE: 2586 CODE:
2580{ 2587{
2581 STRLEN len; 2588 STRLEN len;
2582 char *buf = SvPVbyte (packet, len); 2589 char *buf = SvPVbyte (packet, len);
2583 2590
2591 if (len > MAXSOCKBUF)
2592 {
2593 // ugly
2594 if (THIS->pl)
2595 THIS->pl->failmsg ("[packet too long for client]");
2596 }
2597 else
2584 THIS->send_packet (buf, len); 2598 THIS->send_packet (buf, len);
2585} 2599}
2586 2600
2587faceidx 2601faceidx
2588client::need_face (utf8_string name, int pri = 0) 2602client::need_face (utf8_string name, int pri = 0)
2589 CODE: 2603 CODE:
… …
2688 } 2702 }
2689} 2703}
2690 2704
2691int get_data_size (faceidx idx, int faceset = 0) 2705int get_data_size (faceidx idx, int faceset = 0)
2692 CODE: 2706 CODE:
2693 facedata *d = face_data (idx, faceset); assert (d); 2707 facedata *d = face_data (idx, faceset);
2708 if (!d) XSRETURN_UNDEF;
2694 RETVAL = d->data.size (); 2709 RETVAL = d->data.size ();
2695 OUTPUT: 2710 OUTPUT:
2696 RETVAL 2711 RETVAL
2697 2712
2698SV *get_chksum (faceidx idx, int faceset = 0) 2713SV *get_chksum (faceidx idx, int faceset = 0)
2699 CODE: 2714 CODE:
2700 facedata *d = face_data (idx, faceset); assert (d); 2715 facedata *d = face_data (idx, faceset);
2716 if (!d) XSRETURN_UNDEF;
2701 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE); 2717 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE);
2718 OUTPUT:
2719 RETVAL
2720
2721SV *get_data (faceidx idx, int faceset = 0)
2722 CODE:
2723 facedata *d = face_data (idx, faceset);
2724 if (!d) XSRETURN_UNDEF;
2725 RETVAL = newSVpvn (d->data.data (), d->data.length ());
2702 OUTPUT: 2726 OUTPUT:
2703 RETVAL 2727 RETVAL
2704 2728
2705void invalidate (faceidx idx) 2729void invalidate (faceidx idx)
2706 CODE: 2730 CODE:
… …
2798extract_tags (object_thawer *self) 2822extract_tags (object_thawer *self)
2799 PPCODE: 2823 PPCODE:
2800 while (self->kw != KW_EOF) 2824 while (self->kw != KW_EOF)
2801 { 2825 {
2802 PUTBACK; 2826 PUTBACK;
2803 coroapi::cede_to_tick_every (5000); 2827 coroapi::cede_to_tick ();
2804 SPAGAIN; 2828 SPAGAIN;
2805 2829
2806 if (self->kw == KW_tag) 2830 if (self->kw == KW_tag)
2807 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ()))); 2831 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
2808 2832

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines