[Gnash-commit] /srv/bzr/gnash/trunk r11704: Drop unneeded additional variable and math used in the collection phase

[Sandro Santilli]

------------------------------------------------------------
revno: 11704
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Wed 2009-12-16 21:35:26 +0100
message:
  Drop unneeded additional variable and math used in the collection phase
modified:
  libbase/GC.cpp

=== modified file 'libbase/GC.cpp'
--- a/libbase/GC.cpp    2009-12-16 19:46:46 +0000
+++ b/libbase/GC.cpp    2009-12-16 20:35:26 +0000
@@ -106,7 +106,13 @@
                }
        }
 
-    _resListSize -= deleted;
+       _resListSize -= deleted;
+
+#ifdef GNASH_GC_DEBUG 
+       log_debug(_("GC: recycled %d unreachable resources - %d left"),
+                       deleted, _resListSize);
+#endif
+
 
        return deleted;
 }
@@ -143,11 +149,10 @@
        //    runtime analisys
        //
 
-       size_t curResCount = _resListSize;
-       if ( curResCount <  _lastResCount + maxNewCollectablesCount )
+       if ( _resListSize <  _lastResCount + maxNewCollectablesCount )
        {
 #if GNASH_GC_DEBUG  > 1
-               log_debug(_("GC: collection cycle skipped - %d/%d new resources 
allocated since last run (from %d to %d)"), curResCount-_lastResCount, 
maxNewCollectablesCount, _lastResCount, curResCount);
+               log_debug(_("GC: collection cycle skipped - %d/%d new resources 
allocated since last run (from %d to %d)"), _resListSize-_lastResCount, 
maxNewCollectablesCount, _lastResCount, _resListSize);
 #endif // GNASH_GC_DEBUG
                return;
        }
@@ -161,7 +166,7 @@
 #endif
 
 #ifdef GNASH_GC_DEBUG 
-       log_debug(_("GC: collection cycle started - %d/%d new resources 
allocated since last run (from %d to %d)"), curResCount-_lastResCount, 
maxNewCollectablesCount, _lastResCount, curResCount);
+       log_debug(_("GC: collection cycle started - %d/%d new resources 
allocated since last run (from %d to %d)"), _resListSize-_lastResCount, 
maxNewCollectablesCount, _lastResCount, _resListSize);
 #endif // GNASH_GC_DEBUG
 
 #ifndef NDEBUG
@@ -173,14 +178,9 @@
        markReachable();
 
        // clean unreachable resources, and mark the others as reachable again
-       size_t deleted = cleanUnreachable();
-
-       _lastResCount = curResCount - deleted;
-
-#ifdef GNASH_GC_DEBUG 
-       log_debug(_("GC: recycled %d unreachable resources - %d left"),
-                       deleted, _lastResCount);
-#endif
+       cleanUnreachable();
+
+       _lastResCount = _resListSize;
 
        //assert(_lastResCount == _resList.size()); // O(n)...