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.150 by root, Tue Jan 23 01:05:18 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) : 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))
140 sever_self ();
141}
142
143// check wether the object really is dead
144void
145attachable::do_check ()
146{
147 if (refcnt_cnt () > 0)
148 return;
149
150 destroy ();
151}
152
153void
154attachable::do_destroy ()
155{
156 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
157
158 if (cb)
121 { 159 {
122 refcnt_inc ();
123 SvREFCNT_dec ((SV *)self); 160 SvREFCNT_dec (cb);
161 cb = 0;
124 } 162 }
125}
126
127// check wether the object really is dead
128void
129attachable::do_check ()
130{
131 if (refcnt > 0 || refcnt_cnt () > 0)
132 return;
133
134 destroy ();
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
… …
173 if (i >= mortals.size ()) 187 if (i >= mortals.size ())
174 { 188 {
175 i = 0; 189 i = 0;
176 190
177 if (mortals.size () > 1000) 191 if (mortals.size () > 1000)
178 fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", mortals.size ()); 192 fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
179 193
180 break; 194 break;
181 } 195 }
182 196
183 attachable *obj = mortals [i]; 197 attachable *obj = mortals [i];
184 198
185 obj->refcnt_chk (); // unborrow from perl, if necessary 199 obj->refcnt_chk (); // unborrow from perl, if necessary
186 200
187 if (obj->refcnt > 0 || obj->self) 201 //if (obj->refcnt > 0 || obj->self)
202 if (obj->refcnt || obj->self)
188 { 203 {
189//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D 204//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
190 ++i; // further delay freeing 205 ++i; // further delay freeing
191 206
192 if (!(i & 0x3ff)) 207 if (!(i & 0x3ff))
… …
226 241
227static int 242static int
228attachable_free (pTHX_ SV *sv, MAGIC *mg) 243attachable_free (pTHX_ SV *sv, MAGIC *mg)
229{ 244{
230 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 {
231 at->self = 0; 250 at->self = 0;
251 SvREFCNT_dec (self);
252 }
253
232 // 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
233 //at->refcnt_chk (); 255 //at->refcnt_chk ();
234 return 0; 256 return 0;
235} 257}
236 258
… …
244 266
245 if (!obj->self) 267 if (!obj->self)
246 { 268 {
247 obj->self = newHV (); 269 obj->self = newHV ();
248 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 270 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
249
250 // borrow the refcnt from the object
251 // it is important thta no refcnt_chk is being executed here
252 obj->refcnt_dec ();
253 271
254 // now bless the object _once_ 272 // now bless the object _once_
255 return sv_bless (newRV_inc ((SV *)obj->self), stash); 273 return sv_bless (newRV_inc ((SV *)obj->self), stash);
256 } 274 }
257 else 275 else
… …
329inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 347inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
330 348
331inline SV *to_sv (UUID v) 349inline SV *to_sv (UUID v)
332{ 350{
333 char buf[128]; 351 char buf[128];
334 snprintf (buf, 128, "<1,%" PRIx64 ">", v.seq); 352 snprintf (buf, 128, "<1.%" PRIx64 ">", v.seq);
335 return newSVpv (buf, 0); 353 return newSVpv (buf, 0);
336} 354}
337 355
338inline 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; }
339inline 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; }
… …
1631 1649
1632void cleanup (const char *cause, bool make_core = false) 1650void cleanup (const char *cause, bool make_core = false)
1633 1651
1634void emergency_save () 1652void emergency_save ()
1635 1653
1654void _exit (int status = EXIT_SUCCESS)
1655
1636UV sv_2watcher (SV *w) 1656UV sv_2watcher (SV *w)
1637 CODE: 1657 CODE:
1638 RETVAL = (UV)GEventAPI->sv_2watcher (w); 1658 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1639 OUTPUT: 1659 OUTPUT:
1640 RETVAL 1660 RETVAL
1641
1642void _exit (int status = 0)
1643 1661
1644#if _POSIX_MEMLOCK 1662#if _POSIX_MEMLOCK
1645 1663
1646int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1664int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1647 1665
… …
1702 CODE: 1720 CODE:
1703 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1721 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1704 OUTPUT: 1722 OUTPUT:
1705 RETVAL 1723 RETVAL
1706 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
1707INCLUDE: $PERL genacc attachable ../include/cfperl.h | 1735INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1708 1736
1709MODULE = cf PACKAGE = cf::global 1737MODULE = cf PACKAGE = cf::global
1710 1738
1711int invoke (SV *klass, int event, ...) 1739int invoke (SV *klass, int event, ...)
… …
1728 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1756 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1729 OUTPUT: RETVAL 1757 OUTPUT: RETVAL
1730 1758
1731SV *registry (object *op) 1759SV *registry (object *op)
1732 1760
1733void mortals ()
1734 PPCODE:
1735 EXTEND (SP, object::mortals.size ());
1736 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1737 PUSHs (to_sv (*i));
1738
1739int objects_size () 1761int objects_size ()
1740 CODE: 1762 CODE:
1741 RETVAL = objects.size (); 1763 RETVAL = objects.size ();
1742 OUTPUT: RETVAL 1764 OUTPUT: RETVAL
1743 1765
… …
1782 1804
1783void 1805void
1784set_animation (object *op, int idx) 1806set_animation (object *op, int idx)
1785 CODE: 1807 CODE:
1786 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
1787 1815
1788object *find_best_object_match (object *op, const char *match) 1816object *find_best_object_match (object *op, const char *match)
1789 1817
1790object *find_marked_object (object *op) 1818object *find_marked_object (object *op)
1791 1819
… …
2119 EXTEND (SP, THIS->players); 2147 EXTEND (SP, THIS->players);
2120 for_all_players (pl) 2148 for_all_players (pl)
2121 if (pl->ob && pl->ob->map == THIS) 2149 if (pl->ob && pl->ob->map == THIS)
2122 PUSHs (sv_2mortal (to_sv (pl->ob))); 2150 PUSHs (sv_2mortal (to_sv (pl->ob)));
2123 } 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}
2124 2170
2125void 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)
2126 2172
2127int out_of_map (maptile *map, int x, int y) 2173int out_of_map (maptile *map, int x, int y)
2128 2174
… …
2209 OUTPUT: RETVAL 2255 OUTPUT: RETVAL
2210 2256
2211void fix_walls (maptile *map, int x, int y) 2257void fix_walls (maptile *map, int x, int y)
2212 2258
2213void fix_walls_around (maptile *map, int x, int y) 2259void fix_walls_around (maptile *map, int x, int y)
2214
2215const char *
2216region_name (maptile *m)
2217 CODE:
2218 RETVAL = get_name_of_region_for_map (m);
2219 OUTPUT: RETVAL
2220 2260
2221# worst xs function of my life 2261# worst xs function of my life
2222bool 2262bool
2223_create_random_map (\ 2263_create_random_map (\
2224 maptile *self,\ 2264 maptile *self,\
… …
2341 OUTPUT: RETVAL 2381 OUTPUT: RETVAL
2342 2382
2343region *find (char *name) 2383region *find (char *name)
2344 PROTOTYPE: $ 2384 PROTOTYPE: $
2345 CODE: 2385 CODE:
2346 RETVAL = get_region_by_name (name); 2386 RETVAL = region::find (name);
2347 OUTPUT: RETVAL 2387 OUTPUT: RETVAL
2348 2388
2349INCLUDE: $PERL genacc region ../include/map.h | 2389INCLUDE: $PERL genacc region ../include/map.h |
2350 2390
2351MODULE = cf PACKAGE = cf::living 2391MODULE = cf PACKAGE = cf::living

Diff Legend

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