Stable version of thread-safe JMPLib

Author: jose-r-lopez

lib/jmplib-with-dependencies.jar

@@ -48,6 +48,9 @@ public SimpleEvaluator() {
      * {@inheritDoc}
      */
     public IEvaluator createEvaluator() {
+        if (!JMPlibConfig.getInstance().isAgentLoaded())
+            throw new IllegalStateException("The Updater Agent has not been loaded. JMPLib cannot be used. Please do" +
+                    " not forget to add the -javaagent:./lib/jmplib.jar parameter when running the application");
         if (_instance == null) {
             if (JMPlibConfig.getInstance().getConfigureAsThreadSafe()) {
                 _instance = new ThreadSafeSimpleEvaluator();

lib/jmplib.jar

@@ -1,5 +1,6 @@
 package jmplib;
 
+import jmplib.config.JMPlibConfig;
 import jmplib.exceptions.StructuralIntercessionException;
 import jmplib.reflect.Class;
 import jmplib.reflect.TypeVariable;
@@ -35,6 +36,9 @@ public class SimpleIntercessor implements IIntercessor {
      * {@inheritDoc}
      */
     public IIntercessor createIntercessor() {
+        if (!JMPlibConfig.getInstance().isAgentLoaded())
+            throw new IllegalStateException("The Updater Agent has not been loaded. JMPLib cannot be used. Please do" +
+                    " not forget to add the -javaagent:./lib/jmplib.jar parameter when running the application");
         return _instance;
     }
 

src/jmplib/SimpleEvaluator.java

@@ -50,6 +50,10 @@ public TransactionalIntercessor() {
      * {@inheritDoc}
      */
     public IIntercessor createIntercessor() {
+        if (!JMPlibConfig.getInstance().isAgentLoaded())
+            throw new IllegalStateException("The Updater Agent has not been loaded. JMPLib cannot be used. Please do" +
+                    " not forget to add the -javaagent:./lib/jmplib.jar parameter when running the application");
+
         return new TransactionalIntercessor();
     }
 

src/jmplib/SimpleIntercessor.java

@@ -53,6 +53,7 @@ public static void premain(String agentArgs, Instrumentation inst) {
                 if (agentArgs.equals(JMPlibConfig.THREAD_SAFE_OPTION))
                     JMPlibConfig.getInstance().setConfigureAsThreadSafe(true);
             }
+            JMPlibConfig.getInstance().setAgentLoaded(true);
             run("premain", agentArgs, inst);
         } catch (StructuralIntercessionException e) {
             throw new RuntimeException("Intrumentation error", e);

src/jmplib/TransactionalIntercessor.java

@@ -256,7 +256,7 @@ private void generateInvoker(String name, String desc, String[] exceptions) {
                     clazz.getSimpleName() + "_NewVersion_0", //%3
                     paramsNames, //%4
                     (returnClassName.equals("void") ? "" : returnClassName + " ret_value = "), //%5
-                    (returnClassName.equals("void") ? "" : " return ret_value;"), //%6
+                    (returnClassName.equals("void") ? "return;" : " return ret_value;"), //%6
                     (returnClassName.equals("void") ? "" : "(" + returnClassName+")"), //%7
                     (paramsNames.equals("") ? "" : ", " + paramsNames), //%8
                     (paramTypes.equals("") ? "" : ", " + paramTypes)}; //%9

src/jmplib/agent/UpdaterAgent.java

@@ -36,6 +36,16 @@ public class JMPlibConfig {
     public static final String THREAD_SAFE_OPTION = "thread_safety";
     private boolean configureAsThreadSafe = false;
 
+    public boolean isAgentLoaded() {
+        return agentLoaded;
+    }
+
+    public void setAgentLoaded(boolean agentLoaded) {
+        this.agentLoaded = agentLoaded;
+    }
+
+    private boolean agentLoaded = false;
+
     private JMPlibConfig() {
         configFileExist = new File(PROPERTY_FILE_NAME).exists();
         originalClassPath = load(ORIGINAL_CLASS_PATH_KEY).orElse(DEFAULT_ORIGINAL_CLASS_PATH);

src/jmplib/asm/visitor/ClassCacherVisitor.java

@@ -85,7 +85,10 @@ private String getProperReturnClassName() {
         //For arrays
         if ((this.returnClass.toString().startsWith("[")) || (this.returnClass.toString().startsWith("class [")))
             return this.returnClass.getSimpleName();
-        return returnClass.toString();
+        String strReturn = returnClass.toString();
+        if (strReturn.startsWith("class "))
+            strReturn = strReturn.substring("class ".length(), strReturn.length());
+        return strReturn;
     }
     /**
      * Generates the body of an invoker method
@@ -100,7 +103,7 @@ protected String getBodyInvoker(String name, String paramsNames, String paramTyp
                     clazz.getSimpleName() + "_NewVersion_"
                             + (classContent.isUpdated() ? classContent.getVersion() - 1 : classContent.getVersion()),
                     paramsNames, (returnClass.getName().equals("void") ? "" : getProperReturnClassName() + " ret_value = "),
-                    (returnClass.getName().equals("void") ? "" : " return ret_value;"),
+                    (returnClass.getName().equals("void") ? "return;" : " return ret_value;"),
                     (returnClass.getName().equals("void") ? "" : "(" + getProperReturnClassName()+")"),
                     (paramsNames.equals("") ? "" : ", " + paramsNames), //%8
                     (paramTypes.equals("") ? "" : ", " + paramTypes)}; //%9