chore: test

Author: GuillaumeLagrange

.github/workflows/ci.yml

@@ -56,7 +56,10 @@ jobs:
           key: ${{ runner.os }}-build-${{ matrix.codspeed-mode }}-${{ hashFiles('**/CMakeLists.txt') }}
 
       - name: Create build directory
-        run: mkdir examples\google_benchmark_cmake\build
+        run: |
+          if (-not (Test-Path examples\google_benchmark_cmake\build)) {
+            mkdir examples\google_benchmark_cmake\build
+          }
         shell: pwsh
 
       - name: Build benchmark example

core/BUILD

@@ -6,7 +6,7 @@ CODSPEED_VERSION = "1.1.1"
 # Define the codspeed library
 cc_library(
     name = "codspeed",
-    srcs = glob(["src/**/*.cpp"]),
+    srcs = glob(["src/**/*.cpp"] + ["src/**/*.h"]),
     hdrs = glob(["include/**/*.h"] + ["include/**/*.hpp"]),
     includes = ["include"],
     defines = [

core/include/codspeed.h

@@ -1,6 +1,7 @@
 #ifndef CODSPEED_H
 #define CODSPEED_H
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
@@ -33,7 +34,7 @@ class CodSpeed {
 struct RawWalltimeBenchmark {
   std::string name;
   std::string uri;
-  long iter_per_round;
+  int64_t iter_per_round;
   double mean_ns;
   double median_ns;
   double stdev_ns;

core/src/codspeed.cpp

@@ -76,7 +76,7 @@ void CodSpeed::start_benchmark(const std::string &name) {
 
   // Sanity check URI and add a placeholder if format is wrong
   if (name.find("::") == std::string::npos) {
-    std::string uri = "unknown_file::" + name;
+    uri = "unknown_file::" + name;
     std::cout << "WARNING: Benchmark name does not contain '::'. Using URI: "
               << uri << std::endl;
   }

core/src/utils.h

@@ -0,0 +1,13 @@
+#ifndef CODSPEED_UTILS_H
+#define CODSPEED_UTILS_H
+
+#include <string>
+
+namespace codspeed {
+
+// Cross-platform getenv wrapper
+std::string safe_getenv(const char* var_name);
+
+}  // namespace codspeed
+
+#endif  // CODSPEED_UTILS_H

core/src/walltime.cpp

@@ -9,6 +9,7 @@
 #include <string>
 
 #include "codspeed.h"
+#include "utils.h"
 #ifdef _WIN32
 #include <process.h>
 #else
@@ -31,7 +32,7 @@ struct BenchmarkStats {
   double total_time;
   uint64_t iqr_outlier_rounds;
   uint64_t stdev_outlier_rounds;
-  long iter_per_round;
+  int64_t iter_per_round;
   uint64_t warmup_iters;
 };
 
@@ -169,8 +170,8 @@ void write_codspeed_benchmarks_to_json(
   oss << "}";
 
   // Determine the directory path
-  const char *profile_folder = std::getenv("CODSPEED_PROFILE_FOLDER");
-  std::string directory = profile_folder ? profile_folder : ".";
+  std::string profile_folder = safe_getenv("CODSPEED_PROFILE_FOLDER");
+  std::string directory = profile_folder.empty() ? "." : profile_folder;
 
   // Create the results directory if it does not exist
   std::filesystem::path results_path = directory + "/results";

core/src/workspace.cpp

@@ -3,13 +3,31 @@
 #include <filesystem>
 
 #include "codspeed.h"
+#include "utils.h"
 
 namespace codspeed {
 
+std::string safe_getenv(const char* var_name) {
+#ifdef _WIN32
+  char* value;
+  size_t len;
+  errno_t err = _dupenv_s(&value, &len, var_name);
+  if (err == 0 && value) {
+    std::string result(value);
+    free(value);
+    return result;
+  }
+  return "";
+#else
+  const char* value = std::getenv(var_name);
+  return value ? value : "";
+#endif
+}
+
 std::string get_path_relative_to_workspace(const std::string &path) {
   // 1. Check for bazel usage, through the BUILD_WORKSPACE_DIRECTORY env var
   // If so, __FILE__ will already be relative to the bazel workspace root
-  if (std::getenv("BUILD_WORKSPACE_DIRECTORY") != NULL) {
+  if (!safe_getenv("BUILD_WORKSPACE_DIRECTORY").empty()) {
     return path;
   }
 

examples/google_benchmark_cmake/CMakeLists.txt

@@ -6,12 +6,19 @@ project(codspeed_picobench_compat VERSION 0.0.0 LANGUAGES CXX)
 # Treat warnings as errors
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
     add_compile_options(-Wall -Wextra -Werror)
+elseif(MSVC)
+    add_compile_options(/W4 /WX 
+        /wd5051  # Ignore [[maybe_unused]] C++17 warnings from Google Benchmark
+        /wd4038  # Ignore STL <filesystem> C++17 warnings
+    )
 endif()
 
 # On the small benchmarks of this repo, most of the benches will be optimized out, but this is expected.
 set(CMAKE_BUILD_TYPE RelWithDebInfo)
 
-option(BENCHMARK_ENABLE_GTEST_TESTS OFF)
+# Disable Google Benchmark tests
+set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE BOOL "Enable testing of the benchmark library." FORCE)
+set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Enable testing of the benchmark library." FORCE)
 
 FetchContent_Declare(
     google_benchmark

google_benchmark/include/benchmark/benchmark.h

@@ -1459,16 +1459,27 @@ class Fixture : public internal::Benchmark {
 #define BENCHMARK_PRIVATE_CONCAT_NAME(BaseClass, Method) \
   BaseClass##_##Method##_Benchmark
 
+#ifdef _MSC_VER
+#define BENCHMARK_PRIVATE_DECLARE(n)                                           \
+  /* NOLINTNEXTLINE(misc-use-anonymous-namespace) */                           \
+  static ::benchmark::internal::Benchmark const* const BENCHMARK_PRIVATE_NAME( \
+      n)
+#else
 #define BENCHMARK_PRIVATE_DECLARE(n)                                           \
   /* NOLINTNEXTLINE(misc-use-anonymous-namespace) */                           \
   static ::benchmark::internal::Benchmark const* const BENCHMARK_PRIVATE_NAME( \
       n) [[maybe_unused]]
+#endif
 
 #ifdef CODSPEED_ENABLED
 #define CUR_FILE \
   codspeed::get_path_relative_to_workspace(__FILE__) + "::"
+#ifdef _MSC_VER
+#define NAMESPACE std::string("")
+#else
 #define NAMESPACE \
   (([]() { return codspeed::extract_lambda_namespace(__PRETTY_FUNCTION__); })())
+#endif
 #define STATIC_NAMESPACE_STRING(name) static std::string name = NAMESPACE;
 
 #define FILE_AND_NAMESPACE CUR_FILE + NAMESPACE