[PATCH] Change output/input file expectations
authorJens Axboe <axboe@suse.de>
Tue, 20 Sep 2005 12:41:37 +0000 (14:41 +0200)
committerJens Axboe <axboe@suse.de>
Tue, 20 Sep 2005 12:41:37 +0000 (14:41 +0200)
I think it's a little confusing right now with the naming, giving
-o foo to blktrace results in foo_dev_out.cpu files. Change this
to instead generate foo.cpu files, if the option is given.

blkparse.c
blktrace.c

index 6da028842f853d9f2a848b26020de2d0e11d5c1d..7dfb054603545a6bf4495d77fa4a4de681f1e8ea 100644 (file)
@@ -103,64 +103,58 @@ static struct per_process_info *ppi_list;
 static struct option l_opts[] = {
        {
                .name = "input",
-               .has_arg = 1,
+               .has_arg = required_argument,
                .flag = NULL,
                .val = 'i'
        },
        {
                .name = "output",
-               .has_arg = 1,
+               .has_arg = required_argument,
                .flag = NULL,
                .val = 'o'
        },
        {
                .name = "batch",
-               .has_arg = 1,
+               .has_arg = required_argument,
                .flag = NULL,
                .val = 'b'
        },
        {
                .name = "per program stats",
-               .has_arg = 0,
+               .has_arg = no_argument,
                .flag = NULL,
                .val = 's'
        },
        {
                .name = "track ios",
-               .has_arg = 0,
+               .has_arg = no_argument,
                .flag = NULL,
                .val = 't'
        },
        {
                .name = "quiet",
-               .has_arg = 0,
+               .has_arg = no_argument,
                .flag = NULL,
                .val = 'q'
        },
        {
                .name = "stopwatch",
-               .has_arg = 1,
+               .has_arg = required_argument,
                .flag = NULL,
                .val = 'w'
        },
        {
                .name = "format",
-               .has_arg = 1,
+               .has_arg = required_argument,
                .flag = NULL,
                .val = 'f'
        },
        {
                .name = "format-spec",
-               .has_arg = 1,
+               .has_arg = required_argument,
                .flag = NULL,
                .val = 'F'
        },
-       {
-               .name = NULL,
-               .has_arg = 0,
-               .flag = NULL,
-               .val = 0
-       }
 };
 
 /*
@@ -1453,7 +1447,7 @@ static int do_file(void)
                        pci->cpu = j;
 
                        snprintf(pci->fname, sizeof(pci->fname)-1,
-                                "%s_out.%d", pdi->name, j);
+                                "%s.%d", pdi->name, j);
                        if (stat(pci->fname, &st) < 0)
                                break;
                        if (!st.st_size)
index 3612068844e103cf5bc02dc65e1253883457b3cc..37e088c7c23909c85cc1eaef352b0db6cb80ce78 100644 (file)
@@ -73,52 +73,46 @@ struct mask_map mask_maps[] = {
 static struct option l_opts[] = {
        {
                .name = "dev",
-               .has_arg = 1,
+               .has_arg = required_argument,
                .flag = NULL,
                .val = 'd'
        },
        {
                .name = "act-mask",
-               .has_arg = 1,
+               .has_arg = required_argument,
                .flag = NULL,
                .val = 'a'
        },
        {
                .name = "set-mask",
-               .has_arg = 1,
+               .has_arg = required_argument,
                .flag = NULL,
                .val = 'A'
        },
        {
                .name = "relay",
-               .has_arg = 1,
+               .has_arg = required_argument,
                .flag = NULL,
                .val = 'r'
        },
        {
                .name = "output",
-               .has_arg = 1,
+               .has_arg = required_argument,
                .flag = NULL,
                .val = 'o'
        },
        {
                .name = "kill",
-               .has_arg = 0,
+               .has_arg = no_argument,
                .flag = NULL,
                .val = 'k'
        },
        {
                .name = "stopwatch",
-               .has_arg = 1,
+               .has_arg = required_argument,
                .flag = NULL,
                .val = 'w'
        },
-       {
-               .name = NULL,
-               .has_arg = 0,
-               .flag = NULL,
-               .val = 0
-       }
 };
 
 struct thread_information {
@@ -413,8 +407,7 @@ static int start_threads(struct device_information *dip)
                        tip->fd_lock = &stdout_mutex;
                } else {
                        if (output_name)
-                               sprintf(op, "%s_%s_out.%d", output_name,
-                                       dip->buts_name, tip->cpu);
+                               sprintf(op, "%s.%d", output_name, tip->cpu);
                        else
                                sprintf(op, "%s_out.%d",
                                        dip->buts_name, tip->cpu);
@@ -569,7 +562,7 @@ static void show_stats(void)
        struct device_information *dip;
        struct thread_information *tip;
        unsigned long long events_processed;
-  
+
        if (output_name && !strcmp(output_name, "-"))
                return;