[ViewVC] Diff of: cvs/deliantra/server/server/cfperl.xs

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.151 by root, Tue Jan 23 01:29:51 2007 UTC vs.
Revision 1.152 by root, Tue Jan 23 03:17:56 2007 UTC

 }
 int
 attachable::refcnt_cnt () const
 {
-  return refcnt + (self ? SvREFCNT (self) : 0);
+  return refcnt + (self ? SvREFCNT (self) - 1 : 0);
 }
 void
 attachable::optimise ()
 {
   if (self
       && SvREFCNT (self) == 1
       && !HvTOTALKEYS (self))
     {
-      refcnt_inc ();
       SvREFCNT_dec ((SV *)self);
+      assert (!self);
     }
 }
 // check wether the object really is dead
 void
 attachable::do_check ()
 {
-  if (refcnt > 0 || refcnt_cnt () > 0)
+  if (refcnt_cnt () > 0)
     return;
   destroy ();
   if (self)
       if (i >= mortals.size ())
         {
           i = 0;
           if (mortals.size () > 1000)
-            fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", mortals.size ());
+            fprintf (stderr, "mortal queue size (%d) exceeds 1000.\n", (int)mortals.size ());
           break;
         }
       attachable *obj = mortals [i];
   if (!obj->self)
     {
       obj->self = newHV ();
       sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
-      // borrow the refcnt from the object
-      // it is important thta no refcnt_chk is being executed here
-      obj->refcnt_dec ();
       // now bless the object _once_
       return sv_bless (newRV_inc ((SV *)obj->self), stash);
     }
   else

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