X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=de713fa7769502d1ee8d6929d34f1306f7adf1c7;hb=f71abea4e21c6f358df2cf7efba2c51de2563d88;hp=33bc6e277ea2c3fb8a2b1efe30df775905890c9d;hpb=db8b9c608ae1c0eaf1afd257a1c4af2654fbeaee;p=paraslash.git

diff --git a/afs.c b/afs.c
index 33bc6e27..de713fa7 100644
--- a/afs.c
+++ b/afs.c
@@ -450,27 +450,6 @@ int close_audio_file(struct audio_file_data *afd)
 	return para_munmap(afd->map.data, afd->map.size);
 }
 
-#if 0
-static void play_loop(enum play_mode current_play_mode)
-{
-	int i, ret;
-	struct audio_file_data afd;
-
-	afd.current_play_mode = current_play_mode;
-	for (i = 0; i < 0; i++) {
-		ret = open_next_audio_file(&afd);
-		if (ret < 0) {
-			PARA_ERROR_LOG("failed to open next audio file: %d\n", ret);
-			return;
-		}
-		PARA_NOTICE_LOG("next audio file: %s, score: %li\n", afd.path, afd.score);
-		sleep(1);
-		close_audio_file(&afd);
-	}
-}
-#endif
-
-
 static enum play_mode init_admissible_files(void)
 {
 	int ret;
@@ -518,16 +497,6 @@ static int setup_command_socket_or_die(void)
 	return ret;
 }
 
-static int server_socket;
-static struct command_task command_task_struct;
-static struct signal_task signal_task_struct;
-
-static void unregister_tasks(void)
-{
-	unregister_task(&command_task_struct.task);
-	unregister_task(&signal_task_struct.task);
-}
-
 static void close_afs_tables(enum osl_close_flags flags)
 {
 	PARA_NOTICE_LOG("closing afs_tables\n");
@@ -542,6 +511,86 @@ static void close_afs_tables(enum osl_close_flags flags)
 	aft_shutdown(flags);
 }
 
+static char *database_dir;
+
+static int make_database_dir(void)
+{
+	int ret;
+
+	if (!database_dir) {
+		if (conf.afs_database_dir_given)
+			database_dir = para_strdup(conf.afs_database_dir_arg);
+		else {
+			char *home = para_homedir();
+			database_dir = make_message(
+				"%s/.paraslash/afs_database", home);
+			free(home);
+		}
+	}
+	PARA_INFO_LOG("afs_database dir %s\n", database_dir);
+	ret = para_mkdir(database_dir, 0777);
+	if (ret >= 0 || ret == -E_EXIST)
+		return 1;
+	free(database_dir);
+	database_dir = NULL;
+	return ret;
+}
+
+
+static int open_afs_tables(void)
+{
+	int ret = make_database_dir();
+
+	if (ret < 0)
+		return ret;
+	ret = attribute_init(&afs_tables[TBLNUM_ATTRIBUTES], database_dir);
+	if (ret < 0)
+		return ret;
+	ret = moods_init(&afs_tables[TBLNUM_MOODS], database_dir);
+	if (ret < 0)
+		goto moods_init_error;
+	ret = playlists_init(&afs_tables[TBLNUM_PLAYLIST], database_dir);
+	if (ret < 0)
+		goto playlists_init_error;
+	ret = lyrics_init(&afs_tables[TBLNUM_LYRICS], database_dir);
+	if (ret < 0)
+		goto lyrics_init_error;
+	ret = images_init(&afs_tables[TBLNUM_IMAGES], database_dir);
+	if (ret < 0)
+		goto images_init_error;
+	ret = score_init(&afs_tables[TBLNUM_SCORES], database_dir);
+	if (ret < 0)
+		goto score_init_error;
+	ret = aft_init(&afs_tables[TBLNUM_AUDIO_FILES], database_dir);
+	if (ret < 0)
+		goto aft_init_error;
+	return 1;
+
+aft_init_error:
+	score_shutdown(OSL_MARK_CLEAN);
+score_init_error:
+	images_shutdown(OSL_MARK_CLEAN);
+images_init_error:
+	lyrics_shutdown(OSL_MARK_CLEAN);
+lyrics_init_error:
+	playlists_shutdown(OSL_MARK_CLEAN);
+playlists_init_error:
+	moods_shutdown(OSL_MARK_CLEAN);
+moods_init_error:
+	attribute_shutdown(OSL_MARK_CLEAN);
+	return ret;
+}
+
+static int server_socket;
+static struct command_task command_task_struct;
+static struct signal_task signal_task_struct;
+
+static void unregister_tasks(void)
+{
+	unregister_task(&command_task_struct.task);
+	unregister_task(&signal_task_struct.task);
+}
+
 static void signal_pre_select(struct sched *s, struct task *t)
 {
 	struct signal_task *st = t->private_data;
@@ -559,6 +608,11 @@ static void signal_post_select(struct sched *s, struct task *t)
 	t->ret = 1;
 	if (st->signum == SIGUSR1)
 		return; /* ignore SIGUSR1 */
+	if (st->signum == SIGHUP) {
+		close_afs_tables(OSL_MARK_CLEAN);
+		t->ret = open_afs_tables();
+		return;
+	}
 	PARA_NOTICE_LOG("caught signal %d\n", st->signum);
 	t->ret = -E_SIGNAL_CAUGHT;
 	unregister_tasks();
@@ -572,6 +626,7 @@ static void register_signal_task(void)
 	para_install_sighandler(SIGINT);
 	para_install_sighandler(SIGTERM);
 	para_install_sighandler(SIGPIPE);
+	para_install_sighandler(SIGHUP);
 
 	st->task.pre_select = signal_pre_select;
 	st->task.post_select = signal_post_select;
@@ -744,75 +799,6 @@ void register_tasks(uint32_t cookie)
 	register_command_task(cookie);
 }
 
-static char *database_dir;
-
-static int make_database_dir(void)
-{
-	int ret;
-
-	if (!database_dir) {
-		if (conf.afs_database_dir_given)
-			database_dir = para_strdup(conf.afs_database_dir_arg);
-		else {
-			char *home = para_homedir();
-			database_dir = make_message(
-				"%s/.paraslash/afs_database", home);
-			free(home);
-		}
-	}
-	PARA_INFO_LOG("afs_database dir %s\n", database_dir);
-	ret = para_mkdir(database_dir, 0777);
-	if (ret >= 0 || ret == -E_EXIST)
-		return 1;
-	free(database_dir);
-	database_dir = NULL;
-	return ret;
-}
-
-static int open_afs_tables(void)
-{
-	int ret = make_database_dir();
-
-	if (ret < 0)
-		return ret;
-	ret = attribute_init(&afs_tables[TBLNUM_ATTRIBUTES], database_dir);
-	if (ret < 0)
-		return ret;
-	ret = moods_init(&afs_tables[TBLNUM_MOODS], database_dir);
-	if (ret < 0)
-		goto moods_init_error;
-	ret = playlists_init(&afs_tables[TBLNUM_PLAYLIST], database_dir);
-	if (ret < 0)
-		goto playlists_init_error;
-	ret = lyrics_init(&afs_tables[TBLNUM_LYRICS], database_dir);
-	if (ret < 0)
-		goto lyrics_init_error;
-	ret = images_init(&afs_tables[TBLNUM_IMAGES], database_dir);
-	if (ret < 0)
-		goto images_init_error;
-	ret = score_init(&afs_tables[TBLNUM_SCORES], database_dir);
-	if (ret < 0)
-		goto score_init_error;
-	ret = aft_init(&afs_tables[TBLNUM_AUDIO_FILES], database_dir);
-	if (ret < 0)
-		goto aft_init_error;
-	return 1;
-
-aft_init_error:
-	score_shutdown(OSL_MARK_CLEAN);
-score_init_error:
-	images_shutdown(OSL_MARK_CLEAN);
-images_init_error:
-	lyrics_shutdown(OSL_MARK_CLEAN);
-lyrics_init_error:
-	playlists_shutdown(OSL_MARK_CLEAN);
-playlists_init_error:
-	moods_shutdown(OSL_MARK_CLEAN);
-moods_init_error:
-	attribute_shutdown(OSL_MARK_CLEAN);
-	return ret;
-}
-
 __noreturn int afs_init(uint32_t cookie, int socket_fd)
 {
 	enum play_mode current_play_mode;