X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=a16252cdf037e50bdd415b8978968b638b508f0c;hp=1d23c9ff6897828eec8753f84399797fb6d2033c;hb=19d0ffee2c551fb8d17f01f5bd04b0c52987147b;hpb=0c5e3f4c2f95d6a73bf840bc82dd0a1ce91e4016

diff --git a/afs.c b/afs.c
index 1d23c9ff..a16252cd 100644
--- a/afs.c
+++ b/afs.c
@@ -89,7 +89,7 @@ extern struct misc_meta_data *mmd;
 
 static int server_socket;
 static struct command_task command_task_struct;
-static struct signal_task signal_task_struct;
+static struct signal_task *signal_task;
 
 static enum play_mode current_play_mode;
 static char *current_mop; /* mode or playlist specifier. NULL means dummy mood */
@@ -455,7 +455,7 @@ static int pass_afd(int fd, char *buf, size_t size)
 }
 
 /**
- * Open the audio file with highest score.
+ * Pass the fd of the next audio file to the server process.
  *
  * This stores all information for streaming the "best" audio file in a shared
  * memory area. The id of that area and an open file descriptor for the next
@@ -467,27 +467,15 @@ static int pass_afd(int fd, char *buf, size_t size)
  */
 static int open_next_audio_file(void)
 {
-	struct osl_row *aft_row;
 	struct audio_file_data afd;
 	int ret, shmid;
 	char buf[8];
-	long score;
-again:
-	PARA_NOTICE_LOG("getting next audio file\n");
-	ret = score_get_best(&aft_row, &score);
+
+	ret = open_and_update_audio_file(&afd);
 	if (ret < 0) {
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 		goto no_admissible_files;
 	}
-	ret = open_and_update_audio_file(aft_row, score, &afd);
-	if (ret < 0) {
-		ret = score_delete(aft_row);
-		if (ret < 0) {
-			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-			goto no_admissible_files;
-		}
-		goto again;
-	}
 	shmid = ret;
 	if (!write_ok(server_socket)) {
 		ret = -E_AFS_SOCKET;
@@ -637,25 +625,19 @@ static int setup_command_socket_or_die(void)
 {
 	int ret, socket_fd;
 	char *socket_name = conf.afs_socket_arg;
-	struct sockaddr_un unix_addr;
 
 	unlink(socket_name);
-	ret = create_local_socket(socket_name, &unix_addr,
-		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+	ret = create_local_socket(socket_name, 0);
 	if (ret < 0) {
-		PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret), socket_name);
-		exit(EXIT_FAILURE);
+		ret = create_local_socket(socket_name,
+			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+		if (ret < 0) {
+			PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret),
+				socket_name);
+			exit(EXIT_FAILURE);
+		}
 	}
 	socket_fd = ret;
-	if (listen(socket_fd , 5) < 0) {
-		PARA_EMERG_LOG("can not listen on socket\n");
-		exit(EXIT_FAILURE);
-	}
-	ret = mark_fd_nonblocking(socket_fd);
-	if (ret < 0) {
-		close(socket_fd);
-		return ret;
-	}
 	PARA_INFO_LOG("listening on socket %s (fd %d)\n", socket_name,
 		socket_fd);
 	return socket_fd;
@@ -747,20 +729,17 @@ shutdown:
 
 static void register_signal_task(struct sched *s)
 {
-	struct signal_task *st = &signal_task_struct;
-
 	para_sigaction(SIGPIPE, SIG_IGN);
-	st->fd = para_signal_init();
-	PARA_INFO_LOG("signal pipe: fd %d\n", st->fd);
+	signal_task = signal_init_or_die();
 	para_install_sighandler(SIGINT);
 	para_install_sighandler(SIGTERM);
 	para_install_sighandler(SIGHUP);
 
-	st->task = task_register(&(struct task_info) {
+	signal_task->task = task_register(&(struct task_info) {
 		.name = "signal",
 		.pre_select = signal_pre_select,
 		.post_select = afs_signal_post_select,
-		.context = st,
+		.context = signal_task,
 
 	}, s);
 }