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.135 by root, Wed Jan 10 01:16:54 2007 UTC vs.
Revision 1.154 by root, Fri Jan 26 21:44:11 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 *self = (SV *)this->self;
124
125 SvREFCNT_inc (self);
126 sv_unmagic (self, PERL_MAGIC_ext);
123 SvREFCNT_dec ((SV *)self); 127 SvREFCNT_dec (self);
128 assert (!this->self);
124 } 129 }
125} 130}
126 131
127// check wether the object really is dead 132// check wether the object really is dead
128void 133void
129attachable::do_check () 134attachable::do_check ()
130{ 135{
131 if (refcnt > 0 || refcnt_cnt () > 0) 136 if (refcnt_cnt () > 0)
132 return; 137 return;
133 138
134 destroy (); 139 destroy ();
140}
141
142void
143attachable::do_destroy ()
144{
145 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
146
147 if (cb)
148 {
149 SvREFCNT_dec (cb);
150 cb = 0;
151 }
135 152
136 if (self) 153 if (self)
137 { 154 {
138 hv_clear (self); 155 hv_clear (self);
156
157 SV *self = (SV *)this->self;
158 SvREFCNT_inc (self);
139 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 159 sv_unmagic (self, PERL_MAGIC_ext);
140 SvREFCNT_dec (self); 160 SvREFCNT_dec (self);
141 self = 0; 161 // self is now 0
162 assert (!this->self);//D//TODO remove soon
142 } 163 }
143}
144
145void
146attachable::do_destroy ()
147{
148 invoke (EVENT_ATTACHABLE_DESTROY, DT_END);
149
150 if (self)
151 hv_clear (self);
152 164
153 mortals.push_back (this); 165 mortals.push_back (this);
154} 166}
155 167
156void 168void
… …
164} 176}
165 177
166void 178void
167attachable::check_mortals () 179attachable::check_mortals ()
168{ 180{
169 for (int i = 0; i < mortals.size (); ) 181 static int i = 0;
182
183 for (;;)
170 { 184 {
185 if (i >= mortals.size ())
186 {
187 i = 0;
188
189 if (mortals.size () > 1000)
190 fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
191
192 break;
193 }
194
171 attachable *obj = mortals [i]; 195 attachable *obj = mortals [i];
172 196
173 obj->refcnt_chk (); // unborrow from perl, if necessary 197 obj->refcnt_chk (); // unborrow from perl, if necessary
174 198
199 //if (obj->refcnt > 0 || obj->self)
175 if (obj->refcnt || obj->self) 200 if (obj->refcnt || obj->self)
176 { 201 {
177#if 0 202//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 203 ++i; // further delay freeing
204
205 if (!(i & 0x3ff))
206 break;
183 }//D 207 }
184 else 208 else
185 { 209 {
186 //Dfprintf (stderr, "deleteing %d:%p:%s\n", i, obj,typeid (*obj).name ());//D
187 mortals.erase (i); 210 mortals.erase (i);
188 delete obj; 211 delete obj;
189 } 212 }
190 } 213 }
191} 214}
… …
216 239
217static int 240static int
218attachable_free (pTHX_ SV *sv, MAGIC *mg) 241attachable_free (pTHX_ SV *sv, MAGIC *mg)
219{ 242{
220 attachable *at = (attachable *)mg->mg_ptr; 243 attachable *at = (attachable *)mg->mg_ptr;
244
245 //TODO: check if transaction behaviour is really required here
246 if (SV *self = (SV *)at->self)
247 {
221 at->self = 0; 248 at->self = 0;
249 SvREFCNT_dec (self);
250 }
251
222 // next line makes sense, but most objects still have refcnt 0 by default 252 // next line makes sense, but most objects still have refcnt 0 by default
223 //at->refcnt_chk (); 253 //at->refcnt_chk ();
224 return 0; 254 return 0;
225} 255}
226 256
… …
235 if (!obj->self) 265 if (!obj->self)
236 { 266 {
237 obj->self = newHV (); 267 obj->self = newHV ();
238 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 268 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
239 269
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_ 270 // now bless the object _once_
245 return sv_bless (newRV_inc ((SV *)obj->self), stash); 271 return sv_bless (newRV_inc ((SV *)obj->self), stash);
246 } 272 }
247 else 273 else
274 {
248 return newRV_inc ((SV *)obj->self); 275 SV *sv = newRV_inc ((SV *)obj->self);
276
277 if (Gv_AMG (stash)) // handle overload correctly, as the perl core does not
278 SvAMAGIC_on (sv);
279
280 return sv;
281 }
249} 282}
250 283
251static void 284static void
252clearSVptr (SV *sv) 285clearSVptr (SV *sv)
253{ 286{
… …
306inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 339inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
307 340
308inline SV *to_sv (object & v) { return to_sv (&v); } 341inline SV *to_sv (object & v) { return to_sv (&v); }
309inline SV *to_sv (living & v) { return to_sv (&v); } 342inline SV *to_sv (living & v) { return to_sv (&v); }
310 343
311//TODO:
312inline SV *to_sv (New_Face * v) { return to_sv (v->name); } 344inline SV *to_sv (facetile * v) { return to_sv (v->name); }
313inline SV *to_sv (treasurelist * v) { return to_sv (v->name); } 345inline SV *to_sv (treasurelist * v) { return to_sv (v->name); }
314 346
315inline SV *to_sv (UUID v) 347inline SV *to_sv (UUID v)
316{ 348{
317 char buf[128]; 349 char buf[128];
… …
342inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 374inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
343inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 375inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
344inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); } 376inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
345inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 377inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
346 378
347inline void sv_to (SV *sv, New_Face * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; } //TODO 379inline void sv_to (SV *sv, facetile * &v) { v = &new_faces[FindFace (SvPV_nolen (sv), 0)]; }
348inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); } // TODO 380inline void sv_to (SV *sv, treasurelist * &v) { v = find_treasurelist (SvPV_nolen (sv)); }
349 381
350template<class T> 382template<class T>
351inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; } 383inline void sv_to (SV *sv, refptr<T> &v) { T *tmp; sv_to (sv, tmp); v = tmp; }
352 384
353template<int N> 385template<int N>
… …
489 if (!ext->cb) 521 if (!ext->cb)
490 ext->cb = newAV (); 522 ext->cb = newAV ();
491 523
492 return newRV_inc ((SV *)ext->cb); 524 return newRV_inc ((SV *)ext->cb);
493} 525}
494
495#if 0
496void attachable::clear ()
497{
498 if (self)
499 {
500 // disconnect Perl from C, to avoid crashes
501 sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
502
503 // clear the perl hash, might or might not be a good idea
504 hv_clear ((HV *)SvRV ((SV *)self));
505
506 SvREFCNT_dec (self);
507 self = 0;
508 }
509
510 if (cb)
511 {
512 SvREFCNT_dec (cb);
513 cb = 0;
514 }
515
516 attach = 0;
517}
518#endif
519 526
520///////////////////////////////////////////////////////////////////////////// 527/////////////////////////////////////////////////////////////////////////////
521 528
522extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 529extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
523{ 530{
… …
914void 921void
915iw::alloc () 922iw::alloc ()
916{ 923{
917 pe = GEventAPI->new_idle (0, 0); 924 pe = GEventAPI->new_idle (0, 0);
918 925
926 WaREENTRANT_off (pe);
919 pe->base.callback = (void *)iw_dispatch; 927 pe->base.callback = (void *)iw_dispatch;
920 pe->base.ext_data = (void *)this; 928 pe->base.ext_data = (void *)this;
921} 929}
922 930
923static void iow_dispatch (pe_event *ev) 931static void iow_dispatch (pe_event *ev)
… …
929void 937void
930iow::alloc () 938iow::alloc ()
931{ 939{
932 pe = GEventAPI->new_io (0, 0); 940 pe = GEventAPI->new_io (0, 0);
933 941
942 WaREENTRANT_off (pe);
934 pe->base.callback = (void *)iow_dispatch; 943 pe->base.callback = (void *)iow_dispatch;
935 pe->base.ext_data = (void *)this; 944 pe->base.ext_data = (void *)this;
936 945
937 pe->fd = -1; 946 pe->fd = -1;
938 pe->poll = 0; 947 pe->poll = 0;
… …
1266 const_iv (FLAG_ACTIVATE_ON_RELEASE) 1275 const_iv (FLAG_ACTIVATE_ON_RELEASE)
1267 const_iv (FLAG_IS_WATER) 1276 const_iv (FLAG_IS_WATER)
1268 const_iv (FLAG_CONTENT_ON_GEN) 1277 const_iv (FLAG_CONTENT_ON_GEN)
1269 const_iv (FLAG_IS_A_TEMPLATE) 1278 const_iv (FLAG_IS_A_TEMPLATE)
1270 const_iv (FLAG_IS_BUILDABLE) 1279 const_iv (FLAG_IS_BUILDABLE)
1280 const_iv (FLAG_DESTROY_ON_DEATH)
1281 const_iv (FLAG_NO_MAP_SAVE)
1271 1282
1272 const_iv (NDI_BLACK) 1283 const_iv (NDI_BLACK)
1273 const_iv (NDI_WHITE) 1284 const_iv (NDI_WHITE)
1274 const_iv (NDI_NAVY) 1285 const_iv (NDI_NAVY)
1275 const_iv (NDI_RED) 1286 const_iv (NDI_RED)
… …
1460 const_iv (ATNR_BLIND) 1471 const_iv (ATNR_BLIND)
1461 const_iv (ATNR_INTERNAL) 1472 const_iv (ATNR_INTERNAL)
1462 const_iv (ATNR_LIFE_STEALING) 1473 const_iv (ATNR_LIFE_STEALING)
1463 const_iv (ATNR_DISEASE) 1474 const_iv (ATNR_DISEASE)
1464 1475
1465 const_iv (MAP_FLUSH)
1466 const_iv (MAP_PLAYER_UNIQUE)
1467 const_iv (MAP_BLOCK)
1468 const_iv (MAP_STYLE)
1469 const_iv (MAP_OVERLAY)
1470
1471 const_iv (MAP_IN_MEMORY) 1476 const_iv (MAP_IN_MEMORY)
1472 const_iv (MAP_SWAPPED) 1477 const_iv (MAP_SWAPPED)
1473 const_iv (MAP_LOADING) 1478 const_iv (MAP_LOADING)
1474 const_iv (MAP_SAVING) 1479 const_iv (MAP_SAVING)
1475 1480
… …
1568} 1573}
1569 1574
1570NV floor (NV x) 1575NV floor (NV x)
1571 1576
1572NV ceil (NV x) 1577NV ceil (NV x)
1578
1579NV rndm (...)
1580 CODE:
1581 switch (items)
1582 {
1583 case 0: RETVAL = rndm (); break;
1584 case 1: RETVAL = rndm (SvUV (ST (0))); break;
1585 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break;
1586 default: croak ("cf::rndm requires none, one or two parameters."); break;
1587 }
1588 OUTPUT:
1589 RETVAL
1573 1590
1574void server_tick () 1591void server_tick ()
1575 CODE: 1592 CODE:
1576 runtime = SvNVx (sv_runtime); 1593 runtime = SvNVx (sv_runtime);
1577 server_tick (); 1594 server_tick ();
… …
1624 } 1641 }
1625 OUTPUT: RETVAL 1642 OUTPUT: RETVAL
1626 1643
1627void abort () 1644void abort ()
1628 1645
1646void fork_abort (char *cause = "cf::fork_abort")
1647
1629void cleanup (const char *cause, bool make_core = false) 1648void cleanup (const char *cause, bool make_core = false)
1630 1649
1631void emergency_save () 1650void emergency_save ()
1651
1652UV sv_2watcher (SV *w)
1653 CODE:
1654 RETVAL = (UV)GEventAPI->sv_2watcher (w);
1655 OUTPUT:
1656 RETVAL
1632 1657
1633void _exit (int status = 0) 1658void _exit (int status = 0)
1634 1659
1635#if _POSIX_MEMLOCK 1660#if _POSIX_MEMLOCK
1636 1661
… …
1693 CODE: 1718 CODE:
1694 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1719 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1695 OUTPUT: 1720 OUTPUT:
1696 RETVAL 1721 RETVAL
1697 1722
1723int mortals_size ()
1724 CODE:
1725 RETVAL = attachable::mortals.size ();
1726 OUTPUT: RETVAL
1727
1728#object *mortals (U32 index)
1729# CODE:
1730# RETVAL = index < attachable::mortals.size () ? attachable::mortals [index] : 0;
1731# OUTPUT: RETVAL
1732
1698INCLUDE: $PERL genacc attachable ../include/cfperl.h | 1733INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1699 1734
1700MODULE = cf PACKAGE = cf::global 1735MODULE = cf PACKAGE = cf::global
1701 1736
1702int invoke (SV *klass, int event, ...) 1737int invoke (SV *klass, int event, ...)
… …
1718 for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i))); 1753 for (int i = 2; i < items; i++) av_push (av, SvREFCNT_inc (ST (i)));
1719 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1754 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1720 OUTPUT: RETVAL 1755 OUTPUT: RETVAL
1721 1756
1722SV *registry (object *op) 1757SV *registry (object *op)
1723
1724void mortals ()
1725 PPCODE:
1726 EXTEND (SP, object::mortals.size ());
1727 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1728 PUSHs (to_sv (*i));
1729 1758
1730int objects_size () 1759int objects_size ()
1731 CODE: 1760 CODE:
1732 RETVAL = objects.size (); 1761 RETVAL = objects.size ();
1733 OUTPUT: RETVAL 1762 OUTPUT: RETVAL
… …
1857 1886
1858void drop (object *who, object *op) 1887void drop (object *who, object *op)
1859 1888
1860void pick_up (object *who, object *op) 1889void pick_up (object *who, object *op)
1861 1890
1862object *cf_object_insert_object (object *op, object *container)
1863
1864object *cf_object_insert_in_ob (object *ob, object *where)
1865
1866int cf_object_teleport (object *op, maptile *map, int x, int y) 1891int cf_object_teleport (object *op, maptile *map, int x, int y)
1867 1892
1868void update_object (object *op, int action) 1893void update_object (object *op, int action)
1869 1894
1870object *cf_create_object_by_name (const char *name) 1895object *cf_create_object_by_name (const char *name)
… …
1988 2013
1989void esrv_update_item (object *op, int what, object *item) 2014void esrv_update_item (object *op, int what, object *item)
1990 C_ARGS: what, op, item 2015 C_ARGS: what, op, item
1991 2016
1992void clear_los (object *op) 2017void clear_los (object *op)
1993
1994int command_teleport (object *op, char *params)
1995 2018
1996int command_summon (object *op, char *params) 2019int command_summon (object *op, char *params)
1997 2020
1998int command_arrest (object *op, char *params) 2021int command_arrest (object *op, char *params)
1999 2022
… …
2142 2165
2143object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny) 2166object* cf_map_present_arch_by_name (maptile *map, const char* str, int nx, int ny)
2144 C_ARGS: str, map, nx, ny 2167 C_ARGS: str, map, nx, ny
2145 2168
2146void 2169void
2147cf_map_normalise (maptile *map, int x, int y) 2170get_map_flags (maptile *map, int x, int y)
2148 PPCODE: 2171 PPCODE:
2149{ 2172{
2150 maptile *nmap = 0; 2173 maptile *nmap = 0;
2151 I16 nx = 0, ny = 0; 2174 I16 nx = 0, ny = 0;
2152 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2175 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
… …
2214 CODE: 2237 CODE:
2215 RETVAL = get_name_of_region_for_map (m); 2238 RETVAL = get_name_of_region_for_map (m);
2216 OUTPUT: RETVAL 2239 OUTPUT: RETVAL
2217 2240
2218# worst xs function of my life 2241# worst xs function of my life
2219maptile * 2242bool
2220_create_random_map (\ 2243_create_random_map (\
2221 char *path,\ 2244 maptile *self,\
2222 char *wallstyle,\ 2245 char *wallstyle,\
2223 char *wall_name,\ 2246 char *wall_name,\
2224 char *floorstyle,\ 2247 char *floorstyle,\
2225 char *monsterstyle,\ 2248 char *monsterstyle,\
2226 char *treasurestyle,\ 2249 char *treasurestyle,\
… …
2230 char *origin_map,\ 2253 char *origin_map,\
2231 char *final_map,\ 2254 char *final_map,\
2232 char *exitstyle,\ 2255 char *exitstyle,\
2233 char *this_map,\ 2256 char *this_map,\
2234 char *exit_on_final_map,\ 2257 char *exit_on_final_map,\
2235 int Xsize,\ 2258 int xsize,\
2236 int Ysize,\ 2259 int ysize,\
2237 int expand2x,\ 2260 int expand2x,\
2238 int layoutoptions1,\ 2261 int layoutoptions1,\
2239 int layoutoptions2,\ 2262 int layoutoptions2,\
2240 int layoutoptions3,\ 2263 int layoutoptions3,\
2241 int symmetry,\ 2264 int symmetry,\
… …
2246 int dungeon_depth,\ 2269 int dungeon_depth,\
2247 int decoroptions,\ 2270 int decoroptions,\
2248 int orientation,\ 2271 int orientation,\
2249 int origin_y,\ 2272 int origin_y,\
2250 int origin_x,\ 2273 int origin_x,\
2251 int random_seed,\ 2274 U32 random_seed,\
2252 val64 total_map_hp,\ 2275 val64 total_map_hp,\
2253 int map_layout_style,\ 2276 int map_layout_style,\
2254 int treasureoptions,\ 2277 int treasureoptions,\
2255 int symmetry_used,\ 2278 int symmetry_used,\
2256 region *region\ 2279 region *region,\
2280 char *custom\
2257) 2281)
2258 CODE: 2282 CODE:
2259{ 2283{
2260 random_map_params rmp; 2284 random_map_params rmp;
2261 2285
… …
2271 assign (rmp.exit_on_final_map, exit_on_final_map); 2295 assign (rmp.exit_on_final_map, exit_on_final_map);
2272 2296
2273 rmp.origin_map = origin_map; 2297 rmp.origin_map = origin_map;
2274 rmp.final_map = final_map; 2298 rmp.final_map = final_map;
2275 rmp.this_map = this_map; 2299 rmp.this_map = this_map;
2276 rmp.Xsize = Xsize; 2300 rmp.xsize = xsize;
2277 rmp.Ysize = Ysize; 2301 rmp.ysize = ysize;
2278 rmp.expand2x = expand2x; 2302 rmp.expand2x = expand2x;
2279 rmp.layoutoptions1 = layoutoptions1; 2303 rmp.layoutoptions1 = layoutoptions1;
2280 rmp.layoutoptions2 = layoutoptions2; 2304 rmp.layoutoptions2 = layoutoptions2;
2281 rmp.layoutoptions3 = layoutoptions3; 2305 rmp.layoutoptions3 = layoutoptions3;
2282 rmp.symmetry = symmetry; 2306 rmp.symmetry = symmetry;
… …
2293 rmp.total_map_hp = total_map_hp; 2317 rmp.total_map_hp = total_map_hp;
2294 rmp.map_layout_style = map_layout_style; 2318 rmp.map_layout_style = map_layout_style;
2295 rmp.treasureoptions = treasureoptions; 2319 rmp.treasureoptions = treasureoptions;
2296 rmp.symmetry_used = symmetry_used; 2320 rmp.symmetry_used = symmetry_used;
2297 rmp.region = region; 2321 rmp.region = region;
2322 rmp.custom = custom;
2298 2323
2299 RETVAL = generate_random_map (path, &rmp); 2324 RETVAL = self->generate_random_map (&rmp);
2300} 2325}
2301 OUTPUT: 2326 OUTPUT:
2302 RETVAL 2327 RETVAL
2303 2328
2304MODULE = cf PACKAGE = cf::arch 2329MODULE = cf PACKAGE = cf::arch

Diff Legend

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