|
48 | 48 | * // -b bufsize frame buffer size (long) |
49 | 49 | * // -t profile different threads separately |
50 | 50 | * // -s simple class names instead of FQN |
51 | | - * // -o fmt[,fmt...] output format: summary|traces|flat|collapsed|svg|tree|jfr |
| 51 | + * // -o fmt[,fmt...] output format: summary|traces|flat|collapsed|svg|tree|jfr|html |
52 | 52 | * // --width px SVG width pixels (integer) |
53 | 53 | * // --height px SVG frame height pixels (integer) |
54 | 54 | * // --minwidth px skip frames smaller than px (double) |
@@ -145,9 +145,12 @@ enum Output { |
145 | 145 | TRACES, |
146 | 146 | FLAT, |
147 | 147 | COLLAPSED, |
| 148 | + // No SVG in 2.x asyncprofiler. |
148 | 149 | SVG, |
149 | 150 | TREE, |
150 | | - JFR |
| 151 | + JFR, |
| 152 | + // In 2.x asyncprofiler, this is how you get flamegraphs. |
| 153 | + HTML |
151 | 154 | } |
152 | 155 |
|
153 | 156 | @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "SE_TRANSIENT_FIELD_NOT_RESTORED", |
@@ -358,10 +361,10 @@ private Output getOutput(final HttpServletRequest req) { |
358 | 361 | try { |
359 | 362 | return Output.valueOf(outputArg.trim().toUpperCase()); |
360 | 363 | } catch (IllegalArgumentException e) { |
361 | | - return Output.SVG; |
| 364 | + return Output.HTML; |
362 | 365 | } |
363 | 366 | } |
364 | | - return Output.SVG; |
| 367 | + return Output.HTML; |
365 | 368 | } |
366 | 369 |
|
367 | 370 | static void setResponseHeader(final HttpServletResponse response) { |
@@ -390,7 +393,7 @@ protected void doGet(final HttpServletRequest req, final HttpServletResponse res |
390 | 393 | resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); |
391 | 394 | setResponseHeader(resp); |
392 | 395 | resp.getWriter().write("The profiler servlet was disabled at startup.\n\n" + |
393 | | - "Please ensure the prerequsites for the Profiler Servlet have been installed and the\n" + |
| 396 | + "Please ensure the prerequisites for the Profiler Servlet have been installed and the\n" + |
394 | 397 | "environment is properly configured. For more information please see\n" + |
395 | 398 | "http://hbase.apache.org/book.html#profiler\n"); |
396 | 399 | return; |
|
0 commit comments