Changeset 351Tweet

Timestamp:

Feb 4, 2011, 12:42:22 AM (10 years ago)

Author:

sam

Message:

More aggressive ticker panic mode.

File:

• trunk/src/ticker.cpp (modified) (3 diffs)

trunk/src/ticker.cpp

@@ -96 +96 @@
 {
 #if !FINAL_RELEASE
+    if (!entity)
+    {
+        fprintf(stderr, "ERROR: refing NULL entity\n");
+        return;
+    }
     if (entity->destroy)
         fprintf(stderr, "ERROR: refing entity scheduled for destruction\n");
@@ -122 +127 @@
 {
 #if !FINAL_RELEASE
+    if (!entity)
+    {
+        fprintf(stderr, "ERROR: dereferencing NULL entity\n");
+        return 0;
+    }
     if (entity->ref <= 0)
         fprintf(stderr, "ERROR: dereferencing unreferenced entity\n");
@@ -163 +173 @@
     if (data->quit && !((data->frame - data->quitframe) % data->quitdelay))
     {
-        Entity *entity = NULL;
-        for (int i = 0; i < Entity::ALLGROUP_END && !entity; i++)
-            entity = data->list[i];
-        if (entity && entity->ref)
-        {
-#if !FINAL_RELEASE
-            if (!data->panic)
-                fprintf(stderr, "ERROR: %i entities stuck after %i frames\n",
-                        data->nentities, data->quitdelay);
-            data->panic = 1;
-#endif
-            entity->ref--;
-            data->quitdelay = data->quitdelay > 1 ? data->quitdelay / 2 : 1;
-        }
+        int n = 0;
+        data->panic = 2 * (data->panic + 1);
+
+        for (int i = 0; i < Entity::ALLGROUP_END && n < data->panic; i++)
+        for (Entity *e = data->list[i]; e && n < data->panic; e = e->gamenext)
+            if (e->ref)
+            {
+                e->ref--;
+                n++;
+            }
+
+#if !FINAL_RELEASE
+        if (n)
+            fprintf(stderr, "ERROR: %i entities stuck after %i frames, "
+                    "poked %i\n", data->nentities, data->quitdelay, n);
+#endif
+
+        data->quitdelay = data->quitdelay > 1 ? data->quitdelay / 2 : 1;
     }