X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=6210358c4ef075ed4bb13680028b27f1ec430123;hp=0c7526c74110fb59da4cc20b815972421090cc12;hb=5b8e525dfb2f18a4e0d67b9da264259159ad2184;hpb=d894e0cc7ce94d09847a8a35f47127968d4268f1

diff --git a/afs.c b/afs.c
index 0c7526c7..6210358c 100644
--- a/afs.c
+++ b/afs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -75,11 +75,15 @@ struct command_task {
 	struct task task;
 };
 
+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 enum play_mode current_play_mode;
+static char *current_mop; /* mode or playlist specifier. NULL means dummy mooe */
+
 
 /**
  * A random number used to "authenticate" the connection.
@@ -160,7 +164,6 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	int ret, fd = -1, query_shmid, result_shmid;
 	void *query_shm, *result_shm;
 	char buf[sizeof(afs_socket_cookie) + sizeof(int)];
-	struct sockaddr_un unix_addr;
 	size_t query_shm_size = sizeof(*cq);
 
 	if (query)
@@ -185,16 +188,10 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	*(uint32_t *) buf = afs_socket_cookie;
 	*(int *) (buf + sizeof(afs_socket_cookie)) = query_shmid;
 
-	ret = get_stream_socket(PF_UNIX);
+	ret = create_remote_socket(conf.afs_socket_arg);
 	if (ret < 0)
 		goto out;
 	fd = ret;
-	ret = init_unix_addr(&unix_addr, conf.afs_socket_arg);
-	if (ret < 0)
-		goto out;
-	ret = PARA_CONNECT(fd, &unix_addr);
-	if (ret < 0)
-		goto out;
 	ret = send_bin_buffer(fd, buf, sizeof(buf));
 	if (ret < 0)
 		goto out;
@@ -202,7 +199,7 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	if (ret < 0)
 		goto out;
 	if (ret != sizeof(int)) {
-		ret = -E_RECV;
+		ret = -E_AFS_SHORT_READ;
 		goto out;
 	}
 	ret = *(int *) buf;
@@ -431,7 +428,7 @@ int stdin_command(int fd, struct osl_object *arg_obj, callback_function *f,
 	return ret;
 }
 
-int pass_afd(int fd, char *buf, size_t size)
+static int pass_afd(int fd, char *buf, size_t size)
 {
 	struct msghdr msg = {.msg_iov = NULL};
 	struct cmsghdr *cmsg;
@@ -456,7 +453,7 @@ int pass_afd(int fd, char *buf, size_t size)
 
 	/* Sum of the length of all control messages in the buffer */
 	msg.msg_controllen = cmsg->cmsg_len;
-	PARA_NOTICE_LOG("passing %zu bytes and fd %d\n", size, fd);
+	PARA_DEBUG_LOG("passing %zu bytes and fd %d\n", size, fd);
 	ret = sendmsg(server_socket, &msg, 0);
 	if (ret < 0) {
 		ret = -ERRNO_TO_PARA_ERROR(errno);
@@ -468,14 +465,13 @@ int pass_afd(int fd, char *buf, size_t size)
 /**
  * Open the audio file with highest score.
  *
- * \param afd Audio file data is returned here.
+ * 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
+ * audio file are passed to the server process.
  *
- * This stores all information for streaming the "best" audio file
- * in the \a afd structure.
+ * \return Standard.
  *
- * \return Positive on success, negative on errors.
- *
- * \sa close_audio_file(), open_and_update_audio_file().
+ * \sa open_and_update_audio_file().
  */
 int open_next_audio_file(void)
 {
@@ -483,33 +479,44 @@ int open_next_audio_file(void)
 	struct audio_file_data afd;
 	int ret, shmid;
 	char buf[8];
-
-	PARA_NOTICE_LOG("getting next af\n");
-	ret = score_get_best(&aft_row, &afd.score);
-	if (ret < 0)
-		return ret;
-	ret = open_and_update_audio_file(aft_row, &afd);
-	if (ret < 0)
-		return ret;
+	long score;
+again:
+	PARA_NOTICE_LOG("getting next audio file\n");
+	ret = score_get_best(&aft_row, &score);
+	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) {
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+		ret = score_delete(aft_row);
+		if (ret < 0) {
+			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+			goto no_admissible_files;
+		}
+		goto again;
+	}
 	shmid = ret;
-	PARA_NOTICE_LOG("shmid: %u\n", shmid);
 	if (!write_ok(server_socket)) {
-		PARA_EMERG_LOG("afs_socket not writable\n");
+		ret = -E_AFS_SOCKET;
 		goto destroy;
 	}
 	*(uint32_t *)buf = NEXT_AUDIO_FILE;
 	*(uint32_t *)(buf + 4) = (uint32_t)shmid;
 	ret = pass_afd(afd.fd, buf, 8);
+	close(afd.fd);
 	if (ret >= 0)
 		return ret;
-	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
 destroy:
 	shm_destroy(shmid);
 	return ret;
+no_admissible_files:
+	*(uint32_t *)buf = NO_ADMISSIBLE_FILES;
+	*(uint32_t *)(buf + 4) = (uint32_t)0;
+	return send_bin_buffer(server_socket, buf, 8);
 }
 
-static char *current_mop; /* mode or playlist specifier. NULL means dummy mooe */
-
 /* Never fails if arg == NULL */
 static int activate_mood_or_playlist(char *arg, int *num_admissible)
 {
@@ -520,14 +527,14 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
 		ret = change_current_mood(NULL); /* always successful */
 		mode = PLAY_MODE_MOOD;
 	} else {
-		if (!strncmp(arg, "p:", 2)) {
+		if (!strncmp(arg, "p/", 2)) {
 			ret = playlist_open(arg + 2);
 			mode = PLAY_MODE_PLAYLIST;
-		} else if (!strncmp(arg, "m:", 2)) {
+		} else if (!strncmp(arg, "m/", 2)) {
 			ret = change_current_mood(arg + 2);
 			mode = PLAY_MODE_MOOD;
 		} else
-			ret = -E_AFS_SYNTAX;
+			return -E_AFS_SYNTAX;
 		if (ret < 0)
 			return ret;
 	}
@@ -536,10 +543,19 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
 	current_play_mode = mode;
 	if (arg != current_mop) {
 		free(current_mop);
-		if (arg)
+		if (arg) {
 			current_mop = para_strdup(arg);
-		else
+			mmd_lock();
+			strncpy(mmd->afs_mode_string, arg,
+				sizeof(mmd->afs_mode_string));
+			mmd->afs_mode_string[sizeof(mmd->afs_mode_string) - 1] = '\0';
+			mmd_unlock();
+		} else {
+			mmd_lock();
+			strcpy(mmd->afs_mode_string, "dummy");
+			mmd_unlock();
 			current_mop = NULL;
+		}
 	}
 	return 1;
 }
@@ -560,13 +576,13 @@ static int com_select_callback(const struct osl_object *query,
 		playlist_close();
 	ret = activate_mood_or_playlist(arg, &num_admissible);
 	if (ret < 0) {
-		para_printf(&pb, "%s\n", PARA_STRERROR(-ret));
+		para_printf(&pb, "%s\n", para_strerror(-ret));
 		para_printf(&pb, "switching back to %s\n", current_mop?
 			current_mop : "dummy");
 		ret = activate_mood_or_playlist(current_mop, &num_admissible);
 		if (ret < 0) {
 			para_printf(&pb, "failed, switching to dummy\n");
-			change_current_mood(NULL); /* always successful */
+			activate_mood_or_playlist(NULL, &num_admissible);
 		}
 	}
 	para_printf(&pb, "activated %s (%d admissible files)\n", current_mop?
@@ -594,21 +610,15 @@ int com_select(int fd, int argc, char * const * const argv)
 	return ret;
 }
 
-static void init_admissible_files(void)
+static void init_admissible_files(char *arg)
 {
-	int ret = 0;
-	char *arg = conf.afs_initial_mode_arg;
-	ret = activate_mood_or_playlist(arg, NULL);
-	if (ret >= 0)
-		return;
-	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-	PARA_NOTICE_LOG("defaulting to dummy mood\n");
-	activate_mood_or_playlist(NULL, NULL); /* always successful */
+	if (activate_mood_or_playlist(arg, NULL) < 0)
+		activate_mood_or_playlist(NULL, NULL); /* always successful */
 }
 
 static int setup_command_socket_or_die(void)
 {
-	int ret;
+	int ret, socket_fd;
 	char *socket_name = conf.afs_socket_arg;
 	struct sockaddr_un unix_addr;
 
@@ -616,16 +626,22 @@ static int setup_command_socket_or_die(void)
 	ret = create_local_socket(socket_name, &unix_addr,
 		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
 	if (ret < 0) {
-		PARA_EMERG_LOG("%s: %s\n", PARA_STRERROR(-ret), socket_name);
+		PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret), socket_name);
 		exit(EXIT_FAILURE);
 	}
-	if (listen(ret , 5) < 0) {
-		PARA_EMERG_LOG("%s", "can not listen on socket\n");
+	socket_fd = ret;
+	if (listen(socket_fd , 5) < 0) {
+		PARA_EMERG_LOG("can not listen on socket\n");
 		exit(EXIT_FAILURE);
 	}
-	PARA_INFO_LOG("listening on command socket %s (fd %d)\n", socket_name,
-		ret);
-	return ret;
+	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;
 }
 
 static void close_afs_tables(void)
@@ -669,18 +685,20 @@ static int open_afs_tables(void)
 	int i, ret;
 
 	get_database_dir();
+	PARA_NOTICE_LOG("opening %u osl tables in %s\n", NUM_AFS_TABLES,
+		database_dir);
 	for (i = 0; i < NUM_AFS_TABLES; i++) {
 		ret = afs_tables[i].open(database_dir);
 		if (ret >= 0)
 			continue;
 		PARA_ERROR_LOG("%s init: %s\n", afs_tables[i].name,
-			PARA_STRERROR(-ret));
+			para_strerror(-ret));
+		break;
 	}
 	if (ret >= 0)
 		return ret;
-	do
-		afs_tables[i].close();
-	while (i--);
+	while (i)
+		afs_tables[--i].close();
 	return ret;
 }
 
@@ -700,6 +718,9 @@ static void signal_pre_select(struct sched *s, struct task *t)
 static void signal_post_select(struct sched *s, struct task *t)
 {
 	struct signal_task *st = t->private_data;
+	t->ret = -E_AFS_PARENT_DIED;
+	if (getppid() == 1)
+		goto err;
 	t->ret = 1;
 	if (!FD_ISSET(st->fd, &s->rfds))
 		return;
@@ -710,10 +731,14 @@ static void signal_post_select(struct sched *s, struct task *t)
 	if (st->signum == SIGHUP) {
 		close_afs_tables();
 		t->ret = open_afs_tables();
+		if (t->ret < 0)
+			goto err;
+		init_admissible_files(current_mop);
 		return;
 	}
-	PARA_NOTICE_LOG("caught signal %d\n", st->signum);
 	t->ret = -E_AFS_SIGNAL;
+err:
+	PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
 	unregister_tasks();
 }
 
@@ -736,9 +761,13 @@ static void register_signal_task(void)
 
 static struct list_head afs_client_list;
 
+/** Describes on connected afs client. */
 struct afs_client {
+	/** Position in the afs client list. */
 	struct list_head node;
+	/** The socket file descriptor for this client. */
 	int fd;
+	/** The time the client connected. */
 	struct timeval connect_time;
 };
 
@@ -816,14 +845,17 @@ static void execute_server_command(void)
 
 	if (ret <= 0) {
 		if (ret < 0)
-			PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 		return;
 	}
 	buf[ret] = '\0';
-	PARA_NOTICE_LOG("received: %s\n", buf);
+	PARA_DEBUG_LOG("received: %s\n", buf);
 	if (!strcmp(buf, "new")) {
 		ret = open_next_audio_file();
-		PARA_NOTICE_LOG("ret: %d\n", ret);
+		if (ret < 0) {
+			PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+			unregister_tasks();
+		}
 		return;
 	}
 	PARA_ERROR_LOG("unknown command\n");
@@ -838,7 +870,7 @@ static void execute_afs_command(int fd, uint32_t expected_cookie)
 	int ret = recv_bin_buffer(fd, buf, sizeof(buf));
 
 	if (ret < 0) {
-		PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret));
+		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 		return;
 	}
 	if (ret != sizeof(buf)) {
@@ -870,7 +902,7 @@ static void command_post_select(struct sched *s, struct task *t)
 	struct command_task *ct = t->private_data;
 	struct sockaddr_un unix_addr;
 	struct afs_client *client, *tmp;
-
+	int fd;
 	if (FD_ISSET(server_socket, &s->rfds))
 		execute_server_command();
 
@@ -894,11 +926,18 @@ static void command_post_select(struct sched *s, struct task *t)
 		goto out;
 	t->ret = para_accept(ct->fd, &unix_addr, sizeof(unix_addr));
 	if (t->ret < 0) {
-		PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+		PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
+		goto out;
+	}
+	fd = t->ret;
+	t->ret = mark_fd_nonblocking(fd);
+	if (t->ret < 0) {
+		PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
+		close(fd);
 		goto out;
 	}
 	client = para_malloc(sizeof(*client));
-	client->fd = t->ret;
+	client->fd = fd;
 	client->connect_time = *now;
 	para_list_add(&client->node, &afs_client_list);
 out:
@@ -941,22 +980,22 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd)
 	ret = open_afs_tables();
 
 	if (ret < 0) {
-		PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
 	server_socket = socket_fd;
-	ret = mark_fd_nonblock(server_socket);
+	ret = mark_fd_nonblocking(server_socket);
 	if (ret < 0)
 		exit(EXIT_FAILURE);
 	PARA_INFO_LOG("server_socket: %d, afs_socket_cookie: %u\n",
 		server_socket, (unsigned) cookie);
-	init_admissible_files();
+	init_admissible_files(conf.afs_initial_mode_arg);
 	register_tasks(cookie);
 	s.default_timeout.tv_sec = 0;
-	s.default_timeout.tv_usec = 99 * 1000;
-	ret = sched(&s);
+	s.default_timeout.tv_usec = 999 * 1000;
+	ret = schedule(&s);
 	if (ret < 0)
-		PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	close_afs_tables();
 	exit(EXIT_FAILURE);
 }
@@ -1107,7 +1146,7 @@ void afs_event(enum afs_events event, struct para_buffer *pb,
 			continue;
 		ret = t->event_handler(event, pb, data);
 		if (ret < 0)
-			PARA_CRIT_LOG("%s\n", PARA_STRERROR(-ret));
+			PARA_CRIT_LOG("%s\n", para_strerror(-ret));
 	}
 }