From: Andre Noll <maan@systemlinux.org>
Date: Sun, 31 Mar 2013 13:30:57 +0000 (+0000)
Subject: prebuffer: Switch to the alternative post select method.
X-Git-Tag: v0.4.13~39^2~31
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=4ca80f239ef2532dfe3af4013eb1d0cd38100185

prebuffer: Switch to the alternative post select method.
---

diff --git a/prebuffer_filter.c b/prebuffer_filter.c
index e1afff5a..c849424a 100644
--- a/prebuffer_filter.c
+++ b/prebuffer_filter.c
@@ -37,7 +37,6 @@ static void prebuffer_pre_select(struct sched *s, struct task *t)
 	struct prebuffer_filter_args_info *conf = ppd->conf;
 	struct timeval diff;
 
-	t->error = 0;
 	if (iqs == 0)
 		return;
 	if (ppd->barrier.tv_sec == 0) {
@@ -57,7 +56,7 @@ static void prebuffer_close(struct filter_node *fn)
 	free(fn->private_data);
 }
 
-static void prebuffer_post_select(__a_unused struct sched *s, struct task *t)
+static int prebuffer_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
 	struct btr_node *btrn = fn->btrn;
@@ -65,15 +64,14 @@ static void prebuffer_post_select(__a_unused struct sched *s, struct task *t)
 	struct private_prebuffer_data *ppd = fn->private_data;
 	struct prebuffer_filter_args_info *conf = ppd->conf;
 
-	t->error = 0;
 	if (ppd->barrier.tv_sec == 0)
-		return;
+		return 0;
 	if (tv_diff(now, &ppd->barrier, NULL) < 0)
-		return;
+		return 0;
 	if (iqs < conf->size_arg)
-		return;
-	btr_splice_out_node(btrn);
-	t->error = -E_PREBUFFER_SUCCESS;
+		return 0;
+	btr_splice_out_node(fn->btrn);
+	return -E_PREBUFFER_SUCCESS;
 }
 
 static int prebuffer_parse_config(int argc, char **argv, void **config)
@@ -124,7 +122,8 @@ void prebuffer_filter_init(struct filter *f)
 	f->parse_config = prebuffer_parse_config;
 	f->free_config = prebuffer_free_config;
 	f->pre_select = prebuffer_pre_select;
-	f->post_select = prebuffer_post_select;
+	f->new_post_select = prebuffer_post_select;
+	f->post_select = NULL;
 	f->help = (struct ggo_help) {
 		.short_help = prebuffer_filter_args_info_help,
 		.detailed_help = prebuffer_filter_args_info_detailed_help