Skip to content
Snippets Groups Projects
Commit ba63faf9 authored by Florian Fittkau's avatar Florian Fittkau
Browse files

fixed bug concurrency bugs

parent f347aafe
No related branches found
No related tags found
No related merge requests found
...@@ -89,9 +89,9 @@ public class MonitoringController { ...@@ -89,9 +89,9 @@ public class MonitoringController {
configuration.getIntProperty(ConfigurationFactory.LOAD_BALANCER_PORT, 9999), configuration.getIntProperty(ConfigurationFactory.LOAD_BALANCER_PORT, 9999),
configuration.getIntProperty(ConfigurationFactory.LOAD_BALANCER_WAIT_TIME, configuration.getIntProperty(ConfigurationFactory.LOAD_BALANCER_WAIT_TIME,
20000), 20000),
configuration configuration
.getStringProperty(ConfigurationFactory.LOAD_BALANCER_SCALING_GROUP), .getStringProperty(ConfigurationFactory.LOAD_BALANCER_SCALING_GROUP),
tcpWriter); tcpWriter);
} else { } else {
try { try {
tcpWriter.connect(); tcpWriter.connect();
......
...@@ -7,7 +7,7 @@ import java.util.ArrayList; ...@@ -7,7 +7,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import explorviz.live_trace_processing.Constants; import explorviz.live_trace_processing.Constants;
...@@ -15,7 +15,7 @@ import explorviz.live_trace_processing.debug.DebugFileByteBufferWriter; ...@@ -15,7 +15,7 @@ import explorviz.live_trace_processing.debug.DebugFileByteBufferWriter;
import explorviz.live_trace_processing.record.misc.StringRegistryRecord; import explorviz.live_trace_processing.record.misc.StringRegistryRecord;
public class MonitoringStringRegistry { public class MonitoringStringRegistry {
private static final Map<String, Integer> stringReg = new ConcurrentSkipListMap<String, Integer>(); private static final Map<String, Integer> stringReg = new ConcurrentHashMap<String, Integer>();
private static final AtomicInteger stringRegIndex = new AtomicInteger(0); private static final AtomicInteger stringRegIndex = new AtomicInteger(0);
public static final Integer getIdForString(final String value) { public static final Integer getIdForString(final String value) {
......
package explorviz.monitoring.main; package explorviz.monitoring.main;
import testpackage.TestClass; import testpackage.TestClass;
import explorviz.live_trace_processing.main.MonitoringController;
public class MonitoringStarter { public class MonitoringStarter {
...@@ -16,9 +15,9 @@ public class MonitoringStarter { ...@@ -16,9 +15,9 @@ public class MonitoringStarter {
testClass.testMethod(9); testClass.testMethod(9);
} }
} }
}).run(); }).start();
} }
MonitoringController.shutdown(); // MonitoringController.shutdown();
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment