/*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
return;
}
if (!i)
- min_written = t->ret;
+ min_written = wn->written;
else
- min_written = PARA_MIN(min_written, t->ret);
+ min_written = PARA_MIN(min_written, wn->written);
+ }
+// PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written);
+ if (min_written) {
+ *g->loaded -= min_written;
+ FOR_EACH_WRITER_NODE(i, g)
+ g->writer_nodes[i].written -= min_written;
}
- *g->loaded -= min_written;
if (!*g->loaded && *g->input_eof) {
g->eof = 1;
t->ret = -E_WNG_EOF;
- } else
- t->ret = 1;
- if (*g->loaded && min_written)
+ return;
+ }
+ t->ret = 1;
+ if (*g->loaded && min_written) {
+// PARA_INFO_LOG("moving %zd bytes\n", *g->loaded);
memmove(g->buf, g->buf + min_written, *g->loaded);
+ }
}
int wng_open(struct writer_node_group *g)
struct writer_node *wn = &g->writer_nodes[i];
wn->writer->close(wn);
}
- free(g->written);
free(g->writer_nodes);
free(g);
}
g->num_writers = num_writers;
g->writer_nodes = para_calloc(num_writers
* sizeof(struct writer_node));
- g->written = para_calloc(num_writers * sizeof(size_t));
g->task.private_data = g;
g->task.post_select = wng_post_select;
g->task.pre_select = wng_pre_select;
writers[i].init(&writers[i]);
}
-void *check_writer_arg(char *wa, int *writer_num)
+void *check_writer_arg(const char *wa, int *writer_num)
{
int i;