mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xserver: Detect an clean up stale lock file

Browse Source
This commit is contained in:
Kristian Høgsberg
2011-07-15 20:14:57 -04:00
parent d6520e144a
commit fcf6577108
1 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/xserver-launcher.c
+37 -5
View File
@@ -30,6 +30,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>
@@ -551,8 +552,9 @@ int
wlsc_xserver_init(struct wl_display *display) wlsc_xserver_init(struct wl_display *display)
{ {
struct wlsc_xserver *mxs; struct wlsc_xserver *mxs;
char lockfile[256], pid[16]; char lockfile[256], pid[16], *end;
socklen_t size, name_size; socklen_t size, name_size;
pid_t other;
int fd; int fd;
mxs = malloc(sizeof *mxs); mxs = malloc(sizeof *mxs);
@@ -574,15 +576,44 @@ wlsc_xserver_init(struct wl_display *display)
fd = open(lockfile, fd = open(lockfile,
O_WRONLY | O_CLOEXEC | O_CREAT | O_EXCL, 0444); O_WRONLY | O_CLOEXEC | O_CREAT | O_EXCL, 0444);
if (fd < 0 && errno == EEXIST) { if (fd < 0 && errno == EEXIST) {
fprintf(stderr, "server %d exists\n", mxs->display); fd = open(lockfile, O_CLOEXEC, O_RDONLY);
if (fd < 0 || read(fd, pid, 11) != 11) {
fprintf(stderr,
"can't read lock file %s: %s\n",
lockfile, strerror(errno));
mxs->display++;
continue;
}
other = strtol(pid, &end, 0);
if (end != pid + 10) {
fprintf(stderr, "can't parse lock file %s\n",
lockfile);
mxs->display++;
continue;
}
if (kill(other, 0) < 0 && errno == ESRCH) {
/* stale lock file; unlink and try again */
fprintf(stderr,
"unlinking stale lock file %s\n",
lockfile);
unlink(lockfile);
continue;
}
mxs->display++; mxs->display++;
continue; continue;
} else if (fd < 0) { } else if (fd < 0) {
fprintf(stderr, "failed to create lock file %s: %s\n",
lockfile, strerror(errno));
close(mxs->fd); close(mxs->fd);
free(mxs); free(mxs);
return -1; return -1;
} }
/* Subtle detail: we use the pid of the wayland
* compositor, not the xserver in the lock file. */
size = snprintf(pid, sizeof pid, "%10d\n", getpid()); size = snprintf(pid, sizeof pid, "%10d\n", getpid());
write(fd, pid, size); write(fd, pid, size);
close(fd); close(fd);
@@ -591,9 +622,10 @@ wlsc_xserver_init(struct wl_display *display)
sizeof mxs->addr.sun_path, sizeof mxs->addr.sun_path,
"/tmp/.X11-unix/X%d", mxs->display) + 1; "/tmp/.X11-unix/X%d", mxs->display) + 1;
size = offsetof(struct sockaddr_un, sun_path) + name_size; size = offsetof(struct sockaddr_un, sun_path) + name_size;
unlink(mxs->addr.sun_path);
if (bind(mxs->fd, (struct sockaddr *) &mxs->addr, size) < 0) { if (bind(mxs->fd, (struct sockaddr *) &mxs->addr, size) < 0) {
fprintf(stderr, "failed to bind to %s (%m)\n", fprintf(stderr, "failed to bind to %s (%s)\n",
mxs->addr.sun_path); mxs->addr.sun_path, strerror(errno));
unlink(lockfile); unlink(lockfile);
close(mxs->fd); close(mxs->fd);
free(mxs); free(mxs);
@@ -602,7 +634,7 @@ wlsc_xserver_init(struct wl_display *display)
break; break;
} while (errno != 0); } while (errno != 0);
fprintf(stderr, "listening on display %d\n", mxs->display); fprintf(stderr, "xserver listening on display :%d\n", mxs->display);
if (listen(mxs->fd, 1) < 0) { if (listen(mxs->fd, 1) < 0) {
unlink(mxs->addr.sun_path); unlink(mxs->addr.sun_path);