src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
author mgronlun
Wed, 30 Oct 2019 19:43:52 +0100
changeset 58863 c16ac7a2eba4
parent 55302 686dedba1d9a
permissions -rw-r--r--
8226511: Implement JFR Event Streaming Reviewed-by: egahlin, mseledtsov, mgronlun Contributed-by: erik.gahlin@oracle.com, mikhailo.seledtsov@oracle.com, markus.gronlund@oracle.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
     1
/*
54847
59ea39bb2809 8223657: Remove unused THREAD argument from SymbolTable functions
coleenp
parents: 52669
diff changeset
     2
 * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
     4
 *
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
     7
 * published by the Free Software Foundation.
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
     8
 *
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    13
 * accompanied this code).
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    14
 *
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    18
 *
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    21
 * questions.
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    22
 *
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    23
 */
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    24
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    25
#include "precompiled.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    26
#include "classfile/javaClasses.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    27
#include "classfile/vmSymbols.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    28
#include "jfr/jfr.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    29
#include "jfr/dcmd/jfrDcmds.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    30
#include "jfr/jni/jfrJavaSupport.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    31
#include "jfr/recorder/jfrRecorder.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    32
#include "jfr/recorder/service/jfrOptionSet.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    33
#include "memory/resourceArea.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    34
#include "oops/oop.inline.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    35
#include "oops/symbol.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    36
#include "runtime/handles.inline.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    37
#include "services/diagnosticArgument.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    38
#include "services/diagnosticFramework.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    39
#include "utilities/globalDefinitions.hpp"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    40
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    41
#ifdef _WINDOWS
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    42
#define JFR_FILENAME_EXAMPLE "C:\\Users\\user\\My Recording.jfr"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    43
#endif
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    44
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    45
#ifdef __APPLE__
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    46
#define JFR_FILENAME_EXAMPLE  "/Users/user/My Recording.jfr"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    47
#endif
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    48
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    49
#ifndef JFR_FILENAME_EXAMPLE
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    50
#define JFR_FILENAME_EXAMPLE "/home/user/My Recording.jfr"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    51
#endif
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    52
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    53
// JNIHandle management
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    54
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    55
// ------------------------------------------------------------------
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    56
// push_jni_handle_block
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    57
//
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    58
// Push on a new block of JNI handles.
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    59
static void push_jni_handle_block(Thread* const thread) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    60
  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(thread));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    61
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    62
  // Allocate a new block for JNI handles.
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    63
  // Inlined code from jni_PushLocalFrame()
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    64
  JNIHandleBlock* prev_handles = thread->active_handles();
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    65
  JNIHandleBlock* entry_handles = JNIHandleBlock::allocate_block(thread);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    66
  assert(entry_handles != NULL && prev_handles != NULL, "should not be NULL");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    67
  entry_handles->set_pop_frame_link(prev_handles);  // make sure prev handles get gc'd.
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    68
  thread->set_active_handles(entry_handles);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    69
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    70
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    71
// ------------------------------------------------------------------
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    72
// pop_jni_handle_block
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    73
//
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    74
// Pop off the current block of JNI handles.
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    75
static void pop_jni_handle_block(Thread* const thread) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    76
  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(thread));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    77
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    78
  // Release our JNI handle block
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    79
  JNIHandleBlock* entry_handles = thread->active_handles();
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    80
  JNIHandleBlock* prev_handles = entry_handles->pop_frame_link();
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    81
  // restore
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    82
  thread->set_active_handles(prev_handles);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    83
  entry_handles->set_pop_frame_link(NULL);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    84
  JNIHandleBlock::release_block(entry_handles, thread); // may block
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    85
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    86
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    87
class JNIHandleBlockManager : public StackObj {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    88
 private:
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    89
  Thread* const _thread;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    90
 public:
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    91
  JNIHandleBlockManager(Thread* thread) : _thread(thread) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    92
    push_jni_handle_block(_thread);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    93
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    94
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    95
  ~JNIHandleBlockManager() {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    96
    pop_jni_handle_block(_thread);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    97
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    98
};
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
    99
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   100
static bool is_module_available(outputStream* output, TRAPS) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   101
  return JfrJavaSupport::is_jdk_jfr_module_available(output, THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   102
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   103
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   104
static bool is_disabled(outputStream* output) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   105
  if (Jfr::is_disabled()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   106
    if (output != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   107
      output->print_cr("Flight Recorder is disabled.\n");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   108
    }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   109
    return true;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   110
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   111
  return false;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   112
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   114
static bool is_recorder_instance_created(outputStream* output) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   115
  if (!JfrRecorder::is_created()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   116
    if (output != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   117
      output->print_cr("No available recordings.\n");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   118
      output->print_cr("Use JFR.start to start a recording.\n");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   119
    }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   120
    return false;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   121
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   122
  return true;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   123
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   124
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   125
static bool invalid_state(outputStream* out, TRAPS) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   126
  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   127
  return is_disabled(out) || !is_module_available(out, THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   128
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   129
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   130
static void print_pending_exception(outputStream* output, oop throwable) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   131
  assert(throwable != NULL, "invariant");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   132
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   133
  oop msg = java_lang_Throwable::message(throwable);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   134
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   135
  if (msg != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   136
    char* text = java_lang_String::as_utf8_string(msg);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   137
    output->print_raw_cr(text);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   138
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   139
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   140
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   141
static void print_message(outputStream* output, const char* message) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   142
  if (message != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   143
    output->print_raw(message);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   144
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   145
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   146
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   147
static void handle_dcmd_result(outputStream* output,
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   148
                               const oop result,
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   149
                               const DCmdSource source,
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   150
                               TRAPS) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   151
  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   152
  assert(output != NULL, "invariant");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   153
  if (HAS_PENDING_EXCEPTION) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   154
    print_pending_exception(output, PENDING_EXCEPTION);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   155
    // Don't clear excption on startup, JVM should fail initialization.
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   156
    if (DCmd_Source_Internal != source) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   157
      CLEAR_PENDING_EXCEPTION;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   158
    }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   159
    return;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   160
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   161
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   162
  assert(!HAS_PENDING_EXCEPTION, "invariant");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   163
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   164
  if (result != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   165
    const char* result_chars = java_lang_String::as_utf8_string(result);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   166
    print_message(output, result_chars);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   167
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   168
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   169
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   170
static oop construct_dcmd_instance(JfrJavaArguments* args, TRAPS) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   171
  assert(args != NULL, "invariant");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   172
  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   173
  assert(args->klass() != NULL, "invariant");
54847
59ea39bb2809 8223657: Remove unused THREAD argument from SymbolTable functions
coleenp
parents: 52669
diff changeset
   174
  args->set_name("<init>");
59ea39bb2809 8223657: Remove unused THREAD argument from SymbolTable functions
coleenp
parents: 52669
diff changeset
   175
  args->set_signature("()V");
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   176
  JfrJavaSupport::new_object(args, CHECK_NULL);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   177
  return (oop)args->result()->get_jobject();
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   178
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   179
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   180
JfrDumpFlightRecordingDCmd::JfrDumpFlightRecordingDCmd(outputStream* output,
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   181
                                                       bool heap) : DCmdWithParser(output, heap),
50745
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   182
  _name("name", "Recording name, e.g. \\\"My Recording\\\"", "STRING", false, NULL),
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   183
  _filename("filename", "Copy recording data to file, e.g. \\\"" JFR_FILENAME_EXAMPLE "\\\"", "STRING", false),
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   184
  _maxage("maxage", "Maximum duration to dump, in (s)econds, (m)inutes, (h)ours, or (d)ays, e.g. 60m, or 0 for no limit", "NANOTIME", false, "0"),
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   185
  _maxsize("maxsize", "Maximum amount of bytes to dump, in (M)B or (G)B, e.g. 500M, or 0 for no limit", "MEMORY SIZE", false, "0"),
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   186
  _begin("begin", "Point in time to dump data from, e.g. 09:00, 21:35:00, 2018-06-03T18:12:56.827Z, 2018-06-03T20:13:46.832, -10m, -3h, or -1d", "STRING", false),
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   187
  _end("end", "Point in time to dump data to, e.g. 09:00, 21:35:00, 2018-06-03T18:12:56.827Z, 2018-06-03T20:13:46.832, -10m, -3h, or -1d", "STRING", false),
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   188
  _path_to_gc_roots("path-to-gc-roots", "Collect path to GC roots", "BOOLEAN", false, "false") {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   189
  _dcmdparser.add_dcmd_option(&_name);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   190
  _dcmdparser.add_dcmd_option(&_filename);
50745
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   191
  _dcmdparser.add_dcmd_option(&_maxage);
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   192
  _dcmdparser.add_dcmd_option(&_maxsize);
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   193
  _dcmdparser.add_dcmd_option(&_begin);
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   194
  _dcmdparser.add_dcmd_option(&_end);
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   195
  _dcmdparser.add_dcmd_option(&_path_to_gc_roots);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   196
};
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   197
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   198
int JfrDumpFlightRecordingDCmd::num_arguments() {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   199
  ResourceMark rm;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   200
  JfrDumpFlightRecordingDCmd* dcmd = new JfrDumpFlightRecordingDCmd(NULL, false);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   201
  if (dcmd != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   202
    DCmdMark mark(dcmd);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   203
    return dcmd->_dcmdparser.num_arguments();
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   204
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   205
  return 0;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   206
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   207
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   208
void JfrDumpFlightRecordingDCmd::execute(DCmdSource source, TRAPS) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   209
  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   210
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   211
  if (invalid_state(output(), THREAD) || !is_recorder_instance_created(output())) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   212
    return;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   213
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   214
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   215
  ResourceMark rm(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   216
  HandleMark hm(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   217
  JNIHandleBlockManager jni_handle_management(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   218
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   219
  JavaValue result(T_OBJECT);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   220
  JfrJavaArguments constructor_args(&result);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   221
  constructor_args.set_klass("jdk/jfr/internal/dcmd/DCmdDump", CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   222
  const oop dcmd = construct_dcmd_instance(&constructor_args, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   223
  Handle h_dcmd_instance(THREAD, dcmd);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   224
  assert(h_dcmd_instance.not_null(), "invariant");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   225
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   226
  jstring name = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   227
  if (_name.is_set() && _name.value()  != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   228
    name = JfrJavaSupport::new_string(_name.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   229
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   230
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   231
  jstring filepath = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   232
  if (_filename.is_set() && _filename.value() != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   233
    filepath = JfrJavaSupport::new_string(_filename.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   234
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   235
50745
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   236
  jobject maxage = NULL;
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   237
  if (_maxage.is_set()) {
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   238
    maxage = JfrJavaSupport::new_java_lang_Long(_maxage.value()._nanotime, CHECK);
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   239
  }
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   240
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   241
  jobject maxsize = NULL;
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   242
  if (_maxsize.is_set()) {
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   243
    maxsize = JfrJavaSupport::new_java_lang_Long(_maxsize.value()._size, CHECK);
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   244
  }
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   245
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   246
  jstring begin = NULL;
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   247
  if (_begin.is_set() && _begin.value() != NULL) {
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   248
    begin = JfrJavaSupport::new_string(_begin.value(), CHECK);
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   249
  }
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   250
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   251
  jstring end = NULL;
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   252
  if (_end.is_set() && _end.value() != NULL) {
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   253
    end = JfrJavaSupport::new_string(_end.value(), CHECK);
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   254
  }
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   255
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   256
  jobject path_to_gc_roots = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   257
  if (_path_to_gc_roots.is_set()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   258
    path_to_gc_roots = JfrJavaSupport::new_java_lang_Boolean(_path_to_gc_roots.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   259
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   260
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   261
  static const char klass[] = "jdk/jfr/internal/dcmd/DCmdDump";
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   262
  static const char method[] = "execute";
50745
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   263
  static const char signature[] = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;)Ljava/lang/String;";
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   264
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   265
  JfrJavaArguments execute_args(&result, klass, method, signature, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   266
  execute_args.set_receiver(h_dcmd_instance);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   267
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   268
  // arguments
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   269
  execute_args.push_jobject(name);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   270
  execute_args.push_jobject(filepath);
50745
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   271
  execute_args.push_jobject(maxage);
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   272
  execute_args.push_jobject(maxsize);
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   273
  execute_args.push_jobject(begin);
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   274
  execute_args.push_jobject(end);
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   275
  execute_args.push_jobject(path_to_gc_roots);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   276
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   277
  JfrJavaSupport::call_virtual(&execute_args, THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   278
  handle_dcmd_result(output(), (oop)result.get_jobject(), source, THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   279
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   280
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   281
JfrCheckFlightRecordingDCmd::JfrCheckFlightRecordingDCmd(outputStream* output, bool heap) : DCmdWithParser(output, heap),
50745
a390cbb82d47 8203929: Limit amount of data for JFR.dump
egahlin
parents: 50195
diff changeset
   282
  _name("name","Recording name, e.g. \\\"My Recording\\\" or omit to see all recordings","STRING",false, NULL),
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   283
  _verbose("verbose","Print event settings for the recording(s)","BOOLEAN",
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   284
           false, "false") {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   285
  _dcmdparser.add_dcmd_option(&_name);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   286
  _dcmdparser.add_dcmd_option(&_verbose);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   287
};
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   288
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   289
int JfrCheckFlightRecordingDCmd::num_arguments() {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   290
  ResourceMark rm;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   291
  JfrCheckFlightRecordingDCmd* dcmd = new JfrCheckFlightRecordingDCmd(NULL, false);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   292
  if (dcmd != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   293
    DCmdMark mark(dcmd);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   294
    return dcmd->_dcmdparser.num_arguments();
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   295
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   296
  return 0;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   297
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   298
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   299
void JfrCheckFlightRecordingDCmd::execute(DCmdSource source, TRAPS) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   300
  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   301
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   302
  if (invalid_state(output(), THREAD) || !is_recorder_instance_created(output())) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   303
    return;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   304
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   305
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   306
  ResourceMark rm(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   307
  HandleMark hm(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   308
  JNIHandleBlockManager jni_handle_management(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   309
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   310
  JavaValue result(T_OBJECT);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   311
  JfrJavaArguments constructor_args(&result);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   312
  constructor_args.set_klass("jdk/jfr/internal/dcmd/DCmdCheck", CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   313
  const oop dcmd = construct_dcmd_instance(&constructor_args, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   314
  Handle h_dcmd_instance(THREAD, dcmd);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   315
  assert(h_dcmd_instance.not_null(), "invariant");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   316
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   317
  jstring name = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   318
  if (_name.is_set() && _name.value() != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   319
    name = JfrJavaSupport::new_string(_name.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   320
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   321
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   322
  jobject verbose = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   323
  if (_verbose.is_set()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   324
    verbose = JfrJavaSupport::new_java_lang_Boolean(_verbose.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   325
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   326
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   327
  static const char klass[] = "jdk/jfr/internal/dcmd/DCmdCheck";
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   328
  static const char method[] = "execute";
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   329
  static const char signature[] = "(Ljava/lang/String;Ljava/lang/Boolean;)Ljava/lang/String;";
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   330
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   331
  JfrJavaArguments execute_args(&result, klass, method, signature, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   332
  execute_args.set_receiver(h_dcmd_instance);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   333
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   334
  // arguments
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   335
  execute_args.push_jobject(name);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   336
  execute_args.push_jobject(verbose);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   337
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   338
  JfrJavaSupport::call_virtual(&execute_args, THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   339
  handle_dcmd_result(output(), (oop)result.get_jobject(), source, THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   340
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   341
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   342
JfrStartFlightRecordingDCmd::JfrStartFlightRecordingDCmd(outputStream* output,
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   343
                                                         bool heap) : DCmdWithParser(output, heap),
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   344
  _name("name", "Name that can be used to identify recording, e.g. \\\"My Recording\\\"", "STRING", false, NULL),
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   345
  _settings("settings", "Settings file(s), e.g. profile or default. See JRE_HOME/lib/jfr", "STRING SET", false),
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   346
  _delay("delay", "Delay recording start with (s)econds, (m)inutes), (h)ours), or (d)ays, e.g. 5h.", "NANOTIME", false, "0"),
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   347
  _duration("duration", "Duration of recording in (s)econds, (m)inutes, (h)ours, or (d)ays, e.g. 300s.", "NANOTIME", false, "0"),
51334
cc2c79d22508 8208671: Runtime, JFR, Serviceability changes to allow enabling -Wreorder
tschatzl
parents: 50745
diff changeset
   348
  _disk("disk", "Recording should be persisted to disk", "BOOLEAN", false),
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   349
  _filename("filename", "Resulting recording filename, e.g. \\\"" JFR_FILENAME_EXAMPLE "\\\"", "STRING", false),
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   350
  _maxage("maxage", "Maximum time to keep recorded data (on disk) in (s)econds, (m)inutes, (h)ours, or (d)ays, e.g. 60m, or 0 for no limit", "NANOTIME", false, "0"),
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   351
  _maxsize("maxsize", "Maximum amount of bytes to keep (on disk) in (k)B, (M)B or (G)B, e.g. 500M, or 0 for no limit", "MEMORY SIZE", false, "0"),
58863
c16ac7a2eba4 8226511: Implement JFR Event Streaming
mgronlun
parents: 55302
diff changeset
   352
  _flush_interval("flush-interval", "Minimum time before flushing buffers, measured in (s)econds, e.g. 4 s, or 0 for flushing when a recording ends", "NANOTIME", false, "1s"),
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   353
  _dump_on_exit("dumponexit", "Dump running recording when JVM shuts down", "BOOLEAN", false),
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   354
  _path_to_gc_roots("path-to-gc-roots", "Collect path to GC roots", "BOOLEAN", false, "false") {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   355
  _dcmdparser.add_dcmd_option(&_name);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   356
  _dcmdparser.add_dcmd_option(&_settings);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   357
  _dcmdparser.add_dcmd_option(&_delay);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   358
  _dcmdparser.add_dcmd_option(&_duration);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   359
  _dcmdparser.add_dcmd_option(&_disk);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   360
  _dcmdparser.add_dcmd_option(&_filename);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   361
  _dcmdparser.add_dcmd_option(&_maxage);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   362
  _dcmdparser.add_dcmd_option(&_maxsize);
58863
c16ac7a2eba4 8226511: Implement JFR Event Streaming
mgronlun
parents: 55302
diff changeset
   363
  _dcmdparser.add_dcmd_option(&_flush_interval);
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   364
  _dcmdparser.add_dcmd_option(&_dump_on_exit);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   365
  _dcmdparser.add_dcmd_option(&_path_to_gc_roots);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   366
};
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   367
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   368
int JfrStartFlightRecordingDCmd::num_arguments() {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   369
  ResourceMark rm;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   370
  JfrStartFlightRecordingDCmd* dcmd = new JfrStartFlightRecordingDCmd(NULL, false);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   371
  if (dcmd != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   372
    DCmdMark mark(dcmd);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   373
    return dcmd->_dcmdparser.num_arguments();
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   374
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   375
  return 0;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   376
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   377
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   378
void JfrStartFlightRecordingDCmd::execute(DCmdSource source, TRAPS) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   379
  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   380
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   381
  if (invalid_state(output(), THREAD)) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   382
    return;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   383
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   384
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   385
  ResourceMark rm(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   386
  HandleMark hm(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   387
  JNIHandleBlockManager jni_handle_management(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   388
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   389
  JavaValue result(T_OBJECT);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   390
  JfrJavaArguments constructor_args(&result);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   391
  constructor_args.set_klass("jdk/jfr/internal/dcmd/DCmdStart", THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   392
  const oop dcmd = construct_dcmd_instance(&constructor_args, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   393
  Handle h_dcmd_instance(THREAD, dcmd);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   394
  assert(h_dcmd_instance.not_null(), "invariant");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   395
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   396
  jstring name = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   397
  if (_name.is_set() && _name.value() != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   398
    name = JfrJavaSupport::new_string(_name.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   399
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   400
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   401
  jstring filename = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   402
  if (_filename.is_set() && _filename.value() != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   403
    filename = JfrJavaSupport::new_string(_filename.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   404
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   405
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   406
  jobject maxage = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   407
  if (_maxage.is_set()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   408
    maxage = JfrJavaSupport::new_java_lang_Long(_maxage.value()._nanotime, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   409
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   410
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   411
  jobject maxsize = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   412
  if (_maxsize.is_set()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   413
    maxsize = JfrJavaSupport::new_java_lang_Long(_maxsize.value()._size, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   414
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   415
58863
c16ac7a2eba4 8226511: Implement JFR Event Streaming
mgronlun
parents: 55302
diff changeset
   416
  jobject flush_interval = NULL;
c16ac7a2eba4 8226511: Implement JFR Event Streaming
mgronlun
parents: 55302
diff changeset
   417
  if (_flush_interval.is_set()) {
c16ac7a2eba4 8226511: Implement JFR Event Streaming
mgronlun
parents: 55302
diff changeset
   418
    flush_interval = JfrJavaSupport::new_java_lang_Long(_flush_interval.value()._nanotime, CHECK);
c16ac7a2eba4 8226511: Implement JFR Event Streaming
mgronlun
parents: 55302
diff changeset
   419
  }
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   420
  jobject duration = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   421
  if (_duration.is_set()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   422
    duration = JfrJavaSupport::new_java_lang_Long(_duration.value()._nanotime, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   423
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   424
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   425
  jobject delay = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   426
  if (_delay.is_set()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   427
    delay = JfrJavaSupport::new_java_lang_Long(_delay.value()._nanotime, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   428
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   429
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   430
  jobject disk = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   431
  if (_disk.is_set()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   432
    disk = JfrJavaSupport::new_java_lang_Boolean(_disk.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   433
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   434
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   435
  jobject dump_on_exit = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   436
  if (_dump_on_exit.is_set()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   437
    dump_on_exit = JfrJavaSupport::new_java_lang_Boolean(_dump_on_exit.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   438
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   439
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   440
  jobject path_to_gc_roots = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   441
  if (_path_to_gc_roots.is_set()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   442
    path_to_gc_roots = JfrJavaSupport::new_java_lang_Boolean(_path_to_gc_roots.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   443
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   444
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   445
  jobjectArray settings = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   446
  if (_settings.is_set()) {
55302
686dedba1d9a 8216064: -XX:StartFlightRecording:settings= doesn't work properly
egahlin
parents: 54847
diff changeset
   447
    int length = _settings.value()->array()->length();
686dedba1d9a 8216064: -XX:StartFlightRecording:settings= doesn't work properly
egahlin
parents: 54847
diff changeset
   448
    if (length == 1) {
686dedba1d9a 8216064: -XX:StartFlightRecording:settings= doesn't work properly
egahlin
parents: 54847
diff changeset
   449
      const char* c_str = _settings.value()->array()->at(0);
686dedba1d9a 8216064: -XX:StartFlightRecording:settings= doesn't work properly
egahlin
parents: 54847
diff changeset
   450
      if (strcmp(c_str, "none") == 0) {
686dedba1d9a 8216064: -XX:StartFlightRecording:settings= doesn't work properly
egahlin
parents: 54847
diff changeset
   451
        length = 0;
686dedba1d9a 8216064: -XX:StartFlightRecording:settings= doesn't work properly
egahlin
parents: 54847
diff changeset
   452
      }
686dedba1d9a 8216064: -XX:StartFlightRecording:settings= doesn't work properly
egahlin
parents: 54847
diff changeset
   453
    }
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   454
    settings = JfrJavaSupport::new_string_array(length, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   455
    assert(settings != NULL, "invariant");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   456
    for (int i = 0; i < length; ++i) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   457
      jobject element = JfrJavaSupport::new_string(_settings.value()->array()->at(i), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   458
      assert(element != NULL, "invariant");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   459
      JfrJavaSupport::set_array_element(settings, element, i, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   460
    }
52413
6372f5af9612 8209960: -Xlog:jfr* doesn't work with the JFR
egahlin
parents: 51334
diff changeset
   461
  } else {
6372f5af9612 8209960: -Xlog:jfr* doesn't work with the JFR
egahlin
parents: 51334
diff changeset
   462
    settings = JfrJavaSupport::new_string_array(1, CHECK);
6372f5af9612 8209960: -Xlog:jfr* doesn't work with the JFR
egahlin
parents: 51334
diff changeset
   463
    assert(settings != NULL, "invariant");
6372f5af9612 8209960: -Xlog:jfr* doesn't work with the JFR
egahlin
parents: 51334
diff changeset
   464
    jobject element = JfrJavaSupport::new_string("default", CHECK);
6372f5af9612 8209960: -Xlog:jfr* doesn't work with the JFR
egahlin
parents: 51334
diff changeset
   465
    assert(element != NULL, "invariant");
6372f5af9612 8209960: -Xlog:jfr* doesn't work with the JFR
egahlin
parents: 51334
diff changeset
   466
    JfrJavaSupport::set_array_element(settings, element, 0, CHECK);
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   467
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   468
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   469
  static const char klass[] = "jdk/jfr/internal/dcmd/DCmdStart";
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   470
  static const char method[] = "execute";
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   471
  static const char signature[] = "(Ljava/lang/String;[Ljava/lang/String;Ljava/lang/Long;"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   472
    "Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/String;"
58863
c16ac7a2eba4 8226511: Implement JFR Event Streaming
mgronlun
parents: 55302
diff changeset
   473
    "Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;)Ljava/lang/String;";
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   474
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   475
  JfrJavaArguments execute_args(&result, klass, method, signature, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   476
  execute_args.set_receiver(h_dcmd_instance);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   477
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   478
  // arguments
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   479
  execute_args.push_jobject(name);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   480
  execute_args.push_jobject(settings);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   481
  execute_args.push_jobject(delay);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   482
  execute_args.push_jobject(duration);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   483
  execute_args.push_jobject(disk);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   484
  execute_args.push_jobject(filename);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   485
  execute_args.push_jobject(maxage);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   486
  execute_args.push_jobject(maxsize);
58863
c16ac7a2eba4 8226511: Implement JFR Event Streaming
mgronlun
parents: 55302
diff changeset
   487
  execute_args.push_jobject(flush_interval);
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   488
  execute_args.push_jobject(dump_on_exit);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   489
  execute_args.push_jobject(path_to_gc_roots);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   490
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   491
  JfrJavaSupport::call_virtual(&execute_args, THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   492
  handle_dcmd_result(output(), (oop)result.get_jobject(), source, THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   493
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   494
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   495
JfrStopFlightRecordingDCmd::JfrStopFlightRecordingDCmd(outputStream* output,
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   496
                                                       bool heap) : DCmdWithParser(output, heap),
50195
ec881a19d294 8195817: JFR.stop should require name of recording
egahlin
parents: 50113
diff changeset
   497
  _name("name", "Recording text,.e.g \\\"My Recording\\\"", "STRING", true, NULL),
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   498
  _filename("filename", "Copy recording data to file, e.g. \\\"" JFR_FILENAME_EXAMPLE "\\\"", "STRING", false, NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   499
  _dcmdparser.add_dcmd_option(&_name);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   500
  _dcmdparser.add_dcmd_option(&_filename);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   501
};
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   502
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   503
int JfrStopFlightRecordingDCmd::num_arguments() {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   504
  ResourceMark rm;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   505
  JfrStopFlightRecordingDCmd* dcmd = new JfrStopFlightRecordingDCmd(NULL, false);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   506
  if (dcmd != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   507
    DCmdMark mark(dcmd);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   508
    return dcmd->_dcmdparser.num_arguments();
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   509
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   510
  return 0;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   511
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   512
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   513
void JfrStopFlightRecordingDCmd::execute(DCmdSource source, TRAPS) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   514
  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   515
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   516
  if (invalid_state(output(), THREAD) || !is_recorder_instance_created(output())) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   517
    return;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   518
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   519
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   520
  ResourceMark rm(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   521
  HandleMark hm(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   522
  JNIHandleBlockManager jni_handle_management(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   523
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   524
  JavaValue result(T_OBJECT);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   525
  JfrJavaArguments constructor_args(&result);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   526
  constructor_args.set_klass("jdk/jfr/internal/dcmd/DCmdStop", CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   527
  const oop dcmd = construct_dcmd_instance(&constructor_args, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   528
  Handle h_dcmd_instance(THREAD, dcmd);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   529
  assert(h_dcmd_instance.not_null(), "invariant");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   530
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   531
  jstring name = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   532
  if (_name.is_set() && _name.value()  != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   533
    name = JfrJavaSupport::new_string(_name.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   534
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   535
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   536
  jstring filepath = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   537
  if (_filename.is_set() && _filename.value() != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   538
    filepath = JfrJavaSupport::new_string(_filename.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   539
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   540
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   541
  static const char klass[] = "jdk/jfr/internal/dcmd/DCmdStop";
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   542
  static const char method[] = "execute";
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   543
  static const char signature[] = "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;";
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   544
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   545
  JfrJavaArguments execute_args(&result, klass, method, signature, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   546
  execute_args.set_receiver(h_dcmd_instance);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   547
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   548
  // arguments
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   549
  execute_args.push_jobject(name);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   550
  execute_args.push_jobject(filepath);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   551
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   552
  JfrJavaSupport::call_virtual(&execute_args, THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   553
  handle_dcmd_result(output(), (oop)result.get_jobject(), source, THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   554
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   555
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   556
JfrConfigureFlightRecorderDCmd::JfrConfigureFlightRecorderDCmd(outputStream* output,
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   557
                                                               bool heap) : DCmdWithParser(output, heap),
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   558
  _repository_path("repositorypath", "Path to repository,.e.g \\\"My Repository\\\"", "STRING", false, NULL),
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   559
  _dump_path("dumppath", "Path to dump,.e.g \\\"My Dump path\\\"", "STRING", false, NULL),
52669
e21361bccfa1 8213015: Inconsistent settings between JFR.configure and -XX:FlightRecorderOptions
ysuenaga
parents: 52413
diff changeset
   560
  _stack_depth("stackdepth", "Stack Depth", "JULONG", false, "64"),
e21361bccfa1 8213015: Inconsistent settings between JFR.configure and -XX:FlightRecorderOptions
ysuenaga
parents: 52413
diff changeset
   561
  _global_buffer_count("globalbuffercount", "Number of global buffers,", "JULONG", false, "20"),
e21361bccfa1 8213015: Inconsistent settings between JFR.configure and -XX:FlightRecorderOptions
ysuenaga
parents: 52413
diff changeset
   562
  _global_buffer_size("globalbuffersize", "Size of a global buffers,", "MEMORY SIZE", false, "512k"),
e21361bccfa1 8213015: Inconsistent settings between JFR.configure and -XX:FlightRecorderOptions
ysuenaga
parents: 52413
diff changeset
   563
  _thread_buffer_size("thread_buffer_size", "Size of a thread buffer", "MEMORY SIZE", false, "8k"),
e21361bccfa1 8213015: Inconsistent settings between JFR.configure and -XX:FlightRecorderOptions
ysuenaga
parents: 52413
diff changeset
   564
  _memory_size("memorysize", "Overall memory size, ", "MEMORY SIZE", false, "10m"),
e21361bccfa1 8213015: Inconsistent settings between JFR.configure and -XX:FlightRecorderOptions
ysuenaga
parents: 52413
diff changeset
   565
  _max_chunk_size("maxchunksize", "Size of an individual disk chunk", "MEMORY SIZE", false, "12m"),
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   566
  _sample_threads("samplethreads", "Activate Thread sampling", "BOOLEAN", false, "true") {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   567
  _dcmdparser.add_dcmd_option(&_repository_path);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   568
  _dcmdparser.add_dcmd_option(&_dump_path);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   569
  _dcmdparser.add_dcmd_option(&_stack_depth);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   570
  _dcmdparser.add_dcmd_option(&_global_buffer_count);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   571
  _dcmdparser.add_dcmd_option(&_global_buffer_size);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   572
  _dcmdparser.add_dcmd_option(&_thread_buffer_size);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   573
  _dcmdparser.add_dcmd_option(&_memory_size);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   574
  _dcmdparser.add_dcmd_option(&_max_chunk_size);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   575
  _dcmdparser.add_dcmd_option(&_sample_threads);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   576
};
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   577
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   578
int JfrConfigureFlightRecorderDCmd::num_arguments() {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   579
  ResourceMark rm;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   580
  JfrConfigureFlightRecorderDCmd* dcmd = new JfrConfigureFlightRecorderDCmd(NULL, false);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   581
  if (dcmd != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   582
    DCmdMark mark(dcmd);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   583
    return dcmd->_dcmdparser.num_arguments();
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   584
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   585
  return 0;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   586
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   587
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   588
void JfrConfigureFlightRecorderDCmd::execute(DCmdSource source, TRAPS) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   589
  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   590
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   591
  if (invalid_state(output(), THREAD)) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   592
    return;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   593
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   594
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   595
  ResourceMark rm(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   596
  HandleMark hm(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   597
  JNIHandleBlockManager jni_handle_management(THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   598
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   599
  JavaValue result(T_OBJECT);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   600
  JfrJavaArguments constructor_args(&result);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   601
  constructor_args.set_klass("jdk/jfr/internal/dcmd/DCmdConfigure", CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   602
  const oop dcmd = construct_dcmd_instance(&constructor_args, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   603
  Handle h_dcmd_instance(THREAD, dcmd);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   604
  assert(h_dcmd_instance.not_null(), "invariant");
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   605
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   606
  jstring repository_path = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   607
  if (_repository_path.is_set() && _repository_path.value() != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   608
    repository_path = JfrJavaSupport::new_string(_repository_path.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   609
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   610
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   611
  jstring dump_path = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   612
  if (_dump_path.is_set() && _dump_path.value() != NULL) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   613
    dump_path = JfrJavaSupport::new_string(_dump_path.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   614
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   615
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   616
  jobject stack_depth = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   617
  if (_stack_depth.is_set()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   618
    stack_depth = JfrJavaSupport::new_java_lang_Integer((jint)_stack_depth.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   619
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   620
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   621
  jobject global_buffer_count = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   622
  if (_global_buffer_count.is_set()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   623
    global_buffer_count = JfrJavaSupport::new_java_lang_Long(_global_buffer_count.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   624
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   625
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   626
  jobject global_buffer_size = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   627
  if (_global_buffer_size.is_set()) {
52669
e21361bccfa1 8213015: Inconsistent settings between JFR.configure and -XX:FlightRecorderOptions
ysuenaga
parents: 52413
diff changeset
   628
    global_buffer_size = JfrJavaSupport::new_java_lang_Long(_global_buffer_size.value()._size, CHECK);
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   629
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   630
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   631
  jobject thread_buffer_size = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   632
  if (_thread_buffer_size.is_set()) {
52669
e21361bccfa1 8213015: Inconsistent settings between JFR.configure and -XX:FlightRecorderOptions
ysuenaga
parents: 52413
diff changeset
   633
    thread_buffer_size = JfrJavaSupport::new_java_lang_Long(_thread_buffer_size.value()._size, CHECK);
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   634
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   635
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   636
  jobject max_chunk_size = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   637
  if (_max_chunk_size.is_set()) {
52669
e21361bccfa1 8213015: Inconsistent settings between JFR.configure and -XX:FlightRecorderOptions
ysuenaga
parents: 52413
diff changeset
   638
    max_chunk_size = JfrJavaSupport::new_java_lang_Long(_max_chunk_size.value()._size, CHECK);
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   639
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   640
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   641
  jobject memory_size = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   642
  if (_memory_size.is_set()) {
52669
e21361bccfa1 8213015: Inconsistent settings between JFR.configure and -XX:FlightRecorderOptions
ysuenaga
parents: 52413
diff changeset
   643
    memory_size = JfrJavaSupport::new_java_lang_Long(_memory_size.value()._size, CHECK);
50113
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   644
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   645
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   646
  jobject sample_threads = NULL;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   647
  if (_sample_threads.is_set()) {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   648
    sample_threads = JfrJavaSupport::new_java_lang_Boolean(_sample_threads.value(), CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   649
  }
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   650
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   651
  static const char klass[] = "jdk/jfr/internal/dcmd/DCmdConfigure";
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   652
  static const char method[] = "execute";
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   653
  static const char signature[] = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   654
    "Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;"
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   655
    "Ljava/lang/Long;Ljava/lang/Boolean;)Ljava/lang/String;";
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   656
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   657
  JfrJavaArguments execute_args(&result, klass, method, signature, CHECK);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   658
  execute_args.set_receiver(h_dcmd_instance);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   659
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   660
  // params
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   661
  execute_args.push_jobject(repository_path);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   662
  execute_args.push_jobject(dump_path);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   663
  execute_args.push_jobject(stack_depth);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   664
  execute_args.push_jobject(global_buffer_count);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   665
  execute_args.push_jobject(global_buffer_size);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   666
  execute_args.push_jobject(thread_buffer_size);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   667
  execute_args.push_jobject(memory_size);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   668
  execute_args.push_jobject(max_chunk_size);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   669
  execute_args.push_jobject(sample_threads);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   670
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   671
  JfrJavaSupport::call_virtual(&execute_args, THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   672
  handle_dcmd_result(output(), (oop)result.get_jobject(), source, THREAD);
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   673
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   674
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   675
bool register_jfr_dcmds() {
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   676
  uint32_t full_export = DCmd_Source_Internal | DCmd_Source_AttachAPI | DCmd_Source_MBean;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   677
  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrCheckFlightRecordingDCmd>(full_export, true, false));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   678
  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrDumpFlightRecordingDCmd>(full_export, true, false));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   679
  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrStartFlightRecordingDCmd>(full_export, true, false));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   680
  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrStopFlightRecordingDCmd>(full_export, true, false));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   681
  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JfrConfigureFlightRecorderDCmd>(full_export, true, false));
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   682
  return true;
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   683
}
caf115bb98ad 8199712: Flight Recorder
egahlin
parents:
diff changeset
   684