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.143 by root, Fri Jan 19 15:29:52 2007 UTC vs.
Revision 1.153 by root, Fri Jan 26 20:59:57 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);
113} 114}
114 115
115void 116void
116attachable::optimise () 117attachable::optimise ()
117{ 118{
118 if (self 119 if (self
119 && SvREFCNT (self) == 1 120 && SvREFCNT (self) == 1
120 && !HvTOTALKEYS (self)) 121 && !HvTOTALKEYS (self))
121 { 122 {
122 refcnt_inc (); 123 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
123 SvREFCNT_dec ((SV *)self); 124 assert (!self);
124 } 125 }
125} 126}
126 127
127// check wether the object really is dead 128// check wether the object really is dead
128void 129void
129attachable::do_check () 130attachable::do_check ()
130{ 131{
131 if (refcnt > 0 || refcnt_cnt () > 0) 132 if (refcnt_cnt () > 0)
132 return; 133 return;
133 134
134 destroy (); 135 destroy ();
136}
137
138void
139attachable::do_destroy ()
140{
141 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
142
143 if (cb)
144 {
145 SvREFCNT_dec (cb);
146 cb = 0;
147 }
135 148
136 if (self) 149 if (self)
137 { 150 {
138 hv_clear (self); 151 hv_clear (self);
139 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 152 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
140 SvREFCNT_dec (self); 153 // self is now 0
141 self = 0; 154 assert (!self);//D//TODO remove soon
142 } 155 }
143}
144
145void
146attachable::do_destroy ()
147{
148 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
149
150 if (self)
151 hv_clear (self);
152 156
153 mortals.push_back (this); 157 mortals.push_back (this);
154} 158}
155 159
156void 160void
… …
164} 168}
165 169
166void 170void
167attachable::check_mortals () 171attachable::check_mortals ()
168{ 172{
169 for (int i = 0; i < mortals.size (); ) 173 static int i = 0;
174
175 for (;;)
170 { 176 {
177 if (i >= mortals.size ())
178 {
179 i = 0;
180
181 if (mortals.size () > 1000)
182 fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
183
184 break;
185 }
186
171 attachable *obj = mortals [i]; 187 attachable *obj = mortals [i];
172 188
173 obj->refcnt_chk (); // unborrow from perl, if necessary 189 obj->refcnt_chk (); // unborrow from perl, if necessary
174 190
191 //if (obj->refcnt > 0 || obj->self)
175 if (obj->refcnt || obj->self) 192 if (obj->refcnt || obj->self)
176 { 193 {
177#if 0 194//printf ("%p rc %d\n", obj, obj->refcnt_cnt ());//D
178 if (mortals.size() > 5)fprintf (stderr, "%d delaying %d:%p:%s %d (self %p:%d)\n", time(0),i, obj, typeid (*obj).name (),
179 obj->refcnt, obj->self, obj->self ? SvREFCNT(obj->self): - 1);//D
180#endif
181
182 ++i; // further delay freeing 195 ++i; // further delay freeing
196
197 if (!(i & 0x3ff))
198 break;
183 }//D 199 }
184 else 200 else
185 { 201 {
186 //Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
187 mortals.erase (i); 202 mortals.erase (i);
188 delete obj; 203 delete obj;
189 } 204 }
190 } 205 }
191} 206}
… …
216 231
217static int 232static int
218attachable_free (pTHX_ SV *sv, MAGIC *mg) 233attachable_free (pTHX_ SV *sv, MAGIC *mg)
219{ 234{
220 attachable *at = (attachable *)mg->mg_ptr; 235 attachable *at = (attachable *)mg->mg_ptr;
236
237 //TODO: check if transaction behaviour is really required here
238 if (SV *self = (SV *)at->self)
239 {
221 at->self = 0; 240 at->self = 0;
241 SvREFCNT_dec (self);
242 }
243
222 // next line makes sense, but most objects still have refcnt 0 by default 244 // next line makes sense, but most objects still have refcnt 0 by default
223 //at->refcnt_chk (); 245 //at->refcnt_chk ();
224 return 0; 246 return 0;
225} 247}
226 248
… …
234 256
235 if (!obj->self) 257 if (!obj->self)
236 { 258 {
237 obj->self = newHV (); 259 obj->self = newHV ();
238 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 260 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
239
240 // borrow the refcnt from the object
241 // it is important thta no refcnt_chk is being executed here
242 obj->refcnt_dec ();
243 261
244 // now bless the object _once_ 262 // now bless the object _once_
245 return sv_bless (newRV_inc ((SV *)obj->self), stash); 263 return sv_bless (newRV_inc ((SV *)obj->self), stash);
246 } 264 }
247 else 265 else
… …
313inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 331inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
314 332
315inline SV *to_sv (object & v) { return to_sv (&v); } 333inline SV *to_sv (object & v) { return to_sv (&v); }
316inline SV *to_sv (living & v) { return to_sv (&v); } 334inline SV *to_sv (living & v) { return to_sv (&v); }
317 335
318inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 336inline SV *to_sv (facetile * v) { return to_sv (v->name); }
319inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 337inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
320 338
321inline SV *to_sv (UUID v) 339inline SV *to_sv (UUID v)
322{ 340{
323 char buf[128]; 341 char buf[128];
… …
348inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 366inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
349inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 367inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
350inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); } 368inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
351inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 369inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
352 370
353inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } 371inline void sv_to (SV *sv, facetile * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }
354inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); } 372inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); }
355 373
356template<class T> 374template<class T>
357inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 375inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
358 376
… …
895void 913void
896iw::alloc () 914iw::alloc ()
897{ 915{
898 pe = GEventAPI->new_idle (0, 0); 916 pe = GEventAPI->new_idle (0, 0);
899 917
918 WaREENTRANT_off (pe);
900 pe->base.callback = (void *)iw_dispatch; 919 pe->base.callback = (void *)iw_dispatch;
901 pe->base.ext_data = (void *)this; 920 pe->base.ext_data = (void *)this;
902} 921}
903 922
904static void iow_dispatch (pe_event *ev) 923static void iow_dispatch (pe_event *ev)
… …
910void 929void
911iow::alloc () 930iow::alloc ()
912{ 931{
913 pe = GEventAPI->new_io (0, 0); 932 pe = GEventAPI->new_io (0, 0);
914 933
934 WaREENTRANT_off (pe);
915 pe->base.callback = (void *)iow_dispatch; 935 pe->base.callback = (void *)iow_dispatch;
916 pe->base.ext_data = (void *)this; 936 pe->base.ext_data = (void *)this;
917 937
918 pe->fd = -1; 938 pe->fd = -1;
919 pe->poll = 0; 939 pe->poll = 0;
… …
1248 const_iv (FLAG_IS_WATER) 1268 const_iv (FLAG_IS_WATER)
1249 const_iv (FLAG_CONTENT_ON_GEN) 1269 const_iv (FLAG_CONTENT_ON_GEN)
1250 const_iv (FLAG_IS_A_TEMPLATE) 1270 const_iv (FLAG_IS_A_TEMPLATE)
1251 const_iv (FLAG_IS_BUILDABLE) 1271 const_iv (FLAG_IS_BUILDABLE)
1252 const_iv (FLAG_DESTROY_ON_DEATH) 1272 const_iv (FLAG_DESTROY_ON_DEATH)
1253 const_iv (FLAG_NO_SAVE) 1273 const_iv (FLAG_NO_MAP_SAVE)
1254 1274
1255 const_iv (NDI_BLACK) 1275 const_iv (NDI_BLACK)
1256 const_iv (NDI_WHITE) 1276 const_iv (NDI_WHITE)
1257 const_iv (NDI_NAVY) 1277 const_iv (NDI_NAVY)
1258 const_iv (NDI_RED) 1278 const_iv (NDI_RED)
… …
1443 const_iv (ATNR_BLIND) 1463 const_iv (ATNR_BLIND)
1444 const_iv (ATNR_INTERNAL) 1464 const_iv (ATNR_INTERNAL)
1445 const_iv (ATNR_LIFE_STEALING) 1465 const_iv (ATNR_LIFE_STEALING)
1446 const_iv (ATNR_DISEASE) 1466 const_iv (ATNR_DISEASE)
1447 1467
1448 const_iv (MAP_FLUSH)
1449 const_iv (MAP_PLAYER_UNIQUE)
1450 const_iv (MAP_BLOCK)
1451 const_iv (MAP_STYLE)
1452 const_iv (MAP_OVERLAY)
1453
1454 const_iv (MAP_IN_MEMORY) 1468 const_iv (MAP_IN_MEMORY)
1455 const_iv (MAP_SWAPPED) 1469 const_iv (MAP_SWAPPED)
1456 const_iv (MAP_LOADING) 1470 const_iv (MAP_LOADING)
1457 const_iv (MAP_SAVING) 1471 const_iv (MAP_SAVING)
1458 1472
… …
1619 } 1633 }
1620 OUTPUT: RETVAL 1634 OUTPUT: RETVAL
1621 1635
1622void abort () 1636void abort ()
1623 1637
1638void fork_abort (char *cause = "cf::fork_abort")
1639
1624void cleanup (const char *cause, bool make_core = false) 1640void cleanup (const char *cause, bool make_core = false)
1625 1641
1626void emergency_save () 1642void emergency_save ()
1643
1644UV sv_2watcher (SV *w)
1645 CODE:
1646 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1647 OUTPUT:
1648 RETVAL
1627 1649
1628void _exit (int status = 0) 1650void _exit (int status = 0)
1629 1651
1630#if _POSIX_MEMLOCK 1652#if _POSIX_MEMLOCK
1631 1653
… …
1688 CODE: 1710 CODE:
1689 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1711 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1690 OUTPUT: 1712 OUTPUT:
1691 RETVAL 1713 RETVAL
1692 1714
1715int mortals_size ()
1716 CODE:
1717 RETVAL = attachable::mortals.size ();
1718 OUTPUT: RETVAL
1719
1720#object *mortals (U32 index)
1721# CODE:
1722# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1723# OUTPUT: RETVAL
1724
1693INCLUDE: $PERL genacc attachable ../include/cfperl.h | 1725INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1694 1726
1695MODULE = cf PACKAGE = cf::global 1727MODULE = cf PACKAGE = cf::global
1696 1728
1697int invoke (SV *klass, int event, ...) 1729int invoke (SV *klass, int event, ...)
… …
1713 for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i))); 1745 for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
1714 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1746 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1715 OUTPUT: RETVAL 1747 OUTPUT: RETVAL
1716 1748
1717SV *registry (object *op) 1749SV *registry (object *op)
1718
1719void mortals ()
1720 PPCODE:
1721 EXTEND (SP, object::mortals.size ());
1722 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1723 PUSHs (to_sv (*i));
1724 1750
1725int objects_size () 1751int objects_size ()
1726 CODE: 1752 CODE:
1727 RETVAL = objects.size (); 1753 RETVAL = objects.size ();
1728 OUTPUT: RETVAL 1754 OUTPUT: RETVAL
… …
2219 char *origin_map,\ 2245 char *origin_map,\
2220 char *final_map,\ 2246 char *final_map,\
2221 char *exitstyle,\ 2247 char *exitstyle,\
2222 char *this_map,\ 2248 char *this_map,\
2223 char *exit_on_final_map,\ 2249 char *exit_on_final_map,\
2224 int Xsize,\ 2250 int xsize,\
2225 int Ysize,\ 2251 int ysize,\
2226 int expand2x,\ 2252 int expand2x,\
2227 int layoutoptions1,\ 2253 int layoutoptions1,\
2228 int layoutoptions2,\ 2254 int layoutoptions2,\
2229 int layoutoptions3,\ 2255 int layoutoptions3,\
2230 int symmetry,\ 2256 int symmetry,\
… …
2235 int dungeon_depth,\ 2261 int dungeon_depth,\
2236 int decoroptions,\ 2262 int decoroptions,\
2237 int orientation,\ 2263 int orientation,\
2238 int origin_y,\ 2264 int origin_y,\
2239 int origin_x,\ 2265 int origin_x,\
2240 int random_seed,\ 2266 U32 random_seed,\
2241 val64 total_map_hp,\ 2267 val64 total_map_hp,\
2242 int map_layout_style,\ 2268 int map_layout_style,\
2243 int treasureoptions,\ 2269 int treasureoptions,\
2244 int symmetry_used,\ 2270 int symmetry_used,\
2245 region *region,\ 2271 region *region,\
… …
2261 assign (rmp.exit_on_final_map, exit_on_final_map); 2287 assign (rmp.exit_on_final_map, exit_on_final_map);
2262 2288
2263 rmp.origin_map = origin_map; 2289 rmp.origin_map = origin_map;
2264 rmp.final_map = final_map; 2290 rmp.final_map = final_map;
2265 rmp.this_map = this_map; 2291 rmp.this_map = this_map;
2266 rmp.Xsize = Xsize; 2292 rmp.xsize = xsize;
2267 rmp.Ysize = Ysize; 2293 rmp.ysize = ysize;
2268 rmp.expand2x = expand2x; 2294 rmp.expand2x = expand2x;
2269 rmp.layoutoptions1 = layoutoptions1; 2295 rmp.layoutoptions1 = layoutoptions1;
2270 rmp.layoutoptions2 = layoutoptions2; 2296 rmp.layoutoptions2 = layoutoptions2;
2271 rmp.layoutoptions3 = layoutoptions3; 2297 rmp.layoutoptions3 = layoutoptions3;
2272 rmp.symmetry = symmetry; 2298 rmp.symmetry = symmetry;

Diff Legend

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