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.124 by root, Mon Jan 1 00:41:03 2007 UTC vs.
Revision 1.130 by root, Mon Jan 8 01:19:03 2007 UTC

… …
32#include <sproto.h> 32#include <sproto.h>
33 33
34#include "cfperl.h" 34#include "cfperl.h"
35#include "shstr.h" 35#include "shstr.h"
36 36
37#include <unistd.h>
38#if _POSIX_MEMLOCK
39# include <sys/mman.h>
40#endif
41
37#include <EXTERN.h> 42#include <EXTERN.h>
38#include <perl.h> 43#include <perl.h>
39#include <XSUB.h> 44#include <XSUB.h>
40 45
41#include "CoroAPI.h" 46#include "CoroAPI.h"
… …
94 99
95////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 100//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
96 101
97unordered_vector<attachable *> attachable::mortals; 102unordered_vector<attachable *> attachable::mortals;
98 103
99#if 0
100attachable *attachable::rc_first;
101
102attachable::attachable ()
103{
104 refcnt = 0;
105 rc_next = rc_first;
106 rc_first = this;
107}
108#endif
109
110attachable::~attachable () 104attachable::~attachable ()
111{ 105{
112 assert (!(flags & F_BORROWED));//D//TODO//remove when stable 106 assert (!(flags & F_BORROWED));
113#if 0 107}
114 assert (!rc_next); 108
115 assert (!refcnt); 109int
116#endif 110attachable::refcnt_cnt () const
111{
112 return refcnt + (self ? SvREFCNT (self) : 0);
113}
114
115void
116attachable::optimise ()
117{
118 if (self
119 && SvREFCNT (self) == 1
120 && !HvTOTALKEYS (self))
121 {
122 flags &= ~F_BORROWED;
123 refcnt_inc ();
124 SvREFCNT_dec ((SV *)self);
125 }
117} 126}
118 127
119// check wether the object really is dead 128// check wether the object really is dead
120void 129void
121attachable::do_check () 130attachable::do_check ()
122{ 131{
123 if (refcnt > 0) 132 if (refcnt > 0)
124 return; 133 return;
125 134
126 // try to unborrow the refcnt from perl 135 optimise ();
127 if (flags & F_BORROWED) 136
137 if (self)
128 { 138 {
129 assert (self);//D//TODO//remove when stable 139 if (refcnt + SvREFCNT (self) > 0)
140 return;
141
142 assert (flags & F_BORROWED);
143
130 flags &= ~F_BORROWED; 144 flags &= ~F_BORROWED;
131 refcnt_inc (); 145 refcnt_inc ();
132 SvREFCNT_dec (self); 146 SvREFCNT_dec (self);
147 self = 0;
133 } 148 }
134 149
135 if (refcnt > 0 || self) 150 if (refcnt > 0)
136 return; 151 return;
137 152
138 destroy (); 153 destroy ();
139} 154}
140 155
141void 156void
142attachable::do_destroy () 157attachable::do_destroy ()
143{ 158{
144 invoke (EVENT_ATTACHABLE_DESTROY, DT_END); 159 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
145 160
146 //TODO: call generic destroy callback 161 if (self)
162 hv_clear (self);
163
147 mortals.push_back (this); 164 mortals.push_back (this);
148} 165}
149 166
150void 167void
151attachable::destroy () 168attachable::destroy ()
… …
155 172
156 flags |= F_DESTROYED; 173 flags |= F_DESTROYED;
157 do_destroy (); 174 do_destroy ();
158} 175}
159 176
177void
160void attachable::check_mortals () 178attachable::check_mortals ()
161{ 179{
162 for (int i = 0; i < mortals.size (); ) 180 for (int i = 0; i < mortals.size (); )
163 { 181 {
164 attachable *obj = mortals [i]; 182 attachable *obj = mortals [i];
165 183
… …
209 227
210static int 228static int
211attachable_free (pTHX_ SV *sv, MAGIC *mg) 229attachable_free (pTHX_ SV *sv, MAGIC *mg)
212{ 230{
213 attachable *at = (attachable *)mg->mg_ptr; 231 attachable *at = (attachable *)mg->mg_ptr;
214 assert (!(at->flags & attachable::F_BORROWED));//D//TODO//remove when stable 232 assert (!(at->flags & attachable::F_BORROWED));
215 at->self = 0; 233 at->self = 0;
216 // next line makes sense, but most objects still have refcnt 0 by default 234 // next line makes sense, but most objects still have refcnt 0 by default
217 //at->refcnt_chk (); 235 //at->refcnt_chk ();
218 return 0; 236 return 0;
219} 237}
… …
232 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 250 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
233 251
234 // borrow the refcnt from the object 252 // borrow the refcnt from the object
235 obj->flags |= attachable::F_BORROWED; 253 obj->flags |= attachable::F_BORROWED;
236 obj->refcnt_dec (); 254 obj->refcnt_dec ();
255
256 // now bless the object _once_
257 return sv_bless (newRV_inc ((SV *)obj->self), stash);
237 } 258 }
238 259 else
239 return sv_bless (newRV_inc ((SV *)obj->self), stash); 260 return newRV_inc ((SV *)obj->self);
240} 261}
241 262
242static void 263static void
243clearSVptr (SV *sv) 264clearSVptr (SV *sv)
244{ 265{
… …
328inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 349inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); }
329inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 350inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); }
330inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 351inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); }
331inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 352inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
332inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 353inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
354inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
333inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 355inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
334inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); } 356inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
335inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 357inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
336 358
337inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO 359inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO
… …
504 } 526 }
505 527
506 attach = 0; 528 attach = 0;
507} 529}
508#endif 530#endif
509
510void attachable::optimise ()
511{
512 if (self
513 && SvREFCNT (self) == 1
514 && !HvTOTALKEYS (self))
515 {
516 flags &= ~F_BORROWED;
517 refcnt_inc ();
518 SvREFCNT_dec ((SV *)self);
519 }
520}
521 531
522///////////////////////////////////////////////////////////////////////////// 532/////////////////////////////////////////////////////////////////////////////
523 533
524extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 534extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
525{ 535{
… …
828 CALL_CALL ("cf::map::emergency_save", G_VOID); 838 CALL_CALL ("cf::map::emergency_save", G_VOID);
829 CALL_END; 839 CALL_END;
830} 840}
831 841
832maptile * 842maptile *
833maptile::load_map_sync (const char *path, maptile *origin) 843maptile::find_sync (const char *path, maptile *origin)
834{ 844{
835 CALL_BEGIN (2); 845 CALL_BEGIN (2);
836 CALL_ARG (path); 846 CALL_ARG (path);
837 CALL_ARG (origin); 847 CALL_ARG (origin);
838 CALL_CALL ("cf::map::load_map_sync", G_SCALAR); 848 CALL_CALL ("cf::map::find_sync", G_SCALAR);
839 849
840 maptile *retval; 850 maptile *retval;
841 851
842 if (count) 852 if (count)
843 sv_to (POPs, retval); 853 sv_to (POPs, retval);
… …
845 retval = 0; 855 retval = 0;
846 856
847 CALL_END; 857 CALL_END;
848 858
849 return retval; 859 return retval;
860}
861
862void
863maptile::do_load_sync ()
864{
865 CALL_BEGIN (1);
866 CALL_ARG (this);
867 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
868 CALL_END;
850} 869}
851 870
852void 871void
853maptile::change_all_map_light (int change) 872maptile::change_all_map_light (int change)
854{ 873{
… …
1461 const_iv (ST_SETUP) 1480 const_iv (ST_SETUP)
1462 const_iv (ST_PLAYING) 1481 const_iv (ST_PLAYING)
1463 const_iv (ST_CUSTOM) 1482 const_iv (ST_CUSTOM)
1464 1483
1465 const_iv (ST_CHANGE_CLASS) 1484 const_iv (ST_CHANGE_CLASS)
1466 const_iv (ST_CONFIRM_QUIT)
1467 const_iv (ST_GET_PARTY_PASSWORD)
1468 1485
1469 const_iv (IO_HEADER) 1486 const_iv (IO_HEADER)
1470 const_iv (IO_OBJECTS) 1487 const_iv (IO_OBJECTS)
1471 const_iv (IO_UNIQUES) 1488 const_iv (IO_UNIQUES)
1472 1489
… …
1526 1543
1527void _global_reattach () 1544void _global_reattach ()
1528 CODE: 1545 CODE:
1529{ 1546{
1530 // reattach to all attachable objects in the game. 1547 // reattach to all attachable objects in the game.
1531 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 1548 for_all_clients (ns)
1532 (*i)->reattach (); 1549 ns->reattach ();
1533 1550
1534 for_all_players (pl) 1551 for_all_players (pl)
1535 pl->reattach (); 1552 pl->reattach ();
1536 1553
1537 //TODO 1554 //TODO
1538 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i) 1555 //for (map_container::iterator i = maps.begin (); i != maps.end (); ++i)
1539 // i->second->reattach (); 1556 // i->second->reattach ();
1540 1557
1541 for (object *op = object::first; op; op = op->next) 1558 for_all_objects (op)
1542 op->reattach (); 1559 op->reattach ();
1543} 1560}
1544 1561
1545NV floor (NV x) 1562NV floor (NV x)
1546 1563
… …
1603 1620
1604void emergency_save () 1621void emergency_save ()
1605 1622
1606void _exit (int status = 0) 1623void _exit (int status = 0)
1607 1624
1625#if _POSIX_MEMLOCK
1626
1627int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1628
1629int munlockall ()
1630
1631#endif
1632
1608int find_animation (char *text) 1633int find_animation (char *text)
1609 PROTOTYPE: $ 1634 PROTOTYPE: $
1610 1635
1611int random_roll (int min, int max, object *op, int goodbad); 1636int random_roll (int min, int max, object *op, int goodbad);
1612 1637
… …
1658 CODE: 1683 CODE:
1659 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1684 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1660 OUTPUT: 1685 OUTPUT:
1661 RETVAL 1686 RETVAL
1662 1687
1663#bool 1688INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1664#destroyed (attachable *at)
1665#
1666#void
1667#destroy (attachable *at)
1668 1689
1669MODULE = cf PACKAGE = cf::global 1690MODULE = cf PACKAGE = cf::global
1670 1691
1671int invoke (SV *klass, int event, ...) 1692int invoke (SV *klass, int event, ...)
1672 CODE: 1693 CODE:
… …
1975 CODE: 1996 CODE:
1976 pl->ob->stats.hp = pl->ob->stats.maxhp; 1997 pl->ob->stats.hp = pl->ob->stats.maxhp;
1977 pl->ob->stats.sp = pl->ob->stats.maxsp; 1998 pl->ob->stats.sp = pl->ob->stats.maxsp;
1978 pl->ob->stats.grace = pl->ob->stats.maxgrace; 1999 pl->ob->stats.grace = pl->ob->stats.maxgrace;
1979 pl->orig_stats = pl->ob->stats; 2000 pl->orig_stats = pl->ob->stats;
1980
1981player *cf_player_find (char *name)
1982 PROTOTYPE: $
1983 2001
1984void cf_player_move (player *pl, int dir) 2002void cf_player_move (player *pl, int dir)
1985 2003
1986void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0); 2004void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
1987 2005
… …
2033 if (y) sv_to (y, pl->bed_y); 2051 if (y) sv_to (y, pl->bed_y);
2034 2052
2035void 2053void
2036list () 2054list ()
2037 PPCODE: 2055 PPCODE:
2038 for (player *pl = first_player; pl; pl = pl->next) 2056 for_all_players (pl)
2039 XPUSHs (sv_2mortal (to_sv (pl))); 2057 XPUSHs (sv_2mortal (to_sv (pl)));
2040 2058
2041bool 2059bool
2042peaceful (player *pl, bool new_setting = 0) 2060peaceful (player *pl, bool new_setting = 0)
2043 PROTOTYPE: $;$ 2061 PROTOTYPE: $;$
… …
2082 PROTOTYPE: 2100 PROTOTYPE:
2083 CODE: 2101 CODE:
2084 RETVAL = new maptile; 2102 RETVAL = new maptile;
2085 OUTPUT: 2103 OUTPUT:
2086 RETVAL 2104 RETVAL
2087
2088void
2089maptile::destroy ()
2090 2105
2091void 2106void
2092maptile::players () 2107maptile::players ()
2093 PPCODE: 2108 PPCODE:
2094 if (GIMME_V == G_SCALAR) 2109 if (GIMME_V == G_SCALAR)
… …
2362 char *buf = SvPVbyte (packet, len); 2377 char *buf = SvPVbyte (packet, len);
2363 2378
2364 THIS->send_packet (buf, len); 2379 THIS->send_packet (buf, len);
2365} 2380}
2366 2381
2367void
2368client::destroy ()
2369

Diff Legend

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