client.c: supervisor task should use post_select instead of pre_select.

[paraslash.git] / afs.c

diff --git a/afs.c b/afs.c
index 451a492c8bfe9871dd22c51121eadfd69aeee3ec..bc42026e460ac7ba5f38f992ae17e1f18a3c5ce9 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -499,7 +499,7 @@ static int pass_afd(int fd, char *buf, size_t size)
  *
  * \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;
@@ -747,42 +747,34 @@ static int open_afs_tables(void)
        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 = t->private_data;
-       t->ret = 1;
+       struct signal_task *st = container_of(t, struct signal_task, task);
        para_fd_set(st->fd, &s->rfds, &s->max_fileno);
 }
 
 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;
+       struct signal_task *st = container_of(t, struct signal_task, task);
+       if (getppid() == 1) {
+               PARA_EMERG_LOG("para_server died\n");
+               goto shutdown;
+       }
        if (!FD_ISSET(st->fd, &s->rfds))
                return;
        st->signum = para_next_signal();
-       t->ret = 1;
        if (st->signum == SIGHUP) {
                close_afs_tables();
-               t->ret = open_afs_tables();
-               if (t->ret < 0)
-                       goto err;
+               t->error = open_afs_tables();
+               if (t->error < 0)
+                       return;
                init_admissible_files(current_mop);
                return;
        }
-       t->ret = -E_AFS_SIGNAL;
-err:
-       PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
-       unregister_tasks();
+       PARA_EMERG_LOG("terminating on signal %d\n", st->signum);
+shutdown:
+       sched_shutdown();
+       t->error = -E_AFS_SIGNAL;
 }
 
 static void register_signal_task(void)
@@ -805,7 +797,6 @@ static void register_signal_task(void)
 
        st->task.pre_select = signal_pre_select;
        st->task.post_select = signal_post_select;
-       st->task.private_data = st;
        sprintf(st->task.status, "signal task");
        register_task(&st->task);
 }
@@ -824,14 +815,13 @@ struct afs_client {
 
 static void command_pre_select(struct sched *s, struct task *t)
 {
-       struct command_task *ct = t->private_data;
+       struct command_task *ct = container_of(t, struct command_task, task);
        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);
-       t->ret = 1;
 }
 
 /**
@@ -904,28 +894,24 @@ static int call_callback(int fd, int query_shmid)
        return 1;
 }
 
-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)
@@ -966,12 +952,19 @@ err:
 
 static void command_post_select(struct sched *s, struct task *t)
 {
-       struct command_task *ct = t->private_data;
+       struct command_task *ct = container_of(t, struct command_task, task);
        struct sockaddr_un unix_addr;
        struct afs_client *client, *tmp;
-       int fd;
-       if (FD_ISSET(server_socket, &s->rfds))
-               execute_server_command();
+       int fd, ret;
+
+       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) {
@@ -990,25 +983,23 @@ static void command_post_select(struct sched *s, struct task *t)
        }
        /* 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));
-       if (t->ret < 0) {
-               PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
-               goto out;
+               return;
+       ret = para_accept(ct->fd, &unix_addr, sizeof(unix_addr));
+       if (ret < 0) {
+               PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
+               return;
        }
-       fd = t->ret;
-       t->ret = mark_fd_nonblocking(fd);
-       if (t->ret < 0) {
-               PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
+       fd = ret;
+       ret = mark_fd_nonblocking(fd);
+       if (ret < 0) {
+               PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
                close(fd);
-               goto out;
+               return;
        }
        client = para_malloc(sizeof(*client));
        client->fd = fd;
        client->connect_time = *now;
        para_list_add(&client->node, &afs_client_list);
-out:
-       t->ret = 1;
 }
 
 static void register_command_task(uint32_t cookie)
@@ -1019,7 +1010,6 @@ static void register_command_task(uint32_t cookie)
 
        ct->task.pre_select = command_pre_select;
        ct->task.post_select = command_post_select;
-       ct->task.private_data = ct;
        sprintf(ct->task.status, "command task");
        register_task(&ct->task);
 }