EOF
if compile_prog "" "-lpmem" "libpmem"; then
libpmem="yes"
+ LIBS="-lpmem $LIBS"
fi
echo "libpmem $libpmem"
##########################################
# Check whether we have libpmemblk
+# libpmem is a prerequisite
libpmemblk="no"
-cat > $TMPC << EOF
+if test "$libpmem" = "yes"; then
+ cat > $TMPC << EOF
#include <libpmemblk.h>
int main(int argc, char **argv)
{
- int rc;
- rc = pmemblk_open("", 0);
+ PMEMblkpool *pbp;
+ pbp = pmemblk_open("", 0);
return 0;
}
EOF
-if compile_prog "" "-lpmemblk -lpmem" "libpmemblk"; then
- libpmemblk="yes"
+ if compile_prog "" "-lpmemblk" "libpmemblk"; then
+ libpmemblk="yes"
+ LIBS="-lpmemblk $LIBS"
+ fi
fi
echo "libpmemblk $libpmemblk"
+# Choose the ioengines
if test "$libpmem" = "yes" && test "$disable_pmem" = "no"; then
devdax="yes"
if test "$libpmemblk" = "yes"; then
##########################################
# Report whether pmemblk engine is enabled
-echo "NVML libpmemblk engine $pmemblk"
+echo "NVML pmemblk engine $pmemblk"
##########################################
# Report whether dev-dax engine is enabled
-echo "NVML Device Dax engine $devdax"
+echo "NVML dev-dax engine $devdax"
# Check if we have lex/yacc available
yacc="no"
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
-#include <dlfcn.h>
#include <libgen.h>
+#include <libpmem.h>
#include "../fio.h"
#include "../verify.h"
off_t devdax_off;
};
-static void * (*pmem_memcpy_persist)(void *dest, const void *src, size_t len);
-
static int fio_devdax_file(struct thread_data *td, struct fio_file *f,
size_t length, off_t off)
{
static int fio_devdax_init(struct thread_data *td)
{
struct thread_options *o = &td->o;
- const char *path;
- void *dl;
if ((o->rw_min_bs & page_mask) &&
(o->fsync_blocks || o->fdatasync_blocks)) {
return 1;
}
- path = getenv("FIO_PMEM_LIB");
- if (!path)
- path = "libpmem.so";
-
- dl = dlopen(path, RTLD_NOW | RTLD_NODELETE);
- if (!dl) {
- log_err("fio: unable to open libpmem: %s\n", dlerror());
- return 1;
- }
-
- pmem_memcpy_persist = dlsym(dl, "pmem_memcpy_persist");
- if (!pmem_memcpy_persist) {
- log_err("fio: unable to load libpmem: %s\n", dlerror());
- return 1;
- }
-
return 0;
}
*
* See examples/pmemblk.fio for more.
*
- * libpmemblk.so
- * By default, the pmemblk engine will let the system find the libpmemblk.so
- * that it uses. You can use an alternative libpmemblk by setting the
- * FIO_PMEMBLK_LIB environment variable to the full path to the desired
- * libpmemblk.so.
- *
*/
#include <stdio.h>
#include <sys/uio.h>
#include <errno.h>
#include <assert.h>
-#include <dlfcn.h>
#include <string.h>
+#include <libpmem.h>
+#include <libpmemblk.h>
#include "../fio.h"
/*
* libpmemblk
*/
-struct PMEMblkpool_s;
-typedef struct PMEMblkpool_s PMEMblkpool;
-
-static PMEMblkpool *(*pmemblk_create) (const char *, size_t, size_t, mode_t);
-static PMEMblkpool *(*pmemblk_open) (const char *, size_t);
-static void (*pmemblk_close) (PMEMblkpool *);
-static size_t(*pmemblk_nblock) (PMEMblkpool *);
-static size_t(*pmemblk_bsize) (PMEMblkpool *);
-static int (*pmemblk_read) (PMEMblkpool *, void *, off_t);
-static int (*pmemblk_write) (PMEMblkpool *, const void *, off_t);
-
-int load_libpmemblk(const char *path)
-{
- void *dl;
-
- if (!path)
- path = "libpmemblk.so";
-
- dl = dlopen(path, RTLD_NOW | RTLD_NODELETE);
- if (!dl)
- goto errorout;
-
- pmemblk_create = dlsym(dl, "pmemblk_create");
- if (!pmemblk_create)
- goto errorout;
- pmemblk_open = dlsym(dl, "pmemblk_open");
- if (!pmemblk_open)
- goto errorout;
- pmemblk_close = dlsym(dl, "pmemblk_close");
- if (!pmemblk_close)
- goto errorout;
- pmemblk_nblock = dlsym(dl, "pmemblk_nblock");
- if (!pmemblk_nblock)
- goto errorout;
- pmemblk_bsize = dlsym(dl, "pmemblk_bsize");
- if (!pmemblk_bsize)
- goto errorout;
- pmemblk_read = dlsym(dl, "pmemblk_read");
- if (!pmemblk_read)
- goto errorout;
- pmemblk_write = dlsym(dl, "pmemblk_write");
- if (!pmemblk_write)
- goto errorout;
-
- return 0;
-
-errorout:
- log_err("fio: unable to load libpmemblk: %s\n", dlerror());
- if (dl)
- dlclose(dl);
-
- return -1;
-}
-
typedef struct fio_pmemblk_file *fio_pmemblk_file_t;
struct fio_pmemblk_file {
pmb = fio_pmemblk_cache_lookup(path);
if (!pmb) {
- /* load libpmemblk if needed */
- if (!pmemblk_open)
- if (load_libpmemblk(getenv("FIO_PMEMBLK_LIB")))
- goto error;
-
pmb = malloc(sizeof(*pmb));
if (!pmb)
goto error;
unsigned long long off;
unsigned long len;
void *buf;
- int (*blkop) (PMEMblkpool *, void *, off_t) = (void *)pmemblk_write;
fio_ro_check(td, io_u);
switch (io_u->ddir) {
case DDIR_READ:
- blkop = pmemblk_read;
- /* fall through */
case DDIR_WRITE:
off = io_u->offset;
len = io_u->xfer_buflen;
off /= pmb->pmb_bsize;
len /= pmb->pmb_bsize;
while (0 < len) {
- if (0 != blkop(pmb->pmb_pool, buf, off)) {
+ if (io_u->ddir == DDIR_READ &&
+ 0 != pmemblk_read(pmb->pmb_pool, buf, off)) {
+ io_u->error = errno;
+ break;
+ } else if (0 != pmemblk_write(pmb->pmb_pool, buf, off)) {
io_u->error = errno;
break;
}