X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=a8d2114995bcafb74b692ef5a47d275c0a266d4c;hp=b35773f7ff7103fe002e8b23e3be7c128afb9cad;hb=19d9318abf42debb15d833d4e56ab636893285c3;hpb=51dde9efab2d662cf5813d26d5c9aebce6e197e7 diff --git a/write_common.c b/write_common.c index b35773f7..a8d21149 100644 --- a/write_common.c +++ b/write_common.c @@ -28,7 +28,7 @@ static void wng_pre_select(__a_unused struct sched *s, struct task *t) struct writer_node *wn = &g->writer_nodes[i]; t->ret = wn->writer->pre_select(s, wn); if (t->ret < 0) { - g->eof = 1; + g->error = t->ret; return; } } @@ -44,7 +44,7 @@ static void wng_post_select(struct sched *s, struct task *t) struct writer_node *wn = &g->writer_nodes[i]; t->ret = wn->writer->post_select(s, wn); if (t->ret < 0) { - g->eof = 1; + g->error = t->ret; return; } if (!i) @@ -58,9 +58,9 @@ static void wng_post_select(struct sched *s, struct task *t) FOR_EACH_WRITER_NODE(i, g) g->writer_nodes[i].written -= min_written; } - if (!*g->loaded && *g->input_eof) { - g->eof = 1; - t->ret = -E_WNG_EOF; + if (!*g->loaded && *g->input_error) { + g->error = *g->input_error; + t->ret = g->error; return; } t->ret = 1; @@ -96,7 +96,7 @@ int wng_open(struct writer_node_group *g) g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret); } sprintf(g->task.status, "%s", "writer node group"); - g->eof = 0; + g->error = 0; return 1; err_out: PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); @@ -106,7 +106,7 @@ err_out: wn->writer->close(wn); } g->num_writers = 0; - g->eof = 1; + g->error = ret; return ret; } @@ -119,7 +119,6 @@ err_out: void wng_unregister(struct writer_node_group *g) { unregister_task(&g->task); - g->eof = 1; } /**