From cb70383c5501931e3365c1a76a78b7e89f7d36d3 Mon Sep 17 00:00:00 2001
From: Kevin Huck <khuck@cs.uoregon.edu>
Date: Tue, 29 Oct 2024 10:52:45 -0700
Subject: [PATCH] Minor fixes before release

---
 CMakeLists.txt                        | 2 +-
 src/unit_tests/C++/apex_taskstubs.cpp | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ed26274..1c92a087 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -933,7 +933,7 @@ endif()
 ### Set up perfstubs stuff
 git_external(perfstubs
     https://github.com/khuck/perfstubs.git
-    python-3.12
+    master
     VERBOSE)
 
 if(APEX_WITH_PYTHON)
diff --git a/src/unit_tests/C++/apex_taskstubs.cpp b/src/unit_tests/C++/apex_taskstubs.cpp
index 24a07c19..85fd344c 100644
--- a/src/unit_tests/C++/apex_taskstubs.cpp
+++ b/src/unit_tests/C++/apex_taskstubs.cpp
@@ -16,6 +16,7 @@
 #include <array>
 #include <algorithm>
 #include <iterator>
+#include <thread>
 #include <string.h>
 #include "timer_plugin/tasktimer.h"
 
@@ -203,14 +204,17 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char * argv[]) {
     TASKTIMER_START(tt, &resource);
     // yield the task
     TASKTIMER_YIELD(tt);
-    // run a "child" task
-    A(myguid);
+    // run a "child" task - as a thread just for fun
+    std::thread ta(A,myguid);
     // test the "add_parent" feature
     add_parent_test(myguid);
     // test the "add_child" feature
     add_child_test(tt);
     // resume the task
     TASKTIMER_RESUME(tt, &resource);
+    if (ta.joinable()) {
+        ta.join();
+    }
     // stop the task
     TASKTIMER_STOP(tt);
     // finalize the timer plugin