diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2014-02-18 18:34:35 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2014-02-18 18:34:35 (GMT) |
commit | 43bdf499d56c09a520dc3bc03438dee4092d3d58 (patch) | |
tree | fc08fe113eb7c577eb402bf9ffebd8038d4f90da /doc | |
parent | 3696562aa87c7e68cb8b00b85f0e8d5cf2d199bf (diff) | |
download | fluxbox-43bdf499d56c09a520dc3bc03438dee4092d3d58.zip fluxbox-43bdf499d56c09a520dc3bc03438dee4092d3d58.tar.bz2 |
Fix race condition on shutdown
This commit fixes primarily a race condition that occurs when xinit(1) shuts
down: by not acting properly fluxbox gets caught in an infinite loop. It
caused bug #1100.
xinit(1) sends a SIGHUP signal to all processes. fluxbox tries to shutdown
itself properly by shutting down workspaces and screens. While doing that, the
Xserver might be gone already. Additionally, fluxbox used to restart() itself
on SIGHUP, which is clearly not the right thing to do when xinit(1) is about
to end the session.
So, fluxbox does this:
* handling SIGHUP now shuts down fluxbox without clearing workspaces and
screens.
* A 2 second alarm() is triggered in Fluxbox::shutdown() as a last resort
* XSetIOErrorHandler() is used to recognize the disconnect from the xserver.
* SIGUSR1 is for restarting fluxbox, SIGUSR2 for reloading the config
* FbTk/SignalHandler.cc/hh is gone; this unused abstraction served currently
no real purpose. Signal handling is now done in main.cc
* Unrelated to the issue itself src/main.cc was trimmed down quite a bit and
the code (responsible for handling the command line interface) was moved to
src/cli*
Diffstat (limited to 'doc')
-rw-r--r-- | doc/asciidoc/fluxbox.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt index 7848f03..c2e4815 100644 --- a/doc/asciidoc/fluxbox.txt +++ b/doc/asciidoc/fluxbox.txt | |||
@@ -1256,9 +1256,8 @@ SIGNALS | |||
1256 | ------- | 1256 | ------- |
1257 | fluxbox responds to the following signals: | 1257 | fluxbox responds to the following signals: |
1258 | 1258 | ||
1259 | - SIGHUP fluxbox loads the configuration. | 1259 | - SIGUSR1 restarts fluxbox. |
1260 | - SIGUSR1 Forces reloading of configuration. | 1260 | - SIGUSR2 Forces reloading of configuration. |
1261 | - SIGUSR2 Forces reloading of menu file. | ||
1262 | 1261 | ||
1263 | AUTHORS | 1262 | AUTHORS |
1264 | ------- | 1263 | ------- |