X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=69643208beea484ea067cac2f09b8ad1fe6c24f5;hp=d881868c09cc826e561c2d7d49b5bb03de8fd4ea;hb=54096edf9b0254303dfee9d8f87d2f2f0b17fcce;hpb=019a4caa2bf9232c7efd84ffe7424994de6358fb

diff --git a/server.c b/server.c
index d881868c..69643208 100644
--- a/server.c
+++ b/server.c
@@ -174,7 +174,7 @@ static void shm_init(void)
 		goto err_out;
 	mmd_mutex = ret;
 
-	mmd->dbt_num = 0;
+	mmd->selector_num = 0;
 	mmd->num_played = 0;
 	mmd->num_commands = 0;
 	mmd->events = 0;
@@ -281,7 +281,7 @@ static void init_selector(void)
 {
 	int i, ret;
 
-	mmd->dbt_change = -1; /* no change nec., set to new dbt num by com_cdt */
+	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++) {
@@ -294,12 +294,12 @@ static void init_selector(void)
 			PARA_WARNING_LOG("%s", PARA_STRERROR(-ret));
 			break;
 		}
-		mmd->dbt_num = i;
+		mmd->selector_num = i;
 		return;
 	}
 	PARA_WARNING_LOG("%s", "falling back to the random selector\n");
 random:
-	mmd->dbt_num = 0;
+	mmd->selector_num = 0;
 	dblist[0].init(&dblist[0]); /* always successful */
 }
 
@@ -370,21 +370,21 @@ static unsigned do_inits(int argc, char **argv)
 	return sockfd;
 }
 
-static void handle_dbt_change(void)
+static void change_selector(void)
 {
-	int ret, old = mmd->dbt_num, new = mmd->dbt_change;
+	int ret, old = mmd->selector_num, new = mmd->selector_change;
 
 	dblist[old].shutdown();
 	ret = dblist[new].init(&dblist[new]);
-	mmd->dbt_change = -1; /* reset */
+	mmd->selector_change = -1; /* reset */
 	if (ret >= 0) {
-		mmd->dbt_num = new;
+		mmd->selector_num = new;
 		return;
 	}
 	/* init failed */
 	PARA_ERROR_LOG("%s -- switching to the random selector\n", PARA_STRERROR(-ret));
 	dblist[0].init(&dblist[0]);
-	mmd->dbt_num = 0;
+	mmd->selector_num = 0;
 }
 
 /*
@@ -396,8 +396,8 @@ static void handle_sighup(void)
 	close_log(logfile); /* gets reopened if necessary by parse_config */
 	logfile = NULL;
 	parse_config(1); /* reopens log */
-	mmd->dbt_change = mmd->dbt_num; /* do not change selector */
-	handle_dbt_change(); /* reload selector */
+	mmd->selector_change = mmd->selector_num; /* do not change selector.. */
+	change_selector(); /* .. just reload */
 }
 
 static void status_refresh(void)
@@ -459,8 +459,8 @@ repeat:
 			&max_fileno,
 			&rfds, &wfds);
 	}
-	if (dblist[mmd->dbt_num].pre_select) {
-		ret = dblist[mmd->dbt_num].pre_select(&rfds, &wfds);
+	if (dblist[mmd->selector_num].pre_select) {
+		ret = dblist[mmd->selector_num].pre_select(&rfds, &wfds);
 		max_fileno = MAX(max_fileno, ret);
 	}
 	mmd_unlock();
@@ -469,10 +469,10 @@ repeat:
 	err = errno;
 	//PARA_DEBUG_LOG("%s: select returned  %i\n", __func__, ret);
 	mmd_lock();
-	if (mmd->dbt_change >= 0)
-		handle_dbt_change();
-	if (dblist[mmd->dbt_num].post_select)
-		dblist[mmd->dbt_num].post_select(&rfds, &wfds);
+	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) {
@@ -507,7 +507,7 @@ repeat:
 		case SIGTERM:
 			PARA_EMERG_LOG("terminating on signal %d\n", sig);
 			kill(0, SIGTERM);
-			dblist[mmd->dbt_num].shutdown();
+			dblist[mmd->selector_num].shutdown();
 			mutex_destroy(mmd_mutex);
 			shm_detach(mmd);
 			shm_destroy(mmd_shm_id);