file_write: Kill ->fd of struct private_file_write_data.

Also, simplify the logic in file_write_post_select_btr() a bit.

diff --git a/file_write.c b/file_write.c
index 4b6a5efe6ea8af1c2f14732b5c2030850b02c9ff..4495bf007c4d9965f294bb54027721dbaaf126c9 100644 (file)
--- a/file_write.c
+++ b/file_write.c
@@ -24,12 +24,10 @@
 #include "file_write.cmdline.h"
 #include "error.h"
 
 #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 {
 struct private_file_write_data {

-       /** the file descriptor of the output file */
+       /** The file descriptor of the output file. */

        int fd;
        int fd;

-       /** non-zero if \a fd was added to the write fd set */
-       int check_fd;

 };
 
 /*
 };
 
 /*


@@ -80,11 +78,9 @@ static void file_write_pre_select_btr(struct sched *s, struct task *t)
        int ret;
 
        t->error = 0;
        int ret;
 
        t->error = 0;

-       pfwd->check_fd = 0;

        ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
        if (ret > 0) {
                para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno);
        ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
        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;
        } else if (ret < 0) {
                s->timeout.tv_sec = 0;
                s->timeout.tv_usec = 1;


@@ -111,12 +107,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);
 
        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);
        if (!FD_ISSET(pfwd->fd, &s->wfds))
                return;
        bytes = btr_next_buffer(btrn, &buf);


@@ -124,13 +116,12 @@ 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)
        //PARA_INFO_LOG("writing %zu\n", bytes);
        ret = write(pfwd->fd, buf, bytes);
        if (ret < 0)

-               goto err;
+               goto out;

        btr_consume(btrn, ret);
        btr_consume(btrn, ret);

-       return;
-err:
-       assert(ret < 0);
+out:
+       if (ret < 0)
+               btr_remove_node(btrn);

        t->error = ret;
        t->error = ret;

-       btr_remove_node(btrn);

 }
 
 __malloc static void *file_write_parse_config(const char *options)
 }
 
 __malloc static void *file_write_parse_config(const char *options)