const char *writer_names[] ={WRITER_NAMES};
struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY};
-int wng_write(struct writer_node_group *g, char *buf, size_t *loaded)
-{
- int ret, i, need_more_writes = 1;
- size_t min_written = 0;
-
- while (need_more_writes) {
- need_more_writes = 0;
- FOR_EACH_WRITER_NODE(i, g) {
- size_t w = g->written[i];
- int bytes_to_write;
- struct writer_node *wn = &g->writer_nodes[i];
- if (!i)
- min_written = w;
- else
- min_written = PARA_MIN(min_written, w);
- if (w == *loaded)
- continue;
- if (!g->eof && (*loaded < wn->chunk_bytes + w))
- continue;
- bytes_to_write = PARA_MIN(wn->chunk_bytes,
- *loaded - w);
- ret = wn->writer->write(buf + w, bytes_to_write, wn);
- if (ret < 0)
- goto out;
- if (ret != bytes_to_write)
- PARA_WARNING_LOG("short write: %d/%d\n", ret,
- bytes_to_write);
- g->written[i] += ret;
- need_more_writes = 1;
- }
- }
- *loaded -= min_written;
- ret = 0;
- if (g->eof)
- goto out;
- if (*loaded)
- memmove(buf, buf + min_written, *loaded);
- FOR_EACH_WRITER_NODE(i, g)
- g->written[i] -= min_written;
- ret = 1;
-out:
- return ret;
-}
-
-static void wng_post_select(struct sched *s, struct task *t)
+static void wng_post_select(__a_unused struct sched *s, struct task *t)
{
struct writer_node_group *g = t->private_data;
int i;
min_written = PARA_MIN(min_written, t->ret);
}
*g->loaded -= min_written;
- if (!*g->loaded && g->eof)
- t->ret = 0;
+ if (!*g->loaded && *g->input_eof)
+ t->ret = -E_WNG_EOF;
else
t->ret = 1;
if (*g->loaded && min_written)
wn->task.private_data = wn;
register_task(&wn->task);
}
+ sprintf(g->task.status, "%s", "writer node group");
+ g->eof = 0;
register_task(&g->task);
out:
return ret;
}
}
-static void wng_error_handler(struct task *t)
-{
- struct writer_node_group *g = t->private_data;
-
- PARA_INFO_LOG("%p: ret = %d\n", t, t->ret);
- unregister_task(t);
- wng_close(g);
- wng_destroy(g);
-}
-
struct writer_node_group *wng_new(unsigned num_writers)
{
struct writer_node_group *g = para_calloc(sizeof(struct writer_node_group));
g->written = para_calloc(num_writers * sizeof(size_t));
g->task.private_data = g;
g->task.post_select = wng_post_select;
- g->task.error_handler = wng_error_handler;
- g->task.flags = POST_ADD_TAIL | POST_EOF_IS_ERROR;
+ g->task.flags = POST_ADD_TAIL;
return g;
}
writers[i].init(&writers[i]);
}
-int check_writer_arg(const char *arg)
+void *check_writer_arg(char *wa, int *writer_num)
{
- int i, ret = -E_WRITE_COMMON_SYNTAX;
- char *a = para_strdup(arg), *p = strchr(a, ':');
- if (p)
- *p = '\0';
- p++;
+ int i;
+
+ *writer_num = -E_WRITE_COMMON_SYNTAX;
+ PARA_INFO_LOG("checking %s\n", wa);
FOR_EACH_WRITER(i) {
- if (strcmp(writer_names[i], a))
+ const char *name = writer_names[i];
+ size_t len = strlen(name);
+ char c;
+ if (strlen(wa) < len)
continue;
- ret = i;
- goto out;
+ if (strncmp(name, wa, len))
+ continue;
+ c = wa[len];
+ if (c && c != ' ')
+ continue;
+ if (c && !writers[i].parse_config)
+ return NULL;
+ *writer_num = i;
+ return writers[i].parse_config(c? wa + len + 1 : "");
}
-out:
- free(a);
- return ret;
+ PARA_ERROR_LOG("%s", "writer not found\n");
+ return NULL;
}
struct writer_node_group *setup_default_wng(void)
else
default_writer = 1;
wng->writer_nodes[0].writer = &writers[default_writer];
- PARA_INFO_LOG("using default writer: %s\n",
+ sprintf(wng->writer_nodes[0].task.status, "%s",
writer_names[default_writer]);
+ PARA_INFO_LOG("using default writer: %s %p\n",
+ writer_names[default_writer], writers[default_writer].parse_config);
+ wng->writer_nodes[0].conf = writers[default_writer].parse_config("");
return wng;
}