afs: Use nonblocking API for server commands.

[paraslash.git] / afs.c

diff --git a/afs.c b/afs.c
index d738c3d99f1143648f98f0b65b714bbf1e69ccee..40ef7ad25e454f312a55a48699ca896b59da7171 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -709,15 +709,16 @@ static void signal_pre_select(struct sched *s, struct task *t)
 
 static void afs_signal_post_select(struct sched *s, struct task *t)
 {
 
 static void afs_signal_post_select(struct sched *s, struct task *t)
 {

-       struct signal_task *st = container_of(t, struct signal_task, task);
+       int signum;
+

        if (getppid() == 1) {
                PARA_EMERG_LOG("para_server died\n");
                goto shutdown;
        }
        if (getppid() == 1) {
                PARA_EMERG_LOG("para_server died\n");
                goto shutdown;
        }

-       if (!FD_ISSET(st->fd, &s->rfds))
+       signum = para_next_signal(&s->rfds);
+       if (signum == 0)

                return;
                return;

-       st->signum = para_next_signal();
-       if (st->signum == SIGHUP) {
+       if (signum == SIGHUP) {

                close_afs_tables();
                parse_config_or_die(1);
                t->error = open_afs_tables();
                close_afs_tables();
                parse_config_or_die(1);
                t->error = open_afs_tables();


@@ -726,7 +727,7 @@ static void afs_signal_post_select(struct sched *s, struct task *t)
                init_admissible_files(current_mop);
                return;
        }
                init_admissible_files(current_mop);
                return;
        }

-       PARA_EMERG_LOG("terminating on signal %d\n", st->signum);
+       PARA_EMERG_LOG("terminating on signal %d\n", signum);

 shutdown:
        sched_shutdown();
        t->error = -E_AFS_SIGNAL;
 shutdown:
        sched_shutdown();
        t->error = -E_AFS_SIGNAL;


@@ -842,24 +843,18 @@ static int call_callback(int fd, int query_shmid)
        return shm_detach(query_shm);
 }
 
        return shm_detach(query_shm);
 }
 

-static int execute_server_command(void)
+static int execute_server_command(fd_set *rfds)

 {
        char buf[8];
 {
        char buf[8];

-       int ret = recv_bin_buffer(server_socket, buf, sizeof(buf) - 1);
+       size_t n;
+       int ret = read_nonblock(server_socket, buf, sizeof(buf) - 1, rfds, &n);

 
 

-       if (ret <= 0) {
-               if (!ret)
-                       ret = -ERRNO_TO_PARA_ERROR(ECONNRESET);
-               goto err;
-       }
-       buf[ret] = '\0';
-       PARA_DEBUG_LOG("received: %s\n", buf);
-       ret = -E_BAD_CMD;
+       if (ret < 0 || n == 0)
+               return ret;
+       buf[n] = '\0';

        if (strcmp(buf, "new"))
        if (strcmp(buf, "new"))

-               goto err;
-       ret = open_next_audio_file();
-err:
-       return ret;
+               return -E_BAD_CMD;
+       return open_next_audio_file();

 }
 
 static void execute_afs_command(int fd, uint32_t expected_cookie)
 }
 
 static void execute_afs_command(int fd, uint32_t expected_cookie)


@@ -905,15 +900,12 @@ static void command_post_select(struct sched *s, struct task *t)
        struct afs_client *client, *tmp;
        int fd, ret;
 
        struct afs_client *client, *tmp;
        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;
-               }
+       ret = execute_server_command(&s->rfds);
+       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) {
                if (FD_ISSET(client->fd, &s->rfds))
        /* Check the list of connected clients. */
        list_for_each_entry_safe(client, tmp, &afs_client_list, node) {
                if (FD_ISSET(client->fd, &s->rfds))


@@ -930,14 +922,11 @@ static void command_post_select(struct sched *s, struct task *t)
                free(client);
        }
        /* Accept connections on the local socket. */
                free(client);
        }
        /* Accept connections on the local socket. */

-       if (!FD_ISSET(ct->fd, &s->rfds))
-               return;
-       ret = para_accept(ct->fd, &unix_addr, sizeof(unix_addr));
-       if (ret < 0) {
+       ret = para_accept(ct->fd, &s->rfds, &unix_addr, sizeof(unix_addr), &fd);
+       if (ret < 0)

                PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
                PARA_NOTICE_LOG("%s\n", para_strerror(-ret));

+       if (ret <= 0)

                return;
                return;

-       }
-       fd = ret;

        ret = mark_fd_nonblocking(fd);
        if (ret < 0) {
                PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
        ret = mark_fd_nonblocking(fd);
        if (ret < 0) {
                PARA_NOTICE_LOG("%s\n", para_strerror(-ret));