X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=6799db4175282b779c2fd454d11988be31b933d8;hp=b92dd972e88051dcb0f1a5159cfbed0504615e62;hb=081c8921f827c1ed482c45ba22bd8bb97db2838b;hpb=cc2a6158eef6957769fd5739446916d3e5413ae1

diff --git a/write.c b/write.c
index b92dd972..6799db41 100644
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,8 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "string.h"
@@ -23,296 +21,134 @@
 #include "write_common.h"
 #include "fd.h"
 #include "error.h"
+#include "version.h"
+#include "check_wav.h"
 
 INIT_WRITE_ERRLISTS;
 
-/** Check if given buffer contains a valid wave header. */
-struct check_wav_task {
-	/** The buffer to check. */
-	char *buf;
-	/** Number of bytes loaded in \a buf. */
-	size_t *loaded;
-	/** Non-zero if an error occurred or end of file was reached. */
-	int *input_error;
-	/** Number of channels specified in wav header given by \a buf. */
-	unsigned channels;
-	/** Sample rate specified in wav header given by \a buf. */
-	unsigned samplerate;
-	/** The task structure used by the scheduler. */
-	struct task task;
-};
-
-enum check_wav_state {
-	CWS_NEED_HEADER,
-	CWS_HAVE_HEADER,
-	CWS_NO_HEADER,
-};
-
-struct check_wav_task_btr {
-	int state;
-	/** Number of channels specified in wav header given by \a buf. */
-	unsigned channels;
-	/** Sample rate specified in wav header given by \a buf. */
-	unsigned samplerate;
-	/** The task structure used by the scheduler. */
-	struct task task;
-	struct btr_node *btrn;
-};
-
-/** Delay writing until given time. */
-struct initial_delay_task {
-	/** The time the first data should be written out. */
-	struct timeval start_time;
-	/** The task structure for this task. */
-	struct task task;
-};
-
 static struct write_args_info conf;
 
 static struct stdin_task sit;
 
-static struct check_wav_task the_check_wav_task;
-static struct initial_delay_task the_initial_delay_task;
+static int loglevel;
+INIT_STDERR_LOGGING(loglevel)
 
-static struct writer_node_group *wng;
+__noreturn static void print_help_and_die(void)
+{
+	struct ggo_help h = DEFINE_GGO_HELP(write);
+	bool d = conf.detailed_help_given;
 
-/** Length of a standard wav header. */
-#define WAV_HEADER_LEN 44
+	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
+	print_writer_helps(d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS);
+	exit(0);
+}
 
-/**
- * Test if audio buffer contains a valid wave header.
+/*
+ * Parse config and register a task for a writer node.
+ *
+ * \param arg Command line arguments.
+ * \param parent The new node will be a child of \a parent.
+ * \param wn The writer node.
+ *
+ * If arg is \p NULL, the OS-dependent default writer is used with no
+ * arguments.  The default writers are alsa for Linux, osx for OS X, oss for
+ * *BSD, and the file writer if the default writer is not supported.
+ *
+ * Once the writer configuration has been retrieved from the ->parse_config
+ * callback a writer node is created, its buffer tree node is added to the
+ * buffer tree as a child of the given parent.
+ *
+ * Finally, the new writer node's task structure is initialized and registered
+ * to the paraslash scheduler.
  *
- * \return If not, return -E_NO_WAV_HEADER, otherwise, return zero. If
- * there is less than WAV_HEADER_LEN bytes available, return one.
+ * \return Standard.
  */
-static void check_wav_pre_select(__a_unused struct sched *s, struct task *t)
+static void setup_writer_node(const char *arg, struct btr_node *parent,
+		struct writer_node *wn, struct sched *s)
 {
-	struct check_wav_task *cwt = container_of(t, struct check_wav_task, task);
-	unsigned char *a;
-	int ret;
-
-	if (*cwt->loaded < WAV_HEADER_LEN) {
-		if (*cwt->input_error < 0)
-			t->error = *cwt->input_error;
-		return;
-	}
-	cwt->channels = 2;
-	cwt->samplerate = 44100;
-	a = (unsigned char*)cwt->buf;
-	if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F') {
-		PARA_NOTICE_LOG("wav header not found\n");
-		t->error = -E_NO_WAV_HEADER;
-		goto out;
-	}
-	cwt->channels = (unsigned) a[22];
-	cwt->samplerate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
-	*cwt->loaded -= WAV_HEADER_LEN;
-	memmove(cwt->buf, cwt->buf + WAV_HEADER_LEN, *cwt->loaded);
-	t->error = -E_WAV_HEADER_SUCCESS;
-	PARA_INFO_LOG("channels: %d, sample rate: %d\n", cwt->channels, cwt->samplerate);
-out:
-	wng->channels = &cwt->channels;
-	wng->samplerate = &cwt->samplerate;
-	ret = wng_open(wng);
-	if (ret < 0)
-		t->error = ret;
-	s->timeout.tv_sec = 0;
-	s->timeout.tv_usec = 1;
+	wn->conf = check_writer_arg_or_die(arg, &wn->writer_num);
+	register_writer_node(wn, parent, s);
 }
 
-static void check_wav_pre_select_btr(__a_unused struct sched *s, struct task *t)
-{
-	struct check_wav_task_btr *cwt = container_of(t, struct check_wav_task_btr, task);
+struct write_task {
+	struct task task;
+	struct check_wav_context *cwc;
+};
 
-	if (btr_get_input_queue_size(cwt->btrn) < WAV_HEADER_LEN)
-		return;
-	s->timeout.tv_sec = 0;
-	s->timeout.tv_usec = 1;
+static void write_pre_select(struct sched *s, struct task *t)
+{
+	struct write_task *wt = container_of(t, struct write_task, task);
+	check_wav_pre_select(s, wt->cwc);
 }
 
-static int check_wav_exec(struct btr_node *btrn, const char *cmd, char **result)
+static int write_post_select(__a_unused struct sched *s, struct task *t)
 {
-	struct check_wav_task_btr *cwt = btr_context(btrn);
-
-	if (!strcmp(cmd, "samplerate")) {
-		if (cwt->state != CWS_HAVE_HEADER)
-			return -ERRNO_TO_PARA_ERROR(ENAVAIL);
-		*result = make_message("%d", cwt->samplerate);
-		return 1;
-	}
-	if (!strcmp(cmd, "channels")) {
-		if (cwt->state != CWS_HAVE_HEADER)
-			return -ERRNO_TO_PARA_ERROR(ENAVAIL);
-		*result = make_message("%d", cwt->samplerate);
-		return 1;
-	}
-	return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+	struct write_task *wt = container_of(t, struct write_task, task);
+	return check_wav_post_select(wt->cwc);
 }
 
-static void check_wav_post_select_btr(__a_unused struct sched *s, struct task *t)
+static int setup_and_schedule(void)
 {
-	struct check_wav_task_btr *cwt = container_of(t, struct check_wav_task_btr, task);
-	unsigned char *a;
-	size_t sz = btr_get_input_queue_size(cwt->btrn);
+	int i, ret;
+	struct btr_node *cw_btrn;
+	struct writer_node *wns;
+	static struct sched s;
+	struct wav_params wp;
+	struct write_task wt = {
+		.task = {
+			.pre_select = write_pre_select,
+			.post_select = write_post_select,
+			.status = "write task",
+		},
+	};
+
+	sit.btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "stdin"));
+	stdin_set_defaults(&sit);
+	register_task(&s, &sit.task);
 
-	t->error = 0;
-	if (cwt->state != CWS_NEED_HEADER)
-		goto out;
-	if (sz < WAV_HEADER_LEN) {
-		if (!btr_no_parent(cwt->btrn))
-			return;
-		if (sz != 0) {
-			cwt->state = CWS_NO_HEADER;
-			goto out;
-		}
-		t->error = -E_WRITE_EOF;
-		goto err;
-	}
-	cwt->channels = 2;
-	cwt->samplerate = 44100;
-	btr_next_buffer(cwt->btrn, (char **)&a);
-	if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F') {
-		PARA_NOTICE_LOG("wav header not found\n");
-		cwt->state = CWS_NO_HEADER;
-		sprintf(t->status, "check wav: no header");
-		goto consume;
-	}
-	PARA_INFO_LOG("found wav header\n");
-	cwt->state = CWS_HAVE_HEADER;
-	sprintf(t->status, "check wav: have header");
-	cwt->channels = (unsigned) a[22];
-	cwt->samplerate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
-consume:
-	PARA_INFO_LOG("channels: %d, sample rate: %d\n", cwt->channels, cwt->samplerate);
-	btr_consume(cwt->btrn, WAV_HEADER_LEN);
-out:
-	if (sz) {
-		btr_pushdown(cwt->btrn);
-		s->timeout.tv_sec = 0;
-		s->timeout.tv_usec = 1;
+	COPY_WAV_PARMS(&wp, &conf);
+	wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn);
+	register_task(&s, &wt.task);
+	if (!conf.writer_given) {
+		wns = para_calloc(sizeof(*wns));
+		setup_writer_node(NULL, cw_btrn, wns, &s);
+		i = 1;
 	} else {
-		if (btr_no_parent(cwt->btrn))
-			t->error = -E_WRITE_EOF;
+		wns = para_calloc(conf.writer_given * sizeof(*wns));
+		for (i = 0; i < conf.writer_given; i++)
+			setup_writer_node(conf.writer_arg[i], cw_btrn,
+				wns + i, &s);
 	}
-err:
-	if (t->error < 0)
-		btr_del_node(cwt->btrn);
-}
 
-static void initial_delay_pre_select(struct sched *s, struct task *t)
-{
-	struct initial_delay_task *idt = container_of(t, struct initial_delay_task, task);
-	struct timeval diff;
-
-	if (!idt->start_time.tv_sec && !idt->start_time.tv_usec) {
-		t->error = -E_NO_DELAY;
-		goto register_check_wav;
-	}
-	if (tv_diff(now, &idt->start_time, &diff) > 0) {
-		t->error = -E_DELAY_TIMEOUT;
-		goto register_check_wav;
-	}
-	if (tv_diff(&s->timeout , &diff, NULL) > 0)
-		s->timeout = diff;
-	return;
-register_check_wav:
-	register_task(&the_check_wav_task.task);
-	s->timeout.tv_sec = 0;
-	s->timeout.tv_usec = 1;
-}
-
-static int loglevel;
-INIT_STDERR_LOGGING(loglevel)
-
-static struct writer_node_group *check_args(void)
-{
-	int i, ret = -E_WRITE_SYNTAX;
-	struct writer_node_group *g = NULL;
-	struct initial_delay_task *idt = &the_initial_delay_task;
-
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
-	if (conf.start_time_given) {
-		long unsigned sec, usec;
-		if (sscanf(conf.start_time_arg, "%lu:%lu",
-				&sec, &usec) != 2)
-			goto out;
-		idt->start_time.tv_sec = sec;
-		idt->start_time.tv_usec = usec;
-	}
-	if (!conf.writer_given) {
-		g = setup_default_wng();
-		ret = 1;
-		goto out;
+	s.default_timeout.tv_sec = 10;
+	s.default_timeout.tv_usec = 50000;
+	ret = schedule(&s);
+	if (ret >= 0) {
+		int j;
+		for (j = 0; j < i; j++) {
+			struct task *t = &wns[j].task;
+			assert(t->error < 0);
+			if (t->error != -E_WRITE_COMMON_EOF
+					&& t->error != -E_BTR_EOF) {
+				PARA_ERROR_LOG("%s: %s\n", t->status,
+					para_strerror(-t->error));
+				if (ret >= 0)
+					ret = t->error;
+			}
+		}
 	}
-	g = wng_new(conf.writer_given);
-	ret = -E_WRITE_SYNTAX;
-	for (i = 0; i < conf.writer_given; i++) {
-		int writer_num;
-		g->writer_nodes[i].conf = check_writer_arg(
-			conf.writer_arg[i], &writer_num);
-		if (!g->writer_nodes[i].conf)
-			goto out;
-		g->writer_nodes[i].writer_num = writer_num;
+	for (i--; i >= 0; i--) {
+		struct writer_node *wn = wns + i;
+		struct writer *w = writers + wn->writer_num;
+
+		w->close(wn);
+		btr_remove_node(&wn->btrn);
+		w->free_config(wn->conf);
+		free(wn->conf);
 	}
-	ret = 1;
-out:
-	if (ret > 0)
-		return g;
-	free(g);
-	return NULL;
-}
-
-__noreturn static void print_help_and_die(void)
-{
-	int d = conf.detailed_help_given;
-	const char **p = d? write_args_info_detailed_help
-		: write_args_info_help;
-
-	printf_or_die("%s\n\n", WRITE_CMDLINE_PARSER_PACKAGE "-"
-		WRITE_CMDLINE_PARSER_VERSION);
-	printf_or_die("%s\n\n", write_args_info_usage);
-	for (; *p; p++)
-		printf_or_die("%s\n", *p);
-	print_writer_helps(d);
-	exit(0);
-}
-
-/*
- TODO: check wav, initial delay, multiple writers, non-default writers
- */
-static int main_btr(struct sched *s)
-{
-	struct writer_node *wn = para_malloc(sizeof(*wn));
-	struct writer *w = writers + DEFAULT_WRITER;
-	int ret;
-	struct check_wav_task_btr _cwt, *cwt = &_cwt;
-
-	sit.btrn = btr_new_node("stdin", NULL /* stdin has no parent */, NULL, NULL);
-	stdin_set_defaults(&sit);
-	register_task(&sit.task);
-
-	cwt->state = CWS_NEED_HEADER;
-	cwt->btrn = btr_new_node("check wav", sit.btrn, check_wav_exec, cwt);
-	sprintf(cwt->task.status, "check wav");
-	cwt->task.pre_select = check_wav_pre_select_btr;
-	cwt->task.post_select = check_wav_post_select_btr;
-	register_task(&cwt->task);
-
-	wn->writer_num = DEFAULT_WRITER;
-	wn->conf = writers[DEFAULT_WRITER].parse_config("-B");
-	wn->btrn = btr_new_node("writer", cwt->btrn, NULL, NULL);
-	sprintf(wn->task.status, "some writer");
-	w->open(wn);
-	wn->task.post_select = w->post_select_btr;
-	wn->task.pre_select = w->pre_select_btr;
-	register_task(&wn->task);
-
-
-
-	s->default_timeout.tv_sec = 10;
-	s->default_timeout.tv_usec = 50000;
-	ret = schedule(s);
-	w->close(wn);
+	free(wns);
+	check_wav_shutdown(wt.cwc);
 	return ret;
 }
 
@@ -322,61 +158,23 @@ static int main_btr(struct sched *s)
  * \param argc The usual argument counter.
  * \param argv The usual argument vector.
  *
- * It registers the stdin task, the check_wav_task, the task for initial delay
- * and all tasks for actually writing out the stream.
+ * It sets up and starts the tasks and the buffer tree nodes determined by
+ * command line options.
  *
  * \return \p EXIT_SUCCESS or EXIT_FAILURE
  */
 int main(int argc, char *argv[])
 {
-	int ret = -E_WRITE_SYNTAX;
-	static struct sched s;
-	struct check_wav_task *cwt = &the_check_wav_task;
-	struct initial_delay_task *idt = &the_initial_delay_task;
+	int ret;
 
-	writer_init();
 	write_cmdline_parser(argc, argv, &conf);
-	HANDLE_VERSION_FLAG("write", conf);
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
+	writer_init();
+	version_handle_flag("write", conf.version_given);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
 
-	if (conf.buffer_tree_given) {
-		ret = main_btr(&s);
-		goto out;
-	}
-	wng = check_args();
-	if (!wng)
-		goto out;
-	stdin_set_defaults(&sit);
-	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
-	if (conf.bufsize_arg < 0)
-		goto out;
-	if (conf.bufsize_arg >= INT_MAX / 1024)
-		goto out;
-	sit.bufsize = conf.bufsize_arg * 1024;
-	sit.buf = para_malloc(sit.bufsize);
-
-	wng->bufp = &sit.buf;
-	wng->loaded = &sit.loaded;
-	wng->input_error = &sit.task.error;
-
-	register_task(&sit.task);
-
-	cwt->buf = sit.buf;
-	cwt->loaded = &sit.loaded;
-	cwt->input_error = &sit.task.error;
-	sprintf(cwt->task.status, "check wav");
-	cwt->task.pre_select = check_wav_pre_select;
-
-	idt->task.pre_select = initial_delay_pre_select;
-	sprintf(idt->task.status, "initial_delay");
-	register_task(&idt->task);
-
-	s.default_timeout.tv_sec = 10;
-	s.default_timeout.tv_usec = 0;
-	ret = schedule(&s);
-	wng_close(wng);
-out:
+	ret = setup_and_schedule();
 	if (ret < 0) {
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 		exit(EXIT_FAILURE);