X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=d322dd478b92aa4ba7bdc9f803531446e3bceb92;hp=120fea258a64fdd1bf91e1436f22ee5d7e00a7c0;hb=d16fe3df649cb48d5ffa26187da3dad4c3066646;hpb=fddf60223e26c1dc1e02b432652c4ca6a237c278

diff --git a/server.c b/server.c
index 120fea25..d322dd47 100644
--- a/server.c
+++ b/server.c
@@ -67,7 +67,6 @@
 #include <sys/time.h>
 #include <regex.h>
 #include <osl.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
@@ -79,6 +78,7 @@
 #include "server.h"
 #include "list.h"
 #include "send.h"
+#include "sched.h"
 #include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"
@@ -86,12 +86,13 @@
 #include "daemon.h"
 #include "ipc.h"
 #include "fd.h"
-#include "sched.h"
 #include "signal.h"
 #include "user_list.h"
 #include "color.h"
 #include "version.h"
 
+__printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
+
 /** Define the array of error lists needed by para_server. */
 INIT_SERVER_ERRLISTS;
 
@@ -121,6 +122,7 @@ int mmd_mutex;
 /** The file containing user information (public key, permissions). */
 static char *user_list_file = NULL;
 
+static struct sched sched;
 
 /** The task responsible for server command handling. */
 struct server_command_task {
@@ -344,7 +346,7 @@ static void init_signal_task(void)
 	para_install_sighandler(SIGCHLD);
 	para_sigaction(SIGPIPE, SIG_IGN);
 	add_close_on_fork_list(st->fd);
-	register_task(&st->task);
+	register_task(&sched, &st->task);
 }
 
 static void command_pre_select(struct sched *s, struct task *t)
@@ -427,7 +429,7 @@ static void init_server_command_task(int argc, char **argv)
 		goto err;
 	add_close_on_fork_list(sct->listen_fd); /* child doesn't need the listener */
 	sprintf(sct->task.status, "server command task");
-	register_task(&sct->task);
+	register_task(&sched, &sct->task);
 	return;
 err:
 	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
@@ -466,12 +468,6 @@ static int init_afs(int argc, char **argv)
 	return afs_server_socket[0];
 }
 
-__noreturn static void tmp_sigchld_handler(__a_unused int s)
-{
-	PARA_EMERG_LOG("caught early SIGCHLD\n");
-	exit(EXIT_FAILURE);
-}
-
 static void server_init(int argc, char **argv)
 {
 	struct server_cmdline_parser_params params = {
@@ -499,7 +495,7 @@ static void server_init(int argc, char **argv)
 	init_user_list(user_list_file);
 	/* become daemon */
 	if (conf.daemon_given)
-		daemonize();
+		daemonize(true /* parent waits for SIGTERM */);
 	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
 
@@ -512,17 +508,21 @@ static void server_init(int argc, char **argv)
 	 */
 	para_sigaction(SIGUSR1, SIG_IGN);
 	/*
-	 * We have to install a SIGCHLD handler before the afs process is being
-	 * forked off. Otherwise, para_server does not notice if afs dies before
-	 * the SIGCHLD handler has been installed by init_signal_task() below.
+	 * We have to block SIGCHLD before the afs process is being forked off.
+	 * Otherwise, para_server does not notice if afs dies before the
+	 * SIGCHLD handler has been installed for the parent process by
+	 * init_signal_task() below.
 	 */
-	para_sigaction(SIGCHLD, tmp_sigchld_handler);
+	para_block_signal(SIGCHLD);
 	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	afs_socket = init_afs(argc, argv);
 	init_signal_task();
+	para_unblock_signal(SIGCHLD);
 	PARA_NOTICE_LOG("initializing virtual streaming system\n");
-	init_vss_task(afs_socket);
+	init_vss_task(afs_socket, &sched);
 	init_server_command_task(argc, argv);
+	if (conf.daemon_given)
+		kill(getppid(), SIGTERM);
 	PARA_NOTICE_LOG("server init complete\n");
 }
 
@@ -571,16 +571,13 @@ static int server_select(int max_fileno, fd_set *readfds, fd_set *writefds,
 int main(int argc, char *argv[])
 {
 	int ret;
-	static struct sched s = {
-		.default_timeout = {
-			.tv_sec = 1,
-			.tv_usec = 0
-		},
-		.select_function = server_select
-	};
+
+	sched.default_timeout.tv_sec = 1;
+	sched.select_function = server_select;
+
 	server_init(argc, argv);
 	mutex_lock(mmd_mutex);
-	ret = schedule(&s);
+	ret = schedule(&sched);
 	if (ret < 0) {
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 		exit(EXIT_FAILURE);