Issue/85 (OpenHFT#86)

minborg · web-flow · commit beaa5c07d29d · 2021-12-21T14:55:59.000+01:00
* Reenable test * Cleanup usage of raw types * Fix flaky test. Fix OpenHFT#85
diff --git a/src/main/java/net/openhft/compiler/CachedCompiler.java b/src/main/java/net/openhft/compiler/CachedCompiler.java
@@ -42,7 +42,7 @@ public class CachedCompiler implements Closeable {
     private static final Logger LOG = LoggerFactory.getLogger(CachedCompiler.class);
     private static final PrintWriter DEFAULT_WRITER = new PrintWriter(System.err);
 
-    private final Map<ClassLoader, Map<String, Class>> loadedClassesMap = Collections.synchronizedMap(new WeakHashMap<>());
+    private final Map<ClassLoader, Map<String, Class<?>>> loadedClassesMap = Collections.synchronizedMap(new WeakHashMap<>());
     private final Map<ClassLoader, MyJavaFileManager> fileManagerMap = Collections.synchronizedMap(new WeakHashMap<>());
 
     @Nullable
@@ -130,12 +130,12 @@ public Class loadFromJava(@NotNull ClassLoader classLoader,
                               @NotNull String className,
                               @NotNull String javaCode,
                               @Nullable PrintWriter writer) throws ClassNotFoundException {
-        Class clazz = null;
-        Map<String, Class> loadedClasses;
+        Class<?> clazz = null;
+        Map<String, Class<?>> loadedClasses;
         synchronized (loadedClassesMap) {
             loadedClasses = loadedClassesMap.get(classLoader);
             if (loadedClasses == null)
-                loadedClassesMap.put(classLoader, loadedClasses = new LinkedHashMap<String, Class>());
+                loadedClassesMap.put(classLoader, loadedClasses = new LinkedHashMap<>());
             else
                 clazz = loadedClasses.get(className);
         }
diff --git a/src/main/java/net/openhft/compiler/MyJavaFileManager.java b/src/main/java/net/openhft/compiler/MyJavaFileManager.java
@@ -71,11 +71,15 @@ class MyJavaFileManager implements JavaFileManager {
         this.fileManager = fileManager;
     }
 
-    public Iterable<Set<Location>> listLocationsForModules(final Location location) {
+    // Apparently, this method might not be thread-safe.
+    // See https://github.com/OpenHFT/Java-Runtime-Compiler/issues/85
+    public synchronized Iterable<Set<Location>> listLocationsForModules(final Location location) {
         return invokeNamedMethodIfAvailable(location, "listLocationsForModules");
     }
 
-    public String inferModuleName(final Location location) {
+    // Apparently, this method might not be thread-safe.
+    // See https://github.com/OpenHFT/Java-Runtime-Compiler/issues/85
+    public synchronized String inferModuleName(final Location location) {
         return invokeNamedMethodIfAvailable(location, "inferModuleName");
     }
 
diff --git a/src/test/java/mytest/RuntimeCompileTest.java b/src/test/java/mytest/RuntimeCompileTest.java
@@ -42,7 +42,7 @@ public void outOfBounds() throws Exception {
         }
     }
 
-    @Ignore("see https://teamcity.chronicle.software/viewLog.html?buildId=639347&tab=buildResultsDiv&buildTypeId=OpenHFT_BuildAll_BuildJava11compileJava11")
+    //@Ignore("see https://teamcity.chronicle.software/viewLog.html?buildId=639347&tab=buildResultsDiv&buildTypeId=OpenHFT_BuildAll_BuildJava11compileJava11")
     @Test
     public void testMultiThread() throws Exception {
         StringBuilder largeClass = new StringBuilder("package mytest;\n" +
@@ -64,6 +64,7 @@ public void testMultiThread() throws Exception {
         final ClassLoader cl = new URLClassLoader(new URL[0]);
         final CachedCompiler cc = new CachedCompiler(null, null);
         final int nThreads = Runtime.getRuntime().availableProcessors();
+        System.out.println("nThreads = " + nThreads);
         final AtomicInteger started = new AtomicInteger(0);
         final ExecutorService executor = Executors.newFixedThreadPool(nThreads);
         final List<Future<?>> futures = new ArrayList<>();

Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,15 @@ class MyJavaFileManager implements JavaFileManager {`
`71`	`71`	`this.fileManager = fileManager;`
`72`	`72`	`}`
`73`	`73`
`74`		`- public Iterable<Set<Location>> listLocationsForModules(final Location location) {`
	`74`	`+ // Apparently, this method might not be thread-safe.`
	`75`	`+ // See https://github.com/OpenHFT/Java-Runtime-Compiler/issues/85`
	`76`	`+ public synchronized Iterable<Set<Location>> listLocationsForModules(final Location location) {`
`75`	`77`	`return invokeNamedMethodIfAvailable(location, "listLocationsForModules");`
`76`	`78`	`}`
`77`	`79`
`78`		`- public String inferModuleName(final Location location) {`
	`80`	`+ // Apparently, this method might not be thread-safe.`
	`81`	`+ // See https://github.com/OpenHFT/Java-Runtime-Compiler/issues/85`
	`82`	`+ public synchronized String inferModuleName(final Location location) {`
`79`	`83`	`return invokeNamedMethodIfAvailable(location, "inferModuleName");`
`80`	`84`	`}`
`81`	`85`