Changeset 70

Timestamp:

May 25, 2012, 6:16:35 PM (13 years ago)

Author:

g7moreau

Message:

• Begin error code return Not finish...

Location:

trunk/signal-checkpoint

Files:

• signal_checkpoint.F90 (modified) (7 diffs)
• test_sgck1.f90 (modified) (3 diffs)

trunk/signal-checkpoint/signal_checkpoint.F90

@@ -26 +26 @@
 ! False public, only for trap procedure
 integer, public :: INTERNAL_RECEIVED_COUNT_ = 0  ! Global Counter
+integer, public :: INTERNAL_ERROR_ON_EXIT_  = 0
+integer, public :: INTERNAL_SIGNAL_EXIT_    = 0
 
 public :: SIGHUP
@@ -36 +38 @@
 public :: signal_checkpoint_is_received
 public :: signal_checkpoint_received_times
+public :: signal_checkpoint_ask_for_exit_code
 
 !--------------------------------------------------------------!
@@ -41 +44 @@
 !--------------------------------------------------------------!
 
-subroutine signal_checkpoint_connect (SIG_NUM)
+subroutine signal_checkpoint_connect (SIG_NUM, EXIT)
    integer, intent(in) :: SIG_NUM
+   logical, intent(in), optional :: EXIT
+
 
 #ifdef __INTEL_COMPILER
    integer :: ERR
-      
+
+   if (present(EXIT)) then
+      INTERNAL_SIGNAL_EXIT_ = SIG_NUM
+   end if
+
    ERR = signal(SIG_NUM, signal_checkpoint_trap_callback_intel_, -1)
 #endif
@@ -52 +61 @@
 #ifdef __GNUC__
    intrinsic signal
+
+   if (present(EXIT)) then
+      INTERNAL_SIGNAL_EXIT_ = SIG_NUM
+   end if
 
    call signal(SIG_NUM, signal_checkpoint_trap_callback_gfortran_)
@@ -75 +88 @@
 
 !--------------------------------------------------------------!
+
+function signal_checkpoint_ask_for_exit_code () result (EXIT)
+   logical :: EXIT
+   
+   EXIT = ( INTERNAL_ERROR_ON_EXIT_ /= 0 )
+end function
+
+!--------------------------------------------------------------!
 end module
 !--------------------------------------------------------------!
@@ -88 +109 @@
    integer, intent(in) :: SIG_NUM
 
+!       print *, "SIG1 : ", SIG_NUM
+!  if (SIG_NUM == INTERNAL_SIGNAL_EXIT_) then
+!      print *, "SIG2 : ", INTERNAL_SIGNAL_EXIT_
+!      INTERNAL_ERROR_ON_EXIT_ = 1
+!      print *, "SIG3 : ", INTERNAL_SIGNAL_EXIT_
+!   end if
    INTERNAL_RECEIVED_COUNT_ = INTERNAL_RECEIVED_COUNT_ + 1
 end subroutine
@@ -98 +125 @@
    integer :: ONE
 
+!   if (SIG_NUM == INTERNAL_SIGNAL_EXIT_) then
+!      INTERNAL_ERROR_ON_EXIT_ = 1
+!   end if
    INTERNAL_RECEIVED_COUNT_ = INTERNAL_RECEIVED_COUNT_ + 1
    ONE = 1

trunk/signal-checkpoint/test_sgck1.f90

@@ -15 +15 @@
       signal_checkpoint_is_received, &
       signal_checkpoint_received_times, &
+      signal_checkpoint_ask_for_exit_code, &
       SIGUSR2, &
       SIGUSR1
@@ -21 +22 @@
 
    call signal_checkpoint_connect(SIGUSR2)
-   call signal_checkpoint_connect(SIGUSR1)
+   call signal_checkpoint_connect(SIGUSR1, EXIT=.true.)
 
    print *, "initialising phase"
@@ -33 +34 @@
 
    print *, "finishing phase"
+
+   if (signal_checkpoint_ask_for_exit_code()) then
+      stop 1
+   end if
 end program