Merge branch 'maint'

[paraslash.git] / client.c

diff --git a/client.c b/client.c
index c47dafe8afd300183c8d3853f9da7e0198b4c88d..f3bb92f8e1db84c425c558cd5fa3dd8fcf38a6db 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -35,28 +35,28 @@ __printf_2_3 void (*para_log)(int, const char*, ...) = stderr_log;
 
 #ifdef HAVE_READLINE
 #include "interactive.h"
 
 #ifdef HAVE_READLINE
 #include "interactive.h"

-#include "server_completion.h"
-#include "afs_completion.h"
+#include "server.completion.h"
+#include "afs.completion.h"

 
 struct exec_task {
 
 struct exec_task {

-       struct task task;
+       struct task *task;

        struct btr_node *btrn;
        char *result_buf;
        size_t result_size;
 };
 
        struct btr_node *btrn;
        char *result_buf;
        size_t result_size;
 };
 

-static void exec_pre_select(struct sched *s, struct task *t)
+static void exec_pre_select(struct sched *s, void *context)

 {
 {

-       struct exec_task *et = container_of(t, struct exec_task, task);
+       struct exec_task *et = context;

        int ret = btr_node_status(et->btrn, 0, BTR_NT_LEAF);
 
        if (ret != 0)
                sched_min_delay(s);
 }
 
        int ret = btr_node_status(et->btrn, 0, BTR_NT_LEAF);
 
        if (ret != 0)
                sched_min_delay(s);
 }
 

-static int exec_post_select(__a_unused struct sched *s, struct task *t)
+static int exec_post_select(__a_unused struct sched *s, void *context)

 {
 {

-       struct exec_task *et = container_of(t, struct exec_task, task);
+       struct exec_task *et = context;

        struct btr_node *btrn = et->btrn;
        char *buf;
        size_t sz;
        struct btr_node *btrn = et->btrn;
        char *buf;
        size_t sz;


@@ -93,11 +93,6 @@ static int execute_client_command(const char *cmd, char **result)
        int ret;
        struct sched command_sched = {.default_timeout = {.tv_sec = 1}};
        struct exec_task exec_task = {
        int ret;
        struct sched command_sched = {.default_timeout = {.tv_sec = 1}};
        struct exec_task exec_task = {

-               .task = {
-                       .pre_select = exec_pre_select,
-                       .post_select = exec_post_select,
-                       .status = "client exec task",
-               },

                .result_buf = para_strdup(""),
                .result_size = 1,
        };
                .result_buf = para_strdup(""),
                .result_size = 1,
        };


@@ -107,14 +102,19 @@ static int execute_client_command(const char *cmd, char **result)
                goto out;
        exec_task.btrn = btr_new_node(&(struct btr_node_description)
                EMBRACE(.name = "exec_collect"));
                goto out;
        exec_task.btrn = btr_new_node(&(struct btr_node_description)
                EMBRACE(.name = "exec_collect"));

-       register_task(&command_sched, &exec_task.task);
+       exec_task.task = task_register(&(struct task_info) {
+               .name = "client exec",
+               .pre_select = exec_pre_select,
+               .post_select = exec_post_select,
+               .context = &exec_task,
+       }, &command_sched);

        ret = client_connect(ct, &command_sched, NULL, exec_task.btrn);
        if (ret < 0)
                goto out;
        schedule(&command_sched);
        ret = client_connect(ct, &command_sched, NULL, exec_task.btrn);
        if (ret < 0)
                goto out;
        schedule(&command_sched);

+       sched_shutdown(&command_sched);

        *result = exec_task.result_buf;
        btr_remove_node(&exec_task.btrn);
        *result = exec_task.result_buf;
        btr_remove_node(&exec_task.btrn);

-       client_disconnect(ct);

        ret = 1;
 out:
        btr_remove_node(&exec_task.btrn);
        ret = 1;
 out:
        btr_remove_node(&exec_task.btrn);


@@ -208,6 +208,7 @@ I9E_DUMMY_COMPLETER(version);
 I9E_DUMMY_COMPLETER(stop);
 I9E_DUMMY_COMPLETER(addatt);
 I9E_DUMMY_COMPLETER(init);
 I9E_DUMMY_COMPLETER(stop);
 I9E_DUMMY_COMPLETER(addatt);
 I9E_DUMMY_COMPLETER(init);

+I9E_DUMMY_COMPLETER(tasks);

 
 static struct i9e_completer completers[];
 
 
 static struct i9e_completer completers[];
 


@@ -444,15 +445,14 @@ static int client_i9e_line_handler(char *line)
 {
        int ret;
 
 {
        int ret;
 

-       client_disconnect(ct);

        PARA_DEBUG_LOG("line: %s\n", line);
        ret = make_client_argv(line);
        PARA_DEBUG_LOG("line: %s\n", line);
        ret = make_client_argv(line);

-       if (ret < 0)
+       if (ret <= 0)

                return ret;
        ret = client_connect(ct, &sched, NULL, NULL);
        if (ret < 0)
                return ret;
                return ret;
        ret = client_connect(ct, &sched, NULL, NULL);
        if (ret < 0)
                return ret;

-       i9e_attach_to_stdout(ct->btrn);
+       i9e_attach_to_stdout(ct->btrn[0]);

        return 1;
 }
 
        return 1;
 }
 


@@ -475,7 +475,7 @@ __noreturn static void interactive_session(void)
                .completers = completers,
        };
 
                .completers = completers,
        };
 

-       PARA_NOTICE_LOG("\n%s\n", VERSION_TEXT("client"));
+       PARA_NOTICE_LOG("\n%s\n", version_text("client"));

        if (ct->conf.history_file_given)
                history_file = para_strdup(ct->conf.history_file_arg);
        else {
        if (ct->conf.history_file_given)
                history_file = para_strdup(ct->conf.history_file_arg);
        else {


@@ -497,6 +497,7 @@ __noreturn static void interactive_session(void)
                goto out;
        para_log = i9e_log;
        ret = schedule(&sched);
                goto out;
        para_log = i9e_log;
        ret = schedule(&sched);

+       sched_shutdown(&sched);

        i9e_close();
        para_log = stderr_log;
 out:
        i9e_close();
        para_log = stderr_log;
 out:


@@ -528,27 +529,31 @@ __noreturn static void print_completions(void)
 
 #endif /* HAVE_READLINE */
 
 
 #endif /* HAVE_READLINE */
 

-static int supervisor_post_select(struct sched *s, __a_unused struct task *t)
+struct supervisor_task {
+       bool stdout_task_started;
+       struct task *task;
+};
+
+static int supervisor_post_select(struct sched *s, void *context)

 {
 {

-       if (ct->task.error < 0)
-               return ct->task.error;
-       if (ct->status == CL_SENDING) {
-               stdin_set_defaults(&sit);
-               register_task(s, &sit.task);
-               return -E_TASK_STARTED;
+       struct supervisor_task *svt = context;
+       int ret = task_status(ct->task);
+
+       if (ret < 0)
+               return ret;
+       if (!svt->stdout_task_started && ct->status == CL_EXECUTING) {
+               stdout_task_register(&sot, s);
+               svt->stdout_task_started = true;
+               return 1;

        }
        }

-       if (ct->status == CL_RECEIVING) {
-               stdout_set_defaults(&sot);
-               register_task(s, &sot.task);
+       if (ct->status == CL_SENDING) {
+               stdin_task_register(&sit, s);

                return -E_TASK_STARTED;
        }
        return 0;
 }
 
                return -E_TASK_STARTED;
        }
        return 0;
 }
 

-static struct task svt = {
-       .post_select = supervisor_post_select,
-       .status = "supervisor task"
-};
+static struct supervisor_task supervisor_task;

 
 /**
  * The client program to connect to para_server.
 
 /**
  * The client program to connect to para_server.


@@ -595,21 +600,30 @@ int main(int argc, char *argv[])
        if (ret < 0)
                goto out;
        sot.btrn = btr_new_node(&(struct btr_node_description)
        if (ret < 0)
                goto out;
        sot.btrn = btr_new_node(&(struct btr_node_description)

-               EMBRACE(.name = "stdout", .parent = ct->btrn));
-       register_task(&sched, &svt);
+               EMBRACE(.name = "stdout", .parent = ct->btrn[0]));
+       supervisor_task.task = task_register(&(struct task_info) {
+               .name = "supervisor",
+               .post_select = supervisor_post_select,
+               .context = &supervisor_task,
+       }, &sched);
+

        ret = schedule(&sched);
        ret = schedule(&sched);

-       if (ret >= 0 && ct->task.error < 0) {
-               switch(ct->task.error) {
-               /* these are not errors */
-               case -E_SERVER_CMD_SUCCESS:
-               case -E_EOF:
-               case -E_SERVER_EOF:
-               case -E_BTR_EOF:
-                       ret = 0;
-                       break;
-               default: ret = -E_SERVER_CMD_FAILURE;
+       if (ret >= 0) {
+               ret = task_status(ct->task);
+               if (ret < 0) {
+                       switch (ret) {
+                       /* these are not errors */
+                       case -E_SERVER_CMD_SUCCESS:
+                       case -E_EOF:
+                       case -E_SERVER_EOF:
+                       case -E_BTR_EOF:
+                               ret = 0;
+                               break;
+                       default: ret = -E_SERVER_CMD_FAILURE;
+                       }

                }
        }
                }
        }

+       sched_shutdown(&sched);

 out:
        if (ret < 0)
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 out:
        if (ret < 0)
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));