X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=7e6d47a56beb5e827ebbaa7d31cf2560f6b8f49f;hp=43c0690b9bf87f7a057b80ad79ee8ac73a667a51;hb=3c5c2ebfc2d651f2f77d0df89cbb58a2068bcad0;hpb=1b39496da38155b84636c0f7cee7f7dbbea33632

diff --git a/write.c b/write.c
index 43c0690b..7e6d47a5 100644
--- a/write.c
+++ b/write.c
@@ -19,159 +19,96 @@
 #include "para.h"
 #include "string.h"
 #include "write.cmdline.h"
+#include "list.h"
+#include "sched.h"
+#include "stdin.h"
 #include "write.h"
 #include "write_common.h"
 #include "fd.h"
-
-#include <sys/time.h> /* gettimeofday */
-
 #include "error.h"
 
-#define WAV_HEADER_LEN 44
+INIT_WRITE_ERRLISTS;
 
-static char *audiobuf;
-static struct timeval *start_time;
-struct gengetopt_args_info conf;
+struct check_wav_task {
+	char *buf;
+	size_t *loaded;
+	int *eof;
+	unsigned channels;
+	unsigned sample_rate;
+	struct task task;
+};
 
-INIT_WRITE_ERRLISTS;
+struct initial_delay_task {
+	struct timeval start_time;
+	struct task task;
+};
 
-void para_log(int ll, const char* fmt,...)
-{
-	va_list argp;
+struct gengetopt_args_info conf;
+struct stdin_task sit;
+struct check_wav_task cwt;
+struct initial_delay_task idt;
+static struct writer_node_group *wng;
 
-	if (ll < conf.loglevel_arg)
-		return;
-	va_start(argp, fmt);
-	vfprintf(stderr, fmt, argp);
-	va_end(argp);
-}
+#define WAV_HEADER_LEN 44
 
 /**
- * read WAV_HEADER_LEN bytes from stdin to audio buffer
+ * test if audio buffer contains a valid wave header
  *
- * \return -E_READ_HDR on errors and on eof before WAV_HEADER_LEN could be
- * read. A positive return value indicates success.
+ * \return If not, return -E_NO_WAV_HEADER, otherwise, return zero. If
+ * there is less than WAV_HEADER_LEN bytes awailable, return one.
  */
-static int read_wav_header(void)
+static void check_wav_pre_select(struct sched *s, struct task *t)
 {
-	ssize_t ret, count = 0;
+	struct check_wav_task *cwt = t->private_data;
+	unsigned char *a;
 
-	while (count < WAV_HEADER_LEN) {
-		ret = read(STDIN_FILENO, audiobuf + count, WAV_HEADER_LEN - count);
-		if (ret <= 0)
-			return -E_READ_HDR;
-		count += ret;
+	if (*cwt->loaded < WAV_HEADER_LEN) {
+		t->ret = *cwt->eof? -E_PREMATURE_END : 1;
+		return;
 	}
-	return 1;
+	a = (unsigned char*)cwt->buf;
+	t->ret = -E_NO_WAV_HEADER;
+	if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F')
+		return;
+	cwt->channels = (unsigned) a[22];
+	cwt->sample_rate = 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->ret = 0;
+	PARA_INFO_LOG("channels: %d, sample_rate: %d\n", cwt->channels, cwt->sample_rate);
 }
 
-/**
- * check if current time is later than start_time
- * \param diff pointer to write remaining time to
- *
- * If start_time was not given, or current time is later than given
- * start_time, return 0. Otherwise, return 1 and write the time
- * difference between current time and start_time to diff. diff may be
- * NULL.
- *
- */
-static int start_time_in_future(struct timeval *diff)
+static void initial_delay_pre_select(struct sched *s, struct task *t)
 {
-	struct timeval now;
+	struct initial_delay_task *idt = t->private_data;
+	struct timeval diff;
 
-	if (!conf.start_time_given)
-		return 0;
-	gettimeofday(&now, NULL);
-	return tv_diff(start_time, &now, diff) > 0? 1 : 0;
-}
-
-/**
- * sleep until time given at command line
- *
- * This is called if the initial buffer is filled. It returns
- * immediately if no start_time was given at the command line
- * or if the given start time is in the past.
- *
- */
-static void do_initial_delay(struct timeval *delay)
-{
-	do
-		para_select(1, NULL, NULL, delay);
-	while (start_time_in_future(delay));
+	PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret);
+	t->ret = -E_NO_DELAY;
+	if (!idt->start_time.tv_sec && !idt->start_time.tv_usec)
+		return;
+	t->ret = 0; /* timeout */
+	if (tv_diff(&s->now, &idt->start_time, &diff) > 0)
+		return;
+	t->ret = 1;
+	if (tv_diff(&s->timeout , &diff, NULL) > 0)
+		s->timeout = diff;
 }
 
-static int read_stdin(char *buf, size_t bytes_to_load, size_t *loaded)
-{
-	ssize_t ret;
-
-	while (*loaded < bytes_to_load) {
-		ret = read(STDIN_FILENO, buf + *loaded, bytes_to_load - *loaded);
-		if (ret <= 0) {
-			if (ret < 0)
-				ret = -E_READ_STDIN;
-			return ret;
-		}
-		*loaded += ret;
-	}
-	return 1;
-}
-/**
- * play raw pcm data
- * \param loaded number of bytes already loaded
- *
- * If start_time was given, prebuffer data until buffer is full or
- * start_time is reached. In any case, do not start playing before
- * start_time.
- *
- * \return positive on success, negative on errors.
- */
-static int pcm_write(struct writer_node_group *wng, size_t loaded)
+void para_log(int ll, const char* fmt,...)
 {
-	size_t bufsize, prebuf_size, bytes_to_load;
-	struct timeval delay;
-	int ret, not_yet_started = 1;
+	va_list argp;
 
-	ret = wng_open(wng);
-	if (ret < 0)
-		goto out;
-	PARA_INFO_LOG("max chunk_bytes: %zd\n", wng->max_chunk_bytes);
-	bufsize = (conf.bufsize_arg * 1024 / wng->max_chunk_bytes)
-		* wng->max_chunk_bytes;
-	audiobuf = para_realloc(audiobuf, bufsize);
-	prebuf_size = conf.prebuffer_arg * bufsize / 100;
-	bytes_to_load =  PARA_MIN(prebuf_size, wng->max_chunk_bytes);
-	ret = read_stdin(audiobuf, bytes_to_load, &loaded);
-	if (ret <= 0 || loaded < bytes_to_load) {
-		if (ret >= 0)
-			ret = -E_PREMATURE_END;
-		goto out;
-	}
-	if (not_yet_started && start_time && start_time_in_future(&delay))
-		do_initial_delay(&delay);
-	not_yet_started = 0;
-again:
-	ret = wng_write(wng, audiobuf, &loaded);
-	if (ret <= 0)
-		goto out;
-	ret = -E_WRITE_OVERRUN;
-	if (loaded >= bufsize)
-		goto out;
-	bytes_to_load = PARA_MIN(wng->max_chunk_bytes, bufsize);
-	ret = read_stdin(audiobuf, bytes_to_load, &loaded);
-	if (ret < 0)
-		goto out;
-	if (!ret)
-		wng->eof = 1;
-	goto again;
-out:
-	wng_close(wng);
-	return ret;
+	if (ll < conf.loglevel_arg)
+		return;
+	va_start(argp, fmt);
+	vfprintf(stderr, fmt, argp);
+	va_end(argp);
 }
 
 static struct writer_node_group *check_args(void)
 {
 	int i, ret = -E_WRITE_SYNTAX;
-	static struct timeval tv;
 	struct writer_node_group *wng = NULL;
 
 	if (conf.list_writers_given) {
@@ -195,9 +132,8 @@ static struct writer_node_group *check_args(void)
 		if (sscanf(conf.start_time_arg, "%lu:%lu",
 				&sec, &usec) != 2)
 			goto out;
-		tv.tv_sec = sec;
-		tv.tv_usec = usec;
-		start_time = &tv;
+		idt.start_time.tv_sec = sec;
+		idt.start_time.tv_usec = usec;
 	}
 	if (!conf.writer_given) {
 		wng = setup_default_wng();
@@ -213,47 +149,96 @@ static struct writer_node_group *check_args(void)
 	}
 	ret = 1;
 out:
-	if (ret > 0)
+	if (ret > 0) {
 		return wng;
+	}
 	free(wng);
 	return NULL;
 }
 
-/**
- * test if audio buffer contains a valid wave header
- *
- * \return If not, return 0, otherwise, store number of channels and sample rate
- * in struct conf and return WAV_HEADER_LEN.
- */
-static size_t check_wave(void)
+static void idt_error_handler(struct task *t)
 {
-	unsigned char *a = (unsigned char*)audiobuf;
-	if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F')
-		return WAV_HEADER_LEN;
-	conf.channels_arg = (unsigned) a[22];
-	conf.sample_rate_arg = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
-	return 0;
+	PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret);
+	int ret;
+	unregister_task(t);
+	wng->buf = sit.buf;
+	wng->loaded = &sit.loaded;
+	wng->eof = &sit.eof;
+	ret = wng_open(wng);
+	if (ret < 0) {
+		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+		exit(EXIT_FAILURE);
+	}
+}
+
+static void cwt_error_handler(struct task *t)
+{
+	PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret);
+	if (t->ret < 0) {
+		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
+		if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_PRE_EOF)
+			exit(EXIT_FAILURE);
+		if (t->ret == -E_PRE_EOF) {
+			conf.channels_arg = cwt.channels;
+			conf.sample_rate_arg = cwt.sample_rate;
+		}
+	}
+	unregister_task(t);
+	idt.task.pre_select = initial_delay_pre_select;
+	idt.task.private_data = &idt;
+	idt.task.error_handler = idt_error_handler;
+	idt.task.flags = PRE_EOF_IS_ERROR;
+	register_task(&idt.task);
+}
+
+static void stdin_error_handler(struct task *t)
+{
+	unregister_task(t);
+	PARA_INFO_LOG("task %p, ret: %d\n", t, t->ret);
+	if (t->ret < 0)
+		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
 }
 
 int main(int argc, char *argv[])
 {
 	int ret = -E_WRITE_SYNTAX;
-	struct writer_node_group *wng = NULL;
+	struct sched s;
 
 	cmdline_parser(argc, argv, &conf);
 	wng = check_args();
 	if (!wng)
 		goto out;
 	init_supported_writers();
-	audiobuf = para_malloc(WAV_HEADER_LEN);
-	ret = read_wav_header();
-	if (ret < 0)
-		goto out;
-	ret = pcm_write(wng, check_wave());
+	init_sched();
+
+	sit.bufsize = 16 * 1024,
+	sit.buf = para_malloc(16 * 1024),
+	sit.loaded = 0,
+	sit.task.pre_select = stdin_pre_select;
+	sit.task.post_select = stdin_post_select;
+	sit.task.error_handler = stdin_error_handler;
+	sit.task.flags = POST_EOF_IS_ERROR;
+	sit.task.private_data = &sit;
+	register_task(&sit.task);
+
+	cwt.task.pre_select = check_wav_pre_select;
+	cwt.task.private_data = &cwt;
+	cwt.task.error_handler = cwt_error_handler;
+	cwt.buf = sit.buf;
+	cwt.loaded = &sit.loaded;
+	cwt.eof = &sit.eof;
+	cwt.task.flags = PRE_EOF_IS_ERROR;
+	register_task(&cwt.task);
+
+	s.default_timeout.tv_sec = 1;
+	s.default_timeout.tv_usec = 0;
+	ret = sched(&s);
+
 out:
-	wng_destroy(wng);
-	free(audiobuf);
-	if (ret < 0)
+	if (ret < 0) {
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+		ret = EXIT_FAILURE;
+	} else
+		ret = EXIT_SUCCESS;
 	return ret;
 }