timer for windows and new cmake

Author: dance858

.github/workflows/cmake.yml

@@ -11,17 +11,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
         build_type: [Release, Debug]
 
     steps:
     - uses: actions/checkout@v3
 
     - name: Configure CMake
-      run: cmake -B build -S . -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+      run: cmake -B build -S . -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_VERBOSE_MAKEFILE=ON
 
     - name: Build
       run: cmake --build build --config ${{ matrix.build_type }}
 
     - name: Run tests
-      run: ./build/all_tests
+      run: ./build/all_tests --verbose

CMakeLists.txt

@@ -20,19 +20,23 @@ else()
   message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 endif()
 
-# Warning flags (always enabled)
-add_compile_options(
-    -Wall                  # Enable most warnings
-    -Wextra                # Extra warnings
-    -Wpedantic             # Strict ISO C compliance
-    -Wshadow               # Warn about variable shadowing
-    -Wformat=2             # Extra format string checks
-    -Wcast-qual            # Warn about cast that removes qualifiers
-    -Wcast-align           # Warn about pointer cast alignment issues
-    -Wunused               # Warn about unused variables/functions
-    -Wdouble-promotion     # Warn about float->double promotion
-    -Wnull-dereference     # Warn about null pointer dereference
-)
+# Warning flags (compiler-specific)
+if(MSVC)
+    add_compile_options(/W4 /WX)
+else()
+    add_compile_options(
+        -Wall                  # Enable most warnings
+        -Wextra                # Extra warnings
+        -Wpedantic             # Strict ISO C compliance
+        -Wshadow               # Warn about variable shadowing
+        -Wformat=2             # Extra format string checks
+        -Wcast-qual            # Warn about cast that removes qualifiers
+        -Wcast-align           # Warn about pointer cast alignment issues
+        -Wunused               # Warn about unused variables/functions
+        -Wdouble-promotion     # Warn about float->double promotion
+        -Wnull-dereference     # Warn about null pointer dereference
+    )
+endif()
 
 # Include directories
 include_directories(${PROJECT_SOURCE_DIR}/include)
@@ -43,15 +47,28 @@ file(GLOB_RECURSE SOURCES "src/*.c")
 
 # Create core library
 add_library(dnlp_diff ${SOURCES})
-target_link_libraries(dnlp_diff m)
 
-# Config-specific compile options
-target_compile_options(dnlp_diff PRIVATE
-  $<$<CONFIG:Debug>:-g -O0>
-  $<$<CONFIG:Release>:-O3 -DNDEBUG>
-  $<$<CONFIG:RelWithDebInfo>:-O2 -g -DNDEBUG>
-  $<$<CONFIG:MinSizeRel>:-Os -DNDEBUG>
-)
+# Link math library (Unix/Linux only)
+if(NOT MSVC)
+    target_link_libraries(dnlp_diff m)
+endif()
+
+# Config-specific compile options (compiler-specific)
+if(MSVC)
+    target_compile_options(dnlp_diff PRIVATE
+        $<$<CONFIG:Debug>:/Od /Zi>
+        $<$<CONFIG:Release>:/O2 /DNDEBUG>
+        $<$<CONFIG:RelWithDebInfo>:/O2 /Zi /DNDEBUG>
+        $<$<CONFIG:MinSizeRel>:/Os /DNDEBUG>
+    )
+else()
+    target_compile_options(dnlp_diff PRIVATE
+        $<$<CONFIG:Debug>:-g -O0>
+        $<$<CONFIG:Release>:-O3 -DNDEBUG>
+        $<$<CONFIG:RelWithDebInfo>:-O2 -g -DNDEBUG>
+        $<$<CONFIG:MinSizeRel>:-Os -DNDEBUG>
+    )
+endif()
 
 # This is needed for clock_gettime on Linux without compiler extensions
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")

include/utils/Timer.h

@@ -1,25 +1,61 @@
+/*
+ * Copyright 2025 Daniel Cederberg
+ *
+ * This file is part of the PSLP project (LP Presolver).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #ifndef TIMER_H
 #define TIMER_H
 
-#include "time.h"
-
+#if defined(_WIN32) || defined(_WIN64)
+#include <windows.h>
+typedef struct
+{
+    LARGE_INTEGER start, end;
+} Timer;
+static inline void clock_gettime_monotonic(Timer *timer, int is_start)
+{
+    if (is_start)
+    {
+        QueryPerformanceCounter(&timer->start);
+    }
+    else
+    {
+        QueryPerformanceCounter(&timer->end);
+    }
+}
+static inline double get_elapsed_seconds(const Timer *timer)
+{
+    LARGE_INTEGER freq;
+    QueryPerformanceFrequency(&freq);
+    return (double) (timer->end.QuadPart - timer->start.QuadPart) /
+           (double) freq.QuadPart;
+}
+#define clock_gettime(CLOCK, PTR)                                                   \
+    clock_gettime_monotonic((Timer *) (PTR), ((PTR) == &((Timer *) (PTR))->start))
+#define GET_ELAPSED_SECONDS(timer) get_elapsed_seconds(&(timer))
+#else
+#include <time.h>
 typedef struct
 {
     struct timespec start, end;
 } Timer;
 
-// Macro to compute elapsed time in seconds
 #define GET_ELAPSED_SECONDS(timer)                                                  \
-    (((timer).end.tv_sec - (timer).start.tv_sec) +                                  \
-     ((double) ((timer).end.tv_nsec - (timer).start.tv_nsec) * 1e-9))
-
-#define RUN_AND_TIME(func, timer, time_variable, result_var, ...)                   \
-    do                                                                              \
-    {                                                                               \
-        clock_gettime(CLOCK_MONOTONIC, &timer.start);                               \
-        (result_var) = func(__VA_ARGS__);                                           \
-        clock_gettime(CLOCK_MONOTONIC, &timer.end);                                 \
-        (time_variable) += GET_ELAPSED_SECONDS(timer);                              \
-    } while (0)
+    ((double) ((timer).end.tv_sec - (timer).start.tv_sec) +                         \
+     (double) ((timer).end.tv_nsec - (timer).start.tv_nsec) / 1e9)
+#endif
 
-#endif // TIMER_H
+#endif // TIMER_H