Automatically restart KWin when it crashes.

If it crashes at least two times in a row then disable compositing.

svn path=/trunk/KDE/kdebase/workspace/; revision=717778
icc-effect-5.14.5
Rivo Laks 2007-09-27 14:53:52 +00:00
parent 5bc7142bff
commit ec0fa1789a
2 changed files with 36 additions and 0 deletions

View File

@ -19,6 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <stdlib.h>
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <kcrash.h>
#include <unistd.h>
#include <signal.h>
#include <fcntl.h>
@ -84,6 +85,8 @@ int x11ErrorHandler(Display *d, XErrorEvent *e)
return 0;
}
int Application::crashes = 0;
Application::Application( )
: KApplication( ), owner( screen_number )
{
@ -106,6 +109,18 @@ Application::Application( )
}
connect( &owner, SIGNAL( lostOwnership()), SLOT( lostSelection()));
KCrash::setEmergencySaveFunction( Application::crashHandler );
crashes = args->getOption("crashes").toInt();
// Disable compositing if we have had too many crashes
if( crashes >= 2 )
{
kDebug() << "Too many crashes recently, disabling compositing";
KConfigGroup compgroup( config, "Compositing" );
compgroup.writeEntry( "Enabled", false );
}
// Reset crashes count if we stay up for more that 15 seconds
QTimer::singleShot( 15*1000, this, SLOT( resetCrashesCount() ));
// if there was already kwin running, it saved its configuration after loosing the selection -> reread
config->reparseConfiguration();
@ -178,6 +193,23 @@ static void sighandler(int)
QApplication::exit();
}
void Application::crashHandler(int signal)
{
crashes++;
fprintf( stderr, "Application::crashHandler() called with signal %d; recent crashes: %d\n", signal, crashes );
char cmd[1024];
sprintf( cmd, "kwin --crashes %d &", crashes );
sleep( 1 );
system( cmd );
}
void Application::resetCrashesCount()
{
crashes = 0;
}
} // namespace
@ -267,6 +299,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
KCmdLineOptions args;
args.add("lock", ki18n("Disable configuration options"));
args.add("replace", ki18n("Replace already-running ICCCM2.0-compliant window manager"));
args.add("crashes <n>", ki18n("Indicate that KWin has recently crashed n times"));
KCmdLineArgs::addCmdLineOptions( args );
if (signal(SIGTERM, KWin::sighandler) == SIG_IGN)

3
main.h
View File

@ -29,11 +29,14 @@ class Application : public KApplication
protected:
bool x11EventFilter( XEvent * );
bool notify( QObject* o, QEvent* e );
static void crashHandler(int signal);
private slots:
void lostSelection();
void resetCrashesCount();
private:
KWinSelectionOwner owner;
static int crashes;
};
} // namespace