X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=4350c9f1730a153a89805cbe75b30508850a8476;hp=dda60168276e9695b32e1e843b0dd00b64381b7d;hb=704605b466aca3ae6ca6d1e03b6af55e3d245502;hpb=da34ec740dd1b4db9145d72f9ec1357919a9c633 diff --git a/write_common.c b/write_common.c index dda60168..4350c9f1 100644 --- a/write_common.c +++ b/write_common.c @@ -61,12 +61,13 @@ int wng_open(struct writer_node_group *g) int i, ret = 1; PARA_NOTICE_LOG("opening wng %p with %d writer(s)\n", g, g->num_writers); + register_task(&g->task); 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; + goto err_out; wn->chunk_bytes = ret; g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret); wn->task.pre_select = wn->writer->pre_select; @@ -76,8 +77,16 @@ int wng_open(struct writer_node_group *g) } sprintf(g->task.status, "%s", "writer node group"); g->eof = 0; - register_task(&g->task); -out: + return 1; +err_out: + unregister_task(&g->task); + while (i > 0) { + struct writer_node *wn = &g->writer_nodes[--i]; + unregister_task(&wn->task); + wn->writer->close(wn); + } + g->num_writers = 0; + g->eof = 1; return ret; } @@ -118,7 +127,6 @@ struct writer_node_group *wng_new(unsigned num_writers) g->written = para_calloc(num_writers * sizeof(size_t)); g->task.private_data = g; g->task.post_select = wng_post_select; - g->task.flags = POST_ADD_TAIL; return g; }