diff --git a/pom.xml b/pom.xml
index 8bdaed1..7f0e9c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,13 +21,31 @@
picocontainer
2.15
+
+
+
+
+
+
+
- com.sun
- tools
- 8
- system
- ${java.home}/../lib/tools.jar
+ org.openjfx
+ javafx-controls
+ 17
+
+
+ org.openjfx
+ javafx-fxml
+ 17
+
+
+
+ javax.annotation
+ javax.annotation-api
+ 1.3.2
+
+
org.webbitserver
webbit
@@ -42,7 +60,7 @@
ch.qos.logback
logback-classic
- 1.1.8
+ 1.4.11
args4j
@@ -84,6 +102,15 @@
+
+ org.openjfx
+ javafx-maven-plugin
+ 0.0.8
+
+ com.insightfullogic.honest_profiler.ports.javafx.JavaFXApplication
+
+
+
maven-assembly-plugin
@@ -120,10 +147,10 @@
org.apache.maven.plugins
maven-compiler-plugin
- 2.3.2
+ 3.11.0
- 1.8
- 1.8
+ 11
+ 11
@@ -173,50 +200,50 @@
-
- org.codehaus.mojo
- exec-maven-plugin
- 1.1
-
-
- make-clean
- clean
-
- exec
-
-
- make
-
- clean
-
-
-
-
- make-test
- test
-
- exec
-
-
- ${skipTests}
- make
-
- test
-
-
-
-
- make-compile
- compile
-
- exec
-
-
- make
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/cpp/control.cpp b/src/main/cpp/control.cpp
index 77de91e..51516b3 100644
--- a/src/main/cpp/control.cpp
+++ b/src/main/cpp/control.cpp
@@ -103,5 +103,5 @@ JNIEXPORT void JNICALL Java_com_insightfullogic_honest_1profiler_core_control_Ag
extern "C"
JNIEXPORT jint JNICALL Java_com_insightfullogic_honest_1profiler_core_control_Agent_getCurrentNativeThreadId(JNIEnv *env, jclass klass) {
- return gettid();
+ return mygettid();
}
diff --git a/src/main/cpp/thread_map.cpp b/src/main/cpp/thread_map.cpp
index cd8ce93..3432590 100644
--- a/src/main/cpp/thread_map.cpp
+++ b/src/main/cpp/thread_map.cpp
@@ -8,7 +8,7 @@
#endif
// taken from Wine's get_unix_tid
-int gettid() {
+int mygettid() {
int ret = -1;
#if defined(__linux__)
ret = syscall(SYS_gettid);
diff --git a/src/main/cpp/thread_map.h b/src/main/cpp/thread_map.h
index c67d2ae..34737cb 100644
--- a/src/main/cpp/thread_map.h
+++ b/src/main/cpp/thread_map.h
@@ -6,7 +6,7 @@
#include
#include
-int gettid();
+int mygettid();
template struct PointerHasher {
/* Numerical Recipes, 3rd Edition */
@@ -117,7 +117,7 @@ private:
public:
explicit ThreadMapBase(int capacity = kInitialMapSize) : map(capacity) {}
- void put(JNIEnv *jni_env, const char *name) { put(jni_env, name, gettid()); }
+ void put(JNIEnv *jni_env, const char *name) { put(jni_env, name, mygettid()); }
void put(JNIEnv *jni_env, const char *name, int tid) {
ThreadBucket *info = new ThreadBucket(tid, name);
diff --git a/src/main/java/InfiniteExample.java b/src/main/java/InfiniteExample.java
index 6dec9e9..172cf8f 100644
--- a/src/main/java/InfiniteExample.java
+++ b/src/main/java/InfiniteExample.java
@@ -1,6 +1,6 @@
import com.insightfullogic.honest_profiler.core.control.Agent;
-import java.lang.management.ManagementFactory;
+//import java.lang.management.ManagementFactory;
import static java.lang.Long.parseLong;
@@ -30,11 +30,11 @@ public class InfiniteExample
public static void main(String[] args) throws Exception
{
- final String jvmName = ManagementFactory.getRuntimeMXBean().getName();
- final int index = jvmName.indexOf('@');
+// final String jvmName = ManagementFactory.getRuntimeMXBean().getName();
+// final int index = jvmName.indexOf('@');
final Thread control = new Thread(InfiniteExample::startOrStop);
- System.out.println(parseLong(jvmName.substring(0, index)));
+// System.out.println(parseLong(jvmName.substring(0, index)));
control.start();
while (true)