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

have update process ignore signals when writing db

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@735 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-04-13 19:24:05 +00:00
parent 860f8bda71
commit b5bdc71d2c
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/directory.c
View File

@ -150,6 +150,8 @@ int updateInit(FILE * fp, List * pathList) {
directory_updatePid = fork(); directory_updatePid = fork();
if(directory_updatePid==0) { if(directory_updatePid==0) {
/* child */ /* child */
struct sigaction sa;
clearPlayerPid(); clearPlayerPid();
unblockSignals(); unblockSignals();
@ -186,6 +188,8 @@ int updateInit(FILE * fp, List * pathList) {
} }
} }
else if(updateDirectory(mp3rootDirectory)<0) exit(EXIT_FAILURE); else if(updateDirectory(mp3rootDirectory)<0) exit(EXIT_FAILURE);
/* ignore signals since we don't want them to corrupt the db*/
ignoreSignals();
if(writeDirectoryDB()<0) { if(writeDirectoryDB()<0) {
ERROR("problems writing music db file, \"%s\"\n", ERROR("problems writing music db file, \"%s\"\n",
directorydb); directorydb);
@ -684,6 +688,7 @@ int writeDirectoryDB() {
while(!(fp=fopen(directorydb,"w")) && errno==EINTR); while(!(fp=fopen(directorydb,"w")) && errno==EINTR);
if(!fp) return -1; if(!fp) return -1;
/* block signals when writing the db so we don't get a corrupted db*/
myfprintf(fp,"%s\n",DIRECTORY_INFO_BEGIN); myfprintf(fp,"%s\n",DIRECTORY_INFO_BEGIN);
myfprintf(fp,"%s%s\n",DIRECTORY_MPD_VERSION,VERSION); myfprintf(fp,"%s%s\n",DIRECTORY_MPD_VERSION,VERSION);
myfprintf(fp,"%s%s\n",DIRECTORY_FS_CHARSET,getFsCharset()); myfprintf(fp,"%s%s\n",DIRECTORY_FS_CHARSET,getFsCharset());

14
src/sig_handlers.c
View File

@ -83,6 +83,20 @@ void finishSigHandlers() {
signal_unhandle(SIGHUP); signal_unhandle(SIGHUP);
} }
void ignoreSignals() {
struct sigaction sa;
sa.sa_flags = 0;
sigemptyset(&sa.sa_mask);
sa.sa_handler = SIG_IGN;
while(sigaction(SIGPIPE,&sa,NULL)<0 && errno==EINTR);
while(sigaction(SIGCHLD,&sa,NULL)<0 && errno==EINTR);
while(sigaction(SIGUSR1,&sa,NULL)<0 && errno==EINTR);
while(sigaction(SIGINT,&sa,NULL)<0 && errno==EINTR);
while(sigaction(SIGTERM,&sa,NULL)<0 && errno==EINTR);
while(sigaction(SIGHUP,&sa,NULL)<0 && errno==EINTR);
}
void blockSignals() { void blockSignals() {
sigset_t sset; sigset_t sset;

2
src/sig_handlers.h
View File

@ -27,6 +27,8 @@ void initSigHandlers();
void finishSigHandlers(); void finishSigHandlers();
void ignoreSignals();
void blockSignals(); void blockSignals();
void unblockSignals(); void unblockSignals();