Use a deterministic thread numbering scheme (#7167)

Co-authored-by: Amaury Chamayou <[email protected]>

Author: cjen1-msft

include/ccf/threading/thread_ids.h

@@ -20,5 +20,6 @@ namespace ccf::threading
   static constexpr ThreadID MAIN_THREAD_ID = 0;
 
   uint16_t get_current_thread_id();
+  void set_current_thread_id(ThreadID to);
   void reset_thread_id_generator(ThreadID to = MAIN_THREAD_ID);
 }

src/enclave/thread_local.cpp

@@ -6,12 +6,22 @@ namespace ccf::threading
 {
   static std::atomic<ThreadID> next_thread_id = MAIN_THREAD_ID;
 
-  uint16_t get_current_thread_id()
+  uint16_t& current_thread_id()
   {
     thread_local ThreadID this_thread_id = next_thread_id.fetch_add(1);
     return this_thread_id;
   }
 
+  uint16_t get_current_thread_id()
+  {
+    return current_thread_id();
+  }
+
+  void set_current_thread_id(ThreadID to)
+  {
+    current_thread_id() = to;
+  }
+
   void reset_thread_id_generator(ThreadID to)
   {
     next_thread_id.store(to);

src/host/run.cpp

@@ -975,7 +975,8 @@ namespace ccf
           config.command.service_certificate_file);
       }
 
-      auto enclave_thread_start = [&]() {
+      auto enclave_thread_start = [&](threading::ThreadID thread_id) {
+        threading::set_current_thread_id(thread_id);
         try
         {
           bool ret = enclave_run();
@@ -1003,7 +1004,7 @@ namespace ccf
       std::vector<std::thread> threads;
       for (uint32_t i = 0; i < (config.worker_threads + 1); ++i)
       {
-        threads.emplace_back(enclave_thread_start);
+        threads.emplace_back(enclave_thread_start, i);
       }
 
       LOG_INFO_FMT("Entering event loop");