koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make in-place restarts use socket activation, too (for faster/less flaky tests)

Browse Source
This commit is contained in:
Michael Stapelberg
2012-01-21 23:03:09 +00:00
parent 3b7f4d428e
commit 318d4fdeef
10 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main.c
View File

@ -2,7 +2,7 @@
* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
* © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
* © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
*
* main.c: Initialization, main loop
*
@ -28,6 +28,9 @@ struct rlimit original_rlimit_core;
/* Whether this version of i3 is a debug build or a release build. */
bool debug_build = false;
/** The number of file descriptors passed via socket activation. */
int listen_fds;
static int xkb_event_base;
int xkb_current_group;
@ -662,14 +665,26 @@ int main(int argc, char *argv[]) {
/* Also handle the UNIX domain sockets passed via socket activation. The
* parameter 1 means "remove the environment variables", we don’t want to
* pass these to child processes. */
int fds = sd_listen_fds(1);
if (fds < 0)
listen_fds = sd_listen_fds(0);
if (listen_fds < 0)
ELOG("socket activation: Error in sd_listen_fds\n");
else if (fds == 0)
else if (listen_fds == 0)
DLOG("socket activation: no sockets passed\n");
else {
for (int fd = SD_LISTEN_FDS_START; fd < (SD_LISTEN_FDS_START + fds); fd++) {
int flags;
for (int fd = SD_LISTEN_FDS_START;
fd < (SD_LISTEN_FDS_START + listen_fds);
fd++) {
DLOG("socket activation: also listening on fd %d\n", fd);
/* sd_listen_fds() enables FD_CLOEXEC by default.
* However, we need to keep the file descriptors open for in-place
* restarting, therefore we explicitly disable FD_CLOEXEC. */
if ((flags = fcntl(fd, F_GETFD)) < 0 ||
fcntl(fd, F_SETFD, flags & ~FD_CLOEXEC) < 0) {
ELOG("Could not disable FD_CLOEXEC on fd %d\n", fd);
}
struct ev_io *ipc_io = scalloc(sizeof(struct ev_io));
ev_io_init(ipc_io, ipc_new_client, fd, EV_READ);
ev_io_start(main_loop, ipc_io);

12
src/startup.c
View File

@ -2,7 +2,7 @@
* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
* © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
* © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
*
* startup.c: Startup notification code. Ensures a startup notification context
* is setup when launching applications. We store the current
@ -11,6 +11,7 @@
*
*/
#include "all.h"
#include "sd-daemon.h"
#include <sys/types.h>
#include <sys/wait.h>
@ -113,6 +114,15 @@ void start_application(const char *command, bool no_startup_id) {
/* Child process */
setsid();
setrlimit(RLIMIT_CORE, &original_rlimit_core);
/* Close all socket activation file descriptors explicitly, we disabled
* FD_CLOEXEC to keep them open when restarting i3. */
for (int fd = SD_LISTEN_FDS_START;
fd < (SD_LISTEN_FDS_START + listen_fds);
fd++) {
close(fd);
}
unsetenv("LISTEN_PID");
unsetenv("LISTEN_FDS");
if (fork() == 0) {
/* Setup the environment variable(s) */
if (!no_startup_id)