dzwdz
/
catboy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restart process in sandman

master
Curtis McEnroe 2019-07-02 18:04:27 -04:00
parent d8cffb8ae7
commit 39a752c46e
No known key found for this signature in database
GPG Key ID: CEA2F97ADCFCD77C
2 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sandman.1
View File

@ -1,4 +1,4 @@
.Dd December 2, 2018 .Dd July 2, 2019
.Dt SANDMAN 1 .Dt SANDMAN 1
.Os .Os
. .
@ -15,11 +15,12 @@
is a utility for Darwin systems. is a utility for Darwin systems.
It runs the It runs the
.Ar command .Ar command
as a child process as a child process.
and sends it the When the system goes to sleep,
.Dv SIGHUP the process is sent
signal .Dv SIGHUP .
when the system goes to sleep. When the system wakes up,
the process is restarted.
. .
.Sh EXIT STATUS .Sh EXIT STATUS
.Nm .Nm

46
sandman.m
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2018 Curtis McEnroe <june@causal.agency> /* Copyright (C) 2019 C. McEnroe <june@causal.agency>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by * it under the terms of the GNU Affero General Public License as published by
@ -21,36 +21,43 @@
#import <sysexits.h> #import <sysexits.h>
#import <unistd.h> #import <unistd.h>
void handler(int sig) { static volatile sig_atomic_t sleeping;
static void sigchld(int sig) {
(void)sig; (void)sig;
int status; int status;
pid_t pid = wait(&status); pid_t pid = wait(&status);
if (pid < 0) _exit(EX_OSERR); if (pid < 0) _exit(EX_OSERR);
if (WIFSIGNALED(status)) { if (WIFSIGNALED(status) && WTERMSIG(status) != SIGHUP) {
_exit(128 + WTERMSIG(status)); _exit(128 + WTERMSIG(status));
} else { } else if (!sleeping) {
_exit(WEXITSTATUS(status)); _exit(WEXITSTATUS(status));
} }
} }
static pid_t spawn(char *argv[]) {
pid_t pid = fork();
if (pid < 0) err(EX_OSERR, "fork");
if (pid) return pid;
execvp(argv[0], argv);
err(EX_NOINPUT, "%s", argv[0]);
}
static pid_t pid;
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
if (argc < 2) return EX_USAGE; if (argc < 2) return EX_USAGE;
sigset_t mask; sigset_t mask;
sigemptyset(&mask); sigemptyset(&mask);
struct sigaction sa = { struct sigaction action = {
.sa_handler = handler, .sa_handler = sigchld,
.sa_mask = mask, .sa_mask = mask,
.sa_flags = SA_NOCLDSTOP | SA_RESTART, .sa_flags = SA_NOCLDSTOP | SA_RESTART,
}; };
sigaction(SIGCHLD, &sa, NULL); sigaction(SIGCHLD, &action, NULL);
pid_t pid = fork(); pid = spawn(&argv[1]);
if (pid < 0) err(EX_OSERR, "fork");
if (!pid) {
execvp(argv[1], &argv[1]);
err(EX_NOINPUT, "%s", argv[1]);
}
[ [
[[NSWorkspace sharedWorkspace] notificationCenter] [[NSWorkspace sharedWorkspace] notificationCenter]
@ -59,10 +66,23 @@ int main(int argc, char *argv[]) {
queue: nil queue: nil
usingBlock: ^(NSNotification *note) { usingBlock: ^(NSNotification *note) {
(void)note; (void)note;
sleeping = 1;
int error = kill(pid, SIGHUP); int error = kill(pid, SIGHUP);
if (error) err(EX_UNAVAILABLE, "kill %d", pid); if (error) err(EX_UNAVAILABLE, "kill %d", pid);
} }
]; ];
[
[[NSWorkspace sharedWorkspace] notificationCenter]
addObserverForName: NSWorkspaceDidWakeNotification
object: nil
queue: nil
usingBlock: ^(NSNotification *note) {
(void)note;
sleeping = 0;
pid = spawn(&argv[1]);
}
];
[[NSApplication sharedApplication] run]; [[NSApplication sharedApplication] run];
} }