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.152 by root, Tue Jan 23 03:17:56 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{
… …
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 SvREFCNT_dec ((SV *)self); 123 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
123 assert (!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
… …
130{ 131{
131 if (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
… …
227 231
228static int 232static int
229attachable_free (pTHX_ SV *sv, MAGIC *mg) 233attachable_free (pTHX_ SV *sv, MAGIC *mg)
230{ 234{
231 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 {
232 at->self = 0; 240 at->self = 0;
241 SvREFCNT_dec (self);
242 }
243
233 // 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
234 //at->refcnt_chk (); 245 //at->refcnt_chk ();
235 return 0; 246 return 0;
236} 247}
237 248
… …
1699 CODE: 1710 CODE:
1700 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1711 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1701 OUTPUT: 1712 OUTPUT:
1702 RETVAL 1713 RETVAL
1703 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
1704INCLUDE: $PERL genacc attachable ../include/cfperl.h | 1725INCLUDE: $PERL genacc attachable ../include/cfperl.h |
1705 1726
1706MODULE = cf PACKAGE = cf::global 1727MODULE = cf PACKAGE = cf::global
1707 1728
1708int invoke (SV *klass, int event, ...) 1729int invoke (SV *klass, int event, ...)
… …
1724 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)));
1725 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END); 1746 RETVAL = op->invoke ((event_type)event, ARG_AV (av), DT_END);
1726 OUTPUT: RETVAL 1747 OUTPUT: RETVAL
1727 1748
1728SV *registry (object *op) 1749SV *registry (object *op)
1729
1730void mortals ()
1731 PPCODE:
1732 EXTEND (SP, object::mortals.size ());
1733 for (AUTODECL (i, object::mortals.begin ()); i != object::mortals.end (); ++i)
1734 PUSHs (to_sv (*i));
1735 1750
1736int objects_size () 1751int objects_size ()
1737 CODE: 1752 CODE:
1738 RETVAL = objects.size (); 1753 RETVAL = objects.size ();
1739 OUTPUT: RETVAL 1754 OUTPUT: RETVAL

Diff Legend

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