Release 0.1.1

cmu-pasta · Aug 11, 2024 · 997b6fb · 997b6fb
1 parent fa98c38
commit 997b6fb
Show file tree

Hide file tree

Showing 57 changed files with 130 additions and 107 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,7 +14,7 @@ plugins {
 
 allprojects {
   group = "org.pastalab.fray"
-  version = "0.1"
+  version = "0.1.1"
 }
 
 repositories {
@@ -43,7 +43,7 @@ configure(allprojects - project(":jvmti")) {
   }
 }
 
-configure(allprojects - rootProject) {
+configure(allprojects - rootProject - project(":instrumentation")) {
   plugins.apply("maven-publish")
   plugins.apply("org.jetbrains.dokka")
 

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
   compileOnly(project(":runtime"))
-  compileOnly(project(":instrumentation"))
+  compileOnly(project(":instrumentation:base"))
   implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
   implementation("com.github.ajalt.clikt:clikt:4.2.2")
   testImplementation("org.jetbrains.kotlin:kotlin-test")
@@ -28,10 +28,10 @@ tasks.named("build") {
 }
 
 tasks.withType<JavaExec> {
-  dependsOn(":jdk:build")
-  val instrumentationTask = evaluationDependsOn(":instrumentation-agent")
+  dependsOn(":instrumentation:jdk:build")
+  val instrumentationTask = evaluationDependsOn(":instrumentation:agent")
       .tasks.named("shadowJar").get()
-  val jdk = project(":jdk")
+  val jdk = project(":instrumentation:jdk")
   val jvmti = project(":jvmti")
   val instrumentation = instrumentationTask.outputs.files.first().absolutePath
   classpath += tasks.named("jar").get().outputs.files + files(configurations.runtimeClasspath)
@@ -74,7 +74,7 @@ tasks.register<JavaExec>("runFray") {
 
 tasks.create("genRunner") {
   doLast {
-    val instrumentationTask = evaluationDependsOn(":instrumentation-agent")
+    val instrumentationTask = evaluationDependsOn(":instrumentation:agent")
         .tasks.named("shadowJar").get()
     val instrumentation = instrumentationTask.outputs.files.first().absolutePath
     val core = tasks.named("jar").get().outputs.files.first().absolutePath

diff --git a/core/src/main/kotlin/org/pastalab/fray/core/RunContext.kt b/core/src/main/kotlin/org/pastalab/fray/core/RunContext.kt
@@ -21,7 +21,7 @@ import org.pastalab.fray.core.concurrency.locks.CountDownLatchManager
 import org.pastalab.fray.core.concurrency.locks.LockManager
 import org.pastalab.fray.core.concurrency.locks.SemaphoreManager
 import org.pastalab.fray.core.concurrency.operations.*
-import org.pastalab.fray.instrumentation.memory.VolatileManager
+import org.pastalab.fray.instrumentation.base.memory.VolatileManager
 
 @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
 class RunContext(val config: Configuration) {

diff --git a/instrumentation-agent/build.gradle.kts → instrumentation/agent/build.gradle.kts b/instrumentation-agent/build.gradle.kts → instrumentation/agent/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
   add("shadow", gradleApi())
   testImplementation(platform("org.junit:junit-bom:5.10.0"))
   testImplementation("org.junit.jupiter:junit-jupiter")
-  implementation(project(":instrumentation"))
+  implementation(project(":instrumentation:base"))
 }
 
 tasks.named<ShadowJar>("shadowJar") {

diff --git a/...main/kotlin/ApplicationCodeTransformer.kt → ...main/kotlin/ApplicationCodeTransformer.kt b/...main/kotlin/ApplicationCodeTransformer.kt → ...main/kotlin/ApplicationCodeTransformer.kt
@@ -8,7 +8,7 @@ import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.ClassWriter
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
-import org.pastalab.fray.instrumentation.visitors.*
+import org.pastalab.fray.instrumentation.base.visitors.*
 
 class ApplicationCodeTransformer : ClassFileTransformer {
   override fun transform(

diff --git a/...entation-agent/src/main/kotlin/PreMain.kt → ...entation/agent/src/main/kotlin/PreMain.kt b/...entation-agent/src/main/kotlin/PreMain.kt → ...entation/agent/src/main/kotlin/PreMain.kt
diff --git a/instrumentation/base/build.gradle.kts b/instrumentation/base/build.gradle.kts
@@ -0,0 +1,36 @@
+plugins {
+  java
+  kotlin("jvm")
+}
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  testImplementation("org.jetbrains.kotlin:kotlin-test")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  api("org.ow2.asm:asm:9.7")
+  api("org.ow2.asm:asm-tree:9.7")
+  api("org.ow2.asm:asm-commons:9.7")
+  api("org.ow2.asm:asm-util:9.7")
+  implementation(project(":runtime"))
+}
+
+tasks.withType<JavaExec> {
+  jvmArgs("--patch-module", "org.pastalab.fray.instrumentation.base=${sourceSets["main"].output
+      .asPath}")
+}
+
+tasks.compileJava {
+  options.compilerArgumentProviders.add(CommandLineArgumentProvider {
+    // Provide compiled Kotlin classes to javac – needed for Java/Kotlin mixed sources to work
+    listOf("--patch-module", "org.pastalab.fray.instrumentation.base=${sourceSets["main"].output
+        .asPath}")
+  })
+}
+
+
+tasks.test {
+  useJUnitPlatform()
+}
diff --git a/...umentation/src/main/java/module-info.java → ...ation/base/src/main/java/module-info.java b/...umentation/src/main/java/module-info.java → ...ation/base/src/main/java/module-info.java
@@ -1,6 +1,7 @@
-module org.pastalab.fray.instrumentation {
-    exports org.pastalab.fray.instrumentation;
-    opens org.pastalab.fray.instrumentation;
+module org.pastalab.fray.instrumentation.base {
+    exports org.pastalab.fray.instrumentation.base;
+    exports org.pastalab.fray.instrumentation.base.visitors;
+    opens org.pastalab.fray.instrumentation.base;
     requires org.pastalab.fray.runtime;
     requires kotlin.reflect;
     requires org.objectweb.asm;

diff --git a/.../pastalab/fray/instrumentation/Dummy.java → ...alab/fray/instrumentation/base/Dummy.java b/.../pastalab/fray/instrumentation/Dummy.java → ...alab/fray/instrumentation/base/Dummy.java
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation;
+package org.pastalab.fray.instrumentation.base;
 
 // We need this dummy class to make sure
 // the corresponding folders is also created in

diff --git a/...org/pastalab/fray/instrumentation/Main.kt → ...astalab/fray/instrumentation/base/Main.kt b/...org/pastalab/fray/instrumentation/Main.kt → ...astalab/fray/instrumentation/base/Main.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation
+package org.pastalab.fray.instrumentation.base
 
 import java.io.File
 

diff --git a/...rg/pastalab/fray/instrumentation/Utils.kt → ...stalab/fray/instrumentation/base/Utils.kt b/...rg/pastalab/fray/instrumentation/Utils.kt → ...stalab/fray/instrumentation/base/Utils.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation
+package org.pastalab.fray.instrumentation.base
 
 import java.nio.file.Paths
 import kotlin.io.path.ExperimentalPathApi

diff --git a/...instrumentation/memory/VolatileManager.kt → ...umentation/base/memory/VolatileManager.kt b/...instrumentation/memory/VolatileManager.kt → ...umentation/base/memory/VolatileManager.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.memory
+package org.pastalab.fray.instrumentation.base.memory
 
 import java.lang.reflect.Field
 import java.lang.reflect.Modifier

diff --git a/...tation/visitors/AdviceAdapterExtension.kt → ...n/base/visitors/AdviceAdapterExtension.kt b/...tation/visitors/AdviceAdapterExtension.kt → ...n/base/visitors/AdviceAdapterExtension.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type

diff --git a/...on/visitors/ArrayOperationInstrumenter.kt → ...se/visitors/ArrayOperationInstrumenter.kt b/...on/visitors/ArrayOperationInstrumenter.kt → ...se/visitors/ArrayOperationInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...ntation/visitors/AtomicGetInstrumenter.kt → ...on/base/visitors/AtomicGetInstrumenter.kt b/...ntation/visitors/AtomicGetInstrumenter.kt → ...on/base/visitors/AtomicGetInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...n/visitors/AtomicOperationInstrumenter.kt → ...e/visitors/AtomicOperationInstrumenter.kt b/...n/visitors/AtomicOperationInstrumenter.kt → ...e/visitors/AtomicOperationInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import java.util.*
 import java.util.concurrent.atomic.*

diff --git a/.../visitors/ClassConstructorInstrumenter.kt → .../visitors/ClassConstructorInstrumenter.kt b/.../visitors/ClassConstructorInstrumenter.kt → .../visitors/ClassConstructorInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...tion/visitors/ClassVersionInstrumenter.kt → ...base/visitors/ClassVersionInstrumenter.kt b/...tion/visitors/ClassVersionInstrumenter.kt → ...base/visitors/ClassVersionInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.Opcodes

diff --git a/...trumentation/visitors/ClassVisitorBase.kt → ...ntation/base/visitors/ClassVisitorBase.kt b/...trumentation/visitors/ClassVisitorBase.kt → ...ntation/base/visitors/ClassVisitorBase.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...ntation/visitors/ConditionInstrumenter.kt → ...on/base/visitors/ConditionInstrumenter.kt b/...ntation/visitors/ConditionInstrumenter.kt → ...on/base/visitors/ConditionInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject
 import org.objectweb.asm.ClassVisitor

diff --git a/...on/visitors/CountDownLatchInstrumenter.kt → ...se/visitors/CountDownLatchInstrumenter.kt b/...on/visitors/CountDownLatchInstrumenter.kt → ...se/visitors/CountDownLatchInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import java.util.concurrent.CountDownLatch
 import org.objectweb.asm.ClassVisitor

diff --git a/...ors/FieldInstanceReadWriteInstrumenter.kt → ...ors/FieldInstanceReadWriteInstrumenter.kt b/...ors/FieldInstanceReadWriteInstrumenter.kt → ...ors/FieldInstanceReadWriteInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...trumentation/visitors/LockInstrumenter.kt → ...ntation/base/visitors/LockInstrumenter.kt b/...trumentation/visitors/LockInstrumenter.kt → ...ntation/base/visitors/LockInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import java.util.concurrent.locks.ReentrantLock
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock

diff --git a/...ation/visitors/LockSupportInstrumenter.kt → .../base/visitors/LockSupportInstrumenter.kt b/...ation/visitors/LockSupportInstrumenter.kt → .../base/visitors/LockSupportInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import java.util.concurrent.locks.LockSupport
 import org.objectweb.asm.ClassVisitor

diff --git a/...umentation/visitors/MethodEnterVisitor.kt → ...ation/base/visitors/MethodEnterVisitor.kt b/...umentation/visitors/MethodEnterVisitor.kt → ...ation/base/visitors/MethodEnterVisitor.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import kotlin.reflect.KFunction
 import org.objectweb.asm.MethodVisitor

diff --git a/...rumentation/visitors/MethodExitVisitor.kt → ...tation/base/visitors/MethodExitVisitor.kt b/...rumentation/visitors/MethodExitVisitor.kt → ...tation/base/visitors/MethodExitVisitor.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import kotlin.reflect.KFunction
 import org.objectweb.asm.Label

diff --git a/...sitors/MethodHandleNativesInstrumenter.kt → ...sitors/MethodHandleNativesInstrumenter.kt b/...sitors/MethodHandleNativesInstrumenter.kt → ...sitors/MethodHandleNativesInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...mentation/visitors/MonitorInstrumenter.kt → ...tion/base/visitors/MonitorInstrumenter.kt b/...mentation/visitors/MonitorInstrumenter.kt → ...tion/base/visitors/MonitorInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.*
 import org.objectweb.asm.Opcodes.ASM9

diff --git a/...umentation/visitors/ObjectInstrumenter.kt → ...ation/base/visitors/ObjectInstrumenter.kt b/...umentation/visitors/ObjectInstrumenter.kt → ...ation/base/visitors/ObjectInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.Label

diff --git a/...tion/visitors/ObjectNotifyInstrumenter.kt → ...base/visitors/ObjectNotifyInstrumenter.kt b/...tion/visitors/ObjectNotifyInstrumenter.kt → ...base/visitors/ObjectNotifyInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...ors/ReentrantReadWriteLockInstrumenter.kt → ...ors/ReentrantReadWriteLockInstrumenter.kt b/...ors/ReentrantReadWriteLockInstrumenter.kt → ...ors/ReentrantReadWriteLockInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import java.util.concurrent.locks.ReentrantReadWriteLock
 import org.objectweb.asm.ClassVisitor

diff --git a/...ntation/visitors/SemaphoreInstrumenter.kt → ...on/base/visitors/SemaphoreInstrumenter.kt b/...ntation/visitors/SemaphoreInstrumenter.kt → ...on/base/visitors/SemaphoreInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import java.util.concurrent.Semaphore
 import org.objectweb.asm.ClassVisitor

diff --git a/...ation/visitors/SeparationMethodVisitor.kt → .../base/visitors/SeparationMethodVisitor.kt b/...ation/visitors/SeparationMethodVisitor.kt → .../base/visitors/SeparationMethodVisitor.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.AnnotationVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...tation/visitors/SkipMethodInstrumenter.kt → ...n/base/visitors/SkipMethodInstrumenter.kt b/...tation/visitors/SkipMethodInstrumenter.kt → ...n/base/visitors/SkipMethodInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import java.io.PrintStream
 import java.lang.invoke.CallSite

diff --git a/...rumentation/visitors/SleepInstrumenter.kt → ...tation/base/visitors/SleepInstrumenter.kt b/...rumentation/visitors/SleepInstrumenter.kt → ...tation/base/visitors/SleepInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...isitors/SynchronizedMethodInstrumenter.kt → ...isitors/SynchronizedMethodInstrumenter.kt b/...isitors/SynchronizedMethodInstrumenter.kt → ...isitors/SynchronizedMethodInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.*
 import org.objectweb.asm.Opcodes.ASM9

diff --git a/.../visitors/SystemModulesMapInstrumenter.kt → .../visitors/SystemModulesMapInstrumenter.kt b/.../visitors/SystemModulesMapInstrumenter.kt → .../visitors/SystemModulesMapInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...tation/visitors/TargetExitInstrumenter.kt → ...n/base/visitors/TargetExitInstrumenter.kt b/...tation/visitors/TargetExitInstrumenter.kt → ...n/base/visitors/TargetExitInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...on/visitors/ThreadHashCodeInstrumenter.kt → ...se/visitors/ThreadHashCodeInstrumenter.kt b/...on/visitors/ThreadHashCodeInstrumenter.kt → ...se/visitors/ThreadHashCodeInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...umentation/visitors/ThreadInstrumenter.kt → ...ation/base/visitors/ThreadInstrumenter.kt b/...umentation/visitors/ThreadInstrumenter.kt → ...ation/base/visitors/ThreadInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...trumentation/visitors/TimeInstrumenter.kt → ...ntation/base/visitors/TimeInstrumenter.kt b/...trumentation/visitors/TimeInstrumenter.kt → ...ntation/base/visitors/TimeInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...ntation/visitors/TimedWaitInstrumenter.kt → ...on/base/visitors/TimedWaitInstrumenter.kt b/...ntation/visitors/TimedWaitInstrumenter.kt → ...on/base/visitors/TimedWaitInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import kotlin.reflect.KFunction
 import org.objectweb.asm.ClassVisitor

diff --git a/...entation/visitors/ToStringInstrumenter.kt → ...ion/base/visitors/ToStringInstrumenter.kt b/...entation/visitors/ToStringInstrumenter.kt → ...ion/base/visitors/ToStringInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...umentation/visitors/UnsafeInstrumenter.kt → ...ation/base/visitors/UnsafeInstrumenter.kt b/...umentation/visitors/UnsafeInstrumenter.kt → ...ation/base/visitors/UnsafeInstrumenter.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor

diff --git a/...ab/fray/instrumentation/visitors/Utils.kt → ...ay/instrumentation/base/visitors/Utils.kt b/...ab/fray/instrumentation/visitors/Utils.kt → ...ay/instrumentation/base/visitors/Utils.kt
@@ -1,4 +1,4 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import kotlin.reflect.KFunction
 import kotlin.reflect.javaType

diff --git a/...on/visitors/VolatileFieldsInstrumenter.kt → ...se/visitors/VolatileFieldsInstrumenter.kt b/...on/visitors/VolatileFieldsInstrumenter.kt → ...se/visitors/VolatileFieldsInstrumenter.kt
@@ -1,12 +1,12 @@
-package org.pastalab.fray.instrumentation.visitors
+package org.pastalab.fray.instrumentation.base.visitors
 
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.FieldVisitor
 import org.objectweb.asm.MethodVisitor
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Opcodes.ASM9
 import org.objectweb.asm.commons.AdviceAdapter
-import org.pastalab.fray.instrumentation.memory.VolatileManager
+import org.pastalab.fray.instrumentation.base.memory.VolatileManager
 
 class VolatileFieldsInstrumenter(cv: ClassVisitor, private val instrumentingJdk: Boolean) :
     ClassVisitor(ASM9, cv) {

diff --git a/...ion/src/test/kotlin/visitors/UtilsTest.kt → ...ase/src/test/kotlin/visitors/UtilsTest.kt b/...ion/src/test/kotlin/visitors/UtilsTest.kt → ...ase/src/test/kotlin/visitors/UtilsTest.kt
@@ -2,7 +2,7 @@ package visitors
 
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
-import org.pastalab.fray.instrumentation.visitors.Utils
+import org.pastalab.fray.instrumentation.base.visitors.Utils
 
 fun exampleMethod(param1: String, param2: Int): Long = 42L