oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

ok, fix some bug due to a child process dieing before the parent can

Browse Source 
even assign pid, thus we need to block CHLD signal around fork();

git-svn-id: https://svn.musicpd.org/mpd/trunk@694 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2004-04-11 18:27:12 +00:00
parent c1ab52dcb9
commit abc075c431
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/directory.c
+7 -4
View File
@@ -117,6 +117,7 @@ void directory_sigChldHandler(int pid, int status) {
DEBUG("direcotry_sigChldHandler: "
"updated db succesffully\n");
}
else ERROR("problems updating db\n");
directory_updatePid = 0;
}
}
@@ -127,8 +128,12 @@ int updateInit(FILE * fp, List * pathList) {
return -1;
}
/* need to block CHLD signal, cause it can exit before we
even get a chance to assign directory_updatePID */
blockSignals();
directory_updatePid = fork();
if(directory_updatePid==0) {
unblockSignals();
/* child */
struct sigaction sa;
sa.sa_flags = 0;
@@ -163,8 +168,6 @@ int updateInit(FILE * fp, List * pathList) {
}
else {
if(updateDirectory(directory)<0) {
ERROR("problems updating music "
"db\n");
exit(EXIT_FAILURE);
}
}
@@ -175,19 +178,19 @@ int updateInit(FILE * fp, List * pathList) {
if(writeDirectoryDB()<0) {
ERROR("problems writing music db file, \"%s\"\n",
directorydb);
myfprintf(fp,"%s problems writing music db\n",
COMMAND_RESPOND_ERROR);
exit(EXIT_FAILURE);
}
exit(EXIT_SUCCESS);
}
else if(directory_updatePid < 0) {
unblockSignals();
ERROR("updateInit: Problems forking()'ing\n");
myfprintf(fp,"%s problems trying to update\n",
COMMAND_RESPOND_ERROR);
directory_updatePid = 0;
return -1;
}
unblockSignals();
directory_updateJobId++;
if(directory_updateJobId > 1<<15) directory_updateJobId = 1;