X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=d5da1e557ee3d2df242ced8fff3c2991e803967c;hp=806d0fbd70d199bdd8f515e4511f6224ddfaf856;hb=dabdb25fd7fe411933d3639f71a8148b5dc29630;hpb=2cfb78331c33cb74c6abf357e8221604c3c9ec47

diff --git a/afs.c b/afs.c
index 806d0fbd..d5da1e55 100644
--- a/afs.c
+++ b/afs.c
@@ -144,11 +144,12 @@ 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)];
-//	char *tmpsocket_name;
 	struct sockaddr_un unix_addr;
+	size_t query_shm_size = sizeof(*cq);
 
-	assert(query->data && query->size);
-	ret = shm_new(query->size + sizeof(*cq));
+	if (query)
+		query_shm_size += query->size;
+	ret = shm_new(query_shm_size);
 	if (ret < 0)
 		return ret;
 	query_shmid = ret;
@@ -157,9 +158,10 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 		goto out;
 	cq = query_shm;
 	cq->handler = f;
-	cq->query_size = query->size;
+	cq->query_size = query_shm_size - sizeof(*cq);
 
-	memcpy(query_shm + sizeof(*cq), query->data, query->size);
+	if (query)
+		memcpy(query_shm + sizeof(*cq), query->data, query->size);
 	ret = shm_detach(query_shm);
 	if (ret < 0)
 		goto out;
@@ -174,15 +176,13 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	ret = init_unix_addr(&unix_addr, conf.afs_socket_arg);
 	if (ret < 0)
 		goto out;
-	ret = -E_CONNECT;
-	if (connect(fd, (struct sockaddr *)&unix_addr, sizeof(unix_addr)) < 0) /* FIXME: Use para_connect() */
+	ret = PARA_CONNECT(fd, &unix_addr);
+	if (ret < 0)
 		goto out;
 	ret = send_bin_buffer(fd, buf, sizeof(buf));
-	PARA_NOTICE_LOG("bin buffer ret: %d\n", ret);
 	if (ret < 0)
 		goto out;
 	ret = recv_bin_buffer(fd, buf, sizeof(buf));
-	PARA_NOTICE_LOG("ret: %d\n", ret);
 	if (ret < 0)
 		goto out;
 	if (ret != sizeof(int)) {
@@ -190,7 +190,6 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 		goto out;
 	}
 	ret = *(int *) buf;
-	PARA_NOTICE_LOG("result_shmid: %d\n", ret);
 	if (ret <= 0)
 		goto out;
 	result_shmid = ret;
@@ -214,7 +213,7 @@ out:
 		PARA_ERROR_LOG("%s\n", "shm destroy error");
 	if (fd >= 0)
 		close(fd);
-	PARA_DEBUG_LOG("callback_ret: %d\n", ret);
+//	PARA_DEBUG_LOG("callback_ret: %d\n", ret);
 	return ret;
 }
 
@@ -336,47 +335,40 @@ out:
 
 
 /*
- * write input from fd to dynamically allocated char array,
- * but maximal max_size byte. Return size.
+ * write input from fd to dynamically allocated buffer,
+ * but maximal max_size byte.
  */
-static int fd2buf(int fd, char **buf, int max_size)
+static int fd2buf(int fd, unsigned max_size, struct osl_object *obj)
 {
 	const size_t chunk_size = 1024;
-	size_t size = 2048;
-	char *p;
+	size_t size = 2048, received = 0;
 	int ret;
+	char *buf = para_malloc(size);
 
-	*buf = para_malloc(size * sizeof(char));
-	p = *buf;
-	while ((ret = read(fd, p, chunk_size)) > 0) {
-		p += ret;
-		if ((p - *buf) + chunk_size >= size) {
-			char *tmp;
-
+	for (;;) {
+		ret = recv_bin_buffer(fd, buf + received, chunk_size);
+		if (ret <= 0)
+			break;
+		received += ret;
+		if (received + chunk_size >= size) {
 			size *= 2;
-			if (size > max_size) {
-				ret = -E_INPUT_TOO_LARGE;
-				goto out;
-			}
-			tmp = para_realloc(*buf, size);
-			p = (p - *buf) + tmp;
-			*buf = tmp;
+			ret = -E_INPUT_TOO_LARGE;
+			if (size > max_size)
+				break;
+			buf = para_realloc(buf, size);
 		}
 	}
-	if (ret < 0) {
-		ret = -E_READ;
-		goto out;
-	}
-	ret = p - *buf;
-out:
-	if (ret < 0 && *buf)
-		free(*buf);
+	obj->data = buf;
+	obj->size = received;
+	if (ret < 0)
+		free(buf);
 	return ret;
 }
 
 /**
- * Read from stdin, and send the result to the parent process.
+ * Read data from a file descriptor, and send it to the afs process.
  *
+ * \param fd File descriptor to read data from.
  * \param arg_obj Pointer to the arguments to \a f.
  * \param f The callback function.
  * \param max_len Don't read more than that many bytes from stdin.
@@ -384,29 +376,30 @@ out:
  *
  * This function is used by commands that wish to let para_server store
  * arbitrary data specified by the user (for instance the add_blob family of
- * commands). First, at most \a max_len bytes are read from stdin, the result
+ * commands). First, at most \a max_len bytes are read from \a fd, the result
  * is concatenated with the buffer given by \a arg_obj, and the combined buffer
  * is made available to the parent process via shared memory.
  *
  * \return Negative on errors, the return value of the underlying call to
  * send_callback_request() otherwise.
  */
-int stdin_command(struct osl_object *arg_obj, callback_function *f,
+int stdin_command(int fd, struct osl_object *arg_obj, callback_function *f,
 		unsigned max_len, struct osl_object *result)
 {
-	char *stdin_buf;
-	size_t stdin_len;
-	struct osl_object query;
-	int ret = fd2buf(STDIN_FILENO, &stdin_buf, max_len);
+	struct osl_object query, stdin_obj;
+	int ret;
 
+	ret = send_buffer(fd, AWAITING_DATA_MSG);
 	if (ret < 0)
 		return ret;
-	stdin_len = ret;
-	query.size = arg_obj->size + stdin_len;
+	ret = fd2buf(fd, max_len, &stdin_obj);
+	if (ret < 0)
+		return ret;
+	query.size = arg_obj->size + stdin_obj.size;
 	query.data = para_malloc(query.size);
 	memcpy(query.data, arg_obj->data, arg_obj->size);
-	memcpy((char *)query.data + arg_obj->size, stdin_buf, stdin_len);
-	free(stdin_buf);
+	memcpy((char *)query.data + arg_obj->size, stdin_obj.data, stdin_obj.size);
+	free(stdin_obj.data);
 	ret = send_callback_request(f, &query, result);
 	free(query.data);
 	return ret;
@@ -483,7 +476,7 @@ static enum play_mode init_admissible_files(void)
 	given_playlist = "given_playlist";
 
 	if (given_mood) {
-		ret = mood_open(given_mood);
+		ret = change_current_mood(given_mood);
 		if (ret >= 0) {
 			if (given_playlist)
 				PARA_WARNING_LOG("ignoring playlist %s\n",
@@ -496,10 +489,10 @@ static enum play_mode init_admissible_files(void)
 		if (ret >= 0)
 			return PLAY_MODE_PLAYLIST;
 	}
-	ret = mood_open(NULL); /* open first available mood */
+	ret = change_current_mood(NULL); /* open first available mood */
 	if (ret >= 0)
 		return PLAY_MODE_MOOD;
-	mood_open(""); /* open dummy mood, always successful */
+	change_current_mood(""); /* open dummy mood, always successful */
 	return PLAY_MODE_MOOD;
 }
 
@@ -512,8 +505,10 @@ static int setup_command_socket_or_die(void)
 	unlink(socket_name);
 	ret = create_local_socket(socket_name, &unix_addr,
 		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
-	if (ret < 0)
+	if (ret < 0) {
+		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");
 		exit(EXIT_FAILURE);
@@ -524,19 +519,21 @@ static int setup_command_socket_or_die(void)
 }
 
 static int server_socket;
+static struct command_task command_task_struct;
+static struct signal_task signal_task_struct;
 
-void loop(void)
+static void unregister_tasks(void)
 {
-	for (;;)
-		sleep(1);
+	unregister_task(&command_task_struct.task);
+	unregister_task(&signal_task_struct.task);
 }
 
-static void afs_shutdown(enum osl_close_flags flags)
+static void close_afs_tables(enum osl_close_flags flags)
 {
-	PARA_NOTICE_LOG("cleaning up\n");
+	PARA_NOTICE_LOG("closing afs_tables\n");
 	score_shutdown(flags);
 	attribute_shutdown(flags);
-	mood_close();
+	close_current_mood();
 	playlist_close();
 	moods_shutdown(flags);
 	playlists_shutdown(flags);
@@ -559,17 +556,16 @@ static void signal_post_select(struct sched *s, struct task *t)
 	if (!FD_ISSET(st->fd, &s->rfds))
 		return;
 	st->signum = para_next_signal();
-	PARA_NOTICE_LOG("caught signal %d\n", st->signum);
 	t->ret = 1;
 	if (st->signum == SIGUSR1)
 		return; /* ignore SIGUSR1 */
-	afs_shutdown(OSL_MARK_CLEAN);
+	PARA_NOTICE_LOG("caught signal %d\n", st->signum);
 	t->ret = -E_SIGNAL_CAUGHT;
+	unregister_tasks();
 }
 
 static void register_signal_task(void)
 {
-	static struct signal_task signal_task_struct;
 	struct signal_task *st = &signal_task_struct;
 	st->fd = para_signal_init();
 	PARA_INFO_LOG("signal pipe: fd %d\n", st->fd);
@@ -670,42 +666,34 @@ static void command_post_select(struct sched *s, struct task *t)
 	t->ret = recv_bin_buffer(fd, buf, sizeof(buf));
 	if (t->ret < 0) {
 		PARA_NOTICE_LOG("%s (%d)\n", PARA_STRERROR(-t->ret), t->ret);
-		t->ret = 1;
 		goto out;
 	}
 	if (t->ret != sizeof(buf)) {
 		PARA_NOTICE_LOG("short read (%d bytes, expected %lu)\n",
-			t->ret, sizeof(buf));
-		t->ret = 1;
+			t->ret, (long unsigned) sizeof(buf));
 		goto out;
 	}
 	cookie = *(uint32_t *)buf;
 	if (cookie != ct->cookie) {
 		PARA_NOTICE_LOG("received invalid cookie(got %u, expected %u)\n",
 			(unsigned)cookie, (unsigned)ct->cookie);
-		t->ret = 1;
 		goto out;
 	}
 	query_shmid = *(int *)(buf + sizeof(cookie));
 	if (query_shmid < 0) {
 		PARA_WARNING_LOG("received invalid query shmid %d)\n",
 			query_shmid);
-		t->ret = 1;
-		goto out;
-	}
-	t->ret = call_callback(fd, query_shmid);
-	if (t->ret < 0) {
-		PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
-		t->ret = 1;
 		goto out;
 	}
+	/* Ignore return value: Errors might be ok here. */
+	call_callback(fd, query_shmid);
 out:
+	t->ret = 1;
 	close(fd);
 }
 
 static void register_command_task(uint32_t cookie)
 {
-	static struct command_task command_task_struct;
 	struct command_task *ct = &command_task_struct;
 	ct->fd = setup_command_socket_or_die();
 	ct->cookie = cookie;
@@ -723,43 +711,59 @@ void register_tasks(uint32_t cookie)
 	register_command_task(cookie);
 }
 
-__noreturn int afs_init(uint32_t cookie, int socket_fd)
+static char *database_dir;
+
+static int make_database_dir(void)
 {
 	int ret;
-	enum play_mode current_play_mode;
-	struct sched s;
 
-	server_socket = socket_fd;
-	PARA_INFO_LOG("server_socket: %d, afs_socket_cookie: %u\n",
-		server_socket, (unsigned) cookie);
+	if (!database_dir) {
+		if (conf.afs_database_dir_given)
+			database_dir = para_strdup(conf.afs_database_dir_arg);
+		else {
+			char *home = para_homedir();
+			database_dir = make_message(
+				"%s/.paraslash/afs_database", home);
+			free(home);
+		}
+	}
+	PARA_INFO_LOG("afs_database dir %s\n", database_dir);
+	ret = para_mkdir(database_dir, 0777);
+	if (ret >= 0 || ret == -E_EXIST)
+		return 1;
+	free(database_dir);
+	database_dir = NULL;
+	return ret;
+}
+
+static int open_afs_tables(void)
+{
+	int ret = make_database_dir();
 
-	ret = attribute_init(&afs_tables[TBLNUM_ATTRIBUTES]);
 	if (ret < 0)
-		goto attribute_init_error;
-	ret = moods_init(&afs_tables[TBLNUM_MOODS]);
+		return ret;
+	ret = attribute_init(&afs_tables[TBLNUM_ATTRIBUTES], database_dir);
+	if (ret < 0)
+		return ret;
+	ret = moods_init(&afs_tables[TBLNUM_MOODS], database_dir);
 	if (ret < 0)
 		goto moods_init_error;
-	ret = playlists_init(&afs_tables[TBLNUM_PLAYLIST]);
+	ret = playlists_init(&afs_tables[TBLNUM_PLAYLIST], database_dir);
 	if (ret < 0)
 		goto playlists_init_error;
-	ret = lyrics_init(&afs_tables[TBLNUM_LYRICS]);
+	ret = lyrics_init(&afs_tables[TBLNUM_LYRICS], database_dir);
 	if (ret < 0)
 		goto lyrics_init_error;
-	ret = images_init(&afs_tables[TBLNUM_IMAGES]);
+	ret = images_init(&afs_tables[TBLNUM_IMAGES], database_dir);
 	if (ret < 0)
 		goto images_init_error;
-	ret = score_init(&afs_tables[TBLNUM_SCORES]);
+	ret = score_init(&afs_tables[TBLNUM_SCORES], database_dir);
 	if (ret < 0)
 		goto score_init_error;
-	ret = aft_init(&afs_tables[TBLNUM_AUDIO_FILES]);
+	ret = aft_init(&afs_tables[TBLNUM_AUDIO_FILES], database_dir);
 	if (ret < 0)
 		goto aft_init_error;
-
-	current_play_mode = init_admissible_files();
-	register_tasks(cookie);
-	s.default_timeout.tv_sec = 0;
-	s.default_timeout.tv_usec = 99 * 1000;
-	sched(&s);
+	return 1;
 
 aft_init_error:
 	score_shutdown(OSL_MARK_CLEAN);
@@ -773,48 +777,147 @@ playlists_init_error:
 	moods_shutdown(OSL_MARK_CLEAN);
 moods_init_error:
 	attribute_shutdown(OSL_MARK_CLEAN);
-attribute_init_error:
+	return ret;
+}
+
+__noreturn int afs_init(uint32_t cookie, int socket_fd)
+{
+	enum play_mode current_play_mode;
+	struct sched s;
+	int ret = open_afs_tables();
+
+	if (ret < 0) {
+		PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+		exit(EXIT_FAILURE);
+	}
+	server_socket = socket_fd;
+	ret = mark_fd_nonblock(server_socket);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+	PARA_INFO_LOG("server_socket: %d, afs_socket_cookie: %u\n",
+		server_socket, (unsigned) cookie);
+	current_play_mode = init_admissible_files();
+	register_tasks(cookie);
+	s.default_timeout.tv_sec = 0;
+	s.default_timeout.tv_usec = 99 * 1000;
+	ret = sched(&s);
+	if (ret < 0)
+		PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+	close_afs_tables(OSL_MARK_CLEAN);
 	exit(EXIT_FAILURE);
 }
 
-static int create_all_tables(void)
+static int create_tables_callback(const struct osl_object *query,
+		__a_unused struct osl_object *result)
 {
+	uint32_t table_mask = *(uint32_t *)query->data;
 	int i, ret;
 
+	close_afs_tables(OSL_MARK_CLEAN);
 	for (i = 0; i < NUM_AFS_TABLES; i++) {
 		struct table_info *ti = afs_tables + i;
 
 		if (ti->flags & TBLFLAG_SKIP_CREATE)
 			continue;
+		if (!(table_mask & (1 << i)))
+			continue;
 		ret = osl_create_table(ti->desc);
 		if (ret < 0)
 			return ret;
 	}
-	return 1;
+	ret = open_afs_tables();
+	return ret < 0? ret: 0;
 }
 
-/* TODO load tables after init */
-int com_init(__a_unused int fd, int argc, char * const * const argv)
+int com_init(int fd, int argc, char * const * const argv)
 {
 	int i, j, ret;
-	if (argc == 1)
-		return create_all_tables();
+	uint32_t table_mask = (1 << (NUM_AFS_TABLES + 1)) - 1;
+	struct osl_object query = {.data = &table_mask,
+		.size = sizeof(table_mask)};
+
+	if (argc != 1) {
+		table_mask = 0;
+		for (i = 1; i < argc; i++) {
+			for (j = 0; j < NUM_AFS_TABLES; j++) {
+				struct table_info *ti = afs_tables + j;
+
+				if (ti->flags & TBLFLAG_SKIP_CREATE)
+					continue;
+				if (strcmp(argv[i], ti->desc->name))
+					continue;
+				table_mask |= (1 << j);
+				break;
+			}
+			if (j == NUM_AFS_TABLES)
+				return -E_BAD_TABLE_NAME;
+		}
+	}
+	ret = send_callback_request(create_tables_callback, &query, NULL);
+	if (ret < 0)
+		return ret;
+	return send_va_buffer(fd, "successfully created afs table(s)\n");
+}
+
+enum com_check_flags {
+	CHECK_AFT = 1,
+	CHECK_MOODS = 2,
+	CHECK_PLAYLISTS = 4
+};
+
+int com_check(int fd, int argc, char * const * const argv)
+{
+	unsigned flags = 0;
+	int i, ret;
+	struct osl_object result;
+
 	for (i = 1; i < argc; i++) {
-		for (j = 0; j < NUM_AFS_TABLES; j++) {
-			struct table_info *ti = afs_tables + j;
-
-			if (ti->flags & TBLFLAG_SKIP_CREATE)
-				continue;
-			if (strcmp(argv[i], ti->desc->name))
-				continue;
-			PARA_NOTICE_LOG("creating table %s\n", argv[i]);
-			ret = osl_create_table(ti->desc);
+		const char *arg = argv[i];
+		if (arg[0] != '-')
+			break;
+		if (!strcmp(arg, "--")) {
+			i++;
+			break;
+		}
+		if (!strcmp(arg, "-a")) {
+			flags |= CHECK_AFT;
+			continue;
+		}
+		if (!strcmp(arg, "-p")) {
+			flags |= CHECK_PLAYLISTS;
+			continue;
+		}
+		if (!strcmp(arg, "-m")) {
+			flags |= CHECK_MOODS;
+			continue;
+		}
+		return -E_AFS_SYNTAX;
+	}
+	if (i < argc)
+		return -E_AFS_SYNTAX;
+	if (!flags)
+		flags = ~0U;
+	if (flags & CHECK_AFT) {
+		ret = send_callback_request(aft_check_callback, NULL, &result);
+		if (ret < 0)
+			return ret;
+		if (ret > 0) {
+			ret = send_buffer(fd, (char *) result.data);
+			free(result.data);
+			if (ret < 0)
+				return ret;
+		}
+	}
+	if (flags & CHECK_PLAYLISTS) {
+		ret = send_callback_request(playlist_check_callback, NULL, &result);
+		if (ret < 0)
+			return ret;
+		if (ret > 0) {
+			ret = send_buffer(fd, (char *) result.data);
+			free(result.data);
 			if (ret < 0)
 				return ret;
-			break;
 		}
-		if (j == NUM_AFS_TABLES)
-			return -E_BAD_TABLE_NAME;
 	}
 	return 1;
 }