convert para_filter to the new scheduler

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index abd0419f6f99bb2529982beeecf0d813061b5fd6..f872fec8b2f5c3ffdb250ad0b06ace34a2a5a904 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -17,15 +17,19 @@
  */
 #include "para.h"
 
+#include "list.h"
+#include "sched.h"
 #include "recv.h"
 #include "recv.cmdline.h"
+#include "fd.h"
 #include "error.h"
+#include "stdout.h"
 
 struct gengetopt_args_info conf;
 
 INIT_RECV_ERRLISTS;
 
-__printf_2_3 void para_log(int ll, char* fmt,...)
+__printf_2_3 void para_log(int ll, const char* fmt,...)
 {
        va_list argp;
 
@@ -47,12 +51,14 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
                printf("available receivers: ");
                for (i = 0; receivers[i].name; i++)
                        printf("%s%s", i? " " : "", receivers[i].name);
-               printf("\nTry para_recv -r<receivername>:-h for help on <receivername>\n");
+               printf("\nTry\n\tpara_recv -r '<receivername> -h'\n"
+                       "for help on <receivername>.\n");
                exit(EXIT_SUCCESS);
        }
        return check_receiver_arg(conf.receiver_arg, receiver_num);
 }
 
+#if 0
 int main(int argc, char *argv[])
 {
        int ret, eof = 0, max, r_opened = 0, receiver_num;
@@ -80,16 +86,14 @@ recv:
        FD_ZERO(&rfds);
        FD_ZERO(&wfds);
        timeout.tv_sec = 0;
-       timeout.tv_usec = 1000 * 1000;
+       timeout.tv_usec = 999 * 1000;
        max = -1;
        ret = r->pre_select(&rn, &rfds, &wfds, &timeout);
-       max = MAX(max, ret);
+       max = PARA_MAX(max, ret);
 
-       PARA_DEBUG_LOG("timeout: %lums\n", tv2ms(&timeout));
-       ret = select(max + 1, &rfds, &wfds, NULL, &timeout);
+       PARA_DEBUG_LOG("timeout: %lums, max: %d\n", tv2ms(&timeout), max);
+       ret = para_select(max + 1, &rfds, &wfds, &timeout);
        if (ret < 0) {
-               if (errno == EINTR || errno == EAGAIN)
-                       goto recv;
                ret = -E_RECV_SELECT;
                goto out;
        }
@@ -104,13 +108,13 @@ recv:
                goto recv;
        }
        ret = write(STDOUT_FILENO, rn.buf, rn.loaded);
-       PARA_DEBUG_LOG("wrote %d/%d\n", ret, rn.loaded);
+       PARA_DEBUG_LOG("wrote %d/%zd\n", ret, rn.loaded);
        if (ret < 0) {
                ret = -E_WRITE_STDOUT;
                goto out;
        }
        if (ret != rn.loaded) {
-               PARA_INFO_LOG("short write %d/%d\n", ret, rn.loaded);
+               PARA_INFO_LOG("short write %d/%zd\n", ret, rn.loaded);
                memmove(rn.buf, rn.buf + ret, rn.loaded - ret);
        }
        rn.loaded -= ret;
@@ -122,6 +126,67 @@ out:
        if (r)
                r->shutdown();
        if (ret < 0)
-               PARA_NOTICE_LOG("%d: (%s)\n", ret, PARA_STRERROR(-ret));
+               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+       return ret;
+}
+#endif
+
+void rn_event_handler(struct task *t)
+{
+       PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+       unregister_task(t);
+}
+
+int main(int argc, char *argv[])
+{
+       int ret, r_opened = 0, receiver_num;
+       struct  receiver *r = NULL;
+       struct receiver_node rn;
+       struct stdout_task sot;
+       struct sched s;
+
+       init_sched();
+       s.default_timeout.tv_sec = 1;
+       s.default_timeout.tv_usec = 0;
+
+       memset(&rn, 0, sizeof(struct receiver_node));
+       for (ret = 0; receivers[ret].name; ret++)
+               receivers[ret].init(&receivers[ret]);
+       ret = -E_RECV_SYNTAX;
+       rn.conf = parse_config(argc, argv, &receiver_num);
+       if (!rn.conf) {
+               PARA_EMERG_LOG("%s", "parse failed\n");
+               goto out;
+       }
+       r = &receivers[receiver_num];
+       rn.receiver = r;
+       ret = r->open(&rn);
+       if (ret < 0)
+               goto out;
+       r_opened = 1;
+
+       stdout_set_defaults(&sot);
+       sot.buf = rn.buf;
+       sot.loaded = &rn.loaded;
+       sot.eof = &rn.eof;
+       register_task(&sot.task);
+
+       rn.task.private_data = &rn;
+       rn.task.pre_select = r->pre_select;
+       rn.task.post_select = r->post_select;
+       rn.task.event_handler = rn_event_handler;
+       rn.task.flags = 0;
+       sprintf(rn.task.status, "receiver node");
+       register_task(&rn.task);
+
+
+       ret = sched(&s);
+out:
+       if (r_opened)
+               r->close(&rn);
+       if (r)
+               r->shutdown();
+       if (ret < 0)
+               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
        return ret;
 }