Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Consumer;
Expand Down Expand Up @@ -92,6 +94,8 @@ public class JMeterThread implements Runnable, Interruptible {

private final HashTree testTree;

private final Map<Sampler, List<Controller>> parentControllersCache = new HashMap<>();

private final TestCompiler compiler;

private final JMeterThreadMonitor monitor;
Expand Down Expand Up @@ -343,6 +347,20 @@ public void run() {
}
}

private static class CachedPathToRootTraverser extends FindTestElementsUpToRootTraverser {
private final List<Controller> controllers;

CachedPathToRootTraverser(List<Controller> controllers) {
super(null);
this.controllers = controllers;
}

@Override
public List<Controller> getControllersToRoot() {
return controllers;
}
}

/**
* Trigger break/continue/switch to next thread Loop depending on consumer implementation
* @param sampler Sampler Base sampler
Expand All @@ -363,8 +381,16 @@ private void triggerLoopLogicalActionOnParentControllers(Sampler sampler, JMeter
(sampler != null ? sampler.getName() : "null") + ", sampler:" + sampler);
}
// Find parent controllers of current sampler
FindTestElementsUpToRootTraverser pathToRootTraverser = new FindTestElementsUpToRootTraverser(realSampler);
testTree.traverse(pathToRootTraverser);
List<Controller> controllers = parentControllersCache.get(realSampler);
FindTestElementsUpToRootTraverser pathToRootTraverser;
if (controllers == null) {
pathToRootTraverser = new FindTestElementsUpToRootTraverser(realSampler);
testTree.traverse(pathToRootTraverser);
controllers = pathToRootTraverser.getControllersToRoot();
parentControllersCache.put(realSampler, controllers);
} else {
pathToRootTraverser = new CachedPathToRootTraverser(controllers);
}

consumer.accept(pathToRootTraverser);

Expand Down