/*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
-/** \file stdout.c functions that deal with writing to stdout */
+/** \file stdout.c Functions that deal with writing to stdout. */
#include <dirent.h> /* readdir() */
#include <assert.h>
+#include <stdbool.h>
#include "para.h"
-#include "string.h"
#include "list.h"
#include "sched.h"
#include "fd.h"
#include "error.h"
#include "stdout.h"
+#include "buffer_tree.h"
/**
- * the pre_select function of the stdout task
+ * 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
+ * \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 data available in the input
* buffer, it adds \p STDOUT_FILENO to the write fd set of \a s.
*/
static void stdout_pre_select(struct sched *s, struct task *t)
{
- struct stdout_task *sot = t->private_data;
+ struct stdout_task *sot = container_of(t, struct stdout_task, task);
- t->ret = 1;
+ t->error = 0;
sot->check_fd = 0;
if (!*sot->loaded) {
- if (*sot->input_error) {
- t->ret = *sot->input_error;
+ if (*sot->input_error < 0) {
+ t->error = *sot->input_error;
+ s->timeout.tv_sec = 0;
+ s->timeout.tv_usec = 1;
+ }
+ return;
+ }
+ sot->check_fd = 1;
+ para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
+}
+
+static void stdout_pre_select_btr(struct sched *s, struct task *t)
+{
+ struct stdout_task *sot = container_of(t, struct stdout_task, task);
+ size_t sz = btr_get_input_queue_size(sot->btrn);
+
+ t->error = 0;
+ sot->check_fd = 0;
+ if (sz == 0) {
+ if (btr_no_parent(sot->btrn)) {
s->timeout.tv_sec = 0;
s->timeout.tv_usec = 1;
}
}
/**
- * the post select function of the stdout task
+ * 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
+ * \param s The scheduler this task was registered to.
+ * \param t The task structure of the stdout task.
*
* This function checks if \p STDOUT_FILENO was included by in the write fd set
* of \a s during the previous pre_select call. If yes, and \p STDOUT_FILENO
*/
static void stdout_post_select(struct sched *s, struct task *t)
{
- struct stdout_task *sot = t->private_data;
+ struct stdout_task *sot = container_of(t, struct stdout_task, task);
ssize_t ret;
- t->ret = 1;
+ t->error = 0;
if (!sot->check_fd) {
- if (*sot->input_error)
- t->ret = *sot->input_error;
+ if (!*sot->loaded && *sot->input_error < 0)
+ t->error = *sot->input_error;
return;
}
if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
return;
- t->ret = -E_STDOUT_WRITE;
- ret = write(STDOUT_FILENO, sot->buf, *sot->loaded);
- if (ret <= 0)
+ ret = write(STDOUT_FILENO, *sot->bufp, *sot->loaded);
+ if (ret < 0) {
+ t->error = -ERRNO_TO_PARA_ERROR(errno);
return;
+ }
*sot->loaded -= ret;
if (*sot->loaded)
- memmove(sot->buf, sot->buf + ret, *sot->loaded);
- t->ret = 1;
+ memmove(*sot->bufp, *sot->bufp + ret, *sot->loaded);
}
-static void stdout_default_event_handler(struct task *t)
+static void stdout_post_select_btr(struct sched *s, struct task *t)
{
- PARA_NOTICE_LOG("%p: %s\n", t, PARA_STRERROR(-t->ret));
- unregister_task(t);
-}
+ struct stdout_task *sot = container_of(t, struct stdout_task, task);
+ ssize_t ret;
+ size_t sz = btr_get_input_queue_size(sot->btrn);
+ char *buf;
+ t->error = 0;
+ if (!sot->check_fd) {
+ if (sz == 0 && btr_no_parent(sot->btrn)) {
+ t->error = -E_STDOUT_EOF;
+ goto err;
+ }
+ return;
+ }
+ if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
+ return;
+ sz = btr_next_buffer(sot->btrn, &buf);
+ if (sz == 0)
+ return;
+ ret = write_nonblock(STDOUT_FILENO, buf, sz, 0);
+ if (ret < 0) {
+ t->error = -ERRNO_TO_PARA_ERROR(errno);
+ goto err;
+ }
+ btr_consume(sot->btrn, ret);
+ return;
+err:
+ btr_remove_node(sot->btrn);
+}
/**
- * initialize a stdout task structure with default values
+ * Initialize a stdout task structure with default values.
*
- * \param sot the stdout task structure
+ * \param sot The stdout task structure.
*
* This fills in the pre/post select function poinzters of the task structure
- * given by \a sot. It also sets up a default error handler which unregisters
- * the task on errors and clears the eof flag of \a sot.
+ * given by \a sot.
*/
void stdout_set_defaults(struct stdout_task *sot)
{
- sot->task.private_data = sot;
- sot->task.pre_select = stdout_pre_select;
- sot->task.post_select = stdout_post_select;
- sot->task.event_handler = stdout_default_event_handler;
- sot->error = 0;
- mark_fd_nonblocking(STDOUT_FILENO);
+ int ret;
+
+ if (sot->btrn) {
+ sot->task.pre_select = stdout_pre_select_btr;
+ sot->task.post_select = stdout_post_select_btr;
+ } else {
+ sot->task.pre_select = stdout_pre_select;
+ sot->task.post_select = stdout_post_select;
+ }
sprintf(sot->task.status, "stdout writer");
+ ret = mark_fd_nonblocking(STDOUT_FILENO);
+ if (ret >= 0)
+ return;
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+ exit(EXIT_FAILURE);
}
projects / paraslash.git / blobdiff