/*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
static void wng_pre_select(__a_unused struct sched *s, struct task *t)
{
- struct writer_node_group *g = t->private_data;
+ struct writer_node_group *g = container_of(t, struct writer_node_group, task);
int i;
FOR_EACH_WRITER_NODE(i, g) {
struct writer_node *wn = &g->writer_nodes[i];
- t->ret = wn->writer->pre_select(s, wn);
- if (t->ret < 0) {
- g->error = t->ret;
+ t->error = wn->writer->pre_select(s, wn);
+ if (t->error < 0)
return;
- }
}
}
static void wng_post_select(struct sched *s, struct task *t)
{
- struct writer_node_group *g = t->private_data;
+ struct writer_node_group *g = container_of(t, struct writer_node_group, task);
int i;
size_t min_written = 0;
FOR_EACH_WRITER_NODE(i, g) {
struct writer_node *wn = &g->writer_nodes[i];
- t->ret = wn->writer->post_select(s, wn);
- if (t->ret < 0) {
- g->error = t->ret;
+ t->error = wn->writer->post_select(s, wn);
+ if (t->error < 0)
return;
- }
if (!i)
min_written = wn->written;
else
min_written = PARA_MIN(min_written, wn->written);
}
-// PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_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;
}
if (!*g->loaded && *g->input_error) {
- g->error = *g->input_error;
- t->ret = g->error;
+ t->error = *g->input_error;
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);
g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret);
}
sprintf(g->task.status, "%s", "writer node group");
- g->error = 0;
return 1;
err_out:
- PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+ PARA_ERROR_LOG("%s\n", para_strerror(-ret));
unregister_task(&g->task);
while (i > 0) {
struct writer_node *wn = &g->writer_nodes[--i];
wn->writer->close(wn);
}
g->num_writers = 0;
- g->error = ret;
return ret;
}
g->num_writers = num_writers;
g->writer_nodes = para_calloc(num_writers
* sizeof(struct writer_node));
- g->task.private_data = g;
g->task.post_select = wng_post_select;
g->task.pre_select = wng_pre_select;
return g;
*writer_num = i;
return writers[i].parse_config(c? wa + len + 1 : "");
}
- PARA_ERROR_LOG("%s", "writer not found\n");
+ PARA_ERROR_LOG("writer not found\n");
return NULL;
}