unify sleep interface

Author: perazz

src/stdlib_system.F90

@@ -96,49 +96,19 @@ module subroutine wait_for_completion(process, max_wait_time)
     end subroutine wait_for_completion
 end interface wait
 
-interface
-#ifdef _WIN32
-subroutine winsleep(dwMilliseconds) bind (C, name='Sleep')
-!! version: experimental
-!!
-!! void Sleep(DWORD dwMilliseconds)
-!! https://docs.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-sleep
-import c_long
-integer(c_long), value, intent(in) :: dwMilliseconds
-end subroutine winsleep
-#else
-integer(c_int) function usleep(usec) bind (C)
-!! version: experimental
-!!
-!! int usleep(useconds_t usec);
-!! https://linux.die.net/man/3/usleep
-import c_int
-integer(c_int), value, intent(in) :: usec
-end function usleep
-#endif
+!> Query the system to update a process's state 
+interface update
+    module subroutine update_process_state(process)
+        type(process_type), intent(inout) :: process
+    end subroutine update_process_state
 end interface
 
-
-
-
-contains
-
-subroutine sleep(millisec)
 !! version: experimental
 !!
-integer, intent(in) :: millisec
-integer(c_int) :: ierr
-
-#ifdef _WIN32
-!! PGI Windows, Ifort Windows, ....
-call winsleep(int(millisec, c_long))
-#else
-!! Linux, Unix, MacOS, MSYS2, ...
-ierr = usleep(int(millisec * 1000, c_int))
-if (ierr/=0) error stop 'problem with usleep() system call'
-#endif
-
-
-end subroutine sleep
+interface sleep
+    module subroutine sleep(millisec)
+        integer, intent(in) :: millisec
+    end subroutine sleep
+end interface sleep        
 
 end module stdlib_system

src/stdlib_system_subprocess.F90

@@ -32,23 +32,25 @@ end subroutine process_query_status
 
         subroutine process_create(cmd, stdin_stream, stdin_file, stdout_file, stderr_file, handle, pid) &
                    bind(C, name='process_create')
-            import c_char, c_ptr, process_ID
+            import c_char, process_handle, process_ID
             implicit none
             character(c_char), intent(in)           :: cmd(*)
             character(c_char), intent(in), optional :: stdin_stream(*)
             character(c_char), intent(in), optional :: stdin_file(*)
             character(c_char), intent(in), optional :: stdout_file(*)
             character(c_char), intent(in), optional :: stderr_file(*)
-            type(c_ptr)      , intent(out)          :: handle
+            type(process_handle), intent(out)       :: handle
             integer(process_ID), intent(out)        :: pid
         end subroutine process_create
 
+        ! System implementation of a wait function
         subroutine process_wait(seconds) bind(C,name='process_wait')
             import c_float
             implicit none
             real(c_float), intent(in) :: seconds
         end subroutine process_wait
 
+        ! Return path to the null device
         type(c_ptr) function process_null_device(len) bind(C,name='process_null_device')
             import c_ptr, c_int    
             implicit none
@@ -57,11 +59,16 @@ end function process_null_device
 
     end interface
 
-
-    
-  
 contains
 
+    ! Call system-dependent wait implementation
+    module subroutine sleep(millisec)
+        integer, intent(in) :: millisec
+                        
+        call process_wait(real(0.001*millisec,c_float))
+        
+    end subroutine sleep
+
     !> Open a new, asynchronous process
     module type(process_type) function process_open(args,wait,stdin,want_stdout,want_stderr) result(process)
         !> The command and arguments
@@ -243,7 +250,7 @@ module subroutine wait_for_completion(process, max_wait_time)
         wait_loop: do while (process_is_running(process) .and. elapsed <= wait_time)
 
             ! Small sleep to avoid CPU hogging (1 ms)
-            call process_wait(0.001_c_float)
+            call sleep(1)
 
             call system_clock(current_time)
             elapsed = real(current_time - start_time, RTICKS) / count_rate
@@ -253,8 +260,8 @@ module subroutine wait_for_completion(process, max_wait_time)
     end subroutine wait_for_completion
 
     !> Update a process's state, and 
-    subroutine update_process_state(process)
-        class(process_type), intent(inout) :: process
+    module subroutine update_process_state(process)
+        type(process_type), intent(inout) :: process
 
         real(RTICKS) :: count_rate        
         integer(TICKS) :: count_max,current_time