X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=exp%2Fexpression-parser.l;h=692c6cc37d9bbac5873d8dee9b58c72def1d17eb;hb=ec3e36481f88dc731d7d52030a51fc68b970db3f;hp=856596acfa21aee603f0dc81fba70b7ca5ee03af;hpb=de06a46881e1a8876b5fd1de5e002d6189a90a30;p=fio.git

diff --git a/exp/expression-parser.l b/exp/expression-parser.l
index 856596ac..692c6cc3 100644
--- a/exp/expression-parser.l
+++ b/exp/expression-parser.l
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
@@ -42,6 +42,9 @@ extern int yyerror(long long *result, double *dresult,
 static void __attribute__((unused)) yyunput(int c, char *buf_ptr);
 static int __attribute__((unused)) input(void);
 
+/* set by parser -- this is another thing which makes the parser thread-unsafe :(. */
+int lexer_value_is_time = 0; /* for determining if "m" suffix means mega- or minutes */
+
 #define set_suffix_value(yylval, i_val, d_val, has_d_val) \
 	(yylval).v.dval = (d_val); \
 	(yylval).v.ival = (i_val); \
@@ -57,7 +60,7 @@ static int __attribute__((unused)) input(void);
 			set_suffix_value(yylval, 1024, 1024.0, 0);
 			return SUFFIX;
 		}
-[Mm]|[Mm][bB]	{
+[Mm][bB]	{
 			set_suffix_value(yylval, 1024 * 1024, 1024.0 * 1024.0, 0);
 			return SUFFIX;
 		}
@@ -103,6 +106,14 @@ static int __attribute__((unused)) input(void);
 			set_suffix_value(yylval, 1000000LL, 1000000.0 , 0);
 			return SUFFIX;
 		}
+[mM]		{
+			if (!lexer_value_is_time) {
+				set_suffix_value(yylval, 1024 * 1024, 1024.0 * 1024.0, 0);
+			} else {
+				set_suffix_value(yylval, 60LL * 1000000LL, 60.0 * 1000000.0, 0);
+			}
+			return SUFFIX;
+		}
 [dD]		{
 			set_suffix_value(yylval, 60LL * 60LL * 24LL * 1000000LL,
 						60.0 * 60.0 * 24.0 * 1000000.0, 0);