Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-10-31 21:20:20 +00:00
Code Issues Projects Releases Wiki Activity

Kill a bit of cruft, explain the reasonning behind the kill/traps, and

Browse Source 
fix a potential buffering issue eating the first slider event
This commit is contained in:
NiLuJe 2012-10-03 01:17:21 +02:00
parent 7bc80277e4
commit 8b45833e2d
3 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
input.c
View File

@ -50,7 +50,8 @@ void slider_handler(int sig)
{
/* Kill lipc-wait-event properly on exit */
if(pclose_arg.pid != 0) {
kill(pclose_arg.pid, SIGTERM);
// Be a little more gracious, lipc seems to handle SIGINT properly
kill(pclose_arg.pid, SIGINT);
}
}
@ -84,7 +85,7 @@ static int openInputDevice(lua_State *L) {
return luaL_error(L, "cannot fork() slider event listener");
}
if(childpid == 0) {
// Setup signal handler, to cleanup on exit
// We send a SIGTERM to this child on exit, trap it to kill lipc properly.
signal(SIGTERM, slider_handler);
FILE *fp;
@ -99,25 +100,21 @@ static int openInputDevice(lua_State *L) {
ev.code = key_code;
ev.value = 1;
/* listen power slider events */
char *exec_file = "lipc-wait-event";
char *arg1 = "-m"; // Hang for ever, don't exit on the first one: we're in a dedicated child, and we'll be killed/closed on exit, so we don't care
char *arg2 = "-s";
char *arg3 = "0";
char *arg4 = "com.lab126.powerd";
char *arg5 = "goingToScreenSaver,outOfScreenSaver,charging,notCharging";
char *arg6 = (char *) NULL;
char *argv[] = {exec_file, arg1, arg2, arg3, arg4, arg5, arg6};
/* listen power slider events (listen for ever for multiple events) */
char *argv[] = {"lipc-wait-event", "-m", "-s", "0", "com.lab126.powerd", "goingToScreenSaver,outOfScreenSaver,charging,notCharging", (char *) NULL};
/* @TODO 07.06 2012 (houqp)
* plugin and out event can only be watched by:
lipc-wait-event com.lab126.hal usbPlugOut,usbPlugIn
*/
fp = popen_noshell(exec_file, (const char * const *)argv, "r", &pclose_arg, 0);
fp = popen_noshell("lipc-wait-event", (const char * const *)argv, "r", &pclose_arg, 0);
if (!fp) {
err(EXIT_FAILURE, "popen_noshell()");
}
/* Flush to get rid of buffering issues? */
fflush(fp);
while(fgets(std_out, sizeof(std_out)-1, fp)) {
if(std_out[0] == 'g') {
ev.code = CODE_IN_SAVER;
@ -147,13 +144,13 @@ static int openInputDevice(lua_State *L) {
if (status == -1) {
err(EXIT_FAILURE, "pclose_noshell()");
} else {
printf("Power slider event listener child exited with status %d.\n", status);
printf("lipc-wait-event exited with status %d.\n", status);
if WIFEXITED(status) {
printf("Child exited normally with status: %d.\n", WEXITSTATUS(status));
printf("lipc-wait-event exited normally with status: %d.\n", WEXITSTATUS(status));
}
if WIFSIGNALED(status) {
printf("Child terminated by signal: %d.\n", WTERMSIG(status));
printf("lipc-wait-event terminated by signal: %d.\n", WTERMSIG(status));
}
}
@ -193,7 +190,7 @@ static int closeInputDevices(lua_State *L) {
}
if(slider_pid != -1) {
/* kill and wait for child process */
kill(slider_pid, SIGTERM);
kill(slider_pid, SIGTERM); // We could kill -slider_pid (note the minus) to kill the whole process group, but we trap SIGTERM to handle things nicely
waitpid(-1, NULL, 0);
}
return 0;

9
kpdfview.c
View File

@ -83,15 +83,6 @@ int main(int argc, char **argv) {
}
}
/* Make popen_noshell & valgrind happy */
if (fflush(stdout) != 0)
err(EXIT_FAILURE, "fflush(stdout)");
if (fflush(stderr) != 0)
err(EXIT_FAILURE, "fflush(stderr)");
close(STDIN_FILENO);
close(STDOUT_FILENO);
close(STDERR_FILENO);
return 0;
}

11
slider_watcher.c
View File

@ -65,16 +65,9 @@ main ( int argc, char *argv[] )
ev.value = 1;
/* listen power slider events */
char *exec_file = "lipc-wait-event";
char *arg1 = "-m";
char *arg2 = "-s";
char *arg3 = "0";
char *arg4 = "com.lab126.powerd";
char *arg5 = "goingToScreenSaver,outOfScreenSaver";
char *arg6 = (char *) NULL;
char *chargv[] = {exec_file, arg1, arg2, arg3, arg4, arg5, arg6};
char *argv[] = {"lipc-wait-event", "-m", "-s", "0", "com.lab126.powerd", "goingToScreenSaver,outOfScreenSaver", (char *) NULL};
fp = popen_noshell(exec_file, (const char * const *)chargv, "r", &pclose_arg, 0);
fp = popen_noshell("lipc-wait-event", (const char * const *)chargv, "r", &pclose_arg, 0);
if (!fp) {
err(EXIT_FAILURE, "popen_noshell()");
}