improved signal handling

- possibility to catch SIGTERM
- functions to set SIG(TERM/USR1/USR2) explicitly

src/C_routines.c

@@ -47,10 +47,14 @@ int chdir_c(const char *dir){
   return chdir(dir);
 }
 
+void signalterm_c(void (*handler)(int)){
+  signal(SIGTERM, handler);
+}
+
 void signalusr1_c(void (*handler)(int)){
   signal(SIGUSR1, handler);
 }
 
 void signalusr2_c(void (*handler)(int)){
   signal(SIGUSR2, handler);
-}
+}

src/DAMASK_interface.f90

@@ -13,8 +13,9 @@ module DAMASK_interface
   implicit none
   private
   logical, public, protected :: &
-    SIGUSR1, &                                                                                      !< user-defined signal 1
+    SIGTERM, &                                                                                      !< termination signal 
-    SIGUSR2                                                                                         !< user-defined signal 2
+    SIGUSR1, &                                                                                      !< 1. user-defined signal
+    SIGUSR2                                                                                         !< 2. user-defined signal
   integer, public, protected :: &
     interface_restartInc = 0                                                                        !< Increment at which calculation starts
   character(len=1024), public, protected :: &
@@ -23,7 +24,10 @@ module DAMASK_interface
 
   public :: &
     getSolverJobName, &
-    DAMASK_interface_init
+    DAMASK_interface_init, &
+    setSIGTERM, &
+    setSIGUSR1, &
+    setSIGUSR2
   private :: &
     setWorkingDirectory, &
     getGeometryFile, &
@@ -279,10 +283,12 @@ subroutine DAMASK_interface_init()
   if (interface_restartInc > 0) &
     write(6,'(a,i6.6)') ' Restart from increment: ', interface_restartInc
 
-  call signalusr1_c(c_funloc(setSIGUSR1))
+  !call signalterm_c(c_funloc(catchSIGTERM))
-  call signalusr2_c(c_funloc(setSIGUSR2))
+  call signalusr1_c(c_funloc(catchSIGUSR1))
-  SIGUSR1 = .false.
+  call signalusr2_c(c_funloc(catchSIGUSR2))
-  SIGUSR2 = .false.
+  call setSIGTERM(.false.)
+  call setSIGUSR1(.false.)
+  call setSIGUSR2(.false.)
 
 
 end subroutine DAMASK_interface_init
@@ -470,9 +476,36 @@ end function makeRelativePath
 
 
 !--------------------------------------------------------------------------------------------------
-!> @brief sets global variable SIGUSR1 to .true. if program receives SIGUSR1
+!> @brief sets global variable SIGTERM to .true.
 !--------------------------------------------------------------------------------------------------
-subroutine setSIGUSR1(signal) bind(C)
+subroutine catchSIGTERM(signal) bind(C)
+  use :: iso_c_binding
+
+  implicit none
+  integer(C_INT), value :: signal
+  SIGTERM = .true.
+
+  write(6,'(a,i2.2,a)') ' received signal ',signal, ', set SIGTERM'
+
+end subroutine catchSIGTERM
+
+
+!--------------------------------------------------------------------------------------------------
+!> @brief sets global variable SIGTERM
+!--------------------------------------------------------------------------------------------------
+subroutine setSIGTERM(state)
+
+  implicit none
+  logical, intent(in) :: state
+  SIGTERM = state
+
+end subroutine setSIGTERM
+
+
+!--------------------------------------------------------------------------------------------------
+!> @brief sets global variable SIGUSR1 to .true.
+!--------------------------------------------------------------------------------------------------
+subroutine catchSIGUSR1(signal) bind(C)
   use :: iso_c_binding
 
   implicit none
@@ -481,13 +514,25 @@ subroutine setSIGUSR1(signal) bind(C)
 
   write(6,'(a,i2.2,a)') ' received signal ',signal, ', set SIGUSR1'
 
+end subroutine catchSIGUSR1
+
+
+!--------------------------------------------------------------------------------------------------
+!> @brief sets global variable SIGUSR1
+!--------------------------------------------------------------------------------------------------
+subroutine setSIGUSR1(state)
+
+  implicit none
+  logical, intent(in) :: state
+  SIGUSR1 = state
+
 end subroutine setSIGUSR1
 
 
 !--------------------------------------------------------------------------------------------------
 !> @brief sets global variable SIGUSR2 to .true. if program receives SIGUSR2
 !--------------------------------------------------------------------------------------------------
-subroutine setSIGUSR2(signal) bind(C)
+subroutine catchSIGUSR2(signal) bind(C)
   use :: iso_c_binding
 
   implicit none
@@ -496,6 +541,19 @@ subroutine setSIGUSR2(signal) bind(C)
 
   write(6,'(a,i2.2,a)') ' received signal ',signal, ', set SIGUSR2'
 
+end subroutine catchSIGUSR2
+
+
+!--------------------------------------------------------------------------------------------------
+!> @brief sets global variable SIGUSR2
+!--------------------------------------------------------------------------------------------------
+subroutine setSIGUSR2(state)
+
+  implicit none
+  logical, intent(in) :: state
+  SIGUSR2 = state
+
 end subroutine setSIGUSR2
 
+
 end module

src/system_routines.f90

@@ -3,69 +3,76 @@
 !> @brief    provides wrappers to C routines
 !--------------------------------------------------------------------------------------------------
 module system_routines
- use, intrinsic :: ISO_C_Binding, only: &
+  use, intrinsic :: ISO_C_Binding, only: &
-   C_INT, &
+    C_INT, &
-   C_CHAR, &
+    C_CHAR, &
-   C_NULL_CHAR
+    C_NULL_CHAR
-
- implicit none
- private
  
- public :: &
+  implicit none
-   signalusr1_C, &
+  private
-   signalusr2_C, &
+  
-   isDirectory, &
+  public :: &
-   getCWD, &
+    signalterm_C, &
-   getHostName, &
+    signalusr1_C, &
-   setCWD
+    signalusr2_C, &
-
+    isDirectory, &
-interface
+    getCWD, &
-
+    getHostName, &
- function isDirectory_C(path) bind(C)
+    setCWD
-   use, intrinsic :: ISO_C_Binding, only: &
-     C_INT, &
-     C_CHAR
-   integer(C_INT) :: isDirectory_C
-   character(kind=C_CHAR), dimension(1024), intent(in) :: path                                      ! C string is an array
-  end function isDirectory_C
-
- subroutine getCurrentWorkDir_C(str, stat) bind(C)
-   use, intrinsic :: ISO_C_Binding, only: &
-     C_INT, &
-     C_CHAR
-   character(kind=C_CHAR), dimension(1024), intent(out) :: str                                      ! C string is an array
-   integer(C_INT),intent(out)         :: stat
-  end subroutine getCurrentWorkDir_C
-
- subroutine getHostName_C(str, stat) bind(C)
-   use, intrinsic :: ISO_C_Binding, only: &
-     C_INT, &
-     C_CHAR
-   character(kind=C_CHAR), dimension(1024), intent(out) :: str                                      ! C string is an array
-   integer(C_INT),intent(out)         :: stat
-  end subroutine getHostName_C
-
- function chdir_C(path) bind(C)
-   use, intrinsic :: ISO_C_Binding, only: &
-     C_INT, &
-     C_CHAR
-   integer(C_INT) :: chdir_C
-   character(kind=C_CHAR), dimension(1024), intent(in) :: path                                      ! C string is an array
- end function chdir_C
  
- subroutine signalusr1_C(handler) bind(C)
+  interface
-   use, intrinsic :: ISO_C_Binding, only: &
-     C_FUNPTR
-   type(C_FUNPTR), intent(in), value :: handler
- end subroutine signalusr1_C
  
+  function isDirectory_C(path) bind(C)
+    use, intrinsic :: ISO_C_Binding, only: &
+      C_INT, &
+      C_CHAR
+    integer(C_INT) :: isDirectory_C
+    character(kind=C_CHAR), dimension(1024), intent(in) :: path                                     ! C string is an array
+   end function isDirectory_C
+ 
+  subroutine getCurrentWorkDir_C(str, stat) bind(C)
+    use, intrinsic :: ISO_C_Binding, only: &
+      C_INT, &
+      C_CHAR
+    character(kind=C_CHAR), dimension(1024), intent(out) :: str                                     ! C string is an array
+    integer(C_INT),intent(out)         :: stat
+   end subroutine getCurrentWorkDir_C
+ 
+  subroutine getHostName_C(str, stat) bind(C)
+    use, intrinsic :: ISO_C_Binding, only: &
+      C_INT, &
+      C_CHAR
+    character(kind=C_CHAR), dimension(1024), intent(out) :: str                                     ! C string is an array
+    integer(C_INT),intent(out)         :: stat
+   end subroutine getHostName_C
+ 
+  function chdir_C(path) bind(C)
+    use, intrinsic :: ISO_C_Binding, only: &
+      C_INT, &
+      C_CHAR
+    integer(C_INT) :: chdir_C
+    character(kind=C_CHAR), dimension(1024), intent(in) :: path                                     ! C string is an array
+  end function chdir_C
+  
+  subroutine signalterm_C(handler) bind(C)
+    use, intrinsic :: ISO_C_Binding, only: &
+      C_FUNPTR
+    type(C_FUNPTR), intent(in), value :: handler
+  end subroutine signalterm_C
+ 
+  subroutine signalusr1_C(handler) bind(C)
+    use, intrinsic :: ISO_C_Binding, only: &
+      C_FUNPTR
+    type(C_FUNPTR), intent(in), value :: handler
+  end subroutine signalusr1_C
+  
   subroutine signalusr2_C(handler) bind(C)
-   use, intrinsic :: ISO_C_Binding, only: &
+    use, intrinsic :: ISO_C_Binding, only: &
-     C_FUNPTR
+      C_FUNPTR
-   type(C_FUNPTR), intent(in), value :: handler
+    type(C_FUNPTR), intent(in), value :: handler
- end subroutine signalusr2_C
+  end subroutine signalusr2_C
-
+ 
-end interface
+  end interface
 
 contains