X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=stdout.c;h=ba5f19670fce6c3c04d256a2056477064f5df7d3;hb=08471ab23c0abdf0ddd7ff836a15bd81fbce7520;hp=71c45f69518b349d07143823003dedac9a0f5e2f;hpb=181beb316afad036ac01a778544c5dec0a8d51c7;p=paraslash.git

diff --git a/stdout.c b/stdout.c
index 71c45f69..ba5f1967 100644
--- a/stdout.c
+++ b/stdout.c
@@ -10,24 +10,24 @@
 #include "stdout.h"
 #include "buffer_tree.h"
 
-/* Add STDOUT_FILENO to the write fd set if there is input data available. */
-static void stdout_pre_select(struct sched *s, void *context)
+/* Monitor STDOUT_FILENO if there is input data available. */
+static void stdout_pre_monitor(struct sched *s, void *context)
 {
 	struct stdout_task *sot = context;
 	int ret;
 
 	ret = btr_node_status(sot->btrn, 0, BTR_NT_LEAF);
 	if (ret > 0)
-		para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
+		sched_monitor_writefd(STDOUT_FILENO, s);
 	else if (ret < 0)
 		sched_min_delay(s);
 }
 
 /*
- * This function writes input data from the buffer tree to stdout if
- * STDOUT_FILENO is writable.
+ * If input from the buffer tree is available and STDOUT_FILENO is ready, write
+ * as much as possible.
  */
-static int stdout_post_select(struct sched *s, void *context)
+static int stdout_post_monitor(struct sched *s, void *context)
 {
 	struct stdout_task *sot = context;
 	struct btr_node *btrn = sot->btrn;
@@ -79,8 +79,8 @@ void stdout_task_register(struct stdout_task *sot, struct sched *s)
 {
 	int ret;
 	struct task_info ti = {
-		.pre_select = stdout_pre_select,
-		.post_select = stdout_post_select,
+		.pre_monitor = stdout_pre_monitor,
+		.post_monitor = stdout_post_monitor,
 		.context = sot,
 		.name = "stdout",
 	};