From: Andre Noll <maan@systemlinux.org>
Date: Sun, 31 Mar 2013 19:47:35 +0000 (+0000)
Subject: sched: Rename new_post_select back to post_select.
X-Git-Tag: v0.4.13~39^2~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=484e75562df55dca31ffcb9e5b05a490b4a3d3a1;ds=sidebyside

sched: Rename new_post_select back to post_select.
---

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 71654bf3..9eea045c 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -218,6 +218,6 @@ void aacdec_filter_init(struct filter *f)
 	f->open = aacdec_open;
 	f->close = aacdec_close;
 	f->pre_select = generic_filter_pre_select;
-	f->new_post_select = aacdec_post_select;
+	f->post_select = aacdec_post_select;
 	f->execute = aacdec_execute;
 }
diff --git a/afh_recv.c b/afh_recv.c
index aa27c8b5..774ae88c 100644
--- a/afh_recv.c
+++ b/afh_recv.c
@@ -252,7 +252,7 @@ void afh_recv_init(struct receiver *r)
 	r->open = afh_recv_open;
 	r->close = afh_recv_close;
 	r->pre_select = afh_recv_pre_select;
-	r->new_post_select = afh_recv_post_select;
+	r->post_select = afh_recv_post_select;
 	r->parse_config = afh_recv_parse_config;
 	r->free_config = afh_recv_free_config;
 	r->execute = afh_execute;
diff --git a/afs.c b/afs.c
index 9cc075f6..2f521291 100644
--- a/afs.c
+++ b/afs.c
@@ -761,7 +761,7 @@ static void register_signal_task(struct sched *s)
 	para_install_sighandler(SIGHUP);
 
 	st->task.pre_select = signal_pre_select;
-	st->task.new_post_select = afs_signal_post_select;
+	st->task.post_select = afs_signal_post_select;
 	sprintf(st->task.status, "signal task");
 	register_task(s, &st->task);
 }
@@ -971,7 +971,7 @@ static void register_command_task(uint32_t cookie, struct sched *s)
 	ct->cookie = cookie;
 
 	ct->task.pre_select = command_pre_select;
-	ct->task.new_post_select = command_post_select;
+	ct->task.post_select = command_post_select;
 	sprintf(ct->task.status, "afs command task");
 	register_task(s, &ct->task);
 }
diff --git a/alsa_write.c b/alsa_write.c
index 04a94f73..0563ba73 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -357,7 +357,7 @@ void alsa_write_init(struct writer *w)
 	alsa_write_cmdline_parser_init(&dummy);
 	w->close = alsa_close;
 	w->pre_select = alsa_write_pre_select;
-	w->new_post_select = alsa_write_post_select;
+	w->post_select = alsa_write_post_select;
 	w->parse_config_or_die = alsa_parse_config_or_die;
 	w->free_config = alsa_free_config;
 	w->help = (struct ggo_help) {
diff --git a/amp_filter.c b/amp_filter.c
index 186f87a5..a6bfca25 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -134,7 +134,7 @@ void amp_filter_init(struct filter *f)
 	f->open = amp_open;
 	f->close = amp_close;
 	f->pre_select = generic_filter_pre_select;
-	f->new_post_select = amp_post_select;
+	f->post_select = amp_post_select;
 	f->parse_config = amp_parse_config;
 	f->free_config = amp_free_config;
 	f->help = (struct ggo_help) {
diff --git a/ao_write.c b/ao_write.c
index 65ad02c0..9d204ff3 100644
--- a/ao_write.c
+++ b/ao_write.c
@@ -368,7 +368,7 @@ void ao_write_init(struct writer *w)
 	ao_write_cmdline_parser_init(&dummy);
 	w->close = aow_close;
 	w->pre_select = aow_pre_select;
-	w->new_post_select = aow_post_select;
+	w->post_select = aow_post_select;
 	w->parse_config_or_die = aow_parse_config_or_die;
 	w->free_config = aow_free_config;
 	w->help = (struct ggo_help) {
diff --git a/audioc.c b/audioc.c
index f0c61cdf..74fb11cb 100644
--- a/audioc.c
+++ b/audioc.c
@@ -137,7 +137,7 @@ out:
 static struct audioc_task audioc_task = {
 	.task = {
 		.pre_select = audioc_pre_select,
-		.new_post_select = audioc_post_select,
+		.post_select = audioc_post_select,
 		.status = "audioc task"
 	},
 }, *at = &audioc_task;
diff --git a/audiod.c b/audiod.c
index 0ff92e6f..d2c66f2b 100644
--- a/audiod.c
+++ b/audiod.c
@@ -495,7 +495,7 @@ static void open_filters(struct slot_info *s)
 		fn->filter_num = a->filter_nums[i];
 		fn->conf = a->filter_conf[i];
 		fn->task.pre_select = f->pre_select;
-		fn->task.new_post_select = f->new_post_select;
+		fn->task.post_select = f->post_select;
 		fn->btrn = btr_new_node(&(struct btr_node_description)
 			EMBRACE(.name = f->name, .parent = parent,
 				.handler = f->execute, .context = fn));
@@ -559,7 +559,7 @@ static int open_receiver(int format)
 	PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
 		audio_formats[format], r->name, slot_num);
 	rn->task.pre_select = r->pre_select;
-	rn->task.new_post_select = r->new_post_select;
+	rn->task.post_select = r->post_select;
 	sprintf(rn->task.status, "%s receiver node", r->name);
 	register_task(&sched, &rn->task);
 	return slot_num;
@@ -1009,7 +1009,7 @@ static int signal_post_select(struct sched *s, __a_unused struct task *t)
 static void signal_setup_default(struct signal_task *st)
 {
 	st->task.pre_select = signal_pre_select;
-	st->task.new_post_select = signal_post_select;
+	st->task.post_select = signal_post_select;
 	sprintf(st->task.status, "signal task");
 }
 
@@ -1042,7 +1042,7 @@ static int command_post_select(struct sched *s, struct task *t)
 static void init_command_task(struct command_task *ct)
 {
 	ct->task.pre_select = command_pre_select;
-	ct->task.new_post_select = command_post_select;
+	ct->task.post_select = command_post_select;
 	ct->task.error = 0;
 	ct->fd = audiod_get_socket(); /* doesn't return on errors */
 	sprintf(ct->task.status, "command task");
@@ -1272,7 +1272,7 @@ static void init_status_task(struct status_task *st)
 {
 	memset(st, 0, sizeof(struct status_task));
 	st->task.pre_select = status_pre_select;
-	st->task.new_post_select = status_post_select;
+	st->task.post_select = status_post_select;
 	st->sa_time_diff_sign = 1;
 	st->clock_diff_count = conf.clock_diff_count_arg;
 	st->current_audio_format_num = -1;
diff --git a/client.c b/client.c
index da075e09..90dc432b 100644
--- a/client.c
+++ b/client.c
@@ -95,7 +95,7 @@ static int execute_client_command(const char *cmd, char **result)
 	struct exec_task exec_task = {
 		.task = {
 			.pre_select = exec_pre_select,
-			.new_post_select = exec_post_select,
+			.post_select = exec_post_select,
 			.status = "client exec task",
 		},
 		.result_buf = para_strdup(""),
@@ -548,7 +548,7 @@ static int supervisor_post_select(struct sched *s, __a_unused struct task *t)
 }
 
 static struct task svt = {
-	.new_post_select = supervisor_post_select,
+	.post_select = supervisor_post_select,
 	.status = "supervisor task"
 };
 
diff --git a/client_common.c b/client_common.c
index 8958cace..8ea41922 100644
--- a/client_common.c
+++ b/client_common.c
@@ -601,7 +601,7 @@ int client_connect(struct client_task *ct, struct sched *s,
 	ct->btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "client", .parent = parent, .child = child));
 	ct->task.pre_select = client_pre_select;
-	ct->task.new_post_select = client_post_select;
+	ct->task.post_select = client_post_select;
 	ct->task.error = 0;
 	sprintf(ct->task.status, "client");
 	register_task(s, &ct->task);
diff --git a/compress_filter.c b/compress_filter.c
index a10e7c35..d7162791 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -150,7 +150,7 @@ void compress_filter_init(struct filter *f)
 	f->open = compress_open;
 	f->close = compress_close;
 	f->pre_select = generic_filter_pre_select;
-	f->new_post_select = compress_post_select;
+	f->post_select = compress_post_select;
 	f->parse_config = compress_parse_config;
 	f->free_config = compress_free_config;
 	f->help = (struct ggo_help) {
diff --git a/dccp_recv.c b/dccp_recv.c
index d5f3cadb..1f9df189 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -178,7 +178,7 @@ void dccp_recv_init(struct receiver *r)
 	r->open = dccp_recv_open;
 	r->close = dccp_recv_close;
 	r->pre_select = dccp_recv_pre_select;
-	r->new_post_select = dccp_recv_post_select;
+	r->post_select = dccp_recv_post_select;
 	r->parse_config = dccp_recv_parse_config;
 	r->free_config = dccp_recv_free_config;
 	r->help = (struct ggo_help) {
diff --git a/fecdec_filter.c b/fecdec_filter.c
index f1bd8859..2f0a6746 100644
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -491,5 +491,5 @@ void fecdec_filter_init(struct filter *f)
 	f->close = fecdec_close;
 	f->open = fecdec_open;
 	f->pre_select = generic_filter_pre_select;
-	f->new_post_select = fecdec_post_select;
+	f->post_select = fecdec_post_select;
 }
diff --git a/file_write.c b/file_write.c
index c758dc11..28fddcb6 100644
--- a/file_write.c
+++ b/file_write.c
@@ -153,7 +153,7 @@ void file_write_init(struct writer *w)
 
 	file_write_cmdline_parser_init(&dummy);
 	w->pre_select = file_write_pre_select;
-	w->new_post_select = file_write_post_select;
+	w->post_select = file_write_post_select;
 	w->parse_config_or_die = file_write_parse_config_or_die;
 	w->free_config = file_write_free_config;
 	w->close = file_write_close;
diff --git a/filter.c b/filter.c
index 7a95b1eb..40e3779e 100644
--- a/filter.c
+++ b/filter.c
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
 			EMBRACE(.name = f->name, .parent = parent,
 			.handler = f->execute, .context = fn));
 		fn->task.pre_select = f->pre_select;
-		fn->task.new_post_select = f->new_post_select;
+		fn->task.post_select = f->post_select;
 		f->open(fn);
 		register_task(&s, &fn->task);
 		parent = fn->btrn;
diff --git a/filter.h b/filter.h
index 31f3ef15..9c57904e 100644
--- a/filter.h
+++ b/filter.h
@@ -109,7 +109,7 @@ struct filter {
 	 * post_select function is supposed to set t->error to a (negative)
 	 * error code.
 	 */
-	int (*new_post_select)(struct sched *s, struct task *t);
+	int (*post_select)(struct sched *s, struct task *t);
 	/**
 	 * Answer a buffer tree query.
 	 *
diff --git a/flacdec_filter.c b/flacdec_filter.c
index d739094a..09b319a0 100644
--- a/flacdec_filter.c
+++ b/flacdec_filter.c
@@ -296,6 +296,6 @@ void flacdec_filter_init(struct filter *f)
 	f->open = flacdec_open;
 	f->close = flacdec_close;
 	f->pre_select = flacdec_pre_select;
-	f->new_post_select = flacdec_post_select;
+	f->post_select = flacdec_post_select;
 	f->execute = flacdec_execute;
 }
diff --git a/grab_client.c b/grab_client.c
index 39e95471..ecc16fc8 100644
--- a/grab_client.c
+++ b/grab_client.c
@@ -130,7 +130,7 @@ static void gc_activate(struct grab_client *gc, struct sched *s)
 	gc->btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = name, .parent = parent));
 	gc->task.pre_select = gc_pre_select;
-	gc->task.new_post_select = gc_post_select;
+	gc->task.post_select = gc_post_select;
 	snprintf(gc->task.status, sizeof(gc->task.status) - 1, "%s", name);
 	gc->task.status[sizeof(gc->task.status) - 1] = '\0';
 	gc->task.error = 0;
diff --git a/http_recv.c b/http_recv.c
index ad8e213c..f1d85930 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -192,7 +192,7 @@ void http_recv_init(struct receiver *r)
 	r->open = http_recv_open;
 	r->close = http_recv_close;
 	r->pre_select = http_recv_pre_select;
-	r->new_post_select = http_recv_post_select;
+	r->post_select = http_recv_post_select;
 	r->parse_config = http_recv_parse_config;
 	r->free_config = http_recv_free_config;
 	r->help = (struct ggo_help) {
diff --git a/interactive.c b/interactive.c
index cfc1d606..f2819012 100644
--- a/interactive.c
+++ b/interactive.c
@@ -447,7 +447,7 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s)
 	if (ret < 0)
 		return ret;
 	i9ep->task.pre_select = i9e_pre_select;
-	i9ep->task.new_post_select = i9e_post_select;
+	i9ep->task.post_select = i9e_post_select;
 	sprintf(i9ep->task.status, "i9e");
 	register_task(s, &i9ep->task);
 	rl_readline_name = "para_i9e";
diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index b6e6e362..98627504 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -219,7 +219,7 @@ void mp3dec_filter_init(struct filter *f)
 	f->parse_config = mp3dec_parse_config;
 	f->free_config = mp3dec_free_config;
 	f->pre_select = generic_filter_pre_select;
-	f->new_post_select = mp3dec_post_select;
+	f->post_select = mp3dec_post_select;
 	f->execute = mp3dec_execute;
 	f->help = (struct ggo_help) {
 		.short_help = mp3dec_filter_args_info_help,
diff --git a/oggdec_filter.c b/oggdec_filter.c
index b30abaa1..f41150f2 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -272,6 +272,6 @@ void oggdec_filter_init(struct filter *f)
 	f->open = ogg_open;
 	f->close = ogg_close;
 	f->pre_select = ogg_pre_select;
-	f->new_post_select = ogg_post_select;
+	f->post_select = ogg_post_select;
 	f->execute = oggdec_execute;
 }
diff --git a/oss_write.c b/oss_write.c
index 8a48b07a..cd327243 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -232,7 +232,7 @@ void oss_write_init(struct writer *w)
 	oss_write_cmdline_parser_init(&dummy);
 	w->close = oss_close;
 	w->pre_select = oss_pre_select;
-	w->new_post_select = oss_post_select;
+	w->post_select = oss_post_select;
 	w->parse_config_or_die = oss_parse_config_or_die;
 	w->free_config = oss_free_config;
 	w->help = (struct ggo_help) {
diff --git a/osx_write.c b/osx_write.c
index f961ca56..41b19030 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -363,7 +363,7 @@ void osx_write_init(struct writer *w)
 	osx_write_cmdline_parser_init(&dummy);
 	w->close = osx_write_close;
 	w->pre_select = osx_write_pre_select;
-	w->new_post_select = osx_write_post_select;
+	w->post_select = osx_write_post_select;
 	w->parse_config_or_die = osx_write_parse_config_or_die;
 	w->free_config = osx_free_config;
 	w->help = (struct ggo_help) {
diff --git a/play.c b/play.c
index 96395010..2cb0536d 100644
--- a/play.c
+++ b/play.c
@@ -368,7 +368,7 @@ static int open_new_file(struct play_task *pt)
 		tmp = NULL;
 	}
 	pt->rn.task.pre_select = afh_recv->pre_select;
-	pt->rn.task.new_post_select = afh_recv->new_post_select;
+	pt->rn.task.post_select = afh_recv->post_select;
 	sprintf(pt->rn.task.status, "%s receiver node", afh_recv->name);
 	return 1;
 fail:
@@ -409,7 +409,7 @@ static int load_file(struct play_task *pt)
 	pt->fn.filter_num = ret;
 	decoder = filters + ret;
 	pt->fn.task.pre_select = decoder->pre_select;
-	pt->fn.task.new_post_select = decoder->new_post_select;
+	pt->fn.task.post_select = decoder->post_select;
 	sprintf(pt->fn.task.status, "%s decoder", af);
 	pt->fn.btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = decoder->name, .parent = pt->rn.btrn,
@@ -1270,7 +1270,7 @@ int main(int argc, char *argv[])
 	pt->current_file = conf.inputs_num - 1;
 	pt->playing = true;
 	pt->task.pre_select = play_pre_select;
-	pt->task.new_post_select = play_post_select;
+	pt->task.post_select = play_post_select;
 	sprintf(pt->task.status, "play task");
 	register_task(&sched, &pt->task);
 	ret = schedule(&sched);
diff --git a/prebuffer_filter.c b/prebuffer_filter.c
index 5ccfa456..0759d678 100644
--- a/prebuffer_filter.c
+++ b/prebuffer_filter.c
@@ -122,7 +122,7 @@ 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->new_post_select = prebuffer_post_select;
+	f->post_select = prebuffer_post_select;
 	f->help = (struct ggo_help) {
 		.short_help = prebuffer_filter_args_info_help,
 		.detailed_help = prebuffer_filter_args_info_detailed_help
diff --git a/recv.c b/recv.c
index e46fa1a3..1fb5e25e 100644
--- a/recv.c
+++ b/recv.c
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
 	register_task(&s, &sot.task);
 
 	rn.task.pre_select = r->pre_select;
-	rn.task.new_post_select = r->new_post_select;
+	rn.task.post_select = r->post_select;
 	sprintf(rn.task.status, "%s", r->name);
 	register_task(&s, &rn.task);
 
diff --git a/recv.h b/recv.h
index 6222b93c..cc44a602 100644
--- a/recv.h
+++ b/recv.h
@@ -115,7 +115,7 @@ struct receiver {
 	 *
 	 * \sa select(2), struct receiver.
 	 */
-	int (*new_post_select)(struct sched *s, struct task *t);
+	int (*post_select)(struct sched *s, struct task *t);
 
 	/** The two help texts of this receiver. */
 	struct ggo_help help;
diff --git a/resample_filter.c b/resample_filter.c
index 2055f69c..bd8ece91 100644
--- a/resample_filter.c
+++ b/resample_filter.c
@@ -306,7 +306,7 @@ void resample_filter_init(struct filter *f)
 	f->close = resample_close;
 	f->open = resample_open;
 	f->pre_select = resample_pre_select;
-	f->new_post_select = resample_post_select;
+	f->post_select = resample_post_select;
 	f->parse_config = resample_parse_config;
 	f->free_config = resample_free_config;
 	f->execute = resample_execute;
diff --git a/sched.c b/sched.c
index 50e87b54..d42e1498 100644
--- a/sched.c
+++ b/sched.c
@@ -36,7 +36,7 @@ static void unregister_task(struct task *t)
 		para_strerror(-t->error));
 	if (t->pre_select)
 		list_del(&t->pre_select_node);
-	if (t->new_post_select)
+	if (t->post_select)
 		list_del(&t->post_select_node);
 }
 
@@ -62,13 +62,13 @@ static void sched_preselect(struct sched *s)
 static inline void call_post_select(struct sched *s, struct task *t)
 {
 #ifndef SCHED_DEBUG
-	t->error = t->new_post_select(s, t);
+	t->error = t->post_select(s, t);
 #else
 	struct timeval t1, t2, diff;
 	unsigned long pst;
 
 	clock_get_realtime(&t1);
-	t->error = t->new_post_select(s, t);
+	t->error = t->post_select(s, t);
 	clock_get_realtime(&t2);
 	tv_diff(&t1, &t2, &diff);
 	pst = tv2ms(&diff);
@@ -165,8 +165,8 @@ void register_task(struct sched *s, struct task *t)
 		PARA_DEBUG_LOG("pre_select: %p\n", &t->pre_select);
 		list_add_tail(&t->pre_select_node, &s->pre_select_list);
 	}
-	if (t->new_post_select) {
-		PARA_DEBUG_LOG("post_select: %p\n", &t->new_post_select);
+	if (t->post_select) {
+		PARA_DEBUG_LOG("post_select: %p\n", &t->post_select);
 		list_add_tail(&t->post_select_node, &s->post_select_list);
 	}
 }
diff --git a/sched.h b/sched.h
index da20e303..9c5c098e 100644
--- a/sched.h
+++ b/sched.h
@@ -55,12 +55,13 @@ struct task {
 	 */
 	void (*pre_select)(struct sched *s, struct task *t);
 	/**
-	 * The newer variant of the post select hook of \a t.
+	 * The post select hook of \a t.
 	 *
-	 * This hook must return the error code rather than store it in
-	 * t->error.
+	 * Its purpose is to evaluate and act upon the results of the previous
+	 * select call. If this function returns a negative value, the
+	 * scheduler unregisters the task.
 	 */
-	int (*new_post_select)(struct sched *s, struct task *t);
+	int (*post_select)(struct sched *s, struct task *t);
 	/** Whether this task is in error state. */
 	int error;
 	/** Position of the task in the pre_select list of the scheduler. */
diff --git a/server.c b/server.c
index e963da77..f3d5237f 100644
--- a/server.c
+++ b/server.c
@@ -338,7 +338,7 @@ static void init_signal_task(void)
 		*st = &signal_task_struct;
 
 	st->task.pre_select = signal_pre_select;
-	st->task.new_post_select = signal_post_select;
+	st->task.post_select = signal_post_select;
 	sprintf(st->task.status, "signal task");
 
 	PARA_NOTICE_LOG("setting up signal handling\n");
@@ -422,7 +422,7 @@ static void init_server_command_task(int argc, char **argv)
 
 	PARA_NOTICE_LOG("initializing tcp command socket\n");
 	sct->task.pre_select = command_pre_select;
-	sct->task.new_post_select = command_post_select;
+	sct->task.post_select = command_post_select;
 	sct->argc = argc;
 	sct->argv = argv;
 	ret = para_listen_simple(IPPROTO_TCP, conf.port_arg);
diff --git a/spxdec_filter.c b/spxdec_filter.c
index e9c6df11..9bba042c 100644
--- a/spxdec_filter.c
+++ b/spxdec_filter.c
@@ -304,6 +304,6 @@ void spxdec_filter_init(struct filter *f)
 	f->open = spxdec_open;
 	f->close = speexdec_close;
 	f->pre_select = generic_filter_pre_select;
-	f->new_post_select = speexdec_post_select;
+	f->post_select = speexdec_post_select;
 	f->execute = speexdec_execute;
 }
diff --git a/stdin.c b/stdin.c
index ccd4487a..b25a0ba0 100644
--- a/stdin.c
+++ b/stdin.c
@@ -100,7 +100,7 @@ void stdin_set_defaults(struct stdin_task *sit)
 	int ret;
 
 	sit->task.pre_select = stdin_pre_select;
-	sit->task.new_post_select = stdin_post_select;
+	sit->task.post_select = stdin_post_select;
 	sit->btrp = btr_pool_new("stdin", 128 * 1024);
 	sprintf(sit->task.status, "stdin reader");
 	ret = mark_fd_nonblocking(STDIN_FILENO);
diff --git a/stdout.c b/stdout.c
index a0bbeb3e..abf3d06f 100644
--- a/stdout.c
+++ b/stdout.c
@@ -89,7 +89,7 @@ void stdout_set_defaults(struct stdout_task *sot)
 	int ret;
 
 	sot->task.pre_select = stdout_pre_select;
-	sot->task.new_post_select = stdout_post_select;
+	sot->task.post_select = stdout_post_select;
 	sprintf(sot->task.status, "stdout");
 	ret = mark_fd_nonblocking(STDOUT_FILENO);
 	if (ret >= 0)
diff --git a/udp_recv.c b/udp_recv.c
index 27a392d5..f9c70ec8 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -223,7 +223,7 @@ void udp_recv_init(struct receiver *r)
 	r->open = udp_recv_open;
 	r->close = udp_recv_close;
 	r->pre_select = udp_recv_pre_select;
-	r->new_post_select = udp_recv_post_select;
+	r->post_select = udp_recv_post_select;
 	r->parse_config = udp_recv_parse_config;
 	r->free_config = udp_recv_free_config;
 	r->help = (struct ggo_help) {
diff --git a/vss.c b/vss.c
index e643805c..aec357ab 100644
--- a/vss.c
+++ b/vss.c
@@ -1174,7 +1174,7 @@ void init_vss_task(int afs_socket, struct sched *s)
 	vsst->header_interval.tv_sec = 5; /* should this be configurable? */
 	vsst->afs_socket = afs_socket;
 	vsst->task.pre_select = vss_pre_select;
-	vsst->task.new_post_select = vss_post_select;
+	vsst->task.post_select = vss_post_select;
 	ms2tv(announce_time, &vsst->announce_tv);
 	PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&vsst->announce_tv));
 	INIT_LIST_HEAD(&fec_client_list);
diff --git a/wav_filter.c b/wav_filter.c
index c2a9329f..83b81fb2 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -131,5 +131,5 @@ void wav_filter_init(struct filter *f)
 	f->close = wav_close;
 	f->open = wav_open;
 	f->pre_select = wav_pre_select;
-	f->new_post_select = wav_post_select;
+	f->post_select = wav_post_select;
 }
diff --git a/wmadec_filter.c b/wmadec_filter.c
index e4592dda..8b751f04 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -1285,5 +1285,5 @@ void wmadec_filter_init(struct filter *f)
 	f->close = wmadec_close;
 	f->execute = wmadec_execute;
 	f->pre_select = generic_filter_pre_select;
-	f->new_post_select = wmadec_post_select;
+	f->post_select = wmadec_post_select;
 }
diff --git a/write.c b/write.c
index b401b078..866ea433 100644
--- a/write.c
+++ b/write.c
@@ -102,7 +102,7 @@ static int setup_and_schedule(void)
 	struct write_task wt = {
 		.task = {
 			.pre_select = write_pre_select,
-			.new_post_select = write_post_select,
+			.post_select = write_post_select,
 			.status = "write task",
 		},
 	};
diff --git a/write.h b/write.h
index 896f974c..82921608 100644
--- a/write.h
+++ b/write.h
@@ -65,7 +65,7 @@ struct writer {
 	 *
 	 * Called from the post_select function of the writer node's task.
 	 */
-	int (*new_post_select)(struct sched *s, struct task *t);
+	int (*post_select)(struct sched *s, struct task *t);
 	/**
 	 * Close one instance of the writer.
 	 *
diff --git a/write_common.c b/write_common.c
index db4374fa..44ccf88a 100644
--- a/write_common.c
+++ b/write_common.c
@@ -114,7 +114,7 @@ void register_writer_node(struct writer_node *wn, struct btr_node *parent,
 	strcpy(wn->task.status, name);
 	free(name);
 	wn->task.pre_select = w->pre_select;
-	wn->task.new_post_select = w->new_post_select;
+	wn->task.post_select = w->post_select;
 	register_task(s, &wn->task);
 }