io_u_log_error ddir name mismatch

io_u_log_error ddir name mismatch

[Elliott, Robert (Server Storage)]

The names in io_u_log_error:
       const char *msg[] = { "read", "write", "sync", "datasync",
                               "sync_file_range", "wait", "trim" };

which are printed with
	log_err (msg[io_u->ddir]);

don't match the enum values for io_u->ddir:

enum fio_ddir {
        DDIR_READ = 0,
        DDIR_WRITE = 1,
        DDIR_TRIM = 2,
        DDIR_RWDIR_CNT = 3,
        DDIR_SYNC = 3,
        DDIR_DATASYNC,
        DDIR_SYNC_FILE_RANGE,
        DDIR_WAIT,
        DDIR_INVAL = -1,
};

struct io_u {
        enum fio_ddir ddir;
...

Maybe TRIM was moved earlier at some point?

My test cases just generate reads and writes, so I don't have a 
test case to validate a patch.

---
Rob Elliott    HP Server Storage

Re: io_u_log_error ddir name mismatch

[Jens Axboe]

On 2014-09-16 16:24, Elliott, Robert (Server Storage) wrote:
> The names in io_u_log_error:
>         const char *msg[] = { "read", "write", "sync", "datasync",
>                                 "sync_file_range", "wait", "trim" };
>
> which are printed with
> 	log_err (msg[io_u->ddir]);
>
> don't match the enum values for io_u->ddir:
>
> enum fio_ddir {
>          DDIR_READ = 0,
>          DDIR_WRITE = 1,
>          DDIR_TRIM = 2,
>          DDIR_RWDIR_CNT = 3,
>          DDIR_SYNC = 3,
>          DDIR_DATASYNC,
>          DDIR_SYNC_FILE_RANGE,
>          DDIR_WAIT,
>          DDIR_INVAL = -1,
> };
>
> struct io_u {
>          enum fio_ddir ddir;
> ...
>
> Maybe TRIM was moved earlier at some point?

TRIM was turned into a first class citizen at one point, I suspect that 
is when it broke. It's broken in both io_u.c and iolog.c. I fixed it by 
killing them both, and adding a function for this right in io_ddir.h 
where the data directions are defined.

Thanks Robert!

-- 
Jens Axboe