struct task task;
};
+extern int mmd_mutex;
extern struct misc_meta_data *mmd;
static int server_socket;
*
* \sa open_and_update_audio_file().
*/
-int open_next_audio_file(void)
+static int open_next_audio_file(void)
{
struct osl_row *aft_row;
struct audio_file_data afd;
free(current_mop);
if (arg) {
current_mop = para_strdup(arg);
- mmd_lock();
+ mutex_lock(mmd_mutex);
strncpy(mmd->afs_mode_string, arg,
sizeof(mmd->afs_mode_string));
mmd->afs_mode_string[sizeof(mmd->afs_mode_string) - 1] = '\0';
- mmd_unlock();
+ mutex_unlock(mmd_mutex);
} else {
- mmd_lock();
+ mutex_lock(mmd_mutex);
strcpy(mmd->afs_mode_string, "dummy");
- mmd_unlock();
+ mutex_unlock(mmd_mutex);
current_mop = NULL;
}
}
return ret;
}
-static void unregister_tasks(void)
-{
- unregister_task(&command_task_struct.task);
- unregister_task(&signal_task_struct.task);
-}
-
static void signal_pre_select(struct sched *s, struct task *t)
{
struct signal_task *st = container_of(t, struct signal_task, task);
{
struct signal_task *st = container_of(t, struct signal_task, task);
if (getppid() == 1) {
- t->error = -E_AFS_PARENT_DIED;
- return;
+ PARA_EMERG_LOG("para_server died\n");
+ goto shutdown;
}
if (!FD_ISSET(st->fd, &s->rfds))
return;
init_admissible_files(current_mop);
return;
}
+ PARA_EMERG_LOG("terminating on signal %d\n", st->signum);
+shutdown:
sched_shutdown();
t->error = -E_AFS_SIGNAL;
}
query.data = (char *)query_shm + sizeof(*cq);
query.size = cq->query_size;
cq->handler(fd, &query);
- return 1;
+ return shm_detach(query_shm);
}
-static void execute_server_command(void)
+static int 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;
+ if (!ret)
+ ret = -ERRNO_TO_PARA_ERROR(ECONNRESET);
+ goto err;
}
buf[ret] = '\0';
PARA_DEBUG_LOG("received: %s\n", buf);
- if (!strcmp(buf, "new")) {
- ret = open_next_audio_file();
- if (ret < 0) {
- PARA_EMERG_LOG("%s\n", para_strerror(-ret));
- unregister_tasks();
- }
- return;
- }
- PARA_ERROR_LOG("unknown command\n");
-
+ ret = -E_BAD_CMD;
+ if (strcmp(buf, "new"))
+ goto err;
+ ret = open_next_audio_file();
+err:
+ return ret;
}
static void execute_afs_command(int fd, uint32_t expected_cookie)
struct sockaddr_un unix_addr;
struct afs_client *client, *tmp;
int fd, ret;
- if (FD_ISSET(server_socket, &s->rfds))
- execute_server_command();
+
+ if (FD_ISSET(server_socket, &s->rfds)) {
+ ret = execute_server_command();
+ if (ret < 0) {
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+ sched_shutdown();
+ return;
+ }
+ }
/* Check the list of connected clients. */
list_for_each_entry_safe(client, tmp, &afs_client_list, node) {
*/
__noreturn void afs_init(uint32_t cookie, int socket_fd)
{
- struct sched s;
+ static struct sched s;
int i, ret;
register_signal_task();
return -E_BAD_TABLE_NAME;
}
}
- ret = send_callback_request(create_tables_callback, &query, NULL, NULL);
+ ret = send_callback_request(create_tables_callback, &query, &send_result, &fd);
if (ret < 0)
return send_va_buffer(fd, "%s\n", para_strerror(-ret));
return ret;
continue;
ret = t->event_handler(event, pb, data);
if (ret < 0)
- PARA_CRIT_LOG("%s\n", para_strerror(-ret));
+ PARA_CRIT_LOG("table %s, event %d: %s\n", t->name,
+ event, para_strerror(-ret));
}
}