parse: enable options to be marked dont-free

[fio.git] / engines / libhdfs.c

diff --git a/engines/libhdfs.c b/engines/libhdfs.c
index f690b009e431a2b6c80bdf7b97a9003d64b5549b..96a0871d873ee8813876ce4ee47709de8b3c5b58 100644 (file)
--- a/engines/libhdfs.c
+++ b/engines/libhdfs.c
@@ -15,7 +15,7 @@
 #include <hdfs.h>
 
 #include "../fio.h"
-
+#include "../optgroup.h"
 
 #define CHUNCK_NAME_LENGTH_MAX 80
 #define CHUNCK_CREATION_BUFFER_SIZE 65536
@@ -80,7 +80,9 @@ static struct fio_option options[] = {
                .group  = FIO_OPT_G_HDFS,
        },
        {
-               .name   = "chunck_size",
+               .name   = "chunk_size",
+               .alias  = "chunck_size",
+               .lname  = "Chunk size",
                .type   = FIO_OPT_INT,
                .off1   = offsetof(struct hdfsio_options, chunck_size),
                .def    = "1048576",
@@ -90,6 +92,7 @@ static struct fio_option options[] = {
        },
        {
                .name   = "single_instance",
+               .lname  = "Single Instance",
                .type   = FIO_OPT_BOOL,
                .off1   = offsetof(struct hdfsio_options, single_instance),
                .def    = "1",
@@ -99,6 +102,7 @@ static struct fio_option options[] = {
        },
        {
                .name   = "hdfs_use_direct",
+               .lname  = "HDFS Use Direct",
                .type   = FIO_OPT_BOOL,
                .off1   = offsetof(struct hdfsio_options, use_direct),
                .def    = "0",
@@ -119,7 +123,7 @@ static int get_chunck_name(char *dest, char *file_name, uint64_t chunk_id) {
 static int fio_hdfsio_prep(struct thread_data *td, struct io_u *io_u)
 {
        struct hdfsio_options *options = td->eo;
-       struct hdfsio_data *hd = td->io_ops->data;
+       struct hdfsio_data *hd = td->io_ops_data;
        unsigned long f_id;
        char fname[CHUNCK_NAME_LENGTH_MAX];
        int open_flags;
@@ -163,7 +167,7 @@ static int fio_hdfsio_prep(struct thread_data *td, struct io_u *io_u)
 
 static int fio_hdfsio_queue(struct thread_data *td, struct io_u *io_u)
 {
-       struct hdfsio_data *hd = td->io_ops->data;
+       struct hdfsio_data *hd = td->io_ops_data;
        struct hdfsio_options *options = td->eo;
        int ret;
        unsigned long offset;
@@ -223,7 +227,7 @@ int fio_hdfsio_open_file(struct thread_data *td, struct fio_file *f)
 
 int fio_hdfsio_close_file(struct thread_data *td, struct fio_file *f)
 {
-       struct hdfsio_data *hd = td->io_ops->data;
+       struct hdfsio_data *hd = td->io_ops_data;
 
        if (hd->curr_file_id != -1) {
                if ( hdfsCloseFile(hd->fs, hd->fp) == -1) {
@@ -238,7 +242,7 @@ int fio_hdfsio_close_file(struct thread_data *td, struct fio_file *f)
 static int fio_hdfsio_init(struct thread_data *td)
 {
        struct hdfsio_options *options = td->eo;
-       struct hdfsio_data *hd = td->io_ops->data;
+       struct hdfsio_data *hd = td->io_ops_data;
        struct fio_file *f;
        uint64_t j,k;
        int i, failure = 0;
@@ -309,13 +313,13 @@ static int fio_hdfsio_setup(struct thread_data *td)
        int i;
        uint64_t file_size, total_file_size;
 
-       if (!td->io_ops->data) {
+       if (!td->io_ops_data) {
                hd = malloc(sizeof(*hd));
                memset(hd, 0, sizeof(*hd));
                
                hd->curr_file_id = -1;
 
-               td->io_ops->data = hd;
+               td->io_ops_data = hd;
        }
        
        total_file_size = 0;
@@ -346,7 +350,7 @@ static int fio_hdfsio_setup(struct thread_data *td)
 
 static int fio_hdfsio_io_u_init(struct thread_data *td, struct io_u *io_u)
 {
-       struct hdfsio_data *hd = td->io_ops->data;
+       struct hdfsio_data *hd = td->io_ops_data;
        struct hdfsio_options *options = td->eo;
        int failure;
        struct hdfsBuilder *bld;
@@ -381,7 +385,7 @@ static int fio_hdfsio_io_u_init(struct thread_data *td, struct io_u *io_u)
 
 static void fio_hdfsio_io_u_free(struct thread_data *td, struct io_u *io_u)
 {
-       struct hdfsio_data *hd = td->io_ops->data;
+       struct hdfsio_data *hd = td->io_ops_data;
 
        if (hd->fs && hdfsDisconnect(hd->fs) < 0) {
                log_err("hdfs: disconnect failed: %d\n", errno);