Merge branch 'realloc-io_u-buffers' of https://github.com/aclamk/fio

* 'realloc-io_u-buffers' of https://github.com/aclamk/fio:
  iolog replay: Realloc io_u buffers to adapt to operation size.
  iolog replay: Treat 'open' on file that is scheduled to close as cancel of 'close' operation.

diff --git a/crc/xxhash.h b/crc/xxhash.h
index 8850d208a00fbfbf08d7f89ffe617f2f49bdd1c3..934c555c97a876f44207c4170cebfd86c2610a92 100644 (file)
--- a/crc/xxhash.h
+++ b/crc/xxhash.h
@@ -107,9 +107,9 @@ XXH32() :
 // Advanced Hash Functions
 //****************************
 
-void*         XXH32_init   (unsigned int seed);
+void*         XXH32_init   (uint32_t seed);
 XXH_errorcode XXH32_update (void* state, const void* input, int len);
-unsigned int  XXH32_digest (void* state);
+uint32_t XXH32_digest (void* state);
 
 /*
 These functions calculate the xxhash of an input provided in several small packets,
@@ -135,7 +135,7 @@ Memory will be freed by XXH32_digest().
 
 
 int           XXH32_sizeofState(void);
-XXH_errorcode XXH32_resetState(void* state, unsigned int seed);
+XXH_errorcode XXH32_resetState(void* state, uint32_t seed);
 
 #define       XXH32_SIZEOFSTATE 48
 typedef struct { long long ll[(XXH32_SIZEOFSTATE+(sizeof(long long)-1))/sizeof(long long)]; } XXH32_stateSpace_t;
@@ -151,7 +151,7 @@ use the structure XXH32_stateSpace_t, which will ensure that memory space is lar
 */
 
 
-unsigned int XXH32_intermediateDigest (void* state);
+uint32_t XXH32_intermediateDigest (void* state);
 /*
 This function does the same as XXH32_digest(), generating a 32-bit hash,
 but preserve memory context.

diff --git a/engines/libpmem.c b/engines/libpmem.c
index 4ef3094ef3bd6ab230c7e51c70bb4904513eaa70..99c7b50ddc23a1f188d1a30e0fb249a38afbdfae 100644 (file)
--- a/engines/libpmem.c
+++ b/engines/libpmem.c
@@ -424,10 +424,10 @@ static int fio_libpmem_prep(struct thread_data *td, struct io_u *io_u)
        /*
         * It fits within existing mapping, use it
         */
-       dprint(FD_IO," io_u->offset %lld : fdd->libpmem_off %ld : "
-                       "io_u->buflen %ld : fdd->libpmem_sz %ld\n",
-                       io_u->offset, fdd->libpmem_off,
-                       io_u->buflen, fdd->libpmem_sz);
+       dprint(FD_IO," io_u->offset %llu : fdd->libpmem_off %llu : "
+                       "io_u->buflen %llu : fdd->libpmem_sz %llu\n",
+                       io_u->offset, (unsigned long long) fdd->libpmem_off,
+                       io_u->buflen, (unsigned long long) fdd->libpmem_sz);
 
        if (io_u->offset >= fdd->libpmem_off &&
            (io_u->offset + io_u->buflen <=