verify: fill in vc->name for pattern verify

[fio.git] / verify.c

diff --git a/verify.c b/verify.c
index 58f37aefb65f2777f7fc344f46aae3c45f6c5eec..02cd3a4a70a04c60d6fe28dcdab5563261a00a82 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -41,13 +41,14 @@ void fill_buffer_pattern(struct thread_data *td, void *p, unsigned int len)
        (void)cpy_pattern(td->o.buffer_pattern, td->o.buffer_pattern_bytes, p, len);
 }
 
-void __fill_buffer(struct thread_options *o, unsigned long seed, void *p,
-                  unsigned int len)
+static void __fill_buffer(struct thread_options *o, unsigned long seed, void *p,
+                         unsigned int len)
 {
        __fill_random_buf_percentage(seed, p, o->compress_percentage, len, len, o->buffer_pattern, o->buffer_pattern_bytes);
 }
 
-unsigned long fill_buffer(struct thread_data *td, void *p, unsigned int len)
+static unsigned long fill_buffer(struct thread_data *td, void *p,
+                                unsigned int len)
 {
        struct frand_state *fs = &td->verify_state;
        struct thread_options *o = &td->o;
@@ -392,7 +393,8 @@ static int verify_io_u_pattern(struct verify_header *hdr, struct vcont *vc)
                                (unsigned char)pattern[mod],
                                bits);
                        log_err("fio: bad pattern block offset %u\n", i);
-                       dump_verify_buffers(hdr, vc);
+                       vc->name = "pattern";
+                       log_verify_failure(hdr, vc);
                        return EILSEQ;
                }
                mod++;
@@ -651,7 +653,7 @@ int verify_io_u_async(struct thread_data *td, struct io_u **io_u_ptr)
 
        if (io_u->flags & IO_U_F_IN_CUR_DEPTH) {
                td->cur_depth--;
-               io_u_clear(io_u, IO_U_F_IN_CUR_DEPTH);
+               io_u_clear(td, io_u, IO_U_F_IN_CUR_DEPTH);
        }
        flist_add_tail(&io_u->verify_list, &td->verify_list);
        *io_u_ptr = NULL;
@@ -802,7 +804,7 @@ int verify_io_u(struct thread_data *td, struct io_u **io_u_ptr)
         * If the IO engine is faking IO (like null), then just pretend
         * we verified everything.
         */
-       if (td->io_ops->flags & FIO_FAKEIO)
+       if (td_ioengine_flagged(td, FIO_FAKEIO))
                return 0;
 
        if (io_u->flags & IO_U_F_TRIMMED) {
@@ -1168,10 +1170,10 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u)
                io_u->buflen = ipo->len;
                io_u->numberio = ipo->numberio;
                io_u->file = ipo->file;
-               io_u_set(io_u, IO_U_F_VER_LIST);
+               io_u_set(td, io_u, IO_U_F_VER_LIST);
 
                if (ipo->flags & IP_F_TRIMMED)
-                       io_u_set(io_u, IO_U_F_TRIMMED);
+                       io_u_set(td, io_u, IO_U_F_TRIMMED);
 
                if (!fio_file_open(io_u->file)) {
                        int r = td_io_open_file(td, io_u->file);
@@ -1209,7 +1211,9 @@ nothing:
 void fio_verify_init(struct thread_data *td)
 {
        if (td->o.verify == VERIFY_CRC32C_INTEL ||
+           td->o.verify == VERIFY_CRC32C_ARM64 ||
            td->o.verify == VERIFY_CRC32C) {
+               crc32c_arm64_probe();
                crc32c_intel_probe();
        }
 }
@@ -1255,7 +1259,7 @@ static void *verify_async_thread(void *data)
                        io_u = flist_first_entry(&list, struct io_u, verify_list);
                        flist_del_init(&io_u->verify_list);
 
-                       io_u_set(io_u, IO_U_F_NO_FILE_PUT);
+                       io_u_set(td, io_u, IO_U_F_NO_FILE_PUT);
                        ret = verify_io_u(td, &io_u);
 
                        put_io_u(td, io_u);
@@ -1290,7 +1294,7 @@ int verify_async_init(struct thread_data *td)
        pthread_attr_t attr;
 
        pthread_attr_init(&attr);
-       pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN);
+       pthread_attr_setstacksize(&attr, 2 * PTHREAD_STACK_MIN);
 
        td->verify_thread_exit = 0;