X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=ab88b07fbd60827e56299c2338acc7cb9e3a541d;hp=3cc7e7892ad3d8ceade6f08dcc8ea1417c44e308;hb=08a1de75a3a83c728d97a3c4ff182553adbda8cc;hpb=28afc7781a88734d8954cab3665eb3eacd11c284

diff --git a/server.c b/server.c
index 3cc7e789..ab88b07f 100644
--- a/server.c
+++ b/server.c
@@ -67,35 +67,6 @@ extern void dccp_send_init(struct sender *);
 extern void http_send_init(struct sender *);
 extern void ortp_send_init(struct sender *);
 
-/* TODO: This is better handled by autoconf */
-/** the list of supported audio file selectors */
-struct audio_file_selector selectors[] = {
-	{
-		.name = "random",
-		.init = random_selector_init,
-		.update_audio_file = NULL,
-	},
-	{
-		.name = "playlist",
-		.init = playlist_selector_init,
-		.update_audio_file = NULL,
-		.pre_select = NULL,
-		.post_select = NULL,
-	},
-#ifdef HAVE_MYSQL
-	{
-		.name = "mysql",
-		.init = mysql_selector_init,
-		.update_audio_file = NULL,
-		.pre_select = NULL,
-		.post_select = NULL,
-	},
-#endif
-	{
-		.name = NULL,
-	}
-};
-
 /** the list of supported senders */
 struct sender senders[] = {
 	{
@@ -285,32 +256,6 @@ static void setup_signal_handling(void)
 	}
 }
 
-static void init_selector(void)
-{
-	int i, ret;
-
-	mmd->selector_change = -1; /* no change nec., set to new num by com_chs */
-	if (!conf.selector_given)
-		goto random;
-	for (i = 0; selectors[i].name; i++) {
-		if (strcmp(selectors[i].name, conf.selector_arg))
-			continue;
-		PARA_NOTICE_LOG("initializing %s audio file selector\n",
-			selectors[i].name);
-		ret = selectors[i].init(&selectors[i]);
-		if (ret < 0) {
-			PARA_WARNING_LOG("%s", PARA_STRERROR(-ret));
-			break;
-		}
-		mmd->selector_num = i;
-		return;
-	}
-	PARA_WARNING_LOG("%s", "falling back to the random selector\n");
-random:
-	mmd->selector_num = 0;
-	selectors[0].init(&selectors[0]); /* always successful */
-}
-
 static unsigned init_network(void)
 {
 	int fd, ret = init_tcp_socket(conf.port_arg);
@@ -400,7 +345,7 @@ static unsigned do_inits(int argc, char **argv)
 	/* become daemon */
 	if (conf.daemon_given)
 		daemon_init();
-	init_selector();
+//	init_selector();
 //	PARA_ERROR_LOG("num: %d\n", mmd->selector_num);
 	PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
 	afh_init();
@@ -416,23 +361,6 @@ static unsigned do_inits(int argc, char **argv)
 	return sockfd;
 }
 
-static void change_selector(void)
-{
-	int ret, old = mmd->selector_num, new = mmd->selector_change;
-
-	selectors[old].shutdown();
-	ret = selectors[new].init(&selectors[new]);
-	mmd->selector_change = -1; /* reset */
-	if (ret >= 0) {
-		mmd->selector_num = new;
-		return;
-	}
-	/* init failed */
-	PARA_ERROR_LOG("%s -- switching to the random selector\n", PARA_STRERROR(-ret));
-	selectors[0].init(&selectors[0]);
-	mmd->selector_num = 0;
-}
-
 /*
  * called when server gets SIGHUP or when client invokes hup command.
  */
@@ -442,8 +370,6 @@ static void handle_sighup(void)
 	close_log(logfile); /* gets reopened if necessary by parse_config */
 	logfile = NULL;
 	parse_config(1); /* reopens log */
-	mmd->selector_change = mmd->selector_num; /* do not change selector.. */
-	change_selector(); /* .. just reload */
 	init_user_list(user_list_file); /* reload user list */
 	if (afs_pid)
 		kill(afs_pid, SIGHUP);
@@ -509,18 +435,10 @@ repeat:
 			continue;
 		senders[i].pre_select(&max_fileno, &rfds, &wfds);
 	}
-	if (selectors[mmd->selector_num].pre_select) {
-		ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds);
-		max_fileno = PARA_MAX(max_fileno, ret);
-	}
 	mmd_unlock();
 	ret = para_select(max_fileno + 1, &rfds, &wfds, timeout);
 	mmd_lock();
 	vss_post_select(&rfds, &wfds);
-	if (mmd->selector_change >= 0)
-		change_selector();
-	if (selectors[mmd->selector_num].post_select)
-		selectors[mmd->selector_num].post_select(&rfds, &wfds);
 	if (ret < 0)
 		goto repeat;
 	for (i = 0; senders[i].name; i++) {
@@ -557,7 +475,6 @@ repeat:
 			PARA_EMERG_LOG("terminating on signal %d\n", sig);
 genocide:
 			kill(0, SIGTERM);
-			selectors[mmd->selector_num].shutdown();
 			mutex_destroy(mmd_mutex);
 			shm_detach(mmd);
 			shm_destroy(mmd_shm_id);