Sketch support for getting third party libraries, but disable affinity for now

There’s an issue with Java modules, I don’t want to deal with…

Signed-off-by: Stefan Marr <[email protected]>

Author: smarr

mx.somns/mx_somns.py

@@ -253,3 +253,19 @@ def tests_update_data(args, **kwargs):
     """update expected data for tests"""
     mx.run(["tests/tools/nodestats/test.sh", "update"])
     mx.run(["tests/tools/coverage/test.sh", "update"])
+
+@mx.command(suite.name, "create-third-party-module-file")
+def create_third_party_module_file(args, **kwargs):
+    """create the third party module file"""
+    paths = []
+    for lib in mx.libraries():
+        if lib.name.startswith("SOMNS_DEP") and "DEV" not in lib.name:
+            paths.append(lib.path)
+        elif lib.name == "AFFINITY":
+            paths.append(lib.path)
+        elif lib.name.startswith("SLF4J"):
+            paths.append(lib.path)
+
+    # create file in suite.dir with the paths as text
+    with open(suite.dir + "/.modules", "w") as file:
+        file.write(":".join(paths) + "\n")

mx.somns/suite.py

@@ -58,6 +58,33 @@
                 "version": "3.23.2",
             },
         },
+        "SLF4J_API": {
+            "moduleName": "org.slf4j.api",
+            "digest": "sha512:f9b033fc019a44f98b16048da7e2b59edd4a6a527ba60e358f65ab88e0afae03a9340f1b3e8a543d49fa542290f499c5594259affa1ff3e6e7bf3b428d4c610b",
+            "maven": {
+                "groupId": "org.slf4j",
+                "artifactId": "slf4j-api",
+                "version": "1.7.36",
+            },
+        },
+        "SLF4J_NOP": {
+            "moduleName": "org.slf4j.nop",
+            "digest": "sha512:3ee0417e7a3b1bbd490b15ee8329681b397a4042a5bfec032719fab696c3f0ad401e9ed4ac16f550ccd1ee8c179ad8ec438142b7a7cf8522b793685bd218a9a2",
+            "maven": {
+                "groupId": "org.slf4j",
+                "artifactId": "slf4j-nop",
+                "version": "1.7.36",
+            },
+        },
+        "SLF4J_SIMPLE": {
+            "moduleName": "org.slf4j.simple",
+            "digest": "sha512:cdcebe8fa58527a1bc7da0c18e90a9547ce8ac99cccfe5657860c2a25478c030ea758251da3e32a71eab9cbb91360692b5c6c5887a1f1597d1fda07151b27e5f",
+            "maven": {
+                "groupId": "org.slf4j",
+                "artifactId": "slf4j-simple",
+                "version": "1.7.36",
+            },
+        },
         "LABS_JDK": {
             "id": "labsjdk-ce-latest",
             # I am just using the suite.py to store the info
@@ -74,6 +101,9 @@
                 "tools:TRUFFLE_PROFILER",
                 "SOMNS_DEPS_0.3.8",
                 "AFFINITY",
+                "SLF4J_API",
+                "SLF4J_NOP",
+                "SLF4J_SIMPLE"
             ],
             "requires": [
                 "java.logging",

som

@@ -214,6 +214,12 @@ def get_compiled_graalvm_java_bin(use_libgraal):
   libgraal_jdk_home = lines[-1].strip()
   return libgraal_jdk_home + '/bin/java'
 
+def get_third_party_jars():
+  if not os.path.exists(BASE_DIR + '/.modules'):
+      mx = find_mx()
+      check_output([mx, 'create-third-party-module-file'], cwd=BASE_DIR)
+  with open(BASE_DIR + '/.modules') as f:
+    return f.read().strip()
 
 if args.setup == 'mx':
   mx = find_mx(False)
@@ -341,9 +347,7 @@ else:
 MODULE_PATH_ENTRIES = [
   BASE_DIR + '/mxbuild/dists/somns.jar',
   BASE_DIR + '/libs/somns-deps.jar',
-  BASE_DIR + '/libs/affinity.jar',
-  BASE_DIR + '/libs/slf4j-api.jar',
-  BASE_DIR + '/libs/slf4j-simple.jar',
+  get_third_party_jars(),
   BASE_DIR + '/libs/jna-platform.jar',
   BASE_DIR + '/libs/jna.jar',
   TRUFFLE_DIR + '/sdk/mxbuild/dists/graal-sdk.jar',

src/somns/src/tools/concurrency/TracingActivityThread.java

@@ -5,7 +5,7 @@
 import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import net.openhft.affinity.AffinityLock;
+//import net.openhft.affinity.AffinityLock;
 import somns.VM;
 import somns.interpreter.actors.Actor.ActorProcessingThread;
 import somns.vm.Activity;
@@ -26,7 +26,7 @@ public abstract class TracingActivityThread extends ForkJoinWorkerThread {
   public static final AtomicInteger threadIdGen =
       (VmSettings.UNIFORM_TRACING || VmSettings.KOMPOS_TRACING) ? new AtomicInteger(1) : null;
 
-  private Object /* AffinityLock */ affinity;
+//  private Object /* AffinityLock */ affinity;
 
   protected final long threadId;
   protected long       nextEntityId;
@@ -185,9 +185,9 @@ protected void onStart() {
       TracingBackend.registerThread(this);
     }
 
-    if (VmSettings.USE_PINNING) {
-      affinity = AffinityLock.acquireLock();
-    }
+//    if (VmSettings.USE_PINNING) {
+//      affinity = AffinityLock.acquireLock();
+//    }
 
     vm.enterContext();
   }
@@ -203,9 +203,9 @@ protected void onTermination(final Throwable exception) {
       SnapshotBackend.registerSnapshotBuffer(snapshotBuffer);
     }
 
-    if (VmSettings.USE_PINNING) {
-      ((AffinityLock) affinity).release();
-    }
+//    if (VmSettings.USE_PINNING) {
+//      ((AffinityLock) affinity).release();
+//    }
 
     vm.leaveContext();
     super.onTermination(exception);