| -rw-r--r-- | core/opiealarm/opiealarm.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c index ce0103e..d96ffaf 100644 --- a/core/opiealarm/opiealarm.c +++ b/core/opiealarm/opiealarm.c @@ -44,4 +44,6 @@ int onac ( void ); static int opiealarm_was_running; +static pid_t startpid = 0; + void log_msg ( const char *msg ) @@ -59,4 +61,7 @@ void error_msg_and_die ( int perr, const char *msg ) log_msg ( msg ); + if ( getpid ( ) != startpid ) + kill ( startpid, SIGUSR1 ); + while ( 1 ) // pretend we are waiting on RTC, so opiealarm -r can kill us sleep ( 1 ); @@ -66,10 +71,17 @@ void error_msg_and_die ( int perr, const char *msg ) void sig_handler ( int sig ) { + if ( log ) { log_msg ( "GOT SIGNAL -> EXITING\n" ); fclose ( log ); + } remove_pidfile ( ); exit ( 0 ); } +void sig_handler_parent ( int sig ) +{ + exit ( 0 ); +} + void usage ( void ) { @@ -89,6 +101,10 @@ int fork_with_pidfile ( void ) pid = fork ( ); - if ( pid > 0 ) + if ( pid > 0 ) { + signal ( SIGUSR1, sig_handler_parent ); + while ( 1 ) + sleep ( 1000 ); exit ( 0 ); + } else if ( pid < 0 ) { perror ( "forking failed" ); @@ -181,4 +197,5 @@ int main ( int argc, char **argv ) // kill running opiealarm + startpid = getpid ( ); opiealarm_was_running = kill_with_pidfile ( ); remove_pidfile ( ); @@ -193,4 +210,5 @@ int main ( int argc, char **argv ) + int suspend ( int fix_rtc ) { @@ -210,5 +228,4 @@ int suspend ( int fix_rtc ) - if (!( fp = fopen ( "/etc/resumeat", "r" ))) error_msg_and_die ( 1, "/etc/resumeat" ); @@ -224,6 +241,6 @@ int suspend ( int fix_rtc ) error_msg_and_die ( 0, "/etc/resumeat contains an invalid time description" ); - /* subtract 5 sec from event time... */ - alrt -= 5; + alrt -= 5; // wake up 5 sec before the specified time + if ( log ) @@ -275,5 +292,7 @@ int suspend ( int fix_rtc ) error_msg_and_die ( 1, "ioctl RTC_AIE_ON" ); - log_msg ( "SLEEPING\n" ); + if ( log ) + fprintf( log, "SIGUSR: pid %d - SLEEPING: pid %d\n", startpid, getpid ( )); + kill ( startpid, SIGUSR1 ); // wait for alarm irq @@ -327,4 +346,5 @@ int resume ( int resuspend ) if ( !fork_with_pidfile ( )) return 4; + kill ( startpid, SIGUSR1 ); // sleep <resuspend> sec (not less!) |