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.131 by root, Mon Jan 8 18:18:35 2007 UTC vs.
Revision 1.134 by root, Tue Jan 9 21:32:42 2007 UTC

… …
101 101
102unordered_vector<attachable *> attachable::mortals; 102unordered_vector<attachable *> attachable::mortals;
103 103
104attachable::~attachable () 104attachable::~attachable ()
105{ 105{
106 assert (!(flags & F_BORROWED)); 106 assert (!self);
107} 107}
108 108
109int 109int
110attachable::refcnt_cnt () const 110attachable::refcnt_cnt () const
111{ 111{
… …
117{ 117{
118 if (self 118 if (self
119 && SvREFCNT (self) == 1 119 && SvREFCNT (self) == 1
120 && !HvTOTALKEYS (self)) 120 && !HvTOTALKEYS (self))
121 { 121 {
122 flags &= ~F_BORROWED;
123 refcnt_inc (); 122 refcnt_inc ();
124 SvREFCNT_dec ((SV *)self); 123 SvREFCNT_dec ((SV *)self);
125 } 124 }
126} 125}
127 126
128// check wether the object really is dead 127// check wether the object really is dead
129void 128void
130attachable::do_check () 129attachable::do_check ()
131{ 130{
132 if (refcnt > 0) 131 if (refcnt > 0 || refcnt_cnt () > 0)
133 return; 132 return;
134 133
135 optimise (); 134 destroy ();
136 135
137 if (self) 136 if (self)
138 { 137 {
139 if (refcnt + SvREFCNT (self) > 0) 138 hv_clear (self);
140 return; 139 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
141
142 assert (flags & F_BORROWED);
143
144 flags &= ~F_BORROWED;
145 refcnt_inc ();
146 SvREFCNT_dec (self); 140 SvREFCNT_dec (self);
147 self = 0; 141 self = 0;
148 } 142 }
149
150 if (refcnt > 0)
151 return;
152
153 destroy ();
154} 143}
155 144
156void 145void
157attachable::do_destroy () 146attachable::do_destroy ()
158{ 147{
… …
227 216
228static int 217static int
229attachable_free (pTHX_ SV *sv, MAGIC *mg) 218attachable_free (pTHX_ SV *sv, MAGIC *mg)
230{ 219{
231 attachable *at = (attachable *)mg->mg_ptr; 220 attachable *at = (attachable *)mg->mg_ptr;
232 assert (!(at->flags & attachable::F_BORROWED));
233 at->self = 0; 221 at->self = 0;
234 // next line makes sense, but most objects still have refcnt 0 by default 222 // next line makes sense, but most objects still have refcnt 0 by default
235 //at->refcnt_chk (); 223 //at->refcnt_chk ();
236 return 0; 224 return 0;
237} 225}
… …
248 { 236 {
249 obj->self = newHV (); 237 obj->self = newHV ();
250 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 238 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
251 239
252 // borrow the refcnt from the object 240 // borrow the refcnt from the object
253 obj->flags |= attachable::F_BORROWED; 241 // it is important thta no refcnt_chk is being executed here
254 obj->refcnt_dec (); 242 obj->refcnt_dec ();
255 243
256 // now bless the object _once_ 244 // now bless the object _once_
257 return sv_bless (newRV_inc ((SV *)obj->self), stash); 245 return sv_bless (newRV_inc ((SV *)obj->self), stash);
258 } 246 }
… …
830} 818}
831 819
832///////////////////////////////////////////////////////////////////////////// 820/////////////////////////////////////////////////////////////////////////////
833 821
834void 822void
835maptile::emergency_save () 823cfperl_emergency_save ()
836{ 824{
837 CALL_BEGIN (0); 825 CALL_BEGIN (0);
838 CALL_CALL ("cf::map::emergency_save", G_VOID); 826 CALL_CALL ("cf::emergency_save", G_VOID);
839 CALL_END; 827 CALL_END;
840} 828}
841 829
842maptile * 830maptile *
843maptile::find_sync (const char *path, maptile *origin) 831maptile::find_sync (const char *path, maptile *origin)
… …
1616 } 1604 }
1617 OUTPUT: RETVAL 1605 OUTPUT: RETVAL
1618 1606
1619void abort () 1607void abort ()
1620 1608
1609void cleanup (const char *cause, bool make_core = false)
1610
1621void emergency_save () 1611void emergency_save ()
1622 1612
1623void _exit (int status = 0) 1613void _exit (int status = 0)
1624 1614
1625#if _POSIX_MEMLOCK 1615#if _POSIX_MEMLOCK
… …
1715 PPCODE: 1705 PPCODE:
1716 EXTEND (SP, object::mortals.size ()); 1706 EXTEND (SP, object::mortals.size ());
1717 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i) 1707 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1718 PUSHs (to_sv (*i)); 1708 PUSHs (to_sv (*i));
1719 1709
1720object *first () 1710int objects_size ()
1721 CODE: 1711 CODE:
1722 RETVAL = object::first; 1712 RETVAL = objects.size ();
1713 OUTPUT: RETVAL
1714
1715object *objects (U32 index)
1716 CODE:
1717 RETVAL = index < objects.size () ? objects [index] : 0;
1718 OUTPUT: RETVAL
1719
1720int actives_size ()
1721 CODE:
1722 RETVAL = actives.size ();
1723 OUTPUT: RETVAL
1724
1725object *actives (U32 index)
1726 CODE:
1727 RETVAL = index < actives.size () ? actives [index] : 0;
1723 OUTPUT: RETVAL 1728 OUTPUT: RETVAL
1724 1729
1725# missing properties 1730# missing properties
1726 1731
1727object *head (object *op) 1732object *head (object *op)
1728 PROTOTYPE: $ 1733 PROTOTYPE: $
1729 CODE: 1734 CODE:
1730 RETVAL = op->head ? op->head : op; 1735 RETVAL = op->head_ ();
1731 OUTPUT: RETVAL 1736 OUTPUT: RETVAL
1732 1737
1733int is_head (object *op) 1738int is_head (object *op)
1734 PROTOTYPE: $ 1739 PROTOTYPE: $
1735 CODE: 1740 CODE:
1736 RETVAL = !op->head; 1741 RETVAL = op->head_ () == op;
1737 OUTPUT: RETVAL 1742 OUTPUT: RETVAL
1738 1743
1739void 1744void
1740inv (object *obj) 1745inv (object *obj)
1741 PROTOTYPE: $ 1746 PROTOTYPE: $

Diff Legend

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