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.152 by root, Tue Jan 23 03:17:56 2007 UTC vs.
Revision 1.160 by elmex, Wed Jan 31 14:11:02 2007 UTC

… …
102unordered_vector<attachable *> attachable::mortals; 102unordered_vector<attachable *> attachable::mortals;
103 103
104attachable::~attachable () 104attachable::~attachable ()
105{ 105{
106 assert (!self); 106 assert (!self);
107 assert (!cb);
107} 108}
108 109
109int 110int
110attachable::refcnt_cnt () const 111attachable::refcnt_cnt () const
111{ 112{
112 return refcnt + (self ? SvREFCNT (self) - 1 : 0); 113 return refcnt + (self ? SvREFCNT (self) - 1 : 0);
114}
115
116void
117attachable::sever_self ()
118{
119 if (HV *self = this->self)
120 {
121 // keep a refcount because sv_unmagic might call attachable_free,
122 // which might clear self, causing sv_unmagic to crash on a now
123 // invalid object.
124 SvREFCNT_inc (self);
125 hv_clear (self);
126 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
127 SvREFCNT_dec (self);
128
129 // self *must* be null now because thats sv_unmagic's job.
130 assert (!this->self);
131 }
113} 132}
114 133
115void 134void
116attachable::optimise () 135attachable::optimise ()
117{ 136{
118 if (self 137 if (self
119 && SvREFCNT (self) == 1 138 && SvREFCNT (self) == 1
120 && !HvTOTALKEYS (self)) 139 && !HvTOTALKEYS (self))
121 { 140 sever_self ();
122 SvREFCNT_dec ((SV *)self);
123 assert (!self);
124 }
125} 141}
126 142
127// check wether the object really is dead 143// check wether the object really is dead
128void 144void
129attachable::do_check () 145attachable::do_check ()
130{ 146{
131 if (refcnt_cnt () > 0) 147 if (refcnt_cnt () > 0)
132 return; 148 return;
133 149
134 destroy (); 150 destroy ();
151}
152
153void
154attachable::do_destroy ()
155{
156 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
157
158 if (cb)
159 {
160 SvREFCNT_dec (cb);
161 cb = 0;
162 }
135 163
136 if (self) 164 if (self)
137 { 165 sever_self ();
138 hv_clear (self);
139 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
140 SvREFCNT_dec (self);
141 self = 0;
142 }
143}
144
145void
146attachable::do_destroy ()
147{
148 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
149
150 if (self)
151 hv_clear (self);
152 166
153 mortals.push_back (this); 167 mortals.push_back (this);
154} 168}
155 169
156void 170void
… …
227 241
228static int 242static int
229attachable_free (pTHX_ SV *sv, MAGIC *mg) 243attachable_free (pTHX_ SV *sv, MAGIC *mg)
230{ 244{
231 attachable *at = (attachable *)mg->mg_ptr; 245 attachable *at = (attachable *)mg->mg_ptr;
246
247 //TODO: check if transaction behaviour is really required here
248 if (SV *self = (SV *)at->self)
249 {
232 at->self = 0; 250 at->self = 0;
251 SvREFCNT_dec (self);
252 }
253
233 // next line makes sense, but most objects still have refcnt 0 by default 254 // next line makes sense, but most objects still have refcnt 0 by default
234 //at->refcnt_chk (); 255 //at->refcnt_chk ();
235 return 0; 256 return 0;
236} 257}
237 258
… …
326inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 347inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
327 348
328inline SV *to_sv (UUID v) 349inline SV *to_sv (UUID v)
329{ 350{
330 char buf[128]; 351 char buf[128];
331 snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq); 352 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
332 return newSVpv (buf, 0); 353 return newSVpv (buf, 0);
333} 354}
334 355
335inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; } 356inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPV_nolen (sv) : 0; }
336inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 357inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
… …
1628 1649
1629void cleanup (const char *cause, bool make_core = false) 1650void cleanup (const char *cause, bool make_core = false)
1630 1651
1631void emergency_save () 1652void emergency_save ()
1632 1653
1654void _exit (int status = EXIT_SUCCESS)
1655
1633UV sv_2watcher (SV *w) 1656UV sv_2watcher (SV *w)
1634 CODE: 1657 CODE:
1635 RETVAL = (UV)GEventAPI->sv_2watcher (w); 1658 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1636 OUTPUT: 1659 OUTPUT:
1637 RETVAL 1660 RETVAL
1638
1639void _exit (int status = 0)
1640 1661
1641#if _POSIX_MEMLOCK 1662#if _POSIX_MEMLOCK
1642 1663
1643int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1664int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1644 1665
… …
1699 CODE: 1720 CODE:
1700 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1721 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1701 OUTPUT: 1722 OUTPUT:
1702 RETVAL 1723 RETVAL
1703 1724
1725int mortals_size ()
1726 CODE:
1727 RETVAL = attachable::mortals.size ();
1728 OUTPUT: RETVAL
1729
1730#object *mortals (U32 index)
1731# CODE:
1732# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1733# OUTPUT: RETVAL
1734
1704INCLUDE: $PERL genacc attachable ../include/cfperl.h | 1735INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1705 1736
1706MODULE = cf PACKAGE = cf::global 1737MODULE = cf PACKAGE = cf::global
1707 1738
1708int invoke (SV *klass, int event, ...) 1739int invoke (SV *klass, int event, ...)
… …
1725 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1756 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1726 OUTPUT: RETVAL 1757 OUTPUT: RETVAL
1727 1758
1728SV *registry (object *op) 1759SV *registry (object *op)
1729 1760
1730void mortals ()
1731 PPCODE:
1732 EXTEND (SP, object::mortals.size ());
1733 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1734 PUSHs (to_sv (*i));
1735
1736int objects_size () 1761int objects_size ()
1737 CODE: 1762 CODE:
1738 RETVAL = objects.size (); 1763 RETVAL = objects.size ();
1739 OUTPUT: RETVAL 1764 OUTPUT: RETVAL
1740 1765
… …
1779 1804
1780void 1805void
1781set_animation (object *op, int idx) 1806set_animation (object *op, int idx)
1782 CODE: 1807 CODE:
1783 SET_ANIMATION (op, idx); 1808 SET_ANIMATION (op, idx);
1809
1810int
1811num_animations (object *op)
1812 CODE:
1813 RETVAL = NUM_ANIMATIONS (op);
1814 OUTPUT: RETVAL
1784 1815
1785object *find_best_object_match (object *op, const char *match) 1816object *find_best_object_match (object *op, const char *match)
1786 1817
1787object *find_marked_object (object *op) 1818object *find_marked_object (object *op)
1788 1819
… …
2116 EXTEND (SP, THIS->players); 2147 EXTEND (SP, THIS->players);
2117 for_all_players (pl) 2148 for_all_players (pl)
2118 if (pl->ob && pl->ob->map == THIS) 2149 if (pl->ob && pl->ob->map == THIS)
2119 PUSHs (sv_2mortal (to_sv (pl->ob))); 2150 PUSHs (sv_2mortal (to_sv (pl->ob)));
2120 } 2151 }
2152
2153void
2154maptile::set_regiondata (SV *data, SV *plt)
2155 CODE:
2156{
2157 if (!SvROK (plt) || SvTYPE (SvRV (plt)) != SVt_PVAV)
2158 croak ("maptile::set_regiondata needs arrayref as plt arg");
2159
2160 AV *av = (AV *)SvRV (plt);
2161
2162 region **regionmap = (region **)malloc ((av_len (av) + 1) * sizeof (region *));
2163
2164 for (int i = av_len (av) + 1; i--; )
2165 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
2166
2167 THIS->regions = salloc<uint8_t> (THIS->size (), (uint8_t *)SvPVbyte_nolen (data));
2168 THIS->regionmap = regionmap;
2169}
2121 2170
2122void play_sound_map (maptile *map, int x, int y, int sound_num) 2171void play_sound_map (maptile *map, int x, int y, int sound_num)
2123 2172
2124int out_of_map (maptile *map, int x, int y) 2173int out_of_map (maptile *map, int x, int y)
2125 2174
… …
2206 OUTPUT: RETVAL 2255 OUTPUT: RETVAL
2207 2256
2208void fix_walls (maptile *map, int x, int y) 2257void fix_walls (maptile *map, int x, int y)
2209 2258
2210void fix_walls_around (maptile *map, int x, int y) 2259void fix_walls_around (maptile *map, int x, int y)
2211
2212const char *
2213region_name (maptile *m)
2214 CODE:
2215 RETVAL = get_name_of_region_for_map (m);
2216 OUTPUT: RETVAL
2217 2260
2218# worst xs function of my life 2261# worst xs function of my life
2219bool 2262bool
2220_create_random_map (\ 2263_create_random_map (\
2221 maptile *self,\ 2264 maptile *self,\
… …
2338 OUTPUT: RETVAL 2381 OUTPUT: RETVAL
2339 2382
2340region *find (char *name) 2383region *find (char *name)
2341 PROTOTYPE: $ 2384 PROTOTYPE: $
2342 CODE: 2385 CODE:
2343 RETVAL = get_region_by_name (name); 2386 RETVAL = region::find (name);
2344 OUTPUT: RETVAL 2387 OUTPUT: RETVAL
2345 2388
2346INCLUDE: $PERL genacc region ../include/map.h | 2389INCLUDE: $PERL genacc region ../include/map.h |
2347 2390
2348MODULE = cf PACKAGE = cf::living 2391MODULE = cf PACKAGE = cf::living

Diff Legend

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