t/nvmept_trim: increase transfer size for some tests

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index 830759a78475a7b3de224080eb23ea29d37d3d59..d0c6bf8f5667ba69bb42f54a5e4ea4a0d5fe211a 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -18,12 +18,11 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
 #include <string.h>
-#include <sys/types.h>
 #include <signal.h>
 #include <stdint.h>
 #include <locale.h>
@@ -75,6 +74,8 @@ static const char *fio_arch_strings[arch_nr] = {
        "hppa",
        "mips",
        "aarch64",
+       "loongarch64",
+       "riscv64",
        "generic"
 };
 
@@ -88,23 +89,25 @@ static void reset_io_counters(struct thread_data *td, int all)
                        td->this_io_bytes[ddir] = 0;
                        td->stat_io_blocks[ddir] = 0;
                        td->this_io_blocks[ddir] = 0;
-                       td->rate_bytes[ddir] = 0;
-                       td->rate_blocks[ddir] = 0;
+                       td->last_rate_check_bytes[ddir] = 0;
+                       td->last_rate_check_blocks[ddir] = 0;
                        td->bytes_done[ddir] = 0;
                        td->rate_io_issue_bytes[ddir] = 0;
                        td->rate_next_io_time[ddir] = 0;
+                       td->last_usec[ddir] = 0;
                }
+               td->bytes_verified = 0;
        }
 
        td->zone_bytes = 0;
 
-       td->last_was_sync = 0;
+       td->last_was_sync = false;
        td->rwmix_issues = 0;
 
        /*
         * reset file done count if we are to start over
         */
-       if (td->o.time_based || td->o.loops || td->o.do_verify)
+       if (td->o.time_based || td->loops > 1 || td->o.do_verify)
                td->nr_done_files = 0;
 }
 
@@ -130,25 +133,30 @@ void clear_io_state(struct thread_data *td, int all)
 
 void reset_all_stats(struct thread_data *td)
 {
+       unsigned long long b;
        int i;
 
        reset_io_counters(td, 1);
 
+       b = ddir_rw_sum(td->thinktime_blocks_counter);
+       td->last_thinktime_blocks -= b;
+
        for (i = 0; i < DDIR_RWDIR_CNT; i++) {
                td->io_bytes[i] = 0;
                td->io_blocks[i] = 0;
                td->io_issues[i] = 0;
                td->ts.total_io_u[i] = 0;
                td->ts.runtime[i] = 0;
-               td->rwmix_issues = 0;
        }
 
-       set_epoch_time(td, td->o.log_unix_epoch);
+       set_epoch_time(td, td->o.log_alternate_epoch_clock_id, td->o.job_start_clock_id);
        memcpy(&td->start, &td->epoch, sizeof(td->epoch));
        memcpy(&td->iops_sample_time, &td->epoch, sizeof(td->epoch));
        memcpy(&td->bw_sample_time, &td->epoch, sizeof(td->epoch));
        memcpy(&td->ss.prev_time, &td->epoch, sizeof(td->epoch));
 
+       td->last_thinktime = td->epoch;
+
        lat_target_reset(td);
        clear_rusage_stat(td);
        helper_reset();
@@ -156,8 +164,13 @@ void reset_all_stats(struct thread_data *td)
 
 void reset_fio_state(void)
 {
+       int i;
+
        groupid = 0;
        thread_number = 0;
+       cur_segment = 0;
+       for (i = 0; i < nr_segments; i++)
+               segments[i].nr_threads = 0;
        stat_number = 0;
        done_secs = 0;
 }
@@ -230,19 +243,20 @@ void fio_mark_td_terminate(struct thread_data *td)
 {
        fio_gettime(&td->terminate_time, NULL);
        write_barrier();
-       td->terminate = 1;
+       td->terminate = true;
 }
 
-void fio_terminate_threads(unsigned int group_id)
+void fio_terminate_threads(unsigned int group_id, unsigned int terminate)
 {
-       struct thread_data *td;
        pid_t pid = getpid();
-       int i;
 
        dprint(FD_PROCESS, "terminate group_id=%d\n", group_id);
 
-       for_each_td(td, i) {
-               if (group_id == TERMINATE_ALL || group_id == td->groupid) {
+       for_each_td(td) {
+               if ((terminate == TERMINATE_GROUP && group_id == TERMINATE_ALL) ||
+                   (terminate == TERMINATE_GROUP && group_id == td->groupid) ||
+                   (terminate == TERMINATE_STONEWALL && td->runstate >= TD_RUNNING) ||
+                   (terminate == TERMINATE_ALL)) {
                        dprint(FD_PROCESS, "setting terminate on %s/%d\n",
                                                td->o.name, (int) td->pid);
 
@@ -266,22 +280,20 @@ void fio_terminate_threads(unsigned int group_id)
                                        ops->terminate(td);
                        }
                }
-       }
+       } end_for_each();
 }
 
 int fio_running_or_pending_io_threads(void)
 {
-       struct thread_data *td;
-       int i;
        int nr_io_threads = 0;
 
-       for_each_td(td, i) {
+       for_each_td(td) {
                if (td->io_ops_init && td_ioengine_flagged(td, FIO_NOIO))
                        continue;
                nr_io_threads++;
                if (td->runstate < TD_EXITED)
                        return 1;
-       }
+       } end_for_each();
 
        if (!nr_io_threads)
                return -1; /* we only had cpuio threads to begin with */
@@ -366,6 +378,8 @@ int initialize_fio(char *envp[])
        compiletime_assert((offsetof(struct jobs_eta, m_rate) % 8) == 0, "m_rate");
 
        compiletime_assert(__TD_F_LAST <= TD_ENG_FLAG_SHIFT, "TD_ENG_FLAG_SHIFT");
+       compiletime_assert((__TD_F_LAST + __FIO_IOENGINE_F_LAST) <= 8*sizeof(((struct thread_data *)0)->flags), "td->flags");
+       compiletime_assert(BSSPLIT_MAX <= ZONESPLIT_MAX, "bsssplit/zone max");
 
        err = endian_check();
        if (err) {