* src/vmcore/options.h, src/vmcore/options.c, src/vm/jit/inline/inline.c:

Trace levels for inlining.

--HG--
extra : transplant_source : 0%BE%2AL%B3%8F%A9%3A%A5Q%F5%AE%3BC%BA%87%7F%2B%D3%19

diff --git a/src/vm/jit/inline/inline.c b/src/vm/jit/inline/inline.c
index b168dc64b8c8d04617c2fbde1ae8d640a52a6910..f28eecd24db03e2e42cb2887b01fe326069fbd80 100644 (file)
--- a/src/vm/jit/inline/inline.c
+++ b/src/vm/jit/inline/inline.c
@@ -111,7 +111,8 @@
 
 #if !defined(NDEBUG)
 #define INLINE_VERBOSE
-#define DOLOG(code) do{ if (opt_TraceInlining) { code; } }while(0)
+#define DOLOG(code)       do{ if (opt_TraceInlining >= 2) { code; } }while(0)
+#define DOLOG_SHORT(code) do{ if (opt_TraceInlining >= 1) { code; } }while(0)
 #else
 #define DOLOG(code)
 #endif
@@ -2177,7 +2178,7 @@ static bool inline_transform(inline_node *iln, jitdata *jd)
 #if !defined(NDEBUG)
                        inline_stat_roots++;
 
-                       DOLOG(
+                       DOLOG_SHORT(
                        printf("==== %d.INLINE ==================================================================\n",
                                debug_counter);
                        printf("\ninline tree:\n");

diff --git a/src/vmcore/options.c b/src/vmcore/options.c
index ececa6cbec8bb619e1b05264b9a0c0a5d257da51..fe15314ff93e7bc922c97f5f4ff2a697c476b9fd 100644 (file)
--- a/src/vmcore/options.c
+++ b/src/vmcore/options.c
@@ -293,7 +293,7 @@ option_t options_XX[] = {
        { "TraceCompilerCalls",           OPT_TraceCompilerCalls,           OPT_TYPE_BOOLEAN, "trace JIT compiler calls" },
        { "TraceExceptions",              OPT_TraceExceptions,              OPT_TYPE_BOOLEAN, "trace Exception throwing" },
 #if defined(ENABLE_INLINING) && !defined(NDEBUG)
-       { "TraceInlining",                OPT_TraceInlining,                OPT_TYPE_BOOLEAN, "trace method inlining" },
+       { "TraceInlining",                OPT_TraceInlining,                OPT_TYPE_VALUE,   "trace method inlining with the given verbosity level (default: 1)" },
 #endif
 #if !defined(ENABLE_VMLOG)
        { "TraceJavaCalls",               OPT_TraceJavaCalls,               OPT_TYPE_BOOLEAN, "trace Java method calls" },
@@ -711,7 +711,10 @@ void options_xx(JavaVMInitArgs *vm_args)
 
 #if defined(ENABLE_INLINING) && !defined(NDEBUG)
                case OPT_TraceInlining:
-                       opt_TraceInlining = enable;
+                       if (value == NULL)
+                               opt_TraceInlining = 1;
+                       else
+                               opt_TraceInlining = atoi(value);
                        break;
 #endif