xfs
[Top] [All Lists]

[PATCH 04/12] xfstests: fsstress add command line style output for show_

To: linux-fsdevel@xxxxxxxxxxxxxxx
Subject: [PATCH 04/12] xfstests: fsstress add command line style output for show_opts
From: Dmitry Monakhov <dmonakhov@xxxxxxxxxx>
Date: Thu, 3 Nov 2011 18:24:53 +0400
Cc: xfs@xxxxxxxxxxx, hch@xxxxxx, aelder@xxxxxxx, tytso@xxxxxxx, Dmitry Monakhov <dmonakhov@xxxxxxxxxx>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=LlqyoRSo8YMqqaSZNPVlMIVae72EkbrpmiZGJBXnCTo=; b=P2MjMKJD83gvyowddmg+SdRMx+fiJx7AMklPg4Re+MEEVu/ufBIOoEGkSTe5giQDqP MQOualoFLCAURpyhzKJnK1oeyWTp+/Weo2reUYJSYiIemTzVwLJbqQb148uzluMVKqGw AdVewdqF9nCwKbyKWJOCB7VDxNfe3k7msyEqc=
In-reply-to: <1320330301-2682-1-git-send-email-dmonakhov@xxxxxxxxxx>
References: <1320330301-2682-1-git-send-email-dmonakhov@xxxxxxxxxx>
Sender: Dmitry Monakhov <dmonlist@xxxxxxxxx>
Once some combination of seed+fs_ops result in regression it is
reasonable to document that combination. It is usefull to dump
that configuration in command line style. Later this line may be
simply hardcoded in to regression test.

Signed-off-by: Dmitry Monakhov <dmonakhov@xxxxxxxxxx>
---
 070            |    2 +-
 117            |    2 +-
 ltp/fsstress.c |   22 ++++++++++++++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/070 b/070
index 4458011..f48c33c 100755
--- a/070
+++ b/070
@@ -62,7 +62,7 @@ $FSSTRESS_PROG \
        -f unresvsp=0 \
        -f attr_set=100 \
        -f attr_remove=100 \
-       -S -p 1 -n 10000 >$seq.full 2>&1
+        -p 1 -n 10000 -S c >$seq.full 2>&1
 
 status=$?
 exit
diff --git a/117 b/117
index fcf0485..edec157 100755
--- a/117
+++ b/117
@@ -85,7 +85,7 @@ while [ $i -lt $ITERATIONS ]; do
        -f attr_set=100 \
        -f attr_remove=100 \
         -s $seed \
-       -S -p 1 -n 1000 >>$seq.full 2>&1
+       -p 1 -n 1000 -S c >>$seq.full 2>&1
 
     let i=$i+1
 done
diff --git a/ltp/fsstress.c b/ltp/fsstress.c
index 133a247..77e0682 100644
--- a/ltp/fsstress.c
+++ b/ltp/fsstress.c
@@ -284,7 +284,7 @@ int main(int argc, char **argv)
        nops = sizeof(ops) / sizeof(ops[0]);
        ops_end = &ops[nops];
        myprog = argv[0];
-       while ((c = getopt(argc, argv, "d:e:f:i:m:n:o:p:rs:vwzHS")) != -1) {
+       while ((c = getopt(argc, argv, "d:e:f:i:m:n:o:p:rs:S:vwzH")) != -1) {
                switch (c) {
                case 'd':
                        dirname = optarg;
@@ -345,7 +345,10 @@ int main(int argc, char **argv)
                        zero_freq();
                        break;
                case 'S':
-                       show_ops(0, NULL);
+                       i = 0;
+                       if (optarg[0] == 'c')
+                               i = 1;
+                       show_ops(1, NULL);
                        printf("\n");
                         nousage=1;
                        break;
@@ -1310,7 +1313,8 @@ show_ops(int flag, char *lead_str)
                         x+=printf("%s ", p->name);
                 }
                 printf("\n");
-        } else {
+        } else if (flag == 0) {
+               /* Table view style */
                int             f;
                for (f = 0, p = ops; p < ops_end; p++)
                        f += p->freq;
@@ -1327,6 +1331,16 @@ show_ops(int flag, char *lead_str)
                                (p->iswrite == 0) ? " " : "write op");
                        }
                 }
+       } else {
+               /* Command line style */
+               if (lead_str != NULL)
+                       printf("%s", lead_str);
+               printf ("-z -s %ld -m %d -n %d -p %d ", seed, idmodulo,
+                       operations, nproc);
+               for (p = ops; p < ops_end; p++)
+                       if (p->freq > 0)
+                               printf("-f%s=%d ",p->name, p->freq);
+               printf("\n");
        }
 }
 
@@ -1433,7 +1447,7 @@ usage(void)
        printf("   -v               specifies verbose mode\n");
        printf("   -w               zeros frequencies of non-write 
operations\n");
        printf("   -z               zeros frequencies of all operations\n");
-       printf("   -S               prints the table of operations (omitting 
zero frequency)\n");
+       printf("   -S [c,t]         prints the list of operations (omitting 
zero frequency) in command line or table style\n");
        printf("   -H               prints usage and exits\n");
 }
 
-- 
1.7.1

<Prev in Thread] Current Thread [Next in Thread>