vss: need_audio_header(): Change return value to bool.

[paraslash.git] / file_write.c

diff --git a/file_write.c b/file_write.c
index 7a24b3ac6b78e9d56b1f194c0479c3584cabbfb3..0cee535aa92ff9b5aaba1b815c8e8c95e0dd4731 100644 (file)
--- a/file_write.c
+++ b/file_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -24,12 +24,10 @@
 #include "file_write.cmdline.h"
 #include "error.h"
 
-/** data specific to the file writer */
+/** Data specific to the file writer. */
 struct private_file_write_data {
-       /** the file descriptor of the output file */
+       /** The file descriptor of the output file. */
        int fd;
-       /** non-zero if \a fd was added to the write fd set */
-       int check_fd;
 };
 
 /*
@@ -58,73 +56,40 @@ static int file_write_open(struct writer_node *wn)
                sizeof(struct private_file_write_data));
        struct file_write_args_info *conf = wn->conf;
        char *filename;
+       int ret;
 
        if (conf->filename_given)
                filename = conf->filename_arg;
        else
                filename = random_filename();
        wn->private_data = pfwd;
-       pfwd->fd = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
+       ret = para_open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
        if (!conf->filename_given)
                free(filename);
-       if (pfwd->fd >= 0)
+       if (ret < 0)
+               goto out;
+       pfwd->fd = ret;
+       ret = mark_fd_blocking(pfwd->fd);
+       if (ret >= 0)
                return 1;
+       close(pfwd->fd);
+out:
        free(pfwd);
-       return -E_FW_OPEN;
-}
-
-static int file_write_pre_select(struct sched *s, struct writer_node *wn)
-{
-       struct private_file_write_data *pfwd = wn->private_data;
-       struct writer_node_group *wng = wn->wng;
-
-       pfwd->check_fd = 0;
-       if (pfwd->fd <= 0)
-               return -E_FW_NO_FILE;
-       if (!*wng->loaded)
-               return 1;
-       para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno);
-       pfwd->check_fd = 1;
-       return 1;
+       return ret;
 }
 
-static void file_write_pre_select_btr(struct sched *s, struct task *t)
+static void file_write_pre_select(struct sched *s, struct task *t)
 {
        struct writer_node *wn = container_of(t, struct writer_node, task);
        struct private_file_write_data *pfwd = wn->private_data;
        int ret;
 
        t->error = 0;
-       pfwd->check_fd = 0;
        ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
-       if (ret > 0) {
+       if (ret > 0)
                para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno);
-               pfwd->check_fd = 1;
-       } else if (ret < 0) {
-               s->timeout.tv_sec = 0;
-               s->timeout.tv_usec = 1;
-       }
-}
-
-static int file_write_post_select(struct sched *s, struct writer_node *wn)
-{
-       struct private_file_write_data *pfwd = wn->private_data;
-       struct writer_node_group *wng = wn->wng;
-       int ret;
-
-       if (!pfwd->check_fd)
-               return 1;
-       if (*wng->loaded <= wn->written)
-               return 1;
-       if (!FD_ISSET(pfwd->fd, &s->wfds))
-               return 1;
-//     PARA_INFO_LOG("writing %zd\n", *wng->loaded);
-       ret = write(pfwd->fd, *wng->bufp + wn->written,
-               *wng->loaded - wn->written);
-       if (ret < 0)
-               return -E_FW_WRITE;
-       wn->written += ret;
-       return 1;
+       else if (ret < 0)
+               sched_min_delay(s);
 }
 
 static void file_write_close(struct writer_node *wn)
@@ -132,11 +97,10 @@ static void file_write_close(struct writer_node *wn)
        struct private_file_write_data *pfwd = wn->private_data;
 
        close(pfwd->fd);
-       file_cmdline_parser_free(wn->conf);
        free(pfwd);
 }
 
-static void file_write_post_select_btr(__a_unused struct sched *s,
+static void file_write_post_select(__a_unused struct sched *s,
                struct task *t)
 {
        struct writer_node *wn = container_of(t, struct writer_node, task);
@@ -148,12 +112,8 @@ static void file_write_post_select_btr(__a_unused struct sched *s,
 
        t->error = 0;
        ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
-       if (ret == 0)
-               return;
-       if (ret < 0)
-               goto err;
-       if (!pfwd->check_fd)
-               return;
+       if (ret <= 0)
+               goto out;
        if (!FD_ISSET(pfwd->fd, &s->wfds))
                return;
        bytes = btr_next_buffer(btrn, &buf);
@@ -161,11 +121,11 @@ static void file_write_post_select_btr(__a_unused struct sched *s,
        //PARA_INFO_LOG("writing %zu\n", bytes);
        ret = write(pfwd->fd, buf, bytes);
        if (ret < 0)
-               goto err;
+               goto out;
        btr_consume(btrn, ret);
-       return;
-err:
-       assert(ret < 0);
+out:
+       if (ret < 0)
+               btr_remove_node(btrn);
        t->error = ret;
 }
 
@@ -195,9 +155,7 @@ void file_write_init(struct writer *w)
        file_cmdline_parser_init(&dummy);
        w->open = file_write_open;
        w->pre_select = file_write_pre_select;
-       w->pre_select_btr = file_write_pre_select_btr;
        w->post_select = file_write_post_select;
-       w->post_select_btr = file_write_post_select_btr;
        w->parse_config = file_write_parse_config;
        w->free_config = file_write_free_config;
        w->close = file_write_close;