X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=5eb6b796cbff4a8ce74fae16017e4366485ae84f;hp=f1c1e8f131f3500a326f8832c1d332c9d17cbbac;hb=bb6721e17e741b7ea52fbf88661d2b177bed72c3;hpb=a7a37b282c4e936b2fb34c2bd7423f9f800dfd44 diff --git a/write_common.c b/write_common.c index f1c1e8f1..5eb6b796 100644 --- a/write_common.c +++ b/write_common.c @@ -1,27 +1,18 @@ /* - * Copyright (C) 2006-2007 Andre Noll + * Copyright (C) 2006-2009 Andre Noll * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file write_common.c common functions of para_audiod and para_write */ +#include + #include "para.h" #include "string.h" #include "list.h" #include "sched.h" +#include "ggo.h" #include "write.h" #include "error.h" @@ -33,52 +24,50 @@ struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY}; 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->eof = 1; + struct writer *w = writers + wn->writer_num; + if (!w->pre_select) + continue; + t->error = w->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->eof = 1; + struct writer *w = writers + wn->writer_num; + t->error = w->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_eof) { - g->eof = 1; - t->ret = -E_WNG_EOF; + if (!*g->loaded && *g->input_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); + memmove(*g->bufp, *g->bufp + min_written, *g->loaded); } } @@ -90,50 +79,38 @@ static void wng_post_select(struct sched *s, struct task *t) * \return If at least one open function returned an error, all successful * writer notes get closed and this error value is returned. Upon success, a * task associated with \a g is registered to the scheduler and the function - * returnes a positive value. + * returns a positive value. * */ 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]; + struct writer *w = writers + wn->writer_num; wn->wng = g; - ret = wn->writer->open(wn); + ret = w->open(wn); if (ret < 0) goto err_out; - wn->chunk_bytes = ret; - g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret); } sprintf(g->task.status, "%s", "writer node group"); - g->eof = 0; + register_task(&g->task); + g->open = 1; return 1; err_out: - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - unregister_task(&g->task); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); while (i > 0) { struct writer_node *wn = &g->writer_nodes[--i]; - wn->writer->close(wn); + struct writer *w = writers + wn->writer_num; + w->close(wn); } + free(g->writer_nodes); g->num_writers = 0; - g->eof = 1; + g->task.error = -E_TASK_UNREGISTERED; return ret; } - -/** - * unregister a writer node group task - * - * \param g the group whose task is to be closed - */ -void wng_unregister(struct writer_node_group *g) -{ - unregister_task(&g->task); - g->eof = 1; -} - /** * call the close function of each writer in the given group * @@ -145,12 +122,13 @@ void wng_close(struct writer_node_group *g) { int i; - if (!g) + if (!g || !g->open) return; PARA_NOTICE_LOG("closing wng with %d writer(s)\n", g->num_writers); FOR_EACH_WRITER_NODE(i, g) { struct writer_node *wn = &g->writer_nodes[i]; - wn->writer->close(wn); + struct writer *w = writers + wn->writer_num; + w->close(wn); } free(g->writer_nodes); free(g); @@ -169,16 +147,15 @@ struct writer_node_group *wng_new(unsigned num_writers) 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; } /** - * call the init function of each supported paraslash writer + * Call the init function of each supported paraslash writer. */ -void init_supported_writers(void) +void writer_init(void) { int i; @@ -192,7 +169,7 @@ void init_supported_writers(void) * \param writer_num contains the number of the writer upon success * * This function checks whether \a wa starts with the name of a supported - * paraslash writer, optinally followed by a colon and any options for that + * paraslash writer, optionally followed by a colon and any options for that * writer. If a valid writer name was found and further are present, the * remaining part of \a wa is passed to that writer's config parser. * @@ -222,7 +199,7 @@ void *check_writer_arg(const char *wa, int *writer_num) *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; } @@ -237,9 +214,31 @@ void *check_writer_arg(const char *wa, int *writer_num) struct writer_node_group *setup_default_wng(void) { struct writer_node_group *wng = wng_new(1); - wng->writer_nodes[0].writer = &writers[DEFAULT_WRITER]; + wng->writer_nodes[0].writer_num = 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; } +/** + * Print the help text of all writers to stdout. + * + * \param detailed Whether to print the detailed help text. + */ +void print_writer_helps(int detailed) +{ + int i; + + printf_or_die("\nAvailable writers: \n\t"); + FOR_EACH_WRITER(i) + printf_or_die("%s%s", i? " " : "", writer_names[i]); + printf_or_die("\n\n"); + FOR_EACH_WRITER(i) { + struct writer *w = writers + i; + + if (!w->help.short_help) + continue; + printf_or_die("Options for %s:\n", writer_names[i]); + ggo_print_help(&w->help, detailed); + } +}