skip print.

core/src/main/kotlin/cmu/pasta/sfuzz/core/GlobalContext.kt

@@ -186,21 +186,26 @@ object GlobalContext {
   }
 
   fun threadCompleted(t: Thread) {
-    if (!errorFound) {
-      monitorEnter(t)
-    }
-    objectNotifyAll(t)
-    registeredThreads[t.id]?.state = ThreadState.Completed
-    // We do not want to send notify all because
-    // we don't have monitor lock here.
-    var size = 0
-    lockManager.getLockContext(t).wakingThreads.let {
-      for (thread in it) {
-        registeredThreads[thread]!!.state = ThreadState.Enabled
+    try {
+
+      if (!errorFound) {
+        monitorEnter(t)
+      }
+      objectNotifyAll(t)
+      registeredThreads[t.id]?.state = ThreadState.Completed
+      // We do not want to send notify all because
+      // we don't have monitor lock here.
+      var size = 0
+      lockManager.getLockContext(t).wakingThreads.let {
+        for (thread in it) {
+          registeredThreads[thread]!!.state = ThreadState.Enabled
+        }
+        size = it.size
       }
-      size = it.size
+      syncManager.createWait(t, size)
+    } catch (e: Throwable) {
+      e.printStackTrace()
     }
-    syncManager.createWait(t, size)
 
     executor.submit {
       while (t.isAlive) {
@@ -406,7 +411,7 @@ object GlobalContext {
     // synchronized(lock) {
     //   lock.unlock();
     // }
-    while (!lockManager.lock(lock, t, true, false) && !errorFound) {
+    while (!lockManager.lock(lock, t, true, false)) {
       registeredThreads[t]?.state = ThreadState.Paused
 
       // We want to block current thread because we do
@@ -415,10 +420,6 @@ object GlobalContext {
       // threads hold the same lock.
       scheduleNextOperation(true)
     }
-
-    if (errorFound) {
-      throw TargetTerminateException(-2)
-    }
   }
 
   fun monitorEnter(lock: Any) {

core/src/main/kotlin/cmu/pasta/sfuzz/core/RuntimeDelegate.kt

@@ -233,11 +233,11 @@ class RuntimeDelegate : Delegate() {
     entered.set(false)
   }
 
-  override fun onLoadClass() {
+  override fun onSkipMethod() {
     skipFunctionEntered.set(1 + skipFunctionEntered.get())
   }
 
-  override fun onLoadClassDone() {
+  override fun onSkipMethodDone() {
     skipFunctionEntered.set(skipFunctionEntered.get() - 1)
   }
 

instrumentation/src/main/kotlin/cmu/pasta/sfuzz/instrumentation/JDKInstrumenter.kt

@@ -30,6 +30,7 @@ fun instrumentClass(path: String, inputStream: InputStream): ByteArray {
     cv = VolatileFieldsInstrumenter(cv, true)
     cv = UnsafeInstrumenter(cv)
     cv = ClassloaderInstrumenter(cv)
+    cv = PrintStreamInstrumenter(cv)
     cv = ObjectInstrumenter(cv)
     cv = SemaphoreInstrumenter(cv)
     cv = CountDownLatchInstrumenter(cv)

instrumentation/src/main/kotlin/cmu/pasta/sfuzz/instrumentation/visitors/ClassloaderInstrumenter.kt

@@ -32,9 +32,10 @@ class ClassloaderInstrumenter(cv: ClassVisitor) : ClassVisitor(ASM9, cv) {
         descriptor == "(Ljava/lang/String;)Ljava/lang/Class;" &&
         className == "java/lang/ClassLoader") ||
         (name == "makeImpl" && className == "java/lang/invoke/MethodType")) {
-      val eMv = MethodEnterVisitor(mv, Runtime::onLoadClass, access, name, descriptor, false, false)
+      val eMv =
+          MethodEnterVisitor(mv, Runtime::onSkipMethod, access, name, descriptor, false, false)
       return MethodExitVisitor(
-          eMv, Runtime::onLoadClassDone, access, name, descriptor, false, false, true)
+          eMv, Runtime::onSkipMethodDone, access, name, descriptor, false, false, true)
     }
     return mv
   }

instrumentation/src/main/kotlin/cmu/pasta/sfuzz/instrumentation/visitors/PrintStreamInstrumenter.kt

@@ -0,0 +1,26 @@
+package cmu.pasta.sfuzz.instrumentation.visitors
+
+import cmu.pasta.sfuzz.runtime.Runtime
+import java.io.PrintStream
+import org.objectweb.asm.ClassVisitor
+import org.objectweb.asm.MethodVisitor
+
+class PrintStreamInstrumenter(cv: ClassVisitor) :
+    ClassVisitorBase(cv, PrintStream::class.java.name) {
+  override fun instrumentMethod(
+      mv: MethodVisitor,
+      access: Int,
+      name: String,
+      descriptor: String,
+      signature: String?,
+      exceptions: Array<out String>?
+  ): MethodVisitor {
+    if (name == "println" || name == "writeln" || name == "write") {
+      val eMv =
+          MethodEnterVisitor(mv, Runtime::onSkipMethod, access, name, descriptor, false, false)
+      return MethodExitVisitor(
+          eMv, Runtime::onSkipMethodDone, access, name, descriptor, false, false, false)
+    }
+    return super.instrumentMethod(mv, access, name, descriptor, signature, exceptions)
+  }
+}

runtime/src/main/java/cmu/pasta/sfuzz/runtime/Delegate.java

@@ -97,10 +97,10 @@ public void onExit(int status) {
     public void onYield() {
     }
 
-    public void onLoadClass() {
+    public void onSkipMethod() {
     }
 
-    public void onLoadClassDone() {
+    public void onSkipMethodDone() {
     }
 
     public void start() {

runtime/src/main/java/cmu/pasta/sfuzz/runtime/Runtime.java

@@ -128,12 +128,12 @@ public static void onYield() {
         DELEGATE.onYield();
     }
 
-    public static void onLoadClass() {
-        DELEGATE.onLoadClass();
+    public static void onSkipMethod() {
+        DELEGATE.onSkipMethod();
     }
 
-    public static void onLoadClassDone() {
-        DELEGATE.onLoadClassDone();
+    public static void onSkipMethodDone() {
+        DELEGATE.onSkipMethodDone();
     }
 
     public static void start() {