notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ensure child dies if parent dies

Browse source
This commit is contained in:
Albert Cahalan 2005-01-19 21:18:25 +00:00
parent 9edacdf6ab
commit 690c5b8c36
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/tuxpaint.c
View file

@ -2385,7 +2385,6 @@ static void show_progress_bar(void)
{ {
SDL_Rect dest, src; SDL_Rect dest, src;
int x; int x;
SDL_Event event;
static Uint32 oldtime; static Uint32 oldtime;
Uint32 newtime; Uint32 newtime;
@ -6953,8 +6952,18 @@ static int load_user_fonts(void *vp)
#include <fcntl.h> #include <fcntl.h>
#include <sys/poll.h> #include <sys/poll.h>
#include <sys/wait.h> #include <sys/wait.h>
#ifdef _POSIX_PRIORITY_SCHEDULING #ifdef _POSIX_PRIORITY_SCHEDULING
#include <sched.h> #include <sched.h>
#else
#define sched_yield()
#endif
#ifdef __linux__
#include <sys/prctl.h>
#else
#define prctl(o,a1)
#define PR_SET_PDEATHSIG 0
#endif #endif
static void reliable_write(int fd, const void *buf, size_t count) static void reliable_write(int fd, const void *buf, size_t count)
@ -7025,14 +7034,14 @@ static void run_font_scanner(void)
close(sv[1]); close(sv[1]);
return; return;
} }
nice(42); // be nice, letting the main thread get the CPU nice(42); // be nice, letting the main thread get the CPU
#ifdef _POSIX_PRIORITY_SCHEDULING sched_yield(); // try to let the parent run right now
sched_yield(); prctl(PR_SET_PDEATHSIG, 9); // get killed if parent exits
#endif
font_socket_fd = sv[1]; font_socket_fd = sv[1];
close(sv[0]); close(sv[0]);
progress_bar_disabled = 1; progress_bar_disabled = 1;
reliable_read(font_socket_fd, &no_system_fonts, sizeof no_system_fonts); reliable_read(font_socket_fd, &no_system_fonts, sizeof no_system_fonts);
sched_yield(); // try to let the parent run right now
SDL_Init(SDL_INIT_NOPARACHUTE); SDL_Init(SDL_INIT_NOPARACHUTE);
TTF_Init(); TTF_Init();
load_user_fonts(NULL); load_user_fonts(NULL);