sleep: header, print fail reason

Author: scivision

.github/workflows/ci.yml

@@ -63,7 +63,7 @@ jobs:
     timeout-minutes: 10
 
     env:
-      FC: gfortran-13
+      FC: gfortran-12
 
     steps:
     - name: install valgrind
@@ -73,7 +73,7 @@ jobs:
 
     - uses: actions/checkout@v4
 
-    - run: ctest -S memcheck.cmake -V -E "Fortran_nano_sleep|string_array"
+    - run: ctest -S memcheck.cmake -VV -E "Fortran_nano_sleep|string_array"
 
 
   linux-flang:

CMakePresets.json

@@ -49,7 +49,7 @@
     "noTestsAction": "error",
     "scheduleRandom": true,
     "stopOnFailure": false,
-    "timeout": 60
+    "timeout": 15
   }
 },
 {

src/sleep/sleep.c

@@ -8,11 +8,11 @@
 #include <errno.h>
 #endif
 
+#include "sleep.h"
 
-void c_sleep(int);
 
 // https://docs.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-sleep
-void c_sleep(int milliseconds)
+void c_sleep(const int milliseconds)
 {
 
 #ifdef _MSC_VER

src/sleep/sleep.cpp

@@ -1,9 +1,8 @@
 #include <chrono>
 #include <thread>
 
-extern "C" void c_sleep(int);
+#include "sleep.h"
 
-void c_sleep(int milliseconds)
-{
+void c_sleep(const int milliseconds) {
   std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds));
 }

src/sleep/sleep.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void c_sleep(const int);
+
+#ifdef __cplusplus
+}
+#endif

test/sleep/CMakeLists.txt

@@ -2,10 +2,13 @@ set_property(DIRECTORY PROPERTY LABELS sleep)
 
 add_library(f_sleep OBJECT ${PROJECT_SOURCE_DIR}/src/sleep/sleep_std.f90)
 
-add_library(c_f_sleep ${PROJECT_SOURCE_DIR}/src/sleep/sleep.c)
-target_link_libraries(c_f_sleep PRIVATE f_sleep)
-add_library(cpp_f_sleep ${PROJECT_SOURCE_DIR}/src/sleep/sleep.cpp)
-target_link_libraries(cpp_f_sleep PRIVATE f_sleep)
+# not OBJECT so include propagates
+add_library(c_f_sleep ${PROJECT_SOURCE_DIR}/src/sleep/sleep.c $<TARGET_OBJECTS:f_sleep>)
+target_include_directories(c_f_sleep PUBLIC ${PROJECT_SOURCE_DIR}/src/sleep)
+
+# not OBJECT so include propagates
+add_library(cpp_f_sleep ${PROJECT_SOURCE_DIR}/src/sleep/sleep.cpp $<TARGET_OBJECTS:f_sleep>)
+target_include_directories(cpp_f_sleep PUBLIC ${PROJECT_SOURCE_DIR}/src/sleep)
 
 add_executable(fortran_c_sleep test_sleep.f90)
 target_link_libraries(fortran_c_sleep PRIVATE c_f_sleep)

test/sleep/test_sleep.f90

@@ -1,6 +1,6 @@
 program sleep_demo
 
-use, intrinsic :: iso_fortran_env, only : int64
+use, intrinsic :: iso_fortran_env, only : int64, stderr => error_unit
 
 use sleep_std, only : sleep_ms
 
@@ -28,8 +28,16 @@ program sleep_demo
 
 t_ms = real(toc-tic) * 1000. / real(trate)
 
-if (t_ms < 0.5 * millisec) error stop 'actual sleep time was too short'
-if (t_ms > 2 * millisec) error stop 'actual sleep time was too long'
+if (t_ms < 0.5 * millisec) then
+  !> slept less than half expected time
+  write(stderr, '(a, f9.6)') 'ERROR: measured sleep time too short (millisec): ', t_ms
+  error stop
+endif
+if (t_ms > 2 * millisec) then
+  !> slept more than twice expected time
+  write(stderr, '(a, f9.6)') 'ERROR: measure sleep time too long (millisec): ', t_ms
+  error stop
+endif
 
 print '(A, F6.1)', 'OK: test_sleep: slept for (ms): ', t_ms