[upstream_utils] Import ConcurrentQueue to wpiutil (#7066)

.github/workflows/upstream-utils.yml

@@ -35,6 +35,11 @@ jobs:
           cd upstream_utils
           ./apriltag.py clone
           ./apriltag.py copy-src
+      - name: Run concurrentqueue.py
+        run: |
+          cd upstream_utils
+          ./concurrentqueue.py clone
+          ./concurrentqueue.py copy-src
       - name: Run eigen.py
         run: |
           cd upstream_utils

upstream_utils/concurrentqueue.py

@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+
+import os
+import shutil
+
+from upstream_utils import Lib
+
+
+def copy_upstream_src(wpilib_root):
+    wpiutil = os.path.join(wpilib_root, "wpiutil")
+
+    # Copy header into allwpilib
+    dest_filename = os.path.join(
+        wpiutil,
+        f"src/main/native/thirdparty/concurrentqueue/include/wpi/concurrentqueue.h",
+    )
+    shutil.copyfile("concurrentqueue.h", dest_filename)
+    # Rename namespace from moodycamel to wpi
+    with open(dest_filename) as f:
+        content = f.read()
+    content = content.replace("namespace moodycamel", "namespace wpi")
+    content = content.replace("moodycamel::", "wpi::")
+    # The upstream library has macros that would conflict with other thirdparty WPI_ macros
+    content = content.replace("MOODYCAMEL_", "WPI_CQ_")
+    with open(dest_filename, "w") as f:
+        f.write(content)
+
+
+def main():
+    name = "concurrentqueue"
+    url = "https://github.com/cameron314/concurrentqueue"
+    # master on 2024-09-10
+    tag = "6dd38b8a1dbaa7863aa907045f32308a56a6ff5d"
+
+    expected = Lib(name, url, tag, copy_upstream_src)
+    expected.main()
+
+
+if __name__ == "__main__":
+    main()

wpiutil/CMakeLists.txt

@@ -186,6 +186,7 @@ endif()
 install(
     DIRECTORY
         src/main/native/include/
+        src/main/native/thirdparty/concurrentqueue/include/
         src/main/native/thirdparty/expected/include/
         src/main/native/thirdparty/json/include/
         src/main/native/thirdparty/llvm/include/
@@ -198,6 +199,7 @@ target_include_directories(
     wpiutil
     PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/concurrentqueue/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/expected/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/json/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/llvm/include>

wpiutil/build.gradle

@@ -180,6 +180,9 @@ nativeUtils.exportsConfigs {
 }
 
 cppHeadersZip {
+    from('src/main/native/thirdparty/concurrentqueue/include') {
+        into '/'
+    }
     from('src/main/native/thirdparty/expected/include') {
         into '/'
     }
@@ -235,7 +238,7 @@ model {
         all {
             it.sources.each {
                 it.exportedHeaders {
-                    srcDirs 'src/main/native/include', 'src/main/native/thirdparty/expected/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/memory/include', 'src/main/native/thirdparty/mpack/include', 'src/main/native/thirdparty/protobuf/include'
+                    srcDirs 'src/main/native/include', 'src/main/native/thirdparty/concurrentqueue/include', 'src/main/native/thirdparty/expected/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/memory/include', 'src/main/native/thirdparty/mpack/include', 'src/main/native/thirdparty/protobuf/include'
                 }
             }
         }

wpiutil/src/test/native/cpp/concurrentqueue/ConcurrentQueueTest.cpp

@@ -0,0 +1,17 @@
+// Copyright (c) FIRST and other WPILib contributors.
+// Open Source Software; you can modify and/or share it under the terms of
+// the WPILib BSD license file in the root directory of this project.
+
+#include <gtest/gtest.h>
+
+#include "wpi/concurrentqueue.h"
+
+TEST(ConcurrentQueueTest, Basic) {
+  wpi::ConcurrentQueue<int> q;
+  q.enqueue(25);
+
+  int item;
+  bool found = q.try_dequeue(item);
+  EXPECT_TRUE(found);
+  EXPECT_EQ(item, 25);
+}