X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=4ea6df0b2abdd550866a1189fc2c72de48106614;hp=e3e3eada3513aafe11771474b6255d0a700ecc83;hb=7a3352c3c6969a3019fd4adb3a957c711441160e;hpb=b7dff48534d5f909d846e1fa40fa0d4467322bc3

diff --git a/server.c b/server.c
index e3e3eada..4ea6df0b 100644
--- a/server.c
+++ b/server.c
@@ -7,7 +7,8 @@
 /** \file server.c Paraslash's main server. */
 
 
-/** \mainpage Paraslash API Reference
+/**
+ * \mainpage Paraslash API Reference
  *
  * Starting points for getting an overview are
  *
@@ -22,18 +23,19 @@
  *
  * The gory details, listed by topic:
  *
- * 	- Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c \ref aac_afh.c
- * 	- Decoders: \ref mp3dec.c, \ref \ref oggdec.c, \ref aacdec.c
- *	- Volume normalizer: \ref compress.c
- *	- Output: \ref alsa_write.c, \ref osx_write.c
- * 	- http: \ref http_recv.c, \ref http_send.c
- *	- ortp: \ref ortp_recv.c, \ref ortp_send.c
- *	- dccp: \ref dccp_recv.c, \ref dccp_send.c
- *	- Audio file selector: \ref afs.c, \ref aft.c, \ref mood.c
+ * 	- Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c \ref aac_afh.c,
+ * 	- Decoders: \ref mp3dec.c, \ref \ref oggdec.c, \ref aacdec.c,
+ *	- Volume normalizer: \ref compress.c,
+ *	- Output: \ref alsa_write.c, \ref osx_write.c,
+ * 	- http: \ref http_recv.c, \ref http_send.c,
+ *	- ortp: \ref ortp_recv.c, \ref ortp_send.c,
+ *	- dccp: \ref dccp_recv.c, \ref dccp_send.c,
+ *	- Audio file selector: \ref afs.c, \ref aft.c, \ref mood.c,
  *	- Afs structures: \ref afs_table, \ref audio_file_data,
- *	  \ref afs_info \ref audio_format_info,
+ *	  \ref afs_info \ref afh_info,
  *	- Afs tables: \ref aft.c, \ref mood.c, \ref playlist.c,
- *	  \ref attribute.c, \ref score.c.
+ *	  \ref attribute.c, \ref score.c,
+ *	- The virtual streaming system: \ref vss.c, \ref chunk_queue.c.
  *
  * Lower levels:
  *
@@ -44,14 +46,13 @@
  *	- Daemons: \ref daemon.c,
  *	- Strings: \ref string.c, \ref string.h,
  *	- Time: \ref time.c,
- *	- Spawning processes: \ref exec.c
+ *	- Spawning processes: \ref exec.c,
  *	- Inter process communication: \ref ipc.c,
  *	- The object storage layer: \ref osl.c,
  *	- Blob tables: \ref blob.c,
- *	- Queueing chunks of audio data: \ref chunk_queue.c,
  *	- The error subssystem: \ref error.h.
  *
- * Lov-level data structures:
+ * Low-level data structures:
  *
  *	- Doubly linked lists: \ref list.h,
  *	- Red-black trees: \ref rbtree.h, \ref rbtree.c,
@@ -286,7 +287,8 @@ static void setup_signal_handling(void)
 	int ret = 0;
 
 	signal_pipe = para_signal_init();
-	PARA_NOTICE_LOG("%s", "setting up signal handlers\n");
+
+	PARA_NOTICE_LOG("setting up signal handlers\n");
 	ret += para_install_sighandler(SIGINT);
 	ret += para_install_sighandler(SIGTERM);
 	ret += para_install_sighandler(SIGHUP);
@@ -297,6 +299,7 @@ static void setup_signal_handling(void)
 		PARA_EMERG_LOG("%s", "could not install signal handlers\n");
 		exit(EXIT_FAILURE);
 	}
+	add_close_on_fork_list(signal_pipe);
 }
 
 static unsigned init_network(void)
@@ -309,6 +312,7 @@ static unsigned init_network(void)
 	ret = mark_fd_nonblock(fd);
 	if (ret < 0)
 		goto err;
+	add_close_on_fork_list(fd); /* child doesn't need the listener */
 	return fd;
 err:
 	PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
@@ -369,7 +373,7 @@ static void init_afs(void)
 }
 
 
-static unsigned do_inits(int argc, char **argv)
+static unsigned server_init(int argc, char **argv)
 {
 	/* connector's address information */
 	int sockfd;
@@ -388,17 +392,19 @@ static unsigned do_inits(int argc, char **argv)
 	/* become daemon */
 	if (conf.daemon_given)
 		daemon_init();
-	PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
+	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
+	PARA_NOTICE_LOG("initializing virtual streaming system\n");
 	vss_init();
 	mmd->server_pid = getpid();
 	setup_signal_handling();
+	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	init_afs();
 	mmd_lock();
 	/* init network socket */
-	PARA_NOTICE_LOG("%s", "initializing tcp command socket\n");
+	PARA_NOTICE_LOG("initializing tcp command socket\n");
 	sockfd = init_network();
-	PARA_NOTICE_LOG("%s", "init complete\n");
+	PARA_NOTICE_LOG("server init complete\n");
 	return sockfd;
 }
 
@@ -459,7 +465,7 @@ int main(int argc, char *argv[])
 	struct timeval *timeout;
 
 	valid_fd_012();
-	sockfd = do_inits(argc, argv);
+	sockfd = server_init(argc, argv);
 repeat:
 	FD_ZERO(&rfds);
 	FD_ZERO(&wfds);
@@ -554,7 +560,7 @@ genocide:
 	}
 	alarm(ALARM_TIMEOUT);
 	close_listed_fds();
-	close(sockfd); /* child doesn't need the listener */
+	para_signal_shutdown();
 	/*
 	 * put info on who we are serving into argv[0] to make
 	 * client ip visible in top/ps