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.136 by root, Wed Jan 10 19:52:43 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
… …
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 261
240 // borrow the refcnt from the object
241 // it is important thta no refcnt_chk is being executed here
242 obj->refcnt_dec ();
243
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
266 {
248 return newRV_inc ((SV *)obj->self); 267 SV *sv = newRV_inc ((SV *)obj->self);
268
269 if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
270 SvAMAGIC_on (sv);
271
272 return sv;
273 }
249} 274}
250 275
251static void 276static void
252clearSVptr (SV *sv) 277clearSVptr (SV *sv)
253{ 278{
… …
306inline 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); }
307 332
308inline SV *to_sv (object & v) { return to_sv (&v); } 333inline SV *to_sv (object & v) { return to_sv (&v); }
309inline SV *to_sv (living & v) { return to_sv (&v); } 334inline SV *to_sv (living & v) { return to_sv (&v); }
310 335
311inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 336inline SV *to_sv (facetile * v) { return to_sv (v->name); }
312inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 337inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
313 338
314inline SV *to_sv (UUID v) 339inline SV *to_sv (UUID v)
315{ 340{
316 char buf[128]; 341 char buf[128];
… …
341inline 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"); }
342inline 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"); }
343inline 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"); }
344inline 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"); }
345 370
346inline 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)]; }
347inline 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)); }
348 373
349template<class T> 374template<class T>
350inline 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; }
351 376
… …
488 if (!ext->cb) 513 if (!ext->cb)
489 ext->cb = newAV (); 514 ext->cb = newAV ();
490 515
491 return newRV_inc ((SV *)ext->cb); 516 return newRV_inc ((SV *)ext->cb);
492} 517}
493
494#if 0
495void attachable::clear ()
496{
497 if (self)
498 {
499 // disconnect Perl from C, to avoid crashes
500 sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
501
502 // clear the perl hash, might or might not be a good idea
503 hv_clear ((HV *)SvRV ((SV *)self));
504
505 SvREFCNT_dec (self);
506 self = 0;
507 }
508
509 if (cb)
510 {
511 SvREFCNT_dec (cb);
512 cb = 0;
513 }
514
515 attach = 0;
516}
517#endif
518 518
519///////////////////////////////////////////////////////////////////////////// 519/////////////////////////////////////////////////////////////////////////////
520 520
521extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 521extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
522{ 522{
… …
913void 913void
914iw::alloc () 914iw::alloc ()
915{ 915{
916 pe = GEventAPI->new_idle (0, 0); 916 pe = GEventAPI->new_idle (0, 0);
917 917
918 WaREENTRANT_off (pe);
918 pe->base.callback = (void *)iw_dispatch; 919 pe->base.callback = (void *)iw_dispatch;
919 pe->base.ext_data = (void *)this; 920 pe->base.ext_data = (void *)this;
920} 921}
921 922
922static void iow_dispatch (pe_event *ev) 923static void iow_dispatch (pe_event *ev)
… …
928void 929void
929iow::alloc () 930iow::alloc ()
930{ 931{
931 pe = GEventAPI->new_io (0, 0); 932 pe = GEventAPI->new_io (0, 0);
932 933
934 WaREENTRANT_off (pe);
933 pe->base.callback = (void *)iow_dispatch; 935 pe->base.callback = (void *)iow_dispatch;
934 pe->base.ext_data = (void *)this; 936 pe->base.ext_data = (void *)this;
935 937
936 pe->fd = -1; 938 pe->fd = -1;
937 pe->poll = 0; 939 pe->poll = 0;
… …
1265 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1267 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1266 const_iv (FLAG_IS_WATER) 1268 const_iv (FLAG_IS_WATER)
1267 const_iv (FLAG_CONTENT_ON_GEN) 1269 const_iv (FLAG_CONTENT_ON_GEN)
1268 const_iv (FLAG_IS_A_TEMPLATE) 1270 const_iv (FLAG_IS_A_TEMPLATE)
1269 const_iv (FLAG_IS_BUILDABLE) 1271 const_iv (FLAG_IS_BUILDABLE)
1272 const_iv (FLAG_DESTROY_ON_DEATH)
1273 const_iv (FLAG_NO_MAP_SAVE)
1270 1274
1271 const_iv (NDI_BLACK) 1275 const_iv (NDI_BLACK)
1272 const_iv (NDI_WHITE) 1276 const_iv (NDI_WHITE)
1273 const_iv (NDI_NAVY) 1277 const_iv (NDI_NAVY)
1274 const_iv (NDI_RED) 1278 const_iv (NDI_RED)
… …
1459 const_iv (ATNR_BLIND) 1463 const_iv (ATNR_BLIND)
1460 const_iv (ATNR_INTERNAL) 1464 const_iv (ATNR_INTERNAL)
1461 const_iv (ATNR_LIFE_STEALING) 1465 const_iv (ATNR_LIFE_STEALING)
1462 const_iv (ATNR_DISEASE) 1466 const_iv (ATNR_DISEASE)
1463 1467
1464 const_iv (MAP_FLUSH)
1465 const_iv (MAP_PLAYER_UNIQUE)
1466 const_iv (MAP_BLOCK)
1467 const_iv (MAP_STYLE)
1468 const_iv (MAP_OVERLAY)
1469
1470 const_iv (MAP_IN_MEMORY) 1468 const_iv (MAP_IN_MEMORY)
1471 const_iv (MAP_SWAPPED) 1469 const_iv (MAP_SWAPPED)
1472 const_iv (MAP_LOADING) 1470 const_iv (MAP_LOADING)
1473 const_iv (MAP_SAVING) 1471 const_iv (MAP_SAVING)
1474 1472
… …
1567} 1565}
1568 1566
1569NV floor (NV x) 1567NV floor (NV x)
1570 1568
1571NV ceil (NV x) 1569NV ceil (NV x)
1570
1571NV rndm (...)
1572 CODE:
1573 switch (items)
1574 {
1575 case 0: RETVAL = rndm (); break;
1576 case 1: RETVAL = rndm (SvUV (ST (0))); break;
1577 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
1578 default: croak ("cf::rndm requires none, one or two parameters."); break;
1579 }
1580 OUTPUT:
1581 RETVAL
1572 1582
1573void server_tick () 1583void server_tick ()
1574 CODE: 1584 CODE:
1575 runtime = SvNVx (sv_runtime); 1585 runtime = SvNVx (sv_runtime);
1576 server_tick (); 1586 server_tick ();
… …
1623 } 1633 }
1624 OUTPUT: RETVAL 1634 OUTPUT: RETVAL
1625 1635
1626void abort () 1636void abort ()
1627 1637
1638void fork_abort (char *cause = "cf::fork_abort")
1639
1628void cleanup (const char *cause, bool make_core = false) 1640void cleanup (const char *cause, bool make_core = false)
1629 1641
1630void emergency_save () 1642void emergency_save ()
1643
1644UV sv_2watcher (SV *w)
1645 CODE:
1646 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1647 OUTPUT:
1648 RETVAL
1631 1649
1632void _exit (int status = 0) 1650void _exit (int status = 0)
1633 1651
1634#if _POSIX_MEMLOCK 1652#if _POSIX_MEMLOCK
1635 1653
… …
1692 CODE: 1710 CODE:
1693 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1711 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1694 OUTPUT: 1712 OUTPUT:
1695 RETVAL 1713 RETVAL
1696 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
1697INCLUDE: $PERL genacc attachable ../include/cfperl.h | 1725INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1698 1726
1699MODULE = cf PACKAGE = cf::global 1727MODULE = cf PACKAGE = cf::global
1700 1728
1701int invoke (SV *klass, int event, ...) 1729int invoke (SV *klass, int event, ...)
… …
1717 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)));
1718 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1746 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1719 OUTPUT: RETVAL 1747 OUTPUT: RETVAL
1720 1748
1721SV *registry (object *op) 1749SV *registry (object *op)
1722
1723void mortals ()
1724 PPCODE:
1725 EXTEND (SP, object::mortals.size ());
1726 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1727 PUSHs (to_sv (*i));
1728 1750
1729int objects_size () 1751int objects_size ()
1730 CODE: 1752 CODE:
1731 RETVAL = objects.size (); 1753 RETVAL = objects.size ();
1732 OUTPUT: RETVAL 1754 OUTPUT: RETVAL
… …
1856 1878
1857void drop (object *who, object *op) 1879void drop (object *who, object *op)
1858 1880
1859void pick_up (object *who, object *op) 1881void pick_up (object *who, object *op)
1860 1882
1861object *cf_object_insert_object (object *op, object *container)
1862
1863object *cf_object_insert_in_ob (object *ob, object *where)
1864
1865int cf_object_teleport (object *op, maptile *map, int x, int y) 1883int cf_object_teleport (object *op, maptile *map, int x, int y)
1866 1884
1867void update_object (object *op, int action) 1885void update_object (object *op, int action)
1868 1886
1869object *cf_create_object_by_name (const char *name) 1887object *cf_create_object_by_name (const char *name)
… …
1987 2005
1988void esrv_update_item (object *op, int what, object *item) 2006void esrv_update_item (object *op, int what, object *item)
1989 C_ARGS: what, op, item 2007 C_ARGS: what, op, item
1990 2008
1991void clear_los (object *op) 2009void clear_los (object *op)
1992
1993int command_teleport (object *op, char *params)
1994 2010
1995int command_summon (object *op, char *params) 2011int command_summon (object *op, char *params)
1996 2012
1997int command_arrest (object *op, char *params) 2013int command_arrest (object *op, char *params)
1998 2014
… …
2141 2157
2142object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2158object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2143 C_ARGS: str, map, nx, ny 2159 C_ARGS: str, map, nx, ny
2144 2160
2145void 2161void
2146cf_map_normalise (maptile *map, int x, int y) 2162get_map_flags (maptile *map, int x, int y)
2147 PPCODE: 2163 PPCODE:
2148{ 2164{
2149 maptile *nmap = 0; 2165 maptile *nmap = 0;
2150 I16 nx = 0, ny = 0; 2166 I16 nx = 0, ny = 0;
2151 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2167 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
… …
2213 CODE: 2229 CODE:
2214 RETVAL = get_name_of_region_for_map (m); 2230 RETVAL = get_name_of_region_for_map (m);
2215 OUTPUT: RETVAL 2231 OUTPUT: RETVAL
2216 2232
2217# worst xs function of my life 2233# worst xs function of my life
2218maptile * 2234bool
2219_create_random_map (\ 2235_create_random_map (\
2220 char *path,\ 2236 maptile *self,\
2221 char *wallstyle,\ 2237 char *wallstyle,\
2222 char *wall_name,\ 2238 char *wall_name,\
2223 char *floorstyle,\ 2239 char *floorstyle,\
2224 char *monsterstyle,\ 2240 char *monsterstyle,\
2225 char *treasurestyle,\ 2241 char *treasurestyle,\
… …
2229 char *origin_map,\ 2245 char *origin_map,\
2230 char *final_map,\ 2246 char *final_map,\
2231 char *exitstyle,\ 2247 char *exitstyle,\
2232 char *this_map,\ 2248 char *this_map,\
2233 char *exit_on_final_map,\ 2249 char *exit_on_final_map,\
2234 int Xsize,\ 2250 int xsize,\
2235 int Ysize,\ 2251 int ysize,\
2236 int expand2x,\ 2252 int expand2x,\
2237 int layoutoptions1,\ 2253 int layoutoptions1,\
2238 int layoutoptions2,\ 2254 int layoutoptions2,\
2239 int layoutoptions3,\ 2255 int layoutoptions3,\
2240 int symmetry,\ 2256 int symmetry,\
… …
2245 int dungeon_depth,\ 2261 int dungeon_depth,\
2246 int decoroptions,\ 2262 int decoroptions,\
2247 int orientation,\ 2263 int orientation,\
2248 int origin_y,\ 2264 int origin_y,\
2249 int origin_x,\ 2265 int origin_x,\
2250 int random_seed,\ 2266 U32 random_seed,\
2251 val64 total_map_hp,\ 2267 val64 total_map_hp,\
2252 int map_layout_style,\ 2268 int map_layout_style,\
2253 int treasureoptions,\ 2269 int treasureoptions,\
2254 int symmetry_used,\ 2270 int symmetry_used,\
2255 region *region\ 2271 region *region,\
2272 char *custom\
2256) 2273)
2257 CODE: 2274 CODE:
2258{ 2275{
2259 random_map_params rmp; 2276 random_map_params rmp;
2260 2277
… …
2270 assign (rmp.exit_on_final_map, exit_on_final_map); 2287 assign (rmp.exit_on_final_map, exit_on_final_map);
2271 2288
2272 rmp.origin_map = origin_map; 2289 rmp.origin_map = origin_map;
2273 rmp.final_map = final_map; 2290 rmp.final_map = final_map;
2274 rmp.this_map = this_map; 2291 rmp.this_map = this_map;
2275 rmp.Xsize = Xsize; 2292 rmp.xsize = xsize;
2276 rmp.Ysize = Ysize; 2293 rmp.ysize = ysize;
2277 rmp.expand2x = expand2x; 2294 rmp.expand2x = expand2x;
2278 rmp.layoutoptions1 = layoutoptions1; 2295 rmp.layoutoptions1 = layoutoptions1;
2279 rmp.layoutoptions2 = layoutoptions2; 2296 rmp.layoutoptions2 = layoutoptions2;
2280 rmp.layoutoptions3 = layoutoptions3; 2297 rmp.layoutoptions3 = layoutoptions3;
2281 rmp.symmetry = symmetry; 2298 rmp.symmetry = symmetry;
… …
2292 rmp.total_map_hp = total_map_hp; 2309 rmp.total_map_hp = total_map_hp;
2293 rmp.map_layout_style = map_layout_style; 2310 rmp.map_layout_style = map_layout_style;
2294 rmp.treasureoptions = treasureoptions; 2311 rmp.treasureoptions = treasureoptions;
2295 rmp.symmetry_used = symmetry_used; 2312 rmp.symmetry_used = symmetry_used;
2296 rmp.region = region; 2313 rmp.region = region;
2314 rmp.custom = custom;
2297 2315
2298 RETVAL = generate_random_map (path, &rmp); 2316 RETVAL = self->generate_random_map (&rmp);
2299} 2317}
2300 OUTPUT: 2318 OUTPUT:
2301 RETVAL 2319 RETVAL
2302 2320
2303MODULE = cf PACKAGE = cf::arch 2321MODULE = cf PACKAGE = cf::arch

Diff Legend

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