X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=2e11539c44a52d9287a201e9b0d3d390531fe42f;hp=17557e5eaa789831f136e758a3a31fe5903e7271;hb=61250cf03241bf73662dac3753e44660a572fa2a;hpb=c458b9d45e7c6ddda6285fca3797fddff815bd0a diff --git a/afs.c b/afs.c index 17557e5e..2e11539c 100644 --- a/afs.c +++ b/afs.c @@ -10,16 +10,16 @@ #include #include "server.cmdline.h" #include "para.h" +#include "error.h" +#include "string.h" #include "afh.h" +#include "afs.h" #include "server.h" -#include "error.h" #include /* readdir() */ #include #include #include "net.h" -#include "afs.h" #include "ipc.h" -#include "string.h" #include "list.h" #include "sched.h" #include "signal.h" @@ -53,7 +53,15 @@ enum afs_table_num { NUM_AFS_TABLES }; -static struct table_info afs_tables[NUM_AFS_TABLES]; +static struct afs_table afs_tables[NUM_AFS_TABLES] = { + [TBLNUM_AUDIO_FILES] = {.init = aft_init}, + [TBLNUM_ATTRIBUTES] = {.init = attribute_init}, + [TBLNUM_SCORES] = {.init = score_init}, + [TBLNUM_MOODS] = {.init = moods_init}, + [TBLNUM_LYRICS] = {.init = lyrics_init}, + [TBLNUM_IMAGES] = {.init = images_init}, + [TBLNUM_PLAYLIST] = {.init = playlists_init}, +}; struct command_task { /** The file descriptor for the local socket. */ @@ -67,6 +75,11 @@ struct command_task { struct task task; }; +static int server_socket; +static struct command_task command_task_struct; +static struct signal_task signal_task_struct; + + /** * A random number used to "authenticate" the connection. * @@ -417,6 +430,40 @@ 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) +{ + struct msghdr msg = {.msg_iov = NULL}; + struct cmsghdr *cmsg; + char control[255]; + int ret; + struct iovec iov; + + iov.iov_base = buf; + iov.iov_len = size; + + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + + msg.msg_control = control; + msg.msg_controllen = sizeof(control); + + cmsg = CMSG_FIRSTHDR(&msg); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + cmsg->cmsg_len = CMSG_LEN(sizeof(int)); + *(int *)CMSG_DATA(cmsg) = fd; + + /* 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); + ret = sendmsg(server_socket, &msg, 0); + if (ret < 0) { + ret = -ERRNO_TO_PARA_ERROR(errno); + return ret; + } + return 1; +} + /** * Open the audio file with highest score. * @@ -429,57 +476,62 @@ int stdin_command(int fd, struct osl_object *arg_obj, callback_function *f, * * \sa close_audio_file(), open_and_update_audio_file(). */ -int open_next_audio_file(struct audio_file_data *afd) +int open_next_audio_file(void) { struct osl_row *aft_row; - int ret; - for (;;) { - 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; - } -} + struct audio_file_data afd; + int ret, shmid; + char buf[8]; -/** - * Free all resources which were allocated by open_next_audio_file(). - * - * \param afd The structure previously filled in by open_next_audio_file(). - * - * \return The return value of the underlying call to para_munmap(). - * - * \sa open_next_audio_file(). - */ -int close_audio_file(struct audio_file_data *afd) -{ - free(afd->afhi.chunk_table); - return para_munmap(afd->map.data, afd->map.size); + 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; + shmid = ret; + PARA_NOTICE_LOG("shmid: %u\n", shmid); + if (!write_ok(server_socket)) { + PARA_EMERG_LOG("afs_socket not writable\n"); + goto destroy; + } + *(uint32_t *)buf = NEXT_AUDIO_FILE; + *(uint32_t *)(buf + 4) = (uint32_t)shmid; + ret = pass_afd(afd.fd, buf, 8); + if (ret >= 0) + return ret; + PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); +destroy: + shm_destroy(shmid); + return ret; } static enum play_mode init_admissible_files(void) { - int ret; - - if (conf.mood_given) { - ret = change_current_mood(conf.mood_arg); - if (ret >= 0) { - if (conf.playlist_given) - PARA_WARNING_LOG("ignoring playlist %s\n", - conf.playlist_arg); - return PLAY_MODE_MOOD; + int ret = 0; + char *arg = conf.afs_initial_mode_arg; + + if (conf.afs_initial_mode_given) { + if (!strncmp(arg, "p:", 2)) { + ret = playlist_open(arg + 2); + if (ret >= 0) + return PLAY_MODE_PLAYLIST; + goto dummy; } + if (!strncmp(arg, "m:", 2)) { + ret = change_current_mood(arg + 2); + if (ret >= 0) + return PLAY_MODE_MOOD; + goto dummy; + } + PARA_ERROR_LOG("bad afs initial mode arg: %s\n", arg); } - if (conf.playlist_given) { - ret = playlist_open(conf.playlist_arg); - if (ret >= 0) - return PLAY_MODE_PLAYLIST; - } - ret = change_current_mood(NULL); /* open first available mood */ - if (ret >= 0) - return PLAY_MODE_MOOD; - change_current_mood(""); /* open dummy mood, always successful */ +dummy: + if (ret < 0) + PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_NOTICE_LOG("defaulting to dummy mood\n"); + change_current_mood(""); /* always successful */ return PLAY_MODE_MOOD; } @@ -505,26 +557,18 @@ static int setup_command_socket_or_die(void) return ret; } -static void close_afs_tables(enum osl_close_flags flags) +static void close_afs_tables(void) { + int i; PARA_NOTICE_LOG("closing afs_tables\n"); - score_shutdown(flags); - attribute_shutdown(flags); - close_current_mood(); - playlist_close(); - moods_shutdown(flags); - playlists_shutdown(flags); - lyrics_shutdown(flags); - images_shutdown(flags); - aft_shutdown(flags); + for (i = 0; i < NUM_AFS_TABLES; i++) + afs_tables[i].close(); } static char *database_dir; -static int make_database_dir(void) +static void get_database_dir(void) { - int ret; - if (!database_dir) { if (conf.afs_database_dir_given) database_dir = para_strdup(conf.afs_database_dir_arg); @@ -536,63 +580,39 @@ static int make_database_dir(void) } } PARA_INFO_LOG("afs_database dir %s\n", database_dir); +} + +static int make_database_dir(void) +{ + int ret; + + get_database_dir(); ret = para_mkdir(database_dir, 0777); if (ret >= 0 || is_errno(-ret, EEXIST)) return 1; - free(database_dir); - database_dir = NULL; return ret; } - static int open_afs_tables(void) { - int ret = make_database_dir(); + int i, ret; - if (ret < 0) - return ret; - ret = attribute_init(&afs_tables[TBLNUM_ATTRIBUTES], database_dir); - if (ret < 0) + get_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)); + } + 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], database_dir); - if (ret < 0) - goto playlists_init_error; - ret = lyrics_init(&afs_tables[TBLNUM_LYRICS], database_dir); - if (ret < 0) - goto lyrics_init_error; - ret = images_init(&afs_tables[TBLNUM_IMAGES], database_dir); - if (ret < 0) - goto images_init_error; - ret = score_init(&afs_tables[TBLNUM_SCORES], database_dir); - if (ret < 0) - goto score_init_error; - ret = aft_init(&afs_tables[TBLNUM_AUDIO_FILES], database_dir); - if (ret < 0) - goto aft_init_error; - return 1; - -aft_init_error: - score_shutdown(OSL_MARK_CLEAN); -score_init_error: - images_shutdown(OSL_MARK_CLEAN); -images_init_error: - lyrics_shutdown(OSL_MARK_CLEAN); -lyrics_init_error: - playlists_shutdown(OSL_MARK_CLEAN); -playlists_init_error: - moods_shutdown(OSL_MARK_CLEAN); -moods_init_error: - attribute_shutdown(OSL_MARK_CLEAN); + do + afs_tables[i].close(); + while (i--); return ret; } -static int server_socket; -static struct command_task command_task_struct; -static struct signal_task signal_task_struct; - static void unregister_tasks(void) { unregister_task(&command_task_struct.task); @@ -617,7 +637,7 @@ static void signal_post_select(struct sched *s, struct task *t) if (st->signum == SIGUSR1) return; /* ignore SIGUSR1 */ if (st->signum == SIGHUP) { - close_afs_tables(OSL_MARK_CLEAN); + close_afs_tables(); t->ret = open_afs_tables(); return; } @@ -656,6 +676,7 @@ static void command_pre_select(struct sched *s, struct task *t) struct command_task *ct = t->private_data; struct afs_client *client; + para_fd_set(server_socket, &s->rfds, &s->max_fileno); para_fd_set(ct->fd, &s->rfds, &s->max_fileno); list_for_each_entry(client, &afs_client_list, node) para_fd_set(client->fd, &s->rfds, &s->max_fileno); @@ -717,6 +738,27 @@ out: return ret; } +static void execute_server_command(void) +{ + char buf[8]; + int ret = recv_bin_buffer(server_socket, buf, sizeof(buf) - 1); + + if (ret <= 0) { + if (ret < 0) + PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + return; + } + buf[ret] = '\0'; + PARA_NOTICE_LOG("received: %s\n", buf); + if (!strcmp(buf, "new")) { + ret = open_next_audio_file(); + PARA_NOTICE_LOG("ret: %d\n", ret); + return; + } + PARA_ERROR_LOG("unknown command\n"); + +} + static void execute_afs_command(int fd, uint32_t expected_cookie) { uint32_t cookie; @@ -758,7 +800,10 @@ static void command_post_select(struct sched *s, struct task *t) struct sockaddr_un unix_addr; struct afs_client *client, *tmp; - /* First, check the list of connected clients. */ + if (FD_ISSET(server_socket, &s->rfds)) + execute_server_command(); + + /* Check the list of connected clients. */ list_for_each_entry_safe(client, tmp, &afs_client_list, node) { if (FD_ISSET(client->fd, &s->rfds)) execute_afs_command(client->fd, ct->cookie); @@ -773,7 +818,7 @@ static void command_post_select(struct sched *s, struct task *t) list_del(&client->node); free(client); } - /* Next, accept connections on the local socket. */ + /* Accept connections on the local socket. */ if (!FD_ISSET(ct->fd, &s->rfds)) goto out; t->ret = para_accept(ct->fd, &unix_addr, sizeof(unix_addr)); @@ -818,9 +863,11 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd) { enum play_mode current_play_mode; struct sched s; - int ret; + int i, ret; INIT_LIST_HEAD(&afs_client_list); + for (i = 0; i < NUM_AFS_TABLES; i++) + afs_tables[i].init(&afs_tables[i]); ret = open_afs_tables(); if (ret < 0) { @@ -840,7 +887,7 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd) ret = sched(&s); if (ret < 0) PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); - close_afs_tables(OSL_MARK_CLEAN); + close_afs_tables(); exit(EXIT_FAILURE); } @@ -850,15 +897,15 @@ static int create_tables_callback(const struct osl_object *query, uint32_t table_mask = *(uint32_t *)query->data; int i, ret; - close_afs_tables(OSL_MARK_CLEAN); + close_afs_tables(); for (i = 0; i < NUM_AFS_TABLES; i++) { - struct table_info *ti = afs_tables + i; + struct afs_table *t = &afs_tables[i]; - if (ti->flags & TBLFLAG_SKIP_CREATE) - continue; if (!(table_mask & (1 << i))) continue; - ret = osl_create_table(ti->desc); + if (!t->create) + continue; + ret = t->create(database_dir); if (ret < 0) return ret; } @@ -873,15 +920,16 @@ int com_init(int fd, int argc, char * const * const argv) struct osl_object query = {.data = &table_mask, .size = sizeof(table_mask)}; + ret = make_database_dir(); + if (ret < 0) + return ret; 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; + struct afs_table *t = &afs_tables[j]; - if (ti->flags & TBLFLAG_SKIP_CREATE) - continue; - if (strcmp(argv[i], ti->desc->name)) + if (strcmp(argv[i], t->name)) continue; table_mask |= (1 << j); break; @@ -977,3 +1025,30 @@ int com_check(int fd, int argc, char * const * const argv) } return 1; } + +void afs_event(enum afs_events event, struct para_buffer *pb, + void *data) +{ + int i, ret; + + for (i = 0; i < NUM_AFS_TABLES; i++) { + struct afs_table *t = &afs_tables[i]; + if (!t->event_handler) + continue; + ret = t->event_handler(event, pb, data); + if (ret < 0) + PARA_CRIT_LOG("%s\n", PARA_STRERROR(-ret)); + } +} + +int images_event_handler(__a_unused enum afs_events event, + __a_unused struct para_buffer *pb, __a_unused void *data) +{ + return 1; +} + +int lyrics_event_handler(__a_unused enum afs_events event, + __a_unused struct para_buffer *pb, __a_unused void *data) +{ + return 1; +}