godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use SIGALRM instead of pthread for status script

Browse Source
This commit is contained in:
Philippe Pepiot 2010-12-07 00:28:12 +01:00
parent 6882cfb986
commit 87575a019d
2 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -79,8 +79,6 @@ fi
[ -n "$USE_XRANDR" ] && CFLAGS="$CFLAGS -DHAVE_XRANDR"
[ -n "$USE_IMLIB2" ] && CFLAGS="$CFLAGS -DHAVE_IMLIB"
LDFLAGS="$LDFLAGS -lpthread"
cat > Makefile << EOF
PREFIX=$PREFIX
XDG_CONFIG_DIR=$XDG_CONFIG_DIR

50
src/wmfs.c
View File

@ -141,49 +141,19 @@ quit(void)
return;
}
void *
thread_process(void *arg)
{
XEvent ev;
/* X event loop */
if(arg)
{
while(!exiting && !XNextEvent(dpy, &ev))
getevent(ev);
}
/* Status checking loop with timing */
else
{
pthread_detach(pthread_self());
do
{
conf.status_pid = spawn(conf.status_path);
sleep(conf.status_timing);
} while (!exiting && conf.status_timing != 0);
}
pthread_exit(NULL);
}
/** WMFS main loop.
*/
void
mainloop(void)
{
XEvent ev;
pthread_t evloop, evstatus;
void *ret;
if(!estatus)
while(!exiting && !XNextEvent(dpy, &ev))
getevent(ev);
else
{
pthread_create(&evloop, NULL, thread_process, "1");
pthread_create(&evstatus, NULL, thread_process, NULL);
/* launch status loop */
if (estatus)
signal_handle(SIGALRM);
(void)pthread_join(evloop, &ret);
}
while(!exiting && !XNextEvent(dpy, &ev))
getevent(ev);
return;
}
@ -418,6 +388,16 @@ signal_handle(int sig)
warn("signal(%d)", SIGCHLD);
while (waitpid(-1, NULL, WNOHANG) > 0);
break;
case SIGALRM:
/* re-set signal handler */
if (signal(SIGALRM, &signal_handle) == SIG_ERR)
warn("signal(%d)", SIGALRM);
/* exec status script */
conf.status_pid = spawn(conf.status_path);
/* re-set timer */
if (conf.status_timing > 0)
alarm(conf.status_timing);
break;
}
return;