pmemblk, dev-dax: clean up error logs

Print the errno string rather than the number, and prefix
all log_err prints with pmemblk or dev-dax rather than fio.

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/engines/dev-dax.c b/engines/dev-dax.c
index 45aca4e82382393f12977ce9fe95abd0fd51ca06..235a31e640b17d69c42df5a53aa25b697ca16aec 100644 (file)
--- a/engines/dev-dax.c
+++ b/engines/dev-dax.c
@@ -106,7 +106,7 @@ static int fio_devdax_prep_limited(struct thread_data *td, struct io_u *io_u)
        struct fio_devdax_data *fdd = FILE_ENG_DATA(f);
 
        if (io_u->buflen > f->real_file_size) {
        struct fio_devdax_data *fdd = FILE_ENG_DATA(f);
 
        if (io_u->buflen > f->real_file_size) {

-               log_err("fio: bs too big for dev-dax engine\n");
+               log_err("dev-dax: bs too big for dev-dax engine\n");

                return EIO;
        }
 
                return EIO;
        }
 


@@ -213,8 +213,8 @@ static int fio_devdax_init(struct thread_data *td)
 
        if ((o->rw_min_bs & page_mask) &&
            (o->fsync_blocks || o->fdatasync_blocks)) {
 
        if ((o->rw_min_bs & page_mask) &&
            (o->fsync_blocks || o->fdatasync_blocks)) {

-               log_err("fio: mmap options dictate a minimum block size of "
-                       "%llu bytes\n", (unsigned long long) page_size);
+               log_err("dev-dax: mmap options dictate a minimum block size of %llu bytes\n",
+                       (unsigned long long) page_size);

                return 1;
        }
 
                return 1;
        }
 


@@ -272,8 +272,8 @@ fio_devdax_get_file_size(struct thread_data *td, struct fio_file *f)
 
        rc = stat(f->file_name, &st);
        if (rc < 0) {
 
        rc = stat(f->file_name, &st);
        if (rc < 0) {

-               log_err("%s: failed to stat file %s: %d\n",
-                       td->o.name, f->file_name, errno);
+               log_err("%s: failed to stat file %s (%s)\n",
+                       td->o.name, f->file_name, strerror(errno));

                return -errno;
        }
 
                return -errno;
        }
 


@@ -282,8 +282,8 @@ fio_devdax_get_file_size(struct thread_data *td, struct fio_file *f)
 
        rpath = realpath(spath, npath);
        if (!rpath) {
 
        rpath = realpath(spath, npath);
        if (!rpath) {

-               log_err("%s: realpath on %s failed: %d\n",
-                       td->o.name, spath, errno);
+               log_err("%s: realpath on %s failed (%s)\n",
+                       td->o.name, spath, strerror(errno));

                return -errno;
        }
 
                return -errno;
        }
 


@@ -298,15 +298,15 @@ fio_devdax_get_file_size(struct thread_data *td, struct fio_file *f)
 
        sfile = fopen(spath, "r");
        if (!sfile) {
 
        sfile = fopen(spath, "r");
        if (!sfile) {

-               log_err("%s: fopen on %s failed: %d\n",
-                       td->o.name, spath, errno);
+               log_err("%s: fopen on %s failed (%s)\n",
+                       td->o.name, spath, strerror(errno));

                return 1;
        }
 
        rc = fscanf(sfile, "%lu", &size);
        if (rc < 0) {
                return 1;
        }
 
        rc = fscanf(sfile, "%lu", &size);
        if (rc < 0) {

-               log_err("%s: fscanf on %s failed: %d\n",
-                       td->o.name, spath, errno);
+               log_err("%s: fscanf on %s failed (%s)\n",
+                       td->o.name, spath, strerror(errno));

                return 1;
        }
 
                return 1;
        }
 

diff --git a/engines/pmemblk.c b/engines/pmemblk.c
index 6dde7b515054cdfbc8326aca3d33a97e44e9cad9..ed6c2b2feb7ba5b4e690dcc8f254f70cf5615336 100644 (file)
--- a/engines/pmemblk.c
+++ b/engines/pmemblk.c
@@ -203,9 +203,8 @@ static fio_pmemblk_file_t pmb_open(const char *pathspec, int flags)
                            pmemblk_create(path, bsize, fsize, 0644);
                }
                if (!pmb->pmb_pool) {
                            pmemblk_create(path, bsize, fsize, 0644);
                }
                if (!pmb->pmb_pool) {

-                       log_err
-                           ("fio: enable to open pmemblk pool file (errno %d)\n",
-                            errno);
+                       log_err("pmemblk: unable to open pmemblk pool file %s (%s)\n",
+                            path, strerror(errno));

                        goto error;
                }
 
                        goto error;
                }
 


@@ -267,14 +266,14 @@ static int pmb_get_flags(struct thread_data *td, uint64_t *pflags)
        if (!td->o.use_thread) {
                if (!thread_warned) {
                        thread_warned = 1;
        if (!td->o.use_thread) {
                if (!thread_warned) {
                        thread_warned = 1;

-                       log_err("fio: must set thread=1 for pmemblk engine\n");
+                       log_err("pmemblk: must set thread=1 for pmemblk engine\n");

                }
                return 1;
        }
 
        if (!td->o.odirect && !odirect_warned) {
                odirect_warned = 1;
                }
                return 1;
        }
 
        if (!td->o.odirect && !odirect_warned) {
                odirect_warned = 1;

-               log_info("fio: direct == 0, but pmemblk is always direct\n");
+               log_info("pmemblk: direct == 0, but pmemblk is always direct\n");

        }
 
        if (td->o.allow_create)
        }
 
        if (td->o.allow_create)