X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ao_write.c;h=82d98f3ee8cf6c0491e1820ee32b63c8216abac2;hp=d1d62a6d9d3c3f0f0acdf25ccfa8d7224b8f2eeb;hb=5e8d8a8eea6de9459ebdf4498f9f061c84bfa63a;hpb=c10a445944b716f0f28c3d63f064a12e7b62ba92

diff --git a/ao_write.c b/ao_write.c
index d1d62a6d..82d98f3e 100644
--- a/ao_write.c
+++ b/ao_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2011 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -40,19 +40,15 @@ static void aow_close(struct writer_node *wn)
 
 	if (!pawd)
 		return;
-	if (pawd->thread_btrn) {
-		pthread_cancel(pawd->thread);
-		pthread_join(pawd->thread, NULL);
-	}
+	assert(!pawd->thread_btrn);
 	ao_close(pawd->dev);
 	free(pawd);
 	wn->private_data = NULL;
-	ao_shutdown();
 }
 
-static void aow_pre_select(struct sched *s, struct task *t)
+static void aow_pre_select(struct sched *s, void *context)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_aow_data *pawd = wn->private_data;
 	int ret;
 
@@ -161,7 +157,6 @@ static int aow_init(struct writer_node *wn, unsigned sample_rate,
 	struct private_aow_data *pawd = para_malloc(sizeof(*pawd));
 	struct ao_write_args_info *conf = wn->conf;
 
-	ao_initialize();
 	if (conf->driver_given) {
 		ret = -E_AO_BAD_DRIVER;
 		id = ao_driver_id(conf->driver_arg);
@@ -224,12 +219,12 @@ __noreturn static void *aow_play(void *priv)
 	char *data;
 	int ret;
 
+	pthread_mutex_lock(&pawd->mutex);
 	for (;;) {
-		pthread_mutex_lock(&pawd->mutex);
 		for (;;) {
 			ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
 			if (ret < 0)
-				goto unlock;
+				goto fail;
 			if (ret > 0) {
 				btr_merge(btrn, wn->min_iqs);
 				bytes = btr_next_buffer(btrn, &data);
@@ -238,7 +233,7 @@ __noreturn static void *aow_play(void *priv)
 					break;
 				/* eof and less than a single frame available */
 				ret = -E_WRITE_COMMON_EOF;
-				goto unlock;
+				goto fail;
 			}
 			/*
 			 * No data available, go to sleep and wait for the main
@@ -251,22 +246,22 @@ __noreturn static void *aow_play(void *priv)
 			/* pthread_cond_wait() can never fail here */
 			assert(ret == 0);
 		}
-		pthread_mutex_unlock(&pawd->mutex);
 		assert(frames > 0);
 		bytes = frames * pawd->bytes_per_frame;
-		ret = -E_AO_PLAY;
-		if (ao_play(pawd->dev, data, bytes) == 0) /* failure */
-			goto out;
+		pthread_mutex_unlock(&pawd->mutex);
+		ret = ao_play(pawd->dev, data, bytes);
 		pthread_mutex_lock(&pawd->mutex);
+		if (ret == 0) { /* failure */
+			ret = -E_AO_PLAY;
+			goto fail;
+		}
 		btr_consume(btrn, bytes);
-		pthread_mutex_unlock(&pawd->mutex);
 	}
-unlock:
-	pthread_mutex_unlock(&pawd->mutex);
-out:
+fail:
+	btr_remove_node(&pawd->thread_btrn);
 	assert(ret < 0);
 	PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
-	btr_remove_node(&pawd->thread_btrn);
+	pthread_mutex_unlock(&pawd->mutex);
 	pthread_exit(NULL);
 }
 
@@ -313,10 +308,9 @@ fail:
 	return -E_AO_PTHREAD;
 }
 
-static int aow_post_select(__a_unused struct sched *s,
-		struct task *t)
+static int aow_post_select(__a_unused struct sched *s, void *context)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_aow_data *pawd = wn->private_data;
 	int ret;
 
@@ -352,8 +346,10 @@ static int aow_post_select(__a_unused struct sched *s,
 		return 0;
 	}
 	if (!wn->btrn) {
-		if (!pawd->thread_btrn)
+		if (!pawd->thread_btrn) {
+			pthread_join(pawd->thread, NULL);
 			return -E_AO_EOF;
+		}
 		PARA_INFO_LOG("waiting for play thread to terminate\n");
 		return 0;
 	}
@@ -367,10 +363,10 @@ static int aow_post_select(__a_unused struct sched *s,
 			goto remove_thread_btrn;
 		}
 	}
-	pthread_mutex_unlock(&pawd->mutex);
-	if (ret >= 0)
+	if (ret >= 0) {
+		pthread_mutex_unlock(&pawd->mutex);
 		goto out;
-	pthread_mutex_lock(&pawd->mutex);
+	}
 	btr_remove_node(&wn->btrn);
 	pthread_cond_signal(&pawd->data_available);
 	pthread_mutex_unlock(&pawd->mutex);
@@ -456,6 +452,5 @@ void ao_write_init(struct writer *w)
 	dh[num_lines] = NULL;
 	w->help.detailed_help = (const char **)dh;
 	ao_write_cmdline_parser_free(&dummy);
-	ao_shutdown();
 }