fix dccp sender/receiver

[paraslash.git] / write_common.c

diff --git a/write_common.c b/write_common.c
index cfdabe4821bc6af60a12b99f3c9c5ff0b03d60d5..dda60168276e9695b32e1e843b0dd00b64381b7d 100644 (file)
--- a/write_common.c
+++ b/write_common.c
@@ -37,8 +37,10 @@ static void wng_post_select(__a_unused struct sched *s, struct task *t)
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];
                t->ret = wn->task.ret;
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];
                t->ret = wn->task.ret;

-               if (t->ret < 0)
+               if (t->ret < 0) {
+                       g->eof = 1;

                        return;
                        return;

+               }

                if (!i)
                        min_written = t->ret;
                else
                if (!i)
                        min_written = t->ret;
                else


@@ -58,17 +60,15 @@ int wng_open(struct writer_node_group *g)
 {
        int i, ret = 1;
 
 {
        int i, ret = 1;
 

-       PARA_NOTICE_LOG("opening wng with %d writer(s)\n", g->num_writers);
+       PARA_NOTICE_LOG("opening wng %p with %d writer(s)\n", g, g->num_writers);

        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];

+               wn->wng = g;

                ret = wn->writer->open(wn);
                if (ret < 0)
                        goto out;
                wn->chunk_bytes = ret;
                g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret);
                ret = wn->writer->open(wn);
                if (ret < 0)
                        goto out;
                wn->chunk_bytes = ret;
                g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret);

-               wn->wng = g;
-               PARA_DEBUG_LOG("pre_select: %p\n", &wn->writer->pre_select);
-               PARA_DEBUG_LOG("post_select: %p\n", &wn->writer->post_select);

                wn->task.pre_select = wn->writer->pre_select;
                wn->task.post_select = wn->writer->post_select;
                wn->task.private_data = wn;
                wn->task.pre_select = wn->writer->pre_select;
                wn->task.post_select = wn->writer->post_select;
                wn->task.private_data = wn;


@@ -81,25 +81,32 @@ out:
        return ret;
 }
 
        return ret;
 }
 

-void wng_destroy(struct writer_node_group *g)
+void wng_unregister(struct writer_node_group *g)

 {
 {

-       if (!g)
-               return;
-       free(g->written);
-       free(g->writer_nodes);
-       free(g);
+       int i;
+
+       FOR_EACH_WRITER_NODE(i, g) {
+               struct writer_node *wn = &g->writer_nodes[i];
+               unregister_task(&wn->task);
+       }
+       unregister_task(&g->task);
+       g->eof = 1;

 }
 
 void wng_close(struct writer_node_group *g)
 {
        int i;
 
 }
 
 void wng_close(struct writer_node_group *g)
 {
        int i;
 

+       if (!g)
+               return;

        PARA_NOTICE_LOG("closing wng with %d writer(s)\n", g->num_writers);
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];
        PARA_NOTICE_LOG("closing wng with %d writer(s)\n", g->num_writers);
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];

-               unregister_task(&wn->task);

                wn->writer->close(wn);
        }
                wn->writer->close(wn);
        }

+       free(g->written);
+       free(g->writer_nodes);
+       free(g);

 }
 
 struct writer_node_group *wng_new(unsigned num_writers)
 }
 
 struct writer_node_group *wng_new(unsigned num_writers)