Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp	Sun Jun 07 18:57:54 2020 +0100
     1.2 +++ b/src/share/vm/jfr/recorder/service/jfrOptionSet.cpp	Fri Jun 12 02:59:56 2020 +0100
     1.3 @@ -679,7 +679,7 @@
     1.4    return false;
     1.5  }
     1.6  
     1.7 -static GrowableArray<const char*>* startup_recording_options_array = NULL;
     1.8 +static GrowableArray<const char*>* start_flight_recording_options_array = NULL;
     1.9  
    1.10  bool JfrOptionSet::parse_start_flight_recording_option(const JavaVMOption** option, char* delimiter) {
    1.11    assert(option != NULL, "invariant");
    1.12 @@ -702,28 +702,28 @@
    1.13    assert(value != NULL, "invariant");
    1.14    const size_t value_length = strlen(value);
    1.15  
    1.16 -  if (startup_recording_options_array == NULL) {
    1.17 -    startup_recording_options_array = new (ResourceObj::C_HEAP, mtTracing) GrowableArray<const char*>(8, true, mtTracing);
    1.18 +  if (start_flight_recording_options_array == NULL) {
    1.19 +    start_flight_recording_options_array = new (ResourceObj::C_HEAP, mtTracing) GrowableArray<const char*>(8, true, mtTracing);
    1.20    }
    1.21 -  assert(startup_recording_options_array != NULL, "invariant");
    1.22 +  assert(start_flight_recording_options_array != NULL, "invariant");
    1.23    char* const startup_value = NEW_C_HEAP_ARRAY(char, value_length + 1, mtTracing);
    1.24    strncpy(startup_value, value, value_length + 1);
    1.25    assert(strncmp(startup_value, value, value_length) == 0, "invariant");
    1.26 -  startup_recording_options_array->append(startup_value);
    1.27 +  start_flight_recording_options_array->append(startup_value);
    1.28    return false;
    1.29  }
    1.30  
    1.31 -const GrowableArray<const char*>* JfrOptionSet::startup_recording_options() {
    1.32 -  return startup_recording_options_array;
    1.33 +const GrowableArray<const char*>* JfrOptionSet::start_flight_recording_options() {
    1.34 +  return start_flight_recording_options_array;
    1.35  }
    1.36  
    1.37 -void JfrOptionSet::release_startup_recording_options() {
    1.38 -  if (startup_recording_options_array != NULL) {
    1.39 -    const int length = startup_recording_options_array->length();
    1.40 +void JfrOptionSet::release_start_flight_recording_options() {
    1.41 +  if (start_flight_recording_options_array != NULL) {
    1.42 +    const int length = start_flight_recording_options_array->length();
    1.43      for (int i = 0; i < length; ++i) {
    1.44 -      FREE_C_HEAP_ARRAY(char, startup_recording_options_array->at(i), mtTracing);
    1.45 +      FREE_C_HEAP_ARRAY(char, start_flight_recording_options_array->at(i), mtTracing);
    1.46      }
    1.47 -    delete startup_recording_options_array;
    1.48 -    startup_recording_options_array = NULL;
    1.49 +    delete start_flight_recording_options_array;
    1.50 +    start_flight_recording_options_array = NULL;
    1.51    }
    1.52  }