fio: support suffixes in expression parser
Note that time values in expressions by default have units of microseconds
Signed-off-by: Stephen M. Cameron <stephenmcameron@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
diff --git a/exp/expression-parser.l b/exp/expression-parser.l
index 388515e..f688da1 100644
--- a/exp/expression-parser.l
+++ b/exp/expression-parser.l
@@ -36,12 +36,78 @@
static void __attribute__((unused)) yyunput(int c,char *buf_ptr);
static int __attribute__((unused)) input(void);
+#define set_suffix_value(yylval, i_val, d_val, has_d_val) \
+ (yylval).v.dval = (d_val); \
+ (yylval).v.ival = (i_val); \
+ (yylval).v.has_dval = (has_d_val); \
+ (yylval).v.has_error = 0;
+
%}
%%
-bye return BYE;
+bye return BYE;
+[kK]|[kK][bB] {
+ set_suffix_value(yylval, 1024, 1024.0, 0);
+ return SUFFIX;
+ }
+[Mm]|[Mm][bB] {
+ set_suffix_value(yylval, 1024 * 1024, 1024.0 * 1024.0, 0);
+ return SUFFIX;
+ }
+[mM][sS] {
+ set_suffix_value(yylval, 1000, 1000.0, 1);
+ return SUFFIX;
+ }
+[uU][sS] {
+ set_suffix_value(yylval, 1, 1.0, 1);
+ return SUFFIX;
+ }
+[gG]|[Gg][Bb] {
+ set_suffix_value(yylval, 1024LL * 1024 * 1024, 1024.0 * 1024.0 * 1024, 0);
+ return SUFFIX;
+ }
+[tT]|[tT][bB] {
+ set_suffix_value(yylval, 1024LL * 1024 * 1024 * 1024,
+ 1024.0 * 1024.0 * 1024.0 * 1024.0 * 1024, 0);
+ return SUFFIX;
+ }
+[pP]|[pP][bB] {
+ set_suffix_value(yylval, 1024LL * 1024 * 1024 * 1024 * 1024,
+ 1024.0 * 1024.0 * 1024.0 * 1024.0 * 1024.0, 0);
+ return SUFFIX;
+ }
+[kK][iI][Bb] {
+ set_suffix_value(yylval, 1000LL, 1000.0, 0);
+ return SUFFIX;
+ }
+[mM][Ii][bB] {
+ set_suffix_value(yylval, 1000000LL, 1000000.0 , 0);
+ return SUFFIX;
+ }
+[gG][iI][Bb] {
+ set_suffix_value(yylval, 1000000000LL, 1000000000.0 , 0);
+ return SUFFIX;
+ }
+[pP][iI][Bb] {
+ set_suffix_value(yylval, 1000000000000LL, 1000000000000.0 , 0);
+ return SUFFIX;
+ }
+[sS] {
+ set_suffix_value(yylval, 1000000LL, 1000000.0 , 0);
+ return SUFFIX;
+ }
+[dD] {
+ set_suffix_value(yylval, 60LL * 60LL * 24LL * 1000000LL,
+ 60.0 * 60.0 * 24.0 * 1000000.0, 0);
+ return SUFFIX;
+ }
+[hH] {
+ set_suffix_value(yylval, 60LL * 60LL * 1000000LL,
+ 60.0 * 60.0 * 1000000.0, 0);
+ return SUFFIX;
+ }
[ \t] ; /* ignore whitespace */
#.+ ; /* ignore comments */
[0-9]*[.][0-9]+ {