projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'meins/next' into next
[paraslash.git]
/
stdout.c
diff --git
a/stdout.c
b/stdout.c
index a192f2beb44b4c49bd1a9c7affb5167a82013158..d64586bccd9cdd12ffe743247680d8686ee1c002 100644
(file)
--- a/
stdout.c
+++ b/
stdout.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2006-200
8
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-200
9
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-10,7
+10,6
@@
#include <assert.h>
#include "para.h"
#include <assert.h>
#include "para.h"
-#include "string.h"
#include "list.h"
#include "sched.h"
#include "fd.h"
#include "list.h"
#include "sched.h"
#include "fd.h"
@@
-28,13
+27,13
@@
*/
static void stdout_pre_select(struct sched *s, struct task *t)
{
*/
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) {
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;
}
s->timeout.tv_sec = 0;
s->timeout.tv_usec = 1;
}
@@
-57,31
+56,25
@@
static void stdout_pre_select(struct sched *s, struct task *t)
*/
static void stdout_post_select(struct sched *s, struct task *t)
{
*/
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;
ssize_t ret;
- t->
ret = 1
;
+ t->
error = 0
;
if (!sot->check_fd) {
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;
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;
return;
+ }
*sot->loaded -= ret;
if (*sot->loaded)
*sot->loaded -= ret;
if (*sot->loaded)
- memmove(sot->buf, sot->buf + ret, *sot->loaded);
- t->ret = 1;
-}
-
-static void stdout_default_event_handler(struct task *t)
-{
- PARA_NOTICE_LOG("%p: %s\n", t, para_strerror(-t->ret));
- unregister_task(t);
+ memmove(*sot->bufp, *sot->bufp + ret, *sot->loaded);
}
/**
}
/**
@@
-90,18
+83,14
@@
static void stdout_default_event_handler(struct task *t)
* \param sot The stdout task structure.
*
* This fills in the pre/post select function poinzters of the 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)
{
int ret;
*/
void stdout_set_defaults(struct stdout_task *sot)
{
int ret;
- sot->task.private_data = sot;
sot->task.pre_select = stdout_pre_select;
sot->task.post_select = stdout_post_select;
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;
sprintf(sot->task.status, "stdout writer");
ret = mark_fd_nonblocking(STDOUT_FILENO);
if (ret >= 0)
sprintf(sot->task.status, "stdout writer");
ret = mark_fd_nonblocking(STDOUT_FILENO);
if (ret >= 0)