X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=2f66dc4da17833b2ac32464746645e978d8752c8;hp=c2ede7aa92566337c8d5644d1913da5b247ff512;hb=d7cda933daa35663b2b9b61d62cb514afa37fd18;hpb=1f556ae88bd8c85d4452f689f532f5a6abeabe92

diff --git a/server.c b/server.c
index c2ede7aa..2f66dc4d 100644
--- a/server.c
+++ b/server.c
@@ -41,6 +41,7 @@
 #include "daemon.h"
 #include "string.h"
 #include "ipc.h"
+#include "fd.h"
 
 /** define the array of error lists needed by para_server */
 INIT_SERVER_ERRLISTS;
@@ -63,7 +64,7 @@ extern void ortp_send_init(struct sender *);
 extern struct audio_format afl[];
 
 /** the list of supported audio file selectors */
-struct audio_file_selector dblist[] = {
+struct audio_file_selector selectors[] = {
 	{
 		.name = "random",
 		.init = random_selector_init,
@@ -123,7 +124,7 @@ static int signal_pipe;
  * \param ll the log level
  * \param fmt the format string describing the log message
  */
-void para_log(int ll, char* fmt,...)
+void para_log(int ll, const char* fmt,...)
 {
 	va_list argp;
 	FILE *outfd;
@@ -289,12 +290,12 @@ static void init_selector(void)
 	mmd->selector_change = -1; /* no change nec., set to new num by com_chs */
 	if (!conf.selector_given)
 		goto random;
-	for (i = 0; dblist[i].name; i++) {
-		if (strcmp(dblist[i].name, conf.selector_arg))
+	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",
-			dblist[i].name);
-		ret = dblist[i].init(&dblist[i]);
+			selectors[i].name);
+		ret = selectors[i].init(&selectors[i]);
 		if (ret < 0) {
 			PARA_WARNING_LOG("%s", PARA_STRERROR(-ret));
 			break;
@@ -305,7 +306,7 @@ static void init_selector(void)
 	PARA_WARNING_LOG("%s", "falling back to the random selector\n");
 random:
 	mmd->selector_num = 0;
-	dblist[0].init(&dblist[0]); /* always successful */
+	selectors[0].init(&selectors[0]); /* always successful */
 }
 
 static unsigned init_network(void)
@@ -379,8 +380,8 @@ static void change_selector(void)
 {
 	int ret, old = mmd->selector_num, new = mmd->selector_change;
 
-	dblist[old].shutdown();
-	ret = dblist[new].init(&dblist[new]);
+	selectors[old].shutdown();
+	ret = selectors[new].init(&selectors[new]);
 	mmd->selector_change = -1; /* reset */
 	if (ret >= 0) {
 		mmd->selector_num = new;
@@ -388,7 +389,7 @@ static void change_selector(void)
 	}
 	/* init failed */
 	PARA_ERROR_LOG("%s -- switching to the random selector\n", PARA_STRERROR(-ret));
-	dblist[0].init(&dblist[0]);
+	selectors[0].init(&selectors[0]);
 	mmd->selector_num = 0;
 }
 
@@ -436,7 +437,7 @@ int main(int argc, char *argv[])
 	/* listen on sock_fd, new connection on new_fd */
 	int sockfd, new_fd;
 	struct sockaddr_in their_addr;
-	int err, i, max_fileno, ret;
+	int i, max_fileno, ret;
 	pid_t chld_pid;
 	fd_set rfds, wfds;
 	struct timeval *timeout;
@@ -464,26 +465,19 @@ repeat:
 			&max_fileno,
 			&rfds, &wfds);
 	}
-	if (dblist[mmd->selector_num].pre_select) {
-		ret = dblist[mmd->selector_num].pre_select(&rfds, &wfds);
+	if (selectors[mmd->selector_num].pre_select) {
+		ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds);
 		max_fileno = MAX(max_fileno, ret);
 	}
 	mmd_unlock();
-//	PARA_DEBUG_LOG("%s: select (max = %i)\n", __func__, max_fileno);
-	ret = select(max_fileno + 1, &rfds, &wfds, NULL, timeout);
-	err = errno;
-	//PARA_DEBUG_LOG("%s: select returned  %i\n", __func__, ret);
+	ret = para_select(max_fileno + 1, &rfds, &wfds, timeout);
 	mmd_lock();
 	if (mmd->selector_change >= 0)
 		change_selector();
-	if (dblist[mmd->selector_num].post_select)
-		dblist[mmd->selector_num].post_select(&rfds, &wfds);
-	if (ret < 0 && err == EINTR)
-		goto repeat;
-	if (ret < 0) {
-		PARA_CRIT_LOG("select error (%s)\n", strerror(err));
+	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++) {
 		if (senders[i].status != SENDER_ON)
 			continue;
@@ -512,7 +506,7 @@ repeat:
 		case SIGTERM:
 			PARA_EMERG_LOG("terminating on signal %d\n", sig);
 			kill(0, SIGTERM);
-			dblist[mmd->selector_num].shutdown();
+			selectors[mmd->selector_num].shutdown();
 			mutex_destroy(mmd_mutex);
 			shm_detach(mmd);
 			shm_destroy(mmd_shm_id);