adding everything new now

Author: noabauma

examples/README.md

@@ -8,8 +8,8 @@ If your application uses multiple threads (e.g., with Pthreads), see `pthread_ex
 - `pthread_example.cpp`: Similar to `thread_markers.cpp`, but runs across multiple threads using Pthreads.
 In this case, threads must be explicitly initialized.
 
-- `vmarkers_push_pop.cpp`: Equivalent to `thread_markers.cpp`, but uses VMARKERS (short for vanilla markers).
+- `vmarkers_push_pop.cpp`: Equivalent to `thread_markers.cpp`, but uses VMARKS (short for vanilla markers).
 These are lightweight markers that are pushed using a color ID instead of a marker ID. Useful when working with many different markers.
 
-- `vmarkers_set.cpp`: Another VMARKERS example, this time using the SET method instead of PUSH/POP.
+- `vmarkers_set.cpp`: Another VMARKS example, this time using the SET method instead of PUSH/POP.
 The PUSH/POP method relies on each marker being explicitly pushed and later popped, whereas the SET method simply sets the marker without requiring an end point (i.e. a pop).

examples/pthread_example.cpp

@@ -20,7 +20,7 @@
 #include <unistd.h>      // For getpid()
 #include <vector>
 
-#include <tracr.hpp>
+#include <tracr/tracr.hpp>
 
 #define NRANKS 4 // number of threads
 #define NTASKS 3 // number of tasks per thread
@@ -40,7 +40,7 @@ void *threadFunction(void *arg) {
   // TraCR init thread
   INSTRUMENTATION_THREAD_INIT();
 
-  INSTRUMENTATION_THREAD_MARK_SET(thrd_running_id);
+  INSTRUMENTATION_MARK_SET(thrd_running_id);
 
   // Get the process ID (PID) and thread ID (TID)
   pid_t pid = getpid();            // Process ID
@@ -60,11 +60,11 @@ void *threadFunction(void *arg) {
     std::cout << "Thread " << id << " is running task: " << taskid << std::endl;
   }
 
-  INSTRUMENTATION_THREAD_MARK_SET(thrd_finished_id);
+  INSTRUMENTATION_MARK_SET(thrd_finished_id);
 
   // Optional: This marker pushes the int64_t max value. Can be used to indicate
   // the ending.
-  INSTRUMENTATION_VMARKER_RESET();
+  INSTRUMENTATION_MARK_RESET();
 
   // TraCR free thread
   INSTRUMENTATION_THREAD_END();
@@ -83,18 +83,18 @@ int main() {
   INSTRUMENTATION_START(externally_init);
 
   // 0 == Set and 1 == Push/Pop
-  INSTRUMENTATION_THREAD_MARK_INIT(0);
+  INSTRUMENTATION_MARK_INIT(0);
 
   // Each Label creation costs around (~3us)
   // Should be done at the beginning or at the ending of the code
   thrd_running_id =
-      INSTRUMENTATION_THREAD_MARK_ADD(MARK_COLOR_MINT, "thread running");
+      INSTRUMENTATION_MARK_ADD(MARK_COLOR_MINT, "thread running");
   thrd_finished_id =
-      INSTRUMENTATION_THREAD_MARK_ADD(MARK_COLOR_GREEN, "thread finished");
+      INSTRUMENTATION_MARK_ADD(MARK_COLOR_GREEN, "thread finished");
   const size_t thrd_join_id =
-      INSTRUMENTATION_THREAD_MARK_ADD(MARK_COLOR_BROWN, "join threads");
+      INSTRUMENTATION_MARK_ADD(MARK_COLOR_BROWN, "join threads");
   const size_t thrds_end_id =
-      INSTRUMENTATION_THREAD_MARK_ADD(MARK_COLOR_RED, "threads end");
+      INSTRUMENTATION_MARK_ADD(MARK_COLOR_RED, "threads end");
 
   std::vector<pthread_t> threads(NRANKS); // Vector to hold pthreads
   std::vector<int> threadIds(NRANKS);     // Vector to hold thread IDs
@@ -108,14 +108,14 @@ int main() {
     pthread_create(&threads[i], nullptr, threadFunction, &threadIds[i]);
   }
 
-  INSTRUMENTATION_THREAD_MARK_SET(thrd_join_id);
+  INSTRUMENTATION_MARK_SET(thrd_join_id);
 
   // Wait for all threads to finish
   for (int i = 0; i < NRANKS; ++i) {
     pthread_join(threads[i], nullptr);
   }
 
-  INSTRUMENTATION_THREAD_MARK_SET(thrds_end_id);
+  INSTRUMENTATION_MARK_SET(thrds_end_id);
 
   std::cout << "All threads have finished." << std::endl;
 

examples/pytracr/pthread_example.py

@@ -36,7 +36,7 @@ def threadFunction(lock, id, thrd_running_id, thrd_finished_id):
   # TraCR init thread
   INSTRUMENTATION_THREAD_INIT()
 
-  INSTRUMENTATION_THREAD_MARK_SET(thrd_running_id)
+  INSTRUMENTATION_MARK_SET(thrd_running_id)
 
   # Get the process ID (PID) and thread ID (TID)
   pid = os.getpid() # Process ID
@@ -53,7 +53,7 @@ def threadFunction(lock, id, thrd_running_id, thrd_finished_id):
 
     print(f"Thread {id} is running task: {taskid}")
 
-  INSTRUMENTATION_THREAD_MARK_SET(thrd_finished_id)
+  INSTRUMENTATION_MARK_SET(thrd_finished_id)
 
   # TraCR free thread
   INSTRUMENTATION_THREAD_END()
@@ -67,14 +67,14 @@ def main():
   INSTRUMENTATION_START()
 
   # 0 == Set and 1 == Push/Pop
-  INSTRUMENTATION_THREAD_MARK_INIT(0)
+  INSTRUMENTATION_MARK_INIT(0)
 
   # Each Label creation costs around (~3us)
   # Should be done at the beginning or at the ending of the code
-  thrd_running_id = INSTRUMENTATION_THREAD_MARK_ADD(mark_color.MARK_COLOR_MINT, "thread running")
-  thrd_finished_id = INSTRUMENTATION_THREAD_MARK_ADD(mark_color.MARK_COLOR_GREEN, "thread finished")
-  thrd_join_id = INSTRUMENTATION_THREAD_MARK_ADD(mark_color.MARK_COLOR_BROWN, "join threads")
-  thrds_end_id = INSTRUMENTATION_THREAD_MARK_ADD(mark_color.MARK_COLOR_RED, "threads end")
+  thrd_running_id = INSTRUMENTATION_MARK_ADD(mark_color.MARK_COLOR_MINT, "thread running")
+  thrd_finished_id = INSTRUMENTATION_MARK_ADD(mark_color.MARK_COLOR_GREEN, "thread finished")
+  thrd_join_id = INSTRUMENTATION_MARK_ADD(mark_color.MARK_COLOR_BROWN, "join threads")
+  thrds_end_id = INSTRUMENTATION_MARK_ADD(mark_color.MARK_COLOR_RED, "threads end")
 
   threads = [None] * NRANKS   # Vector to hold pthreads
   threadIds = [None] * NRANKS # Vector to hold thread IDs
@@ -90,13 +90,13 @@ def main():
 
     threads[i].start()
 
-  INSTRUMENTATION_THREAD_MARK_SET(thrd_join_id)
+  INSTRUMENTATION_MARK_SET(thrd_join_id)
 
   # Wait for all threads to finish
   for thread in threads:
     thread.join()
 
-  INSTRUMENTATION_THREAD_MARK_SET(thrds_end_id)
+  INSTRUMENTATION_MARK_SET(thrds_end_id)
 
   print("All threads have finished.")
 

examples/pytracr/thread_markers.py

@@ -30,49 +30,49 @@ def main():
   INSTRUMENTATION_START()
 
   # 0 == Set and 1 == Push/Pop
-  INSTRUMENTATION_THREAD_MARK_INIT(1)
+  INSTRUMENTATION_MARK_INIT(1)
 
-  # Each INSTRUMENTATION_THREAD_MARK_ADD costs around (~3us)
+  # Each INSTRUMENTATION_MARK_ADD costs around (~3us)
   # Should be done at the beginning or at the ending of the code
-  alloc_mem_label_id = INSTRUMENTATION_THREAD_MARK_ADD(mark_color.MARK_COLOR_TEAL, "Allocate Memory")
-  fill_mat_label_id = INSTRUMENTATION_THREAD_MARK_ADD(mark_color.MARK_COLOR_LAVENDER, "Fill matrices with values")
-  prt_mat_label_id = INSTRUMENTATION_THREAD_MARK_ADD(mark_color.MARK_COLOR_RED, "Print all matrices")
-  mmm_label_id = INSTRUMENTATION_THREAD_MARK_ADD(mark_color.MARK_COLOR_PEACH, "MMM")
-  prt_A_label_id = INSTRUMENTATION_THREAD_MARK_ADD(mark_color.MARK_COLOR_LIGHT_GRAY, "Print solution of matrix A")
+  alloc_mem_label_id = INSTRUMENTATION_MARK_ADD(mark_color.MARK_COLOR_TEAL, "Allocate Memory")
+  fill_mat_label_id = INSTRUMENTATION_MARK_ADD(mark_color.MARK_COLOR_LAVENDER, "Fill matrices with values")
+  prt_mat_label_id = INSTRUMENTATION_MARK_ADD(mark_color.MARK_COLOR_RED, "Print all matrices")
+  mmm_label_id = INSTRUMENTATION_MARK_ADD(mark_color.MARK_COLOR_PEACH, "MMM")
+  prt_A_label_id = INSTRUMENTATION_MARK_ADD(mark_color.MARK_COLOR_LIGHT_GRAY, "Print solution of matrix A")
 
   t_after_label_set = time.time()
 
   # allocate memory
-  INSTRUMENTATION_THREAD_MARK_PUSH(alloc_mem_label_id)
+  INSTRUMENTATION_MARK_PUSH(alloc_mem_label_id)
   A = np.empty((N,N))
   B = np.empty((N,N))
   C = np.empty((N,N))
 
   # fill matrices
-  INSTRUMENTATION_THREAD_MARK_PUSH(fill_mat_label_id)
+  INSTRUMENTATION_MARK_PUSH(fill_mat_label_id)
   for i in range(N):
     for j in range(N):
       B[i,j] = i
       C[i,j] = j
-  INSTRUMENTATION_THREAD_MARK_POP(fill_mat_label_id)
-  INSTRUMENTATION_THREAD_MARK_POP(alloc_mem_label_id)
+  INSTRUMENTATION_MARK_POP(fill_mat_label_id)
+  INSTRUMENTATION_MARK_POP(alloc_mem_label_id)
 
   # print matrices
-  INSTRUMENTATION_THREAD_MARK_PUSH(prt_mat_label_id)
+  INSTRUMENTATION_MARK_PUSH(prt_mat_label_id)
   print(f"A: {A}")
   print(f"B: {B}")
   print(f"C: {C}")
-  INSTRUMENTATION_THREAD_MARK_POP(prt_mat_label_id)
+  INSTRUMENTATION_MARK_POP(prt_mat_label_id)
 
   # mmm
-  INSTRUMENTATION_THREAD_MARK_PUSH(mmm_label_id)
+  INSTRUMENTATION_MARK_PUSH(mmm_label_id)
   A = B @ C
-  INSTRUMENTATION_THREAD_MARK_POP(mmm_label_id)
+  INSTRUMENTATION_MARK_POP(mmm_label_id)
 
   # last print
-  INSTRUMENTATION_THREAD_MARK_PUSH(prt_A_label_id)
+  INSTRUMENTATION_MARK_PUSH(prt_A_label_id)
   print(f"A: {A}")
-  INSTRUMENTATION_THREAD_MARK_POP(prt_A_label_id)
+  INSTRUMENTATION_MARK_POP(prt_A_label_id)
 
   # TraCR finished
   INSTRUMENTATION_END()

examples/pytracr/vmarkers_push_pop.py

@@ -23,11 +23,11 @@
  VMakers (Vanilla Markers) are the type of markers pushing the color ID
  directly.
  
- This example is the same as the thread_markers.cpp but with VMARKERS
+ This example is the same as the thread_markers.cpp but with VMARKS
  They are useful if you don't wanna have labels and wanna keep track the
  number.
  
- Still, one can use INSTRUMENTATION_VMARKER_LABEL() if labels are of need.
+ Still, one can use INSTRUMENTATION_VMARK_LABEL() if labels are of need.
  But then you need to remember which color id corresponds to which label.
 """
 def main():
@@ -40,50 +40,50 @@ def main():
 
   # 0 == Set and 1 == Push/Pop
   flag = 1
-  INSTRUMENTATION_VMARKER_TYPE(flag, "Simple Marker Example")
+  INSTRUMENTATION_VMARK_TYPE(flag, "Simple Marker Example")
 
-  # Each INSTRUMENTATION_THREAD_MARK_ADD costs around (~3us)
+  # Each INSTRUMENTATION_MARK_ADD costs around (~3us)
   # Should be done at the beginning or at the ending of the code
-  INSTRUMENTATION_VMARKER_LABEL(MARK_COLOR_LIGHT_GREEN, "Allocate Memory")
-  INSTRUMENTATION_VMARKER_LABEL(MARK_COLOR_LAVENDER,
+  INSTRUMENTATION_VMARK_LABEL(MARK_COLOR_LIGHT_GREEN, "Allocate Memory")
+  INSTRUMENTATION_VMARK_LABEL(MARK_COLOR_LAVENDER,
                                 "Fill matrices with values")
-  INSTRUMENTATION_VMARKER_LABEL(MARK_COLOR_MAROON, "Print all matrices")
-  INSTRUMENTATION_VMARKER_LABEL(MARK_COLOR_OLIVE, "MMM")
-  INSTRUMENTATION_VMARKER_LABEL(MARK_COLOR_NAVY, "Print solution of matrix A")
+  INSTRUMENTATION_VMARK_LABEL(MARK_COLOR_MAROON, "Print all matrices")
+  INSTRUMENTATION_VMARK_LABEL(MARK_COLOR_OLIVE, "MMM")
+  INSTRUMENTATION_VMARK_LABEL(MARK_COLOR_NAVY, "Print solution of matrix A")
 
   t_after_label_set = time.time()
 
   # allocate memory
-  INSTRUMENTATION_VMARKER_PUSH(MARK_COLOR_LIGHT_GREEN)
+  INSTRUMENTATION_VMARK_PUSH(MARK_COLOR_LIGHT_GREEN)
   A = np.empty((N,N))
   B = np.empty((N,N))
   C = np.empty((N,N))
 
   # fill matrices
-  INSTRUMENTATION_VMARKER_PUSH(MARK_COLOR_LAVENDER)
+  INSTRUMENTATION_VMARK_PUSH(MARK_COLOR_LAVENDER)
   for i in range(N):
     for j in range(N):
       B[i, j] = i
       C[i, j] = j
-  INSTRUMENTATION_VMARKER_POP(MARK_COLOR_LAVENDER)
-  INSTRUMENTATION_VMARKER_POP(MARK_COLOR_LIGHT_GREEN)
+  INSTRUMENTATION_VMARK_POP(MARK_COLOR_LAVENDER)
+  INSTRUMENTATION_VMARK_POP(MARK_COLOR_LIGHT_GREEN)
 
   # print matrices
-  INSTRUMENTATION_VMARKER_PUSH(MARK_COLOR_MAROON)
+  INSTRUMENTATION_VMARK_PUSH(MARK_COLOR_MAROON)
   print(f"A: {A}")
   print(f"B: {B}")
   print(f"C: {C}")
-  INSTRUMENTATION_VMARKER_POP(MARK_COLOR_MAROON)
+  INSTRUMENTATION_VMARK_POP(MARK_COLOR_MAROON)
 
   # mmm
-  INSTRUMENTATION_VMARKER_PUSH(MARK_COLOR_OLIVE)
+  INSTRUMENTATION_VMARK_PUSH(MARK_COLOR_OLIVE)
   A = B @ C
-  INSTRUMENTATION_VMARKER_POP(MARK_COLOR_OLIVE)
+  INSTRUMENTATION_VMARK_POP(MARK_COLOR_OLIVE)
 
   # last print
-  INSTRUMENTATION_VMARKER_PUSH(MARK_COLOR_NAVY)
+  INSTRUMENTATION_VMARK_PUSH(MARK_COLOR_NAVY)
   print(f"A: {A}")
-  INSTRUMENTATION_VMARKER_POP(MARK_COLOR_NAVY)
+  INSTRUMENTATION_VMARK_POP(MARK_COLOR_NAVY)
 
   # TraCR finished
   INSTRUMENTATION_END()

examples/pytracr/vmarkers_set.py

@@ -18,7 +18,7 @@
 
 """
  Basic c code to demonstrate TraCR's VMAKERS
- This example uses the VMARKER SET method
+ This example uses the VMARK SET method
  you can create a nice gradient plot in Paraver with it
 """
 def main():
@@ -27,11 +27,11 @@ def main():
 
   # use flag == 1 for push/pop and flag == 0 for the set method
   flag = 0
-  INSTRUMENTATION_VMARKER_TYPE(flag, "Simple VMarker Example")
+  INSTRUMENTATION_VMARK_TYPE(flag, "Simple VMarker Example")
 
   n = 150
   for i in range(1, n+1):
-    INSTRUMENTATION_VMARKER_SET(i)
+    INSTRUMENTATION_VMARK_SET(i)
     print(i, end=' ')
 
   # TraCR finished