dedupe: default to using a bloom filter to save memory

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index 5ed8c6073603d4edb0b381fb356694cce600e04b..5a996f9cbd6e9f35d09709ad70ff78d3a3365c69 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -187,6 +187,13 @@ void td_restore_runstate(struct thread_data *td, int old_state)
        td_set_runstate(td, old_state);
 }
 
+void fio_mark_td_terminate(struct thread_data *td)
+{
+       fio_gettime(&td->terminate_time, NULL);
+       write_barrier();
+       td->terminate = 1;
+}
+
 void fio_terminate_threads(int group_id)
 {
        struct thread_data *td;
@@ -199,7 +206,11 @@ void fio_terminate_threads(int group_id)
                if (group_id == TERMINATE_ALL || groupid == td->groupid) {
                        dprint(FD_PROCESS, "setting terminate on %s/%d\n",
                                                td->o.name, (int) td->pid);
-                       td->terminate = 1;
+
+                       if (td->terminate)
+                               continue;
+
+                       fio_mark_td_terminate(td);
                        td->o.start_delay = 0;
 
                        /*
@@ -234,7 +245,7 @@ int fio_running_or_pending_io_threads(void)
        return 0;
 }
 
-void fio_set_fd_nonblocking(int fd, const char *who)
+int fio_set_fd_nonblocking(int fd, const char *who)
 {
        int flags;
 
@@ -242,11 +253,14 @@ void fio_set_fd_nonblocking(int fd, const char *who)
        if (flags < 0)
                log_err("fio: %s failed to get file flags: %s\n", who, strerror(errno));
        else {
-               flags |= O_NONBLOCK;
-               flags = fcntl(fd, F_SETFL, flags);
-               if (flags < 0)
+               int new_flags = flags | O_NONBLOCK;
+
+               new_flags = fcntl(fd, F_SETFL, new_flags);
+               if (new_flags < 0)
                        log_err("fio: %s failed to get file flags: %s\n", who, strerror(errno));
        }
+
+       return flags;
 }
 
 static int endian_check(void)