summaryrefslogtreecommitdiff
authorsandman <sandman>2002-06-02 01:42:05 (UTC)
committer sandman <sandman>2002-06-02 01:42:05 (UTC)
commit2205558adae76dc40a5c0f2dd83226a4d1c67eae (patch) (side-by-side diff)
treee7e96aa694bab035c2c75f3c1b6dbceea07d4270
parent385a3d8034003a412fa73840bf985582bf6b4547 (diff)
downloadopie-2205558adae76dc40a5c0f2dd83226a4d1c67eae.zip
opie-2205558adae76dc40a5c0f2dd83226a4d1c67eae.tar.gz
opie-2205558adae76dc40a5c0f2dd83226a4d1c67eae.tar.bz2
Reworked the whole system and introduced re-suspend. Effect is that the
iPAQ is re-suspended when woken up by the RTC (as opposed to the button) and on AC. Timeout is currently hardcoded to 120sec.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/opiealarm/opiealarm.c230
-rwxr-xr-xcore/opiealarm/opieatd25
-rwxr-xr-xroot/etc/init.d/opieatd2
3 files changed, 207 insertions, 50 deletions
diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c
index 33d631d..3a06236 100644
--- a/core/opiealarm/opiealarm.c
+++ b/core/opiealarm/opiealarm.c
@@ -20,13 +20,29 @@
#include <time.h>
#include <stdlib.h>
#include <syslog.h>
#include <signal.h>
+#include <errno.h>
+#include <string.h>
#define PIDFILE "/var/run/opiealarm.pid"
+#define APMFILE "/proc/apm"
+
+FILE *log; // debug only
+
+int resume ( void );
+int suspend ( void );
+int main ( int argc, char **argv );
+int fork_with_pidfile ( void );
+int kill_with_pidfile ( void );
+void remove_pidfile ( void );
+void usage ( void );
+void sig_handler ( int sig );
+void error_msg_and_die ( int perr, const char *msg );
+int onac ( void );
-FILE *log;
+static int opiealarm_was_running;
void log_msg ( const char *msg )
{
@@ -41,23 +57,142 @@ void error_msg_and_die ( int perr, const char *msg )
if ( perr )
log_msg ( strerror ( errno ));
log_msg ( msg );
- unlink ( PIDFILE );
+ while ( 1 ) // pretend we are waiting on RTC, so opiealarm -r can kill us
+ sleep ( 1 );
+}
+
+
+void sig_handler ( int sig )
+{
+ log_msg ( "GOT SIGNAL -> EXITING\n" );
+ fclose ( log );
+ remove_pidfile ( );
+ exit ( 0 );
+}
+
+void usage ( void )
+{
+ fprintf ( stderr, "Usage: opiealarm -r|-s\n" );
exit ( 1 );
}
+int fork_with_pidfile ( void )
+{
+ FILE *fp;
+ pid_t pid;
+
+ pid = fork ( );
+
+ if ( pid > 0 )
+ exit ( 0 );
+ else if ( pid < 0 ) {
+ perror ( "forking failed" );
+ return 0;
+ }
+
+ signal ( SIGTERM, sig_handler );
+ signal ( SIGINT, sig_handler );
+
+ // save pid
+ if (( fp = fopen ( PIDFILE, "w" ))) {
+ fprintf ( fp, "%d", getpid ( ));
+ fclose ( fp );
+
+ // detach
+ close ( 0 );
+ close ( 1 );
+ close ( 2 );
+
+ setpgid ( 0, 0 );
+
+ return 1;
+ }
+ else {
+ perror ( PIDFILE );
+ return 0;
+ }
+}
+
+int kill_with_pidfile ( void )
+{
+ FILE *fp;
+ pid_t pid;
+
+ if (( fp = fopen ( PIDFILE, "r" ))) {
+ if ( fscanf ( fp, "%d", &pid ) == 1 )
+ return ( kill ( pid, SIGTERM ) == 0 ) ? 1 : 0;
+ fclose ( fp );
+ }
+ return 0;
+}
+
+void remove_pidfile ( void )
+{
+ unlink ( PIDFILE );
+
+ signal ( SIGTERM, SIG_DFL );
+ signal ( SIGINT, SIG_DFL );
+}
+
+
+int main ( int argc, char **argv )
+{
+ int mode = 0;
+ int opt;
+
+ while (( opt = getopt ( argc, argv, "rs" )) != EOF ) {
+ switch ( opt ) {
+ case 's':
+ mode = 's';
+ break;
+ case 'r':
+ mode = 'r';
+ break;
+ default:
+ usage ( );
+ }
+ }
+
+ if ( geteuid ( ) != 0 ) {
+ fprintf ( stderr, "You need root priviledges to run opiealarm." );
+ return 2;
+ }
+
+ if ( !mode )
+ usage ( );
+
+ // kill running opiealarm
+ opiealarm_was_running = kill_with_pidfile ( );
+ remove_pidfile ( );
+ if ( mode == 'r' )
+ return resume ( );
+ else
+ return suspend ( );
-void suspend_on_rtc ( )
+ return 0;
+}
+
+
+int suspend ( void )
{
FILE *fp;
char buf [64];
time_t t;
struct tm *tm;
int fd;
+ if ( !fork_with_pidfile ( ))
+ return 3;
+
+ log = fopen ( "/tmp/opiealarm.log", "w" );
+ log_msg ( "STARTING\n" );
+
+
+
if (!( fp = fopen ( "/etc/resumeat", "r" )))
error_msg_and_die ( 1, "/etc/resumeat" );
if ( !fgets ( buf, sizeof( buf ) - 1, fp ))
@@ -78,9 +213,9 @@ void suspend_on_rtc ( )
tm = gmtime ( &t );
// Write alarm time to RTC
- if (( fd = open ( "/dev/misc/rtc", O_RDWR ) < 0 );
+ if (( fd = open ( "/dev/misc/rtc", O_RDWR )) < 0 )
error_msg_and_die ( 1, "/dev/misc/rtc" );
// set alarm time
if ( ioctl ( fd, RTC_ALM_SET, tm ) < 0 )
error_msg_and_die ( 1, "ioctl RTC_ALM_SET" );
@@ -100,68 +235,75 @@ void suspend_on_rtc ( )
if ( ioctl ( fd, RTC_AIE_OFF, 0 ) < 0 )
error_msg_and_die ( 1, "ioctl RTC_AIE_OFF" );
close ( fd );
-}
+ log_msg ( "EXITING\n" );
-void sig_handler ( int sig )
-{
- log_msg ( "GOT SIGNAL -> EXITING\n" );
fclose ( log );
- unlink ( PIDFILE );
- exit ( 0 );
+ remove_pidfile ( );
+
+ return 0;
}
-int main ( )
+static int onac ( void )
{
FILE *fp;
- pid_t pid;
+ int on = 0;
- if ( geteuid ( ) != 0 ) {
- fprintf ( stderr, "You need root priviledges to run opiealarm." );
- return 1;
- }
+ if (( fp = fopen ( APMFILE, "r" ))) {
+ int ac = 0;
- pid = fork ( );
+ if ( fscanf ( fp, "%*[^ ] %*d.%*d 0x%*x 0x%x 0x%*x 0x%*x %*d%% %*i %*c", &ac ) == 1 )
+ on = ( ac == 0x01 ) ? 1 : 0;
- if ( pid > 0 )
- return 0;
- else if ( pid < 0 ) {
- perror ( "Could not fork." );
- return 2;
+ fclose ( fp );
}
-
- // save pid
- if (!( fp = fopen ( PIDFILE, "w" ))) {
- perror ( PIDFILE );
- return 3;
+ return on;
}
- fprintf ( fp, "%d", getpid ( ));
- fclose ( fp );
+int resume ( void )
+{
+ FILE *fp;
- // detach
- close ( 0 );
- close ( 1 );
- close ( 2 );
+ // re-suspend when on AC (optional) when woken up via RTC
- setpgid ( 0, 0 );
+ if ( !opiealarm_was_running ) { // opiealarm -s got it's RTC signal -> wake up by RTC
+ if ( onac ( )) {
+ time_t start, now;
+ char *argv [4];
- log = fopen ( "/tmp/opiealarm.log", "w" );
- log_msg ( "STARTING\n" );
+ if ( !fork_with_pidfile ( ))
+ return 4;
- signal ( SIGTERM, sig_handler );
- signal ( SIGINT, sig_handler );
+ // sleep 120sec (not less!)
+ time ( &start );
+ do {
+ sleep ( 1 );
+ time ( &now );
+ } while (( now - start ) < 120 );
- extractevent ( );
+ if ( onac ( )) { // still on ac
+ // system() without fork
+ argv[0] = "qcop";
+ argv[1] = "QPE/Desktop";
+ argv[2] = "suspend()";
+ argv[3] = 0;
- signal ( SIGTERM, SIG_DFL );
- signal ( SIGINT, SIG_DFL );
+ // hard coded for now ...but needed
+ setenv ( "LOGNAME", "root", 1 );
+ setenv ( "HOME", "/root", 1 );
+ setenv ( "LD_LIBRARY_PATH", "/opt/QtPalmtop/lib", 1 );
+ setenv ( "QTDIR", "/opt/QtPalmtop", 1 );
- log_msg ( "EXITING\n" );
+ remove_pidfile ( );
- fclose ( log );
- unlink ( PIDFILE );
+ execv ( "/opt/QtPalmtop/bin/qcop", argv );
+
+ perror ( "exec for qcop failed" );
+ return 5;
+ }
+ }
+ }
return 0;
}
diff --git a/core/opiealarm/opieatd b/core/opiealarm/opieatd
index 3b9dc0e..fc2d421 100755
--- a/core/opiealarm/opieatd
+++ b/core/opiealarm/opieatd
@@ -1,22 +1,37 @@
#!/bin/sh
timefile=/etc/resumeat
+trap exit 0 SIGTERM SIGINT SIGQUIT
+
+echo $$ >/var/run/opieatd.pid
+
mkdir -p /var/spool/at
[ -p /var/spool/at/trigger ] || mkfifo /var/spool/at/trigger
while true; do
- cat /var/spool/at/trigger | while read line; do
- FILE=`ls -1 /var/spool/at/[0-9]* | head -n1`
- echo "File = $FILE"
- if [ -z "$FILE" ]; then
+ while read </var/spool/at/trigger dummy; do
+ FILES=`ls /var/spool/at/[0-9]* 2>/dev/null`
+
+ if [ -z "$FILES" ]; then
echo "clear resume at"
echo "" >$timefile
else
- unixtime=`basename $FILE | cut -c1-10`
+ for i in "$FILES"; do
+ echo "File = $i"
+
+ unixtime=`basename $i | cut -c1-10`
+ pid=`basename $i | cut -c12-`
+
+ if [ -d /proc/$pid ]; then
echo "Datestring = $unixtime"
echo "$unixtime" >$timefile
+ else
+ rm -f $i
+ fi
+ done
fi
done
done
+exit 0
diff --git a/root/etc/init.d/opieatd b/root/etc/init.d/opieatd
index 83f6035..765426c 100755
--- a/root/etc/init.d/opieatd
+++ b/root/etc/init.d/opieatd
@@ -7,9 +7,9 @@ case "$1" in
start)
/opt/QtPalmtop/bin/opieatd &
;;
stop)
- killall opieatd
+ kill `cat /var/run/opieatd.pid`
;;
esac
exit 0