comparison src/share/vm/runtime/globals.hpp @ 17677:51e1bb81df86 jdk8u20-b03

Merge
author amurillo
date Tue, 25 Feb 2014 13:02:52 -0800
parents cd7a42c7be06
children b8413a9cbb84 752ba2e5f6d0
comparison
equal deleted inserted replaced
17660:9a93fe1babdc 17677:51e1bb81df86
1 /* 1 /*
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
239 static Flag* flags; 239 static Flag* flags;
240 240
241 // number of flags 241 // number of flags
242 static size_t numFlags; 242 static size_t numFlags;
243 243
244 static Flag* find_flag(const char* name, size_t length, bool allow_locked = false); 244 static Flag* find_flag(const char* name, size_t length, bool allow_locked = false, bool return_flag = false);
245 static Flag* fuzzy_match(const char* name, size_t length, bool allow_locked = false); 245 static Flag* fuzzy_match(const char* name, size_t length, bool allow_locked = false);
246 246
247 void check_writable(); 247 void check_writable();
248 248
249 bool is_bool() const; 249 bool is_bool() const;
1256 "Trace run-time calls") \ 1256 "Trace run-time calls") \
1257 \ 1257 \
1258 develop(bool, TraceJNICalls, false, \ 1258 develop(bool, TraceJNICalls, false, \
1259 "Trace JNI calls") \ 1259 "Trace JNI calls") \
1260 \ 1260 \
1261 develop(bool, StressRewriter, false, \
1262 "Stress linktime bytecode rewriting") \
1263 \
1261 notproduct(bool, TraceJVMCalls, false, \ 1264 notproduct(bool, TraceJVMCalls, false, \
1262 "Trace JVM calls") \ 1265 "Trace JVM calls") \
1263 \ 1266 \
1264 product(ccstr, TraceJVMTI, NULL, \ 1267 product(ccstr, TraceJVMTI, NULL, \
1265 "Trace flags for JVMTI functions and events") \ 1268 "Trace flags for JVMTI functions and events") \