removing the need to keep track of a vector of TIDs

Author: noabauma

include/tracr/marker_management_engine.hpp

@@ -29,7 +29,6 @@
 #include <fstream> // To store files
 #include <iomanip>
 #include <iostream>
-#include <mutex>
 #include <nlohmann/json.hpp>
 #include <sched.h> // sched_getcpu()
 #include <string>
@@ -63,43 +62,6 @@ constexpr size_t CAPACITY = TRACR_CAPACITY;
 #define debug_print(fmt, ...)
 #endif
 
-/**
- * A way to keep the tracrThreads save when adding/erasing
- */
-inline std::mutex tracrThreadIDsMutex;
-
-/**
- * A list of all the created _tracrThreadIDs
- */
-inline std::vector<pid_t> tracrThreadIDs;
-
-/**
- * Adding a new tracr thread
- *
- * This is thread save.
- */
-inline void addTraCRThread(pid_t tid) {
-  // We have to lock this as this method can be called from multiple threads
-  std::lock_guard<std::mutex> lock(tracrThreadIDsMutex);
-  tracrThreadIDs.push_back(tid);
-}
-
-/**
- *
- */
-inline void eraseTraCRThread(const pid_t tid) {
-  std::lock_guard<std::mutex> lock(tracrThreadIDsMutex);
-
-  auto it = std::find(tracrThreadIDs.begin(), tracrThreadIDs.end(), tid);
-
-  if (it == tracrThreadIDs.end()) {
-    std::cerr << "Thread not found in tracr proc list!\n";
-    std::exit(EXIT_FAILURE);
-  }
-
-  tracrThreadIDs.erase(it);
-}
-
 /**
  * Our nanosecond timer
  *

include/tracr/tracr_core.hpp

@@ -85,22 +85,10 @@ static inline void instrumentation_thread_init() {
     std::exit(EXIT_FAILURE);
   }
 
-  pid_t this_tid = syscall(SYS_gettid);
-
-  for (const auto &tid : tracrThreadIDs) {
-    if (this_tid == tid) {
-      std::cerr << "TraCR thread with this TID already exists in the list in "
-                   "tracr proc\n";
-      std::exit(EXIT_FAILURE);
-    }
-  }
-
   // Add tracr Thread
+  pid_t this_tid = syscall(SYS_gettid);
   tracrThread = std::make_unique<TraCRThread>(this_tid);
 
-  // Add the new TraCR Thread
-  addTraCRThread(this_tid);
-
   // Increase global thread counter
   ++num_tracr_threads;
 }
@@ -123,10 +111,6 @@ static inline void instrumentation_thread_finalize() {
   // Finalize the thread now (destructor of it is also called)
   tracrThread.reset();
 
-  // If it exists check if it is inside the tracr proc list
-  // If yes, erase it, else abort
-  eraseTraCRThread(syscall(SYS_gettid));
-
   // Decrease global thread counter
   --num_tracr_threads;
 }
@@ -180,10 +164,9 @@ static inline void instrumentation_end() {
 
   // Flushing the trace of this TraCR thread/proc now (if enabled)
   if (flush_enabled) {
-    if (num_tracr_threads.load() != 1 || tracrThreadIDs.size() != 1) {
+    if (num_tracr_threads.load() != 1) {
       std::cerr << "Only one(this) TraCR Threads allowed but got: "
-                << num_tracr_threads.load() << ":" << tracrThreadIDs.size()
-                << "\n";
+                << num_tracr_threads.load() << "\n";
       std::exit(EXIT_FAILURE);
     }
 
@@ -197,10 +180,6 @@ static inline void instrumentation_end() {
   // Destroys the TraCR Thread pointer and calls the destructor
   tracrThread.reset();
 
-  // If it exists check if it is inside the tracr proc list
-  // If yes, erase it, else abort
-  eraseTraCRThread(syscall(SYS_gettid));
-
   // Decrease global thread counter
   --num_tracr_threads;