Merge remote-tracking branch 'upstream/standalone-sequence-4' into st…

…andalone
acquire-project · Sep 17, 2024 · b9bb72d · b9bb72d
2 parents 58e1cc7 + 61a53bc
commit b9bb72d
Show file tree

Hide file tree

Showing 55 changed files with 134 additions and 189 deletions.
diff --git a/include/zarr.h → include/acquire.zarr.h b/include/zarr.h → include/acquire.zarr.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+add_subdirectory(logger)
 add_subdirectory(streaming)
 add_subdirectory(driver)
diff --git a/src/driver/zarr.storage.hh b/src/driver/zarr.storage.hh
@@ -2,7 +2,7 @@
 
 #include "device/kit/storage.h"
 
-#include "zarr.h"
+#include "acquire.zarr.h"
 
 #include <string>
 

diff --git a/src/logger/CMakeLists.txt b/src/logger/CMakeLists.txt
@@ -0,0 +1,23 @@
+set(tgt acquire-zarr-logger)
+
+add_library(${tgt}
+        logger.hh
+        logger.cpp
+)
+
+set(PUBLIC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include/)
+
+target_include_directories(${tgt}
+        PUBLIC
+        $<BUILD_INTERFACE:${PUBLIC_INCLUDE_DIR}>
+        PRIVATE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+
+set_target_properties(${tgt} PROPERTIES
+        MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
+)
+
+install(TARGETS ${tgt}
+        LIBRARY DESTINATION lib
+)
diff --git a/src/streaming/logger.cpp → src/logger/logger.cpp b/src/streaming/logger.cpp → src/logger/logger.cpp
@@ -1,23 +1,25 @@
 #include "logger.hh"
 
-#include <iostream>
 #include <cstdarg>
-#include <chrono>
 #include <iomanip>
+#include <iostream>
 #include <filesystem>
+#include <string>
+#include <thread>
 
-ZarrLogLevel Logger::current_level = ZarrLogLevel_Info;
+ZarrLogLevel Logger::current_level_ = ZarrLogLevel_Info;
+std::mutex Logger::log_mutex_{};
 
 void
 Logger::set_log_level(ZarrLogLevel level)
 {
-    current_level = level;
+    current_level_ = level;
 }
 
 ZarrLogLevel
 Logger::get_log_level()
 {
-    return current_level;
+    return current_level_;
 }
 
 std::string
@@ -28,7 +30,8 @@ Logger::log(ZarrLogLevel level,
             const char* format,
             ...)
 {
-    if (current_level == ZarrLogLevel_None || level < current_level) {
+    std::scoped_lock lock(log_mutex_);
+    if (current_level_ == ZarrLogLevel_None || level < current_level_) {
         return {}; // Suppress logs
     }
 

diff --git a/src/streaming/logger.hh → src/logger/logger.hh b/src/streaming/logger.hh → src/logger/logger.hh
@@ -1,6 +1,6 @@
-#include "zarr.h"
+#include "zarr.types.h"
 
-#include <string>
+#include <mutex>
 
 class Logger
 {
@@ -16,23 +16,15 @@ class Logger
                            ...);
 
   private:
-    static ZarrLogLevel current_level;
+    static ZarrLogLevel current_level_;
+    static std::mutex log_mutex_;
 };
 
 #define LOG_DEBUG(...)                                                         \
-    Logger::log(ZarrLogLevel_Debug, __FILE__, __LINE__, __func__, __VA_ARGS__)
+      Logger::log(ZarrLogLevel_Debug, __FILE__, __LINE__, __func__, __VA_ARGS__)
 #define LOG_INFO(...)                                                          \
     Logger::log(LogLevel_Info, __FILE__, __LINE__, __func__, __VA_ARGS__)
 #define LOG_WARNING(...)                                                       \
     Logger::log(ZarrLogLevel_Warning, __FILE__, __LINE__, __func__, __VA_ARGS__)
 #define LOG_ERROR(...)                                                         \
     Logger::log(ZarrLogLevel_Error, __FILE__, __LINE__, __func__, __VA_ARGS__)
-
-#define EXPECT(e, ...)                                                         \
-    do {                                                                       \
-        if (!(e)) {                                                            \
-            const std::string __err = LOG_ERROR(__VA_ARGS__);                  \
-            throw std::runtime_error(__err);                                   \
-        }                                                                      \
-    } while (0)
-#define CHECK(e) EXPECT(e, "Expression evaluated as false:\n\t%s", #e)
diff --git a/src/streaming/CMakeLists.txt b/src/streaming/CMakeLists.txt
@@ -1,8 +1,6 @@
 set(tgt acquire-zarr)
 
 add_library(${tgt}
-        logger.hh
-        logger.cpp
         stream.settings.hh
         stream.settings.cpp
         zarr.stream.hh
@@ -34,10 +32,12 @@ target_include_directories(${tgt}
         PUBLIC
         $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
         PRIVATE
+        $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/logger>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
 target_link_libraries(${tgt} PRIVATE
+        acquire-zarr-logger
         blosc_static
         miniocpp::miniocpp
 )

diff --git a/src/streaming/array.writer.cpp b/src/streaming/array.writer.cpp
@@ -1,8 +1,8 @@
+#include "macros.hh"
 #include "array.writer.hh"
 #include "zarr.common.hh"
 #include "zarr.stream.hh"
 #include "sink.creator.hh"
-#include "logger.hh"
 
 #include <cmath>
 #include <functional>

diff --git a/src/streaming/blosc.compression.params.hh b/src/streaming/blosc.compression.params.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "zarr.h"
+#include "acquire.zarr.h"
 
 #include <blosc.h>
 

diff --git a/src/streaming/file.sink.cpp b/src/streaming/file.sink.cpp
@@ -1,5 +1,5 @@
+#include "macros.hh"
 #include "file.sink.hh"
-#include "logger.hh"
 
 #include <filesystem>
 #include <latch>

diff --git a/src/streaming/macros.hh b/src/streaming/macros.hh
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "logger.hh"
+
+#define EXPECT(e, ...)                                                         \
+    do {                                                                       \
+        if (!(e)) {                                                            \
+            const std::string __err = LOG_ERROR(__VA_ARGS__);                  \
+            throw std::runtime_error(__err);                                   \
+        }                                                                      \
+    } while (0)
+#define CHECK(e) EXPECT(e, "Expression evaluated as false:\n\t%s", #e)
diff --git a/src/streaming/s3.connection.cpp b/src/streaming/s3.connection.cpp
@@ -1,5 +1,5 @@
+#include "macros.hh"
 #include "s3.connection.hh"
-#include "logger.hh"
 
 #include <miniocpp/utils.h>
 

diff --git a/src/streaming/s3.sink.cpp b/src/streaming/s3.sink.cpp
@@ -1,5 +1,5 @@
+#include "macros.hh"
 #include "s3.sink.hh"
-#include "logger.hh"
 
 #include <miniocpp/client.h>
 

diff --git a/src/streaming/sink.creator.cpp b/src/streaming/sink.creator.cpp
@@ -1,8 +1,8 @@
+#include "macros.hh"
 #include "sink.creator.hh"
 #include "file.sink.hh"
 #include "s3.sink.hh"
-#include "logger.hh"
-#include "zarr.h"
+#include "acquire.zarr.h"
 
 #include <filesystem>
 #include <latch>

diff --git a/src/streaming/stream.settings.cpp b/src/streaming/stream.settings.cpp
@@ -1,5 +1,5 @@
 #include "stream.settings.hh"
-#include "zarr.h"
+#include "acquire.zarr.h"
 #include "logger.hh"
 
 #include <blosc.h>

diff --git a/src/streaming/zarr.common.cpp b/src/streaming/zarr.common.cpp
@@ -1,4 +1,4 @@
-#include "logger.hh"
+#include "macros.hh"
 #include "zarr.common.hh"
 
 #include <stdexcept>

diff --git a/src/streaming/zarr.common.hh b/src/streaming/zarr.common.hh
@@ -3,7 +3,7 @@
 #include "stream.settings.hh"
 #include "zarr.stream.hh"
 
-#include "zarr.h"
+#include "acquire.zarr.h"
 
 namespace zarr {
 using Dimension = ZarrDimension_s;

diff --git a/src/streaming/zarr.stream.cpp b/src/streaming/zarr.stream.cpp
@@ -1,6 +1,6 @@
+#include "macros.hh"
 #include "zarr.stream.hh"
-#include "zarr.h"
-#include "logger.hh"
+#include "acquire.zarr.h"
 #include "s3.connection.hh"
 #include "zarrv2.array.writer.hh"
 #include "zarrv3.array.writer.hh"

diff --git a/src/streaming/zarrv2.array.writer.cpp b/src/streaming/zarrv2.array.writer.cpp
@@ -1,6 +1,6 @@
+#include "macros.hh"
 #include "zarrv2.array.writer.hh"
 #include "sink.creator.hh"
-#include "logger.hh"
 #include "zarr.common.hh"
 
 #include <nlohmann/json.hpp>

diff --git a/src/streaming/zarrv3.array.writer.cpp b/src/streaming/zarrv3.array.writer.cpp
@@ -1,6 +1,6 @@
+#include "macros.hh"
 #include "zarrv3.array.writer.hh"
 #include "sink.creator.hh"
-#include "logger.hh"
 #include "zarr.common.hh"
 
 #include <nlohmann/json.hpp>

diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt
@@ -16,14 +16,17 @@ set(tests
 
 foreach (name ${tests})
     set(tgt "${project}-${name}")
-    add_executable(${tgt} ${name}.cpp test.logger.hh test.logger.cpp)
+    add_executable(${tgt} ${name}.cpp)
     target_compile_definitions(${tgt} PUBLIC "TEST=\"${tgt}\"")
     set_target_properties(${tgt} PROPERTIES
             MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
     )
     target_include_directories(${tgt} PRIVATE
-            "${CMAKE_SOURCE_DIR}/src/include")
+            ${CMAKE_SOURCE_DIR}/include
+            ${CMAKE_SOURCE_DIR}/src/logger
+    )
     target_link_libraries(${tgt} PRIVATE
+            acquire-zarr-logger
             acquire-zarr
             nlohmann_json::nlohmann_json
             miniocpp::miniocpp

diff --git a/tests/integration/copy-settings.cpp b/tests/integration/copy-settings.cpp
@@ -1,5 +1,5 @@
-#include "zarr.h"
-#include "test.logger.hh"
+#include "acquire.zarr.h"
+#include "macros.hh"
 
 #include <cstring>
 #include <stdexcept>

diff --git a/tests/integration/create-and-destroy-stream.cpp b/tests/integration/create-and-destroy-stream.cpp
@@ -1,4 +1,4 @@
-#include "zarr.h"
+#include "acquire.zarr.h"
 
 #include <cstdio>
 #include <cstring>

diff --git a/tests/integration/test.logger.hh → tests/integration/macros.hh b/tests/integration/test.logger.hh → tests/integration/macros.hh
@@ -1,32 +1,6 @@
-#include "zarr.h"
+#pragma once
 
-#include <string>
-
-class Logger
-{
-  public:
-    static void set_log_level(ZarrLogLevel level);
-    static ZarrLogLevel get_log_level();
-
-    static std::string log(ZarrLogLevel level,
-                           const char* file,
-                           int line,
-                           const char* func,
-                           const char* format,
-                           ...);
-
-  private:
-    static ZarrLogLevel current_level;
-};
-
-#define LOG_DEBUG(...)                                                         \
-    Logger::log(LogLevel_Debug, __FILE__, __LINE__, __func__, __VA_ARGS__)
-#define LOG_INFO(...)                                                          \
-    Logger::log(LogLevel_Info, __FILE__, __LINE__, __func__, __VA_ARGS__)
-#define LOG_WARNING(...)                                                       \
-    Logger::log(ZarrLogLevel_Warning, __FILE__, __LINE__, __func__, __VA_ARGS__)
-#define LOG_ERROR(...)                                                         \
-    Logger::log(ZarrLogLevel_Error, __FILE__, __LINE__, __func__, __VA_ARGS__)
+#include "logger.hh"
 
 #define EXPECT(e, ...)                                                         \
     do {                                                                       \
@@ -64,4 +38,4 @@ class Logger
                #b,                                                             \
                a_.c_str(),                                                     \
                b_.c_str());                                                    \
-    } while (0)
+    } while (0)
diff --git a/tests/integration/set-and-get-params.cpp b/tests/integration/set-and-get-params.cpp
@@ -1,4 +1,4 @@
-#include "zarr.h"
+#include "acquire.zarr.h"
 
 #include <cstdio>
 #include <string>

diff --git a/tests/integration/stream-zarr-v2-compressed-to-filesystem.cpp b/tests/integration/stream-zarr-v2-compressed-to-filesystem.cpp
@@ -1,5 +1,5 @@
-#include "zarr.h"
-#include "test.logger.hh"
+#include "acquire.zarr.h"
+#include "macros.hh"
 
 #include <nlohmann/json.hpp>
 

diff --git a/tests/integration/stream-zarr-v2-compressed-to-s3.cpp b/tests/integration/stream-zarr-v2-compressed-to-s3.cpp
@@ -1,5 +1,5 @@
-#include "zarr.h"
-#include "test.logger.hh"
+#include "acquire.zarr.h"
+#include "macros.hh"
 
 #include <nlohmann/json.hpp>
 #include <miniocpp/client.h>

diff --git a/tests/integration/stream-zarr-v2-raw-to-filesystem.cpp b/tests/integration/stream-zarr-v2-raw-to-filesystem.cpp
@@ -1,5 +1,5 @@
-#include "zarr.h"
-#include "test.logger.hh"
+#include "acquire.zarr.h"
+#include "macros.hh"
 
 #include <nlohmann/json.hpp>
 

diff --git a/tests/integration/stream-zarr-v2-raw-to-s3.cpp b/tests/integration/stream-zarr-v2-raw-to-s3.cpp
@@ -1,5 +1,5 @@
-#include "zarr.h"
-#include "test.logger.hh"
+#include "acquire.zarr.h"
+#include "macros.hh"
 
 #include <nlohmann/json.hpp>
 #include <miniocpp/client.h>

diff --git a/tests/integration/stream-zarr-v3-compressed-to-filesystem.cpp b/tests/integration/stream-zarr-v3-compressed-to-filesystem.cpp
@@ -1,5 +1,5 @@
-#include "zarr.h"
-#include "test.logger.hh"
+#include "acquire.zarr.h"
+#include "macros.hh"
 
 #include <nlohmann/json.hpp>
 

diff --git a/tests/integration/stream-zarr-v3-compressed-to-s3.cpp b/tests/integration/stream-zarr-v3-compressed-to-s3.cpp
@@ -1,5 +1,5 @@
-#include "zarr.h"
-#include "test.logger.hh"
+#include "acquire.zarr.h"
+#include "macros.hh"
 
 #include <nlohmann/json.hpp>
 #include <miniocpp/client.h>

diff --git a/tests/integration/stream-zarr-v3-raw-to-filesystem.cpp b/tests/integration/stream-zarr-v3-raw-to-filesystem.cpp
@@ -1,5 +1,5 @@
-#include "zarr.h"
-#include "test.logger.hh"
+#include "acquire.zarr.h"
+#include "macros.hh"
 
 #include <nlohmann/json.hpp>
 

diff --git a/tests/integration/stream-zarr-v3-raw-to-s3.cpp b/tests/integration/stream-zarr-v3-raw-to-s3.cpp
@@ -1,5 +1,5 @@
-#include "zarr.h"
-#include "test.logger.hh"
+#include "acquire.zarr.h"
+#include "macros.hh"
 
 #include <nlohmann/json.hpp>
 #include <miniocpp/client.h>