566917: Occasional poor performance with GZip HPROF

Fix newly introduced marking bug and performance tune. Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=566917 Change-Id: I9e8bd9b9e3199cee8708193da171f485bfc59393
eclipse-mat · Sep 18, 2020 · 33c7214 · 33c7214
1 parent 73d20a1
commit 33c7214
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/...ins/org.eclipse.mat.parser/src/org/eclipse/mat/parser/internal/snapshot/ObjectMarker.java b/...ins/org.eclipse.mat.parser/src/org/eclipse/mat/parser/internal/snapshot/ObjectMarker.java
@@ -234,8 +234,8 @@ static class MultiThreadedRootStack extends IntStack
         private int totalThreads;
         private int waits; // Debug
         private long waitsduration; // Debug
-        static final int RESERVED_WAITING = 20;
-        static final int RESERVED_RUNNING = 5;
+        static final int RESERVED_WAITING = 50;
+        static final int RESERVED_RUNNING = 15;
         int totalWork;
         int worked; // ticks done so far
         int pushed; // items pushed to the stack
@@ -675,13 +675,12 @@ public void run()
                                              * Other threads might still need more,
                                              * so transfer more from the queue which is non-local
                                              */
-                                            while (check && (queue.size() > 0 && queue.size() + size > RESERVED))
-                                            {
-                                                check = rootsStack.pushIfWaiting(queue.get());
-                                            }
                                         }
                                         if (check)
+                                        {
+                                            check = fillRootsStack();
                                             continue;
+                                        }
                                     }
                                     if (size == 0)
                                     {
@@ -785,9 +784,13 @@ else if (size > RESERVED)
                 {
                     do
                     {
-                        check = rootsStack.pushIfWaiting(current);
-                        if (check)
-                            current = data[--size];
+                        /* Leave current unaffected */
+                        /* start stack.pop() */
+                        int item = data[--size];
+                        check = rootsStack.pushIfWaiting(item);
+                        if (!check)
+                            /* start stack.push() */
+                            data[size++] = item;
                     }
                     while (check && size > RESERVED);
                 }