-/*
- * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
/** \file stdout.c Functions that deal with writing to stdout. */
-#include <assert.h>
-
#include "para.h"
#include "list.h"
#include "sched.h"
#include "stdout.h"
#include "buffer_tree.h"
-/**
- * The pre_select function of the stdout task.
- *
- * \param s The scheduler this task was registered to.
- * \param t The task structure of the stdout task.
- *
- * This function is always successful. If there is input data available, it
- * adds \p STDOUT_FILENO to the write fd set of \a s.
- */
-static void stdout_pre_select(struct sched *s, struct task *t)
+/* Monitor STDOUT_FILENO if there is input data available. */
+static void stdout_pre_monitor(struct sched *s, void *context)
{
- struct stdout_task *sot = container_of(t, struct stdout_task, task);
+ 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);
}
-/**
- * The post select function of the stdout task.
- *
- * \param s The scheduler this task was registered to.
- * \param t The task structure of the stdout task.
- *
- * This function writes input data from the buffer tree to stdout if \p
- * 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, struct task *t)
+static int stdout_post_monitor(struct sched *s, void *context)
{
- struct stdout_task *sot = container_of(t, struct stdout_task, task);
+ struct stdout_task *sot = context;
struct btr_node *btrn = sot->btrn;
int ret;
char *buf;
goto out;
if (ret == 0)
return 0;
- if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
+ if (!sched_write_ok(STDOUT_FILENO, s))
return 0;
if (sot->must_set_nonblock_flag) {
}
return ret;
}
+
/**
- * Initialize a stdout task structure with default values.
+ * Register a stdout task structure.
*
- * \param sot The stdout task structure.
+ * \param sot The stdout task structure to register.
+ * \param s The task will be added to this scheduler's task list.
*
- * This fills in the pre/post select function pointers of the task structure
- * given by \a sot.
+ * This sets up \a sot and registers a task with \a sot as context pointer.
*/
-void stdout_set_defaults(struct stdout_task *sot)
+void stdout_task_register(struct stdout_task *sot, struct sched *s)
{
int ret;
+ struct task_info ti = {
+ .pre_monitor = stdout_pre_monitor,
+ .post_monitor = stdout_post_monitor,
+ .context = sot,
+ .name = "stdout",
+ };
- sot->task.pre_select = stdout_pre_select;
- sot->task.post_select = stdout_post_select;
- sprintf(sot->task.status, "stdout");
-
- /* See stdin.c for details. */
+ /* See \ref stdin.c for details. */
ret = fcntl(STDOUT_FILENO, F_GETFL);
if (ret < 0) {
PARA_EMERG_LOG("F_GETFL: %s\n", strerror(errno));
exit(EXIT_FAILURE);
}
sot->fd_flags = ret;
- sot->must_set_nonblock_flag = (sot->fd_flags & O_NONBLOCK) == 0;
+ sot->must_set_nonblock_flag = (sot->fd_flags & O_NONBLOCK) == 0
+ && !isatty(STDOUT_FILENO);
+ sot->task = task_register(&ti, s);
}