correct sleep interface

Author: scivision

src/sleep/sleep.c

@@ -15,16 +15,16 @@
 void c_sleep(const int milliseconds)
 {
 
-#ifdef _MSC_VER
-  Sleep(milliseconds);
-#else
-// https://linux.die.net/man/3/usleep
   if (milliseconds <= 0){
     fprintf(stderr, "ERROR:sleep: milliseconds must be strictly positive\n");
     return;
   }
 
-  //int ierr = usleep(*milliseconds * 1000);
+#ifdef _MSC_VER
+  Sleep(milliseconds);
+#else
+// https://linux.die.net/man/3/usleep
+//int ierr = usleep(*milliseconds * 1000);
 
   struct timespec t;
 
@@ -40,8 +40,10 @@ void c_sleep(const int milliseconds)
     fprintf(stderr, "nanosleep() interrupted\n");
     break;
     case EINVAL:
+    fprintf(stderr, "nanosleep() invalid timespec value (EINVAL)\n");
+    break;
     case EFAULT:
-    fprintf(stderr, "nanosleep() bad milliseconds value\n");
+    fprintf(stderr, "nanosleep() timespec points outside accessible address space (EFAULT)\n");
     break;
     case ENOSYS:
     fprintf(stderr, "nanosleep() not supported on this system\n");

src/sleep/sleep_std.f90

@@ -17,8 +17,9 @@ subroutine c_sleep(millseconds) bind(C, name="c_sleep")
 contains
 
 subroutine sleep_ms(millseconds)
-integer(C_INT), intent(in) :: millseconds
-call c_sleep(millseconds)
+integer, intent(in) :: millseconds
+
+call c_sleep(int(millseconds, C_INT))
 end subroutine sleep_ms
 
 end module sleep_std

test/sleep/CMakeLists.txt

@@ -58,17 +58,15 @@ target_link_libraries(fortran_micro_sleep PRIVATE f_micro_sleep)
 add_test(NAME Fortran_micro_sleep COMMAND fortran_micro_sleep)
 
 
-add_library(f_nano_sleep OBJECT ${PROJECT_SOURCE_DIR}/src/sleep/reference/posix_nanosleep.f90)
-set_property(TARGET f_nano_sleep PROPERTY Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/posix_nanosleep)
-target_include_directories(f_nano_sleep PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/include/posix_nanosleep)
+# This method is too brittle
+# add_library(f_nano_sleep OBJECT ${PROJECT_SOURCE_DIR}/src/sleep/reference/posix_nanosleep.f90)
+# set_property(TARGET f_nano_sleep PROPERTY Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/posix_nanosleep)
+# target_include_directories(f_nano_sleep PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/include/posix_nanosleep)
 
-add_executable(fortran_nano_sleep test_sleep.f90)
-target_link_libraries(fortran_nano_sleep PRIVATE f_nano_sleep)
+# add_executable(fortran_nano_sleep test_sleep.f90)
+# target_link_libraries(fortran_nano_sleep PRIVATE f_nano_sleep)
 
-add_test(NAME Fortran_nano_sleep COMMAND fortran_nano_sleep)
-if(APPLE AND CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang")
-  set_property(TEST Fortran_nano_sleep PROPERTY DISABLED true)
-endif()
+# add_test(NAME Fortran_nano_sleep COMMAND fortran_nano_sleep)
 
 endif()