Replace threadmessaging with new task system (#7422)

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

Author: 3 people

CMakeLists.txt

@@ -376,6 +376,7 @@ add_ccf_static_library(
             ccf_endpoints
             ccfcrypto
             ccf_kv
+            ccf_tasks
             nghttp2
             ${CMAKE_THREAD_LIBS_INIT}
             curl
@@ -556,7 +557,6 @@ if(BUILD_TESTS)
       ${CMAKE_CURRENT_SOURCE_DIR}/src/ds/test/serialized.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/src/ds/test/serializer.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/src/ds/test/hash.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/src/ds/test/thread_messaging.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/src/ds/test/lru.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/src/ds/test/hex.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/src/ds/test/contiguous_set.cpp
@@ -591,7 +591,7 @@ if(BUILD_TESTS)
       ${CMAKE_CURRENT_SOURCE_DIR}/src/consensus/aft/test/view_history.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/src/consensus/aft/test/committable_suffix.cpp
     )
-    target_link_libraries(raft_test PRIVATE ccfcrypto)
+    target_link_libraries(raft_test PRIVATE ccfcrypto ccf_tasks)
 
     add_unit_test(
       raft_enclave_test
@@ -622,7 +622,9 @@ if(BUILD_TESTS)
     add_unit_test(
       history_test ${CMAKE_CURRENT_SOURCE_DIR}/src/node/test/history.cpp
     )
-    target_link_libraries(history_test PRIVATE ccfcrypto http_parser ccf_kv)
+    target_link_libraries(
+      history_test PRIVATE ccfcrypto http_parser ccf_kv ccf_tasks
+    )
 
     add_unit_test(
       encryptor_test ${CMAKE_CURRENT_SOURCE_DIR}/src/node/test/encryptor.cpp
@@ -655,23 +657,26 @@ if(BUILD_TESTS)
     )
     target_link_libraries(
       historical_queries_test PRIVATE http_parser ccf_kv ccf_endpoints
+                                      ccf_tasks
     )
     add_unit_test(
       indexing_test ${CMAKE_CURRENT_SOURCE_DIR}/src/indexing/test/indexing.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/src/indexing/test/lfs.cpp
     )
-    target_link_libraries(indexing_test PRIVATE ccf_endpoints ccf_kv)
+    target_link_libraries(indexing_test PRIVATE ccf_endpoints ccf_kv ccf_tasks)
 
     add_unit_test(
       snapshot_test ${CMAKE_CURRENT_SOURCE_DIR}/src/node/test/snapshot.cpp
     )
-    target_link_libraries(snapshot_test PRIVATE ccf_kv)
+    target_link_libraries(snapshot_test PRIVATE ccf_kv ccf_tasks)
 
     add_unit_test(
       snapshotter_test
       ${CMAKE_CURRENT_SOURCE_DIR}/src/node/test/snapshotter.cpp
     )
-    target_link_libraries(snapshotter_test PRIVATE ccf_kv ccf_endpoints)
+    target_link_libraries(
+      snapshotter_test PRIVATE ccf_kv ccf_endpoints ccf_tasks
+    )
 
     add_unit_test(
       node_info_json_test
@@ -722,8 +727,14 @@ if(BUILD_TESTS)
       ${CCF_DIR}/src/node/quote.cpp ${CCF_DIR}/src/node/uvm_endorsements.cpp
     )
     target_link_libraries(
-      frontend_test PRIVATE ${CMAKE_THREAD_LIBS_INIT} http_parser ccf_js
-                            ccf_endpoints ccfcrypto ccf_kv
+      frontend_test
+      PRIVATE ${CMAKE_THREAD_LIBS_INIT}
+              http_parser
+              ccf_js
+              ccf_endpoints
+              ccfcrypto
+              ccf_kv
+              ccf_tasks
     )
 
     add_unit_test(
@@ -775,7 +786,7 @@ if(BUILD_TESTS)
       raft_driver ${CMAKE_CURRENT_SOURCE_DIR}/src/consensus/aft/test/driver.cpp
                   src/enclave/thread_local.cpp
     )
-    target_link_libraries(raft_driver PRIVATE ccfcrypto)
+    target_link_libraries(raft_driver PRIVATE ccfcrypto ccf_tasks)
     target_include_directories(raft_driver PRIVATE src/aft)
 
     add_test(
@@ -818,7 +829,7 @@ if(BUILD_TESTS)
     add_picobench(
       history_bench
       SRCS src/node/test/history_bench.cpp src/enclave/thread_local.cpp
-      LINK_LIBS ccf_kv
+      LINK_LIBS ccf_kv ccf_tasks
     )
 
     add_picobench(

cmake/common.cmake

@@ -225,8 +225,11 @@ function(add_picobench name)
       bash -c
       "$<TARGET_FILE:${name}> --samples=10 --out-fmt=csv --output=${name}.csv && cat ${name}.csv"
   )
-
-  set_property(TEST ${name} PROPERTY LABELS benchmark)
+  set_property(
+    TEST ${name}
+    APPEND
+    PROPERTY LABELS benchmark
+  )
 
   add_san_test_properties(${name})
 endfunction()

src/consensus/aft/raft.h

@@ -8,6 +8,7 @@
 #include "ccf/tx_id.h"
 #include "ccf/tx_status.h"
 #include "consensus/aft/raft_types.h"
+#include "ds/ccf_assert.h"
 #include "ds/internal_logger.h"
 #include "ds/serialized.h"
 #include "impl/state.h"

src/consensus/aft/test/driver.cpp

@@ -38,8 +38,6 @@ int main(int argc, char** argv)
 #endif
   ccf::logger::config::level() = ccf::LoggerLevel::DEBUG;
 
-  threading::ThreadMessaging::init(1);
-
   const std::string filename = argv[1];
 
   std::ifstream fstream;

src/consensus/aft/test/main.cpp

@@ -1010,7 +1010,6 @@ DOCTEST_TEST_CASE(
 
 int main(int argc, char** argv)
 {
-  threading::ThreadMessaging::init(1);
   doctest::Context context;
   context.applyCommandLine(argc, argv);
   int res = context.run();

src/crypto/openssl/symmetric_key.cpp

@@ -6,7 +6,6 @@
 #include "ccf/crypto/openssl/openssl_wrappers.h"
 #include "ccf/crypto/symmetric_key.h"
 #include "ds/internal_logger.h"
-#include "ds/thread_messaging.h"
 
 #include <climits>
 #include <openssl/aes.h>

src/ds/serializer.h

@@ -27,6 +27,11 @@ namespace serializer
   {
     const uint8_t* data;
     const size_t size;
+
+    operator std::span<const uint8_t>() const
+    {
+      return std::span<const uint8_t>(data, size);
+    }
   };
 
   namespace details

src/ds/test/messaging.cpp

@@ -5,7 +5,6 @@
 #include "../non_blocking.h"
 #include "../ring_buffer.h"
 #include "../serialized.h"
-#include "../thread_messaging.h"
 
 #include <array>
 #include <doctest/doctest.h>