summaryrefslogtreecommitdiff
authorsandman <sandman>2002-08-04 02:25:54 (UTC)
committer sandman <sandman>2002-08-04 02:25:54 (UTC)
commit8fd0780faa16abbcf7db9220af1bc333ae484ec8 (patch) (side-by-side diff)
treeffacd596daa0ab07890f185510275667649d55db
parent549df674d7af9fe1347751e6a63d6ed8249d2503 (diff)
downloadopie-8fd0780faa16abbcf7db9220af1bc333ae484ec8.zip
opie-8fd0780faa16abbcf7db9220af1bc333ae484ec8.tar.gz
opie-8fd0780faa16abbcf7db9220af1bc333ae484ec8.tar.bz2
1) Fixes for suspend/resume (improved it for iPAQ, shouldn't have changed
anything for Z) -- It seems that this also fixes the 70% CPU load problem (needs more testing/feedback though) 2) the launcher now creates a /var/run/opie.pid file containing its pid 3) the launcher catches SIGTERM and kills all its child processes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp58
-rw-r--r--core/launcher/main.cpp42
-rw-r--r--libopie/odevice.cpp62
-rw-r--r--libopie/odevice.h4
4 files changed, 135 insertions, 31 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index f90da1a..7f24259 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -591,56 +591,66 @@ static void blankScreen()
QGfx* g = qt_screen->screenGfx();
g->fillRect(0,0,qt_screen->width(),qt_screen->height());
delete g;
*/
blanked = TRUE;
}
static void darkScreen()
{
extern void qpe_setBacklight(int);
qpe_setBacklight(0); // force off
}
void Desktop::togglePower()
{
- bool wasloggedin = loggedin;
- loggedin=0;
- suspendTime = QDateTime::currentDateTime();
- darkScreen();
- if ( wasloggedin )
- blankScreen();
-
- system("apm --suspend");
-
-
-
- QWSServer::screenSaverActivate( FALSE );
- {
- QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep
- QCopEnvelope e("QPE/System", "setBacklight(int)");
- e << -3; // Force on
- }
- if ( wasloggedin ) {
- login(TRUE);
- }
- sleep(1);
- execAutoStart();
- //qcopBridge->closeOpenConnections();
- //qDebug("called togglePower()!!!!!!");
+ static bool excllock = false;
+
+ if ( excllock )
+ return;
+
+ excllock = true;
+
+ bool wasloggedin = loggedin;
+ loggedin=0;
+ suspendTime = QDateTime::currentDateTime();
+ darkScreen();
+ if ( wasloggedin )
+ blankScreen();
+
+ ODevice::inst ( )-> suspend ( );
+
+ QWSServer::screenSaverActivate( FALSE );
+
+ {
+ QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep
+ QCopEnvelope e("QPE/System", "setBacklight(int)");
+ e << -3; // Force on
+ }
+
+ if ( wasloggedin )
+ login(TRUE);
+
+ execAutoStart();
+ //qcopBridge->closeOpenConnections();
+ //qDebug("called togglePower()!!!!!!");
+
+ qApp-> processEvents ( );
+
+ excllock = false;
}
void Desktop::toggleLight()
{
QCopEnvelope e("QPE/System", "setBacklight(int)");
e << -2; // toggle
}
void Desktop::toggleSymbolInput()
{
tb->toggleSymbolInput();
}
void Desktop::toggleNumLockState()
{
tb->toggleNumLockState();
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index a19da14..1e741d5 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -320,35 +320,65 @@ int initApplication( int argc, char ** argv )
// Make sure calibration widget starts on top.
Calibrate *cal = new Calibrate;
cal->exec();
delete cal;
}
#endif
d->show();
int rv = a.exec();
delete d;
return rv;
}
+static const char *pidfile_path = "/var/run/opie.pid";
+
+void create_pidfile ( )
+{
+ FILE *f;
+
+ if (( f = ::fopen ( pidfile_path, "w" ))) {
+ ::fprintf ( f, "%d", getpid ( ));
+ ::fclose ( f );
+ }
+}
+
+void remove_pidfile ( )
+{
+ ::unlink ( pidfile_path );
+}
+
+void handle_sigterm ( int sig )
+{
+ if ( qApp )
+ qApp-> quit ( );
+}
+
int main( int argc, char ** argv )
{
#ifndef SINGLE_APP
- signal( SIGCHLD, SIG_IGN );
+ ::signal( SIGCHLD, SIG_IGN );
+
+ ::signal ( SIGTERM, handle_sigterm );
+
+ ::setsid ( );
+ ::setpgid ( 0, 0 );
+
+ ::atexit ( remove_pidfile );
+ create_pidfile ( );
#endif
- int retVal = initApplication( argc, argv );
+ int retVal = initApplication ( argc, argv );
#ifndef SINGLE_APP
// Kill them. Kill them all.
- setpgid( getpid(), getppid() );
- killpg( getpid(), SIGTERM );
- sleep( 1 );
- killpg( getpid(), SIGKILL );
+ ::kill ( 0, SIGTERM );
+ ::sleep( 1 );
+ ::kill ( 0, SIGKILL );
#endif
return retVal;
}
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index bc8014a..057c344 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -4,67 +4,74 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
+#include <stdlib.h>
+
#include <qfile.h>
#include <qtextstream.h>
#include <qpe/sound.h>
#include <qpe/resource.h>
#include "odevice.h"
class ODeviceData {
public:
QString m_vendorstr;
OVendor m_vendor;
QString m_modelstr;
OModel m_model;
QString m_systemstr;
OSystem m_system;
QString m_sysverstr;
OLedState m_leds [4]; // just for convenience ...
};
class ODeviceIPAQ : public ODevice {
protected:
virtual void init ( );
public:
+ virtual bool suspend ( );
+
virtual void alarmSound ( );
virtual uint hasLeds ( ) const;
virtual OLedState led ( uint which ) const;
virtual bool setLed ( uint which, OLedState st );
+
+private:
+ static void tstp_sighandler ( int );
};
class ODeviceZaurus : public ODevice {
protected:
virtual void init ( );
public:
virtual void alarmSound ( );
virtual void keySound ( );
virtual void touchSound ( );
virtual uint hasLeds ( ) const;
virtual OLedState led ( uint which ) const;
virtual bool setLed ( uint which, OLedState st );
protected:
@@ -100,32 +107,42 @@ ODevice::ODevice ( )
d-> m_vendorstr = "Unkown";
d-> m_vendor = OVENDOR_Unknown;
d-> m_systemstr = "Unkown";
d-> m_system = OSYSTEM_Unknown;
d-> m_sysverstr = "0.0";
}
void ODevice::init ( )
{
}
ODevice::~ODevice ( )
{
delete d;
}
+bool ODevice::suspend ( )
+{
+ int rc = ::system ( "apm --suspend" );
+
+ if (( rc == 127 ) || ( rc == -1 ))
+ return false;
+ else
+ return true;
+}
+
QString ODevice::vendorString ( )
{
return d-> m_vendorstr;
}
OVendor ODevice::vendor ( )
{
return d-> m_vendor;
}
QString ODevice::modelString ( )
{
return d-> m_modelstr;
}
OModel ODevice::model ( )
@@ -238,51 +255,96 @@ void ODeviceIPAQ::init ( )
if ( f. open ( IO_ReadOnly )) {
d-> m_systemstr = "Familiar";
d-> m_system = OSYSTEM_Familiar;
QTextStream ts ( &f );
d-> m_sysverstr = ts. readLine ( ). mid ( 10 );
f. close ( );
}
d-> m_leds [0] = OLED_Off;
}
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
+#include <signal.h>
+#include <sys/time.h>
#include <linux/soundcard.h>
#include <qapplication.h>
#include <qpe/config.h>
//#include <linux/h3600_ts.h> // including kernel headers is evil ...
typedef struct h3600_ts_led {
unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */
unsigned char TotalTime; /* Units of 5 seconds */
unsigned char OnTime; /* units of 100m/s */
unsigned char OffTime; /* units of 100m/s */
} LED_IN;
// #define IOC_H3600_TS_MAGIC 'f'
// #define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, struct h3600_ts_led)
#define LED_ON (( 1<<30 ) | ( 'f'<<8 ) | ( 5 ) | ( sizeof(struct h3600_ts_led)<<16 )) // _IOW only defined in kernel headers :(
+//#include <linux/apm_bios.h>
+
+//#define APM_IOC_SUSPEND _IO('A',2)
+
+#define APM_IOC_SUSPEND (( 0<<30 ) | ( 'A'<<8 ) | ( 2 ) | ( 0<<16 ))
+
+
+void ODeviceIPAQ::tstp_sighandler ( int )
+{
+}
+
+
+bool ODeviceIPAQ::suspend ( )
+{
+ int fd;
+ bool res = false;
+
+ if (( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) {
+ struct timeval tvs, tvn;
+
+ ::signal ( SIGTSTP, tstp_sighandler );
+ ::gettimeofday ( &tvs, 0 );
+
+ res = ( ::ioctl ( fd, APM_IOC_SUSPEND ) == 0 );
+ ::close ( fd );
+
+ if ( res ) {
+ ::kill ( -::getpid ( ), SIGTSTP );
+
+ do {
+ ::usleep ( 200 * 1000 );
+ ::gettimeofday ( &tvn, 0 );
+ } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 1500 );
+
+ ::kill ( -::getpid ( ), SIGCONT );
+ }
+
+ ::signal ( SIGTSTP, SIG_DFL );
+ }
+ return res;
+}
+
+
void ODeviceIPAQ::alarmSound ( )
{
#if defined( QT_QWS_IPAQ ) // IPAQ
#ifndef QT_NO_SOUND
static Sound snd ( "alarm" );
int fd;
int vol;
bool vol_reset = false;
if ((( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) ||
(( fd = ::open ( "/dev/mixer", O_RDWR )) >= 0 )) {
if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) {
Config cfg ( "qpe" );
cfg. setGroup ( "Volume" );
diff --git a/libopie/odevice.h b/libopie/odevice.h
index b54e576..eeae357 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -52,33 +52,35 @@ enum OSystem {
};
enum OLedState {
OLED_Off,
OLED_On,
OLED_BlinkSlow,
OLED_BlinkFast
};
class ODevice
{
public:
public:
static ODevice *inst ( );
-
+
+// system
+ virtual bool suspend ( );
// information
QString modelString ( );
OModel model ( );
QString vendorString ( );
OVendor vendor ( );
QString systemString ( );
OSystem system ( );
QString systemVersionString ( );
// input / output