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)) {
goto out;
}
ret = *(int *) buf;
- PARA_NOTICE_LOG("result_shmid: %d\n", ret);
if (ret <= 0)
goto out;
result_shmid = ret;
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;
}
* \sa send_standard_callback_request(), send_callback_request().
*/
int send_option_arg_callback_request(struct osl_object *options,
- int argc, const char **argv, callback_function *f,
+ int argc, char * const * const argv, callback_function *f,
struct osl_object *result)
{
char *p;
* \return The return value of the underlying call to
* send_option_arg_callback_request().
*/
-int send_standard_callback_request(int argc, const char **argv,
+int send_standard_callback_request(int argc, char * const * const argv,
callback_function *f, struct osl_object *result)
{
return send_option_arg_callback_request(NULL, argc, argv, f, result);
/*
- * 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;
}
* \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;
+ ret = fd2buf(fd, max_len, &stdin_obj);
if (ret < 0)
return ret;
- stdin_len = ret;
- query.size = arg_obj->size + stdin_len;
+ 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;
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);
}
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();
t->ret = 1;
if (st->signum == SIGUSR1)
return; /* ignore SIGUSR1 */
- afs_shutdown(OSL_MARK_CLEAN);
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);
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 %d)\n",
- t->ret, sizeof(buf));
- t->ret = 1;
+ PARA_NOTICE_LOG("short read (%d bytes, expected %lu)\n",
+ 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;
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);
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, const char **argv)
+int com_init(int fd, int argc, char * const * const argv)
{
int i, j, ret;
- if (argc == 1)
- return create_all_tables();
- 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);
- if (ret < 0)
- return ret;
- break;
+ 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;
}
- if (j == NUM_AFS_TABLES)
- return -E_BAD_TABLE_NAME;
}
- return 1;
+ 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");
}
projects / paraslash.git / blobdiff