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.271 by root, Tue Apr 1 19:50:39 2008 UTC vs.
Revision 1.281 by root, Tue Apr 22 07:01:47 2008 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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
… …
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 28
29#define CEDES_PER_TICK 3
30
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>
45#endif 44#endif
46 45
47#if HAVE_MALLOC_H 46#if HAVE_MALLOC_H
48# include <malloc.h> 47# include <malloc.h>
49#endif 48#endif
50 49
50#if !__GLIBC__
51# define malloc_trim(pad) -1
52#endif
53
51#include <EXTERN.h> 54#include <EXTERN.h>
52#include <perl.h> 55#include <perl.h>
53#include <XSUB.h> 56#include <XSUB.h>
54 57
55#include "CoroAPI.h" 58#include "CoroAPI.h"
… …
60typedef object_thawer &object_thawer_ref; 63typedef object_thawer &object_thawer_ref;
61typedef object_freezer &object_freezer_ref; 64typedef object_freezer &object_freezer_ref;
62 65
63typedef std::string std__string; 66typedef std::string std__string;
64 67
65#if IVSIZE >= 8
66 typedef IV val64;
67# define newSVval64 newSViv
68# define SvVAL64 SvIV
69#else
70 typedef double val64;
71# define newSVval64 newSVnv
72# define SvVAL64 SvNV
73#endif
74
75static PerlInterpreter *perl; 68static PerlInterpreter *perl;
76 69
77tstamp NOW, runtime; 70tstamp NOW, runtime;
71
72static int tick_inhibit;
73static int tick_pending;
78 74
79global gbl_ev; 75global gbl_ev;
80static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 76static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
81static SV *sv_runtime, *sv_next_tick, *sv_now; 77static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now;
82 78
83bitset<NUM_EVENT_TYPES> ev_want_event; 79bitset<NUM_EVENT_TYPES> ev_want_event;
84bitset<NUM_TYPES> ev_want_type; 80bitset<NUM_TYPES> ev_want_type;
85 81
86static HV 82static HV
… …
442inline SV *to_sv (living & v) { return to_sv (&v); } 438inline SV *to_sv (living & v) { return to_sv (&v); }
443 439
444inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
445inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 441inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
446 442
447inline SV *to_sv (UUID v) 443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
448{
449 char buf[128];
450 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
451 return newSVpv (buf, 0);
452}
453 444
454inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 445inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }
455inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 446inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
456inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 447inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
457inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 448inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
… …
499 v.assign (data, len); 490 v.assign (data, len);
500} 491}
501 492
502inline void sv_to (SV *sv, UUID &v) 493inline void sv_to (SV *sv, UUID &v)
503{ 494{
504 unsigned int version; 495 if (!v.parse (SvPV_nolen (sv)))
505
506 if (2 != sscanf (SvPV_nolen (sv), "<%d.%" SCNx64 ">", &version, &v.seq) || 1 != version)
507 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 496 croak ("unparsable uuid: %s", SvPV_nolen (sv));
508} 497}
509 498
510inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); } 499inline void sv_to (SV *sv, object::flags_t::reference v) { v = SvTRUE (sv); }
511 500
… …
909} 898}
910 899
911///////////////////////////////////////////////////////////////////////////// 900/////////////////////////////////////////////////////////////////////////////
912// various c++ => perl glue functions 901// various c++ => perl glue functions
913 902
903void cfperl_tick ()
904{
905 tick_pending = 1;
906
907 if (tick_inhibit)
908 return;
909
910 tick_pending = 0;
911
912 dSP;
913
914 PUSHMARK (SP);
915 PUTBACK;
916 call_pv ("cf::tick", G_DISCARD | G_VOID);
917
918 SvNV_set (sv_next_tick, get_next_tick ()); SvNOK_only (sv_next_tick);
919}
920
914void 921void
915cfperl_emergency_save () 922cfperl_emergency_save ()
916{ 923{
917 CALL_BEGIN (0); 924 CALL_BEGIN (0);
918 CALL_CALL ("cf::emergency_save", G_VOID); 925 CALL_CALL ("cf::emergency_save", G_VOID);
… …
1104///////////////////////////////////////////////////////////////////////////// 1111/////////////////////////////////////////////////////////////////////////////
1105 1112
1106struct EVAPI *evapi::GEVAPI; 1113struct EVAPI *evapi::GEVAPI;
1107struct CoroAPI *coroapi::GCoroAPI; 1114struct CoroAPI *coroapi::GCoroAPI;
1108 1115
1109int coroapi::cede_counter;
1110tstamp coroapi::next_cede;
1111
1112void coroapi::do_cede_to_tick () 1116void coroapi::do_cede_to_tick ()
1113{ 1117{
1114 cede_counter = 0; 1118 cede_pending = 0;
1115
1116 cede (); 1119 cede ();
1117
1118 next_cede += TICK / CEDES_PER_TICK;
1119 if (next_cede > SvNVx (sv_next_tick) - 0.002)
1120 next_cede = SvNVx (sv_next_tick);
1121}
1122
1123void coroapi::do_cede_every ()
1124{
1125 cede_counter = 0;
1126
1127 if (coroapi::nready ())
1128 coroapi::cede ();
1129}
1130
1131void coroapi::do_cede_to_tick_every ()
1132{
1133 cede_counter = 0;
1134
1135 cede_to_tick ();
1136} 1120}
1137 1121
1138void 1122void
1139coroapi::wait_for_tick () 1123coroapi::wait_for_tick ()
1140{ 1124{
… …
1164} 1148}
1165 1149
1166void 1150void
1167_connect_to_perl () 1151_connect_to_perl ()
1168{ 1152{
1169 stash_cf = gv_stashpv ("cf" , 1); 1153 stash_cf = gv_stashpv ("cf", 1);
1170 1154
1171 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1155 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1172 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1156 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1173 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1157 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1174 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1158 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
… …
1176 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1160 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1177 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1161 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1178 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1162 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1179 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1163 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1180 1164
1181 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV); 1165 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1182 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV); 1166 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV);
1167 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV);
1183 sv_next_tick = get_sv ("cf::NEXT_TICK", 1); SvUPGRADE (sv_next_tick, SVt_NV); 1168 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
1184 1169
1185 cb_global = get_av ("cf::CB_GLOBAL", 1); 1170 cb_global = get_av ("cf::CB_GLOBAL", 1);
1186 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1); 1171 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1);
1187 cb_object = get_av ("cf::CB_OBJECT", 1); 1172 cb_object = get_av ("cf::CB_OBJECT", 1);
1188 cb_player = get_av ("cf::CB_PLAYER", 1); 1173 cb_player = get_av ("cf::CB_PLAYER", 1);
… …
1421 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION) 1406 const_iv (ATNR_PARALYZE) const_iv (ATNR_TURN_UNDEAD) const_iv (ATNR_FEAR) const_iv (ATNR_CANCELLATION)
1422 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL) 1407 const_iv (ATNR_DEPLETE) const_iv (ATNR_DEATH) const_iv (ATNR_CHAOS) const_iv (ATNR_COUNTERSPELL)
1423 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL) 1408 const_iv (ATNR_GODPOWER) const_iv (ATNR_HOLYWORD) const_iv (ATNR_BLIND) const_iv (ATNR_INTERNAL)
1424 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE) 1409 const_iv (ATNR_LIFE_STEALING) const_iv (ATNR_DISEASE)
1425 1410
1426 const_iv (MAP_IN_MEMORY) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING) 1411 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1412 const_iv (MAP_INACTIVE)
1427 1413
1428 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1414 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1429 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1415 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1430 1416
1431 const_iv (VERSION_CS) const_iv (VERSION_SC) 1417 const_iv (VERSION_CS) const_iv (VERSION_SC)
… …
1446 1432
1447 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X) 1433 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1448 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY) 1434 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1449 1435
1450 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP) 1436 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1451 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_UPDATE_INV) 1437 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1452 const_iv (GT_MINIMAL)
1453 1438
1454 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND) 1439 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1455 const_iv (FT_RSRC) const_iv (FT_NUM) 1440 const_iv (FT_RSRC) const_iv (FT_NUM)
1456 }; 1441 };
1457 1442
… …
1536 } 1521 }
1537 1522
1538 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1523 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1539} 1524}
1540 1525
1526void evthread_start (int aiofd)
1527
1541void _post_tick () 1528void cede_to_tick ()
1542 CODE: 1529 CODE:
1543 coroapi::next_cede = SvNVx (sv_next_tick) - TICK * (1. - 1. / CEDES_PER_TICK); 1530 coroapi::cede_to_tick ();
1544 1531
1545NV till_cede () 1532NV till_tick ()
1546 CODE: 1533 CODE:
1547 RETVAL = coroapi::next_cede - now (); 1534 RETVAL = SvNVX (sv_next_tick) - now ();
1548 OUTPUT: 1535 OUTPUT:
1549 RETVAL 1536 RETVAL
1550 1537
1551NV till_tick () 1538int tick_inhibit ()
1552 CODE: 1539 CODE:
1553 RETVAL = SvNVx (sv_next_tick) - now (); 1540 RETVAL = tick_inhibit;
1554 OUTPUT: 1541 OUTPUT:
1555 RETVAL 1542 RETVAL
1543
1544void tick_inhibit_inc ()
1545 CODE:
1546 ++tick_inhibit;
1547
1548void tick_inhibit_dec ()
1549 CODE:
1550 if (!--tick_inhibit)
1551 if (tick_pending)
1552 {
1553 ev_async_send (EV_DEFAULT, &tick_watcher);
1554 coroapi::cede ();
1555 }
1556
1557void server_tick ()
1558 CODE:
1559{
1560 NOW = ev_now (EV_DEFAULT);
1561 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1562 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1563 runtime = SvNVX (sv_runtime);
1564
1565 server_tick ();
1566
1567 NOW = ev_time ();
1568 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1569 runtime += TICK;
1570 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1571}
1556 1572
1557NV floor (NV x) 1573NV floor (NV x)
1558 1574
1559NV ceil (NV x) 1575NV ceil (NV x)
1560 1576
… …
1586 PROTOTYPE: @ 1602 PROTOTYPE: @
1587 CODE: 1603 CODE:
1588 while (items > 0) 1604 while (items > 0)
1589 sv_rvweaken (ST (--items)); 1605 sv_rvweaken (ST (--items));
1590 1606
1591void cede_to_tick ()
1592 CODE:
1593 coroapi::cede_to_tick ();
1594
1595void server_tick ()
1596 CODE:
1597 NOW = SvNVx (sv_now);
1598 runtime = SvNVx (sv_runtime);
1599 server_tick ();
1600
1601void 1607void
1602log_backtrace (utf8_string msg) 1608log_backtrace (utf8_string msg)
1603 1609
1604void 1610void
1605LOG (int flags, utf8_string msg) 1611LOG (int flags, utf8_string msg)
… …
1609octet_string path_combine (octet_string base, octet_string path) 1615octet_string path_combine (octet_string base, octet_string path)
1610 PROTOTYPE: $$ 1616 PROTOTYPE: $$
1611 1617
1612octet_string path_combine_and_normalize (octet_string base, octet_string path) 1618octet_string path_combine_and_normalize (octet_string base, octet_string path)
1613 PROTOTYPE: $$ 1619 PROTOTYPE: $$
1614
1615void
1616mallinfo ()
1617 PPCODE:
1618{
1619#if __GLIBC__
1620 struct mallinfo mai = mallinfo ();
1621 EXTEND (SP, 10*2);
1622 PUSHs (sv_2mortal (newSVpv ("arena" , 0))); PUSHs (sv_2mortal (newSViv (mai.arena)));
1623 PUSHs (sv_2mortal (newSVpv ("ordblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.ordblks)));
1624 PUSHs (sv_2mortal (newSVpv ("smblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.smblks)));
1625 PUSHs (sv_2mortal (newSVpv ("hblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblks)));
1626 PUSHs (sv_2mortal (newSVpv ("hblkhd" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblkhd)));
1627 PUSHs (sv_2mortal (newSVpv ("usmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.usmblks)));
1628 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1629 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1630 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1631 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1632#endif
1633 EXTEND (SP, 2*2);
1634 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1635 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1636}
1637 1620
1638void 1621void
1639sub_generation_inc () 1622sub_generation_inc ()
1640 CODE: 1623 CODE:
1641 PL_sub_generation++; 1624 PL_sub_generation++;
… …
1678 1661
1679#if _POSIX_MEMLOCK 1662#if _POSIX_MEMLOCK
1680 1663
1681int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1664int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1682 INIT: 1665 INIT:
1666#if __GLIBC__
1683 mallopt (M_PERTURB, 0xaa); // bug-workaround for linux glibc+mlockall+calloc 1667 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1668#endif
1684 1669
1685int munlockall () 1670int munlockall ()
1686 1671
1687#endif 1672#endif
1673
1674int
1675malloc_trim (IV pad = 0)
1676
1677void
1678mallinfo ()
1679 PPCODE:
1680{
1681#if __GLIBC__
1682 struct mallinfo mai = mallinfo ();
1683 EXTEND (SP, 10*2);
1684 PUSHs (sv_2mortal (newSVpv ("arena" , 0))); PUSHs (sv_2mortal (newSViv (mai.arena)));
1685 PUSHs (sv_2mortal (newSVpv ("ordblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.ordblks)));
1686 PUSHs (sv_2mortal (newSVpv ("smblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.smblks)));
1687 PUSHs (sv_2mortal (newSVpv ("hblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblks)));
1688 PUSHs (sv_2mortal (newSVpv ("hblkhd" , 0))); PUSHs (sv_2mortal (newSViv (mai.hblkhd)));
1689 PUSHs (sv_2mortal (newSVpv ("usmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.usmblks)));
1690 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1691 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1692 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1693 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1694#endif
1695 EXTEND (SP, 2*2);
1696 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1697 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1698}
1688 1699
1689int find_animation (utf8_string text) 1700int find_animation (utf8_string text)
1690 PROTOTYPE: $ 1701 PROTOTYPE: $
1691 1702
1692int random_roll (int min, int max, object *op, int goodbad); 1703int random_roll (int min, int max, object *op, int goodbad);
… …
1730 RETVAL = newSVpv (resist_plus[atnr], 0); 1741 RETVAL = newSVpv (resist_plus[atnr], 0);
1731 else 1742 else
1732 XSRETURN_UNDEF; 1743 XSRETURN_UNDEF;
1733 OUTPUT: RETVAL 1744 OUTPUT: RETVAL
1734 1745
1746UUID
1747uuid_cur ()
1748 CODE:
1749 RETVAL = UUID::cur;
1750 OUTPUT:
1751 RETVAL
1752
1753UUID
1754uuid_gen ()
1755 CODE:
1756 RETVAL = UUID::gen ();
1757 OUTPUT:
1758 RETVAL
1759
1760val64
1761uuid_seq (UUID uuid)
1762 CODE:
1763 RETVAL = uuid.seq;
1764 OUTPUT:
1765 RETVAL
1766
1767UUID
1768uuid_str (val64 seq)
1769 CODE:
1770 RETVAL.seq = seq;
1771 OUTPUT:
1772 RETVAL
1773
1774void
1775coin_names ()
1776 PPCODE:
1777 EXTEND (SP, NUM_COINS);
1778 for (int i = 0; i < NUM_COINS; ++i)
1779 PUSHs (sv_2mortal (newSVpv (coins [i], 0)));
1780
1781void
1782coin_archetypes ()
1783 PPCODE:
1784 EXTEND (SP, NUM_COINS);
1785 for (int i = 0; i < NUM_COINS; ++i)
1786 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i]))));
1787
1735bool 1788bool
1736load_resource_file (octet_string filename) 1789load_resource_file_ (octet_string filename)
1737 1790
1738MODULE = cf PACKAGE = cf::attachable 1791MODULE = cf PACKAGE = cf::attachable
1739 1792
1740int 1793int
1741valid (SV *obj) 1794valid (SV *obj)
… …
2024const_utf8_string 2077const_utf8_string
2025base_name (object *op, int plural = op->nrof > 1) 2078base_name (object *op, int plural = op->nrof > 1)
2026 CODE: 2079 CODE:
2027 RETVAL = query_base_name (op, plural); 2080 RETVAL = query_base_name (op, plural);
2028 OUTPUT: RETVAL 2081 OUTPUT: RETVAL
2029
2030object *decrease_ob_nr (object *op, unsigned long i)
2031 2082
2032# return the tail of an object, excluding itself 2083# return the tail of an object, excluding itself
2033void 2084void
2034tail (object *op) 2085tail (object *op)
2035 PPCODE: 2086 PPCODE:
… …
2803extract_tags (object_thawer *self) 2854extract_tags (object_thawer *self)
2804 PPCODE: 2855 PPCODE:
2805 while (self->kw != KW_EOF) 2856 while (self->kw != KW_EOF)
2806 { 2857 {
2807 PUTBACK; 2858 PUTBACK;
2808 coroapi::cede_to_tick_every (500); 2859 coroapi::cede_to_tick ();
2809 SPAGAIN; 2860 SPAGAIN;
2810 2861
2811 if (self->kw == KW_tag) 2862 if (self->kw == KW_tag)
2812 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ()))); 2863 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
2813 2864

Diff Legend

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