Make para_recv use the new scheduler.

[paraslash.git] / write.c

diff --git a/write.c b/write.c
index 3e5a97e8076e9a3d70bbb0d5386ee9b605a4cae7..5bcd1f60aa4c430ef1ae35561ffcb40df25cce26 100644 (file)
--- a/write.c
+++ b/write.c
@@ -157,7 +157,7 @@ out:
        return NULL;
 }
 
        return NULL;
 }
 

-static void idt_error_handler(struct task *t)
+static void idt_event_handler(struct task *t)

 {
        int ret;
 
 {
        int ret;
 


@@ -174,7 +174,7 @@ static void idt_error_handler(struct task *t)
        }
 }
 
        }
 }
 

-static void cwt_error_handler(struct task *t)
+static void cwt_event_handler(struct task *t)

 {
        if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_WAV_HEADER_SUCCESS) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
 {
        if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_WAV_HEADER_SUCCESS) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));


@@ -188,18 +188,18 @@ static void cwt_error_handler(struct task *t)
        }
        idt.task.pre_select = initial_delay_pre_select;
        idt.task.private_data = &idt;
        }
        idt.task.pre_select = initial_delay_pre_select;
        idt.task.private_data = &idt;

-       idt.task.error_handler = idt_error_handler;
+       idt.task.event_handler = idt_event_handler;

        sprintf(idt.task.status, "initial_delay");
        register_task(&idt.task);
 }
 
        sprintf(idt.task.status, "initial_delay");
        register_task(&idt.task);
 }
 

-static void stdin_error_handler(struct task *t)
+static void stdin_event_handler(struct task *t)

 {
        unregister_task(t);
        if (t->ret != -E_STDIN_EOF)
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
        else
 {
        unregister_task(t);
        if (t->ret != -E_STDIN_EOF)
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
        else

-               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
+               PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));

 }
 
 int main(int argc, char *argv[])
 }
 
 int main(int argc, char *argv[])


@@ -219,14 +219,14 @@ int main(int argc, char *argv[])
        sit.loaded = 0,
        sit.task.pre_select = stdin_pre_select;
        sit.task.post_select = stdin_post_select;
        sit.loaded = 0,
        sit.task.pre_select = stdin_pre_select;
        sit.task.post_select = stdin_post_select;

-       sit.task.error_handler = stdin_error_handler;
+       sit.task.event_handler = stdin_event_handler;

        sit.task.private_data = &sit;
        sprintf(sit.task.status, "stdin reader");
        register_task(&sit.task);
 
        cwt.task.pre_select = check_wav_pre_select;
        cwt.task.private_data = &cwt;
        sit.task.private_data = &sit;
        sprintf(sit.task.status, "stdin reader");
        register_task(&sit.task);
 
        cwt.task.pre_select = check_wav_pre_select;
        cwt.task.private_data = &cwt;

-       cwt.task.error_handler = cwt_error_handler;
+       cwt.task.event_handler = cwt_event_handler;

        cwt.buf = sit.buf;
        cwt.loaded = &sit.loaded;
        cwt.eof = &sit.eof;
        cwt.buf = sit.buf;
        cwt.loaded = &sit.loaded;
        cwt.eof = &sit.eof;