Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
8246310: Clean commented-out code about ModuleEntry andPackageEntry in JFR
Tue, 02 Jun 2020 14:29:43 +0800
- author
- ddong
- date
- Tue, 02 Jun 2020 14:29:43 +0800
- changeset 9941
- 45c8de52649c
- parent 9940
- 610401238989
- child 9942
- eddd586d1a4c
8246310: Clean commented-out code about ModuleEntry andPackageEntry in JFR
Reviewed-by: adinn
1.1 --- a/src/share/vm/jfr/jni/jfrJavaSupport.cpp Wed Jun 03 01:21:00 2020 +0100 1.2 +++ b/src/share/vm/jfr/jni/jfrJavaSupport.cpp Tue Jun 02 14:29:43 2020 +0800 1.3 @@ -570,10 +570,6 @@ 1.4 return _cause; 1.5 } 1.6 1.7 -// XXX 1.8 -//const char* const JDK_JFR_MODULE_NAME = "jdk.jfr"; 1.9 -//const char* const JDK_JFR_PACKAGE_NAME = "jdk/jfr"; 1.10 - 1.11 jlong JfrJavaSupport::jfr_thread_id(jobject target_thread) { 1.12 // ThreadsListHandle tlh; 1.13 // XXX is it correct and safe?
2.1 --- a/src/share/vm/jfr/metadata/metadata.xml Wed Jun 03 01:21:00 2020 +0100 2.2 +++ b/src/share/vm/jfr/metadata/metadata.xml Tue Jun 02 14:29:43 2020 +0800 2.3 @@ -725,19 +725,6 @@ 2.4 <Field type="ulong" contentType="address" name="topAddress" label="Top Address" description="Ending address of the module" /> 2.5 </Event> 2.6 2.7 - <!-- XXX 2.8 - <Event name="ModuleRequire" category="Java Virtual Machine, Runtime, Modules" label="Module Require" thread="false" period="everyChunk" 2.9 - description="A directed edge representing a dependency"> 2.10 - <Field type="Module" name="source" label="Source Module" /> 2.11 - <Field type="Module" name="requiredModule" label="Required Module" /> 2.12 - </Event> 2.13 - 2.14 - <Event name="ModuleExport" category="Java Virtual Machine, Runtime, Modules" label="Module Export" thread="false" period="everyChunk"> 2.15 - <Field type="Package" name="exportedPackage" label="Exported Package" /> 2.16 - <Field type="Module" name="targetModule" label="Target Module" 2.17 - description="Module to which the package is qualifiedly exported. If null or N/A, the package is unqualifiedly exported" /> 2.18 - </Event> 2.19 - --> 2.20 <Event name="CompilerStatistics" category="Java Virtual Machine, Compiler" label="Compiler Statistics" thread="false" period="everyChunk" startTime="false"> 2.21 <Field type="int" name="compileCount" label="Compiled Methods" /> 2.22 <Field type="int" name="bailoutCount" label="Bailouts" /> 2.23 @@ -1032,18 +1019,8 @@ 2.24 <Field type="string" name="cause" label="Cause" /> 2.25 </Type> 2.26 2.27 - <!-- 2.28 - <Type name="Module" label="Module"> 2.29 - <Field type="Symbol" name="name" label="Name" /> 2.30 - <Field type="Symbol" name="version" label="Version" /> 2.31 - <Field type="Symbol" name="location" label="Location" /> 2.32 - <Field type="ClassLoader" name="classLoader" label="Class Loader" /> 2.33 - </Type> 2.34 - --> 2.35 - 2.36 <Type name="Package" label="Package"> 2.37 <Field type="Symbol" name="name" label="Name" /> 2.38 - <!-- <Field type="Module" name="module" label="Module" /> --> 2.39 <Field type="boolean" name="exported" label="Exported" /> 2.40 </Type> 2.41 2.42 @@ -1107,7 +1084,6 @@ 2.43 <Relation name="CompileId" /> 2.44 <Relation name="SweepId"/> 2.45 2.46 - <XmlType name="Package" parameterType="const PackageEntry*" fieldType="const PackageEntry*"/> 2.47 <XmlType name="Class" javaType="java.lang.Class" parameterType="const Klass*" fieldType="const Klass*"/> 2.48 <XmlType name="ClassLoader" parameterType="const ClassLoaderData*" fieldType="const ClassLoaderData*"/> 2.49 <XmlType name="Method" parameterType="const Method*" fieldType="const Method*"/>
3.1 --- a/src/share/vm/jfr/recorder/checkpoint/types/jfrTypeSet.cpp Wed Jun 03 01:21:00 2020 +0100 3.2 +++ b/src/share/vm/jfr/recorder/checkpoint/types/jfrTypeSet.cpp Tue Jun 02 14:29:43 2020 +0800 3.3 @@ -25,7 +25,6 @@ 3.4 #include "precompiled.hpp" 3.5 #include "classfile/classLoaderData.inline.hpp" 3.6 #include "classfile/javaClasses.hpp" 3.7 -// XXX #include "classfile/packageEntry.hpp" 3.8 #include "classfile/symbolTable.hpp" 3.9 #include "classfile/systemDictionary.hpp" 3.10 #include "jfr/jfr.hpp" 3.11 @@ -54,20 +53,12 @@ 3.12 #define CREATE_SYMBOL_ID(sym_id) (((u8)((checkpoint_id << 24) | sym_id))) 3.13 3.14 typedef const Klass* KlassPtr; 3.15 -// XXX typedef const PackageEntry* PkgPtr; 3.16 typedef const ClassLoaderData* CldPtr; 3.17 typedef const Method* MethodPtr; 3.18 typedef const Symbol* SymbolPtr; 3.19 typedef const JfrSymbolId::SymbolEntry* SymbolEntryPtr; 3.20 typedef const JfrSymbolId::CStringEntry* CStringEntryPtr; 3.21 3.22 -// XXX 3.23 -// static traceid package_id(KlassPtr klass) { 3.24 -// assert(klass != NULL, "invariant"); 3.25 -// PkgPtr pkg_entry = klass->package(); 3.26 -// return pkg_entry == NULL ? 0 : TRACE_ID(pkg_entry); 3.27 -// } 3.28 - 3.29 static traceid cld_id(CldPtr cld) { 3.30 assert(cld != NULL, "invariant"); 3.31 return cld->is_anonymous() ? 0 : TRACE_ID(cld); 3.32 @@ -75,11 +66,6 @@ 3.33 3.34 static void tag_leakp_klass_artifacts(KlassPtr k, bool class_unload) { 3.35 assert(k != NULL, "invariant"); 3.36 - // XXX 3.37 - // PkgPtr pkg = k->package(); 3.38 - // if (pkg != NULL) { 3.39 - // tag_leakp_artifact(pkg, class_unload); 3.40 - // } 3.41 CldPtr cld = k->class_loader_data(); 3.42 assert(cld != NULL, "invariant"); 3.43 if (!cld->is_anonymous()) { 3.44 @@ -125,7 +111,7 @@ 3.45 theklass = obj_arr_klass->bottom_klass(); 3.46 } 3.47 if (theklass->oop_is_instance()) { 3.48 - pkg_id = 0; // XXX package_id(theklass); 3.49 + pkg_id = 0; 3.50 } else { 3.51 assert(theklass->oop_is_typeArray(), "invariant"); 3.52 } 3.53 @@ -169,29 +155,6 @@ 3.54 typedef JfrArtifactWriterImplHost<MethodPtr, write__artifact__method> MethodWriterImplTarget; 3.55 typedef JfrArtifactWriterHost<MethodWriterImplTarget, TYPE_METHOD> MethodWriterImpl; 3.56 3.57 -// XXX 3.58 -// int write__artifact__package(JfrCheckpointWriter* writer, JfrArtifactSet* artifacts, const void* p) { 3.59 -// assert(writer != NULL, "invariant"); 3.60 -// assert(artifacts != NULL, "invariant"); 3.61 -// assert(p != NULL, "invariant"); 3.62 -// PkgPtr pkg = (PkgPtr)p; 3.63 -// Symbol* const pkg_name = pkg->name(); 3.64 -// const traceid package_name_symbol_id = pkg_name != NULL ? artifacts->mark(pkg_name) : 0; 3.65 -// assert(package_name_symbol_id > 0, "invariant"); 3.66 -// writer->write((traceid)TRACE_ID(pkg)); 3.67 -// writer->write((traceid)CREATE_SYMBOL_ID(package_name_symbol_id)); 3.68 -// writer->write((bool)pkg->is_exported()); 3.69 -// return 1; 3.70 -// } 3.71 - 3.72 -// typedef LeakPredicate<PkgPtr> LeakPackagePredicate; 3.73 -// int _compare_pkg_ptr_(PkgPtr const& lhs, PkgPtr const& rhs) { return lhs > rhs ? 1 : (lhs < rhs) ? -1 : 0; } 3.74 -// typedef UniquePredicate<PkgPtr, _compare_pkg_ptr_> PackagePredicate; 3.75 -// typedef JfrPredicatedArtifactWriterImplHost<PkgPtr, LeakPackagePredicate, write__artifact__package> LeakPackageWriterImpl; 3.76 -// typedef JfrPredicatedArtifactWriterImplHost<PkgPtr, PackagePredicate, write__artifact__package> PackageWriterImpl; 3.77 -// typedef JfrArtifactWriterHost<LeakPackageWriterImpl, TYPE_PACKAGE> LeakPackageWriter; 3.78 -// typedef JfrArtifactWriterHost<PackageWriterImpl, TYPE_PACKAGE> PackageWriter; 3.79 - 3.80 int write__artifact__classloader(JfrCheckpointWriter* writer, JfrArtifactSet* artifacts, const void* c) { 3.81 assert(c != NULL, "invariant"); 3.82 CldPtr cld = (CldPtr)c; 3.83 @@ -292,7 +255,6 @@ 3.84 UniquePredicate<traceid, _compare_traceid_> _unique_predicate; 3.85 3.86 int klass_symbols(KlassPtr klass); 3.87 -// XXX int package_symbols(PkgPtr pkg); 3.88 int class_loader_symbols(CldPtr cld); 3.89 int method_symbols(KlassPtr klass); 3.90 3.91 @@ -312,11 +274,6 @@ 3.92 int count = 0; 3.93 if (_predicate(klass)) { 3.94 count += klass_symbols(klass); 3.95 - // XXX 3.96 - // PkgPtr pkg = klass->package(); 3.97 - // if (pkg != NULL) { 3.98 - // count += package_symbols(pkg); 3.99 - // } 3.100 CldPtr cld = klass->class_loader_data(); 3.101 assert(cld != NULL, "invariant"); 3.102 if (!cld->is_anonymous()) { 3.103 @@ -346,52 +303,6 @@ 3.104 return _unique_predicate(entry->id()) ? write__artifact__symbol__entry__(this->_writer, entry) : 0; 3.105 } 3.106 3.107 -// XXX 3.108 -// template <template <typename> class Predicate> 3.109 -// int KlassSymbolWriterImpl<Predicate>::package_symbols(PkgPtr pkg) { 3.110 -// assert(pkg != NULL, "invariant"); 3.111 -// SymbolPtr pkg_name = pkg->name(); 3.112 -// assert(pkg_name != NULL, "invariant"); 3.113 -// SymbolEntryPtr package_symbol = this->_artifacts->map_symbol(pkg_name); 3.114 -// assert(package_symbol != NULL, "invariant"); 3.115 -// return _unique_predicate(package_symbol->id()) ? 3.116 -// write__artifact__symbol__entry__(this->_writer, package_symbol) : 0; 3.117 -// } 3.118 - 3.119 -// XXX 3.120 -// template <template <typename> class Predicate> 3.121 -// int KlassSymbolWriterImpl<Predicate>::module_symbols(ModPtr module) { 3.122 -// assert(module != NULL, "invariant"); 3.123 -// assert(module->is_named(), "invariant"); 3.124 -// int count = 0; 3.125 -// SymbolPtr sym = module->name(); 3.126 -// SymbolEntryPtr entry = NULL; 3.127 -// if (sym != NULL) { 3.128 -// entry = this->_artifacts->map_symbol(sym); 3.129 -// assert(entry != NULL, "invariant"); 3.130 -// if (_unique_predicate(entry->id())) { 3.131 -// count += write__artifact__symbol__entry__(this->_writer, entry); 3.132 -// } 3.133 -// } 3.134 -// sym = module->version(); 3.135 -// if (sym != NULL) { 3.136 -// entry = this->_artifacts->map_symbol(sym); 3.137 -// assert(entry != NULL, "invariant"); 3.138 -// if (_unique_predicate(entry->id())) { 3.139 -// count += write__artifact__symbol__entry__(this->_writer, entry); 3.140 -// } 3.141 -// } 3.142 -// sym = module->location(); 3.143 -// if (sym != NULL) { 3.144 -// entry = this->_artifacts->map_symbol(sym); 3.145 -// assert(entry != NULL, "invariant"); 3.146 -// if (_unique_predicate(entry->id())) { 3.147 -// count += write__artifact__symbol__entry__(this->_writer, entry); 3.148 -// } 3.149 -// } 3.150 -// return count; 3.151 -// } 3.152 - 3.153 template <template <typename> class Predicate> 3.154 int KlassSymbolWriterImpl<Predicate>::class_loader_symbols(CldPtr cld) { 3.155 assert(cld != NULL, "invariant"); 3.156 @@ -525,100 +436,6 @@ 3.157 do_klasses(); 3.158 } 3.159 3.160 -// XXX 3.161 -// typedef CompositeFunctor<PkgPtr, 3.162 -// PackageWriter, 3.163 -// ClearArtifact<PkgPtr> > PackageWriterWithClear; 3.164 - 3.165 -// typedef CompositeFunctor<PkgPtr, 3.166 -// LeakPackageWriter, 3.167 -// PackageWriter> CompositePackageWriter; 3.168 - 3.169 -// typedef CompositeFunctor<PkgPtr, 3.170 -// CompositePackageWriter, 3.171 -// ClearArtifact<PkgPtr> > CompositePackageWriterWithClear; 3.172 - 3.173 -// class PackageFieldSelector { 3.174 -// public: 3.175 -// typedef PkgPtr TypePtr; 3.176 -// static TypePtr select(KlassPtr klass) { 3.177 -// assert(klass != NULL, "invariant"); 3.178 -// return ((InstanceKlass*)klass)->package(); 3.179 -// } 3.180 -// }; 3.181 - 3.182 -// typedef KlassToFieldEnvelope<PackageFieldSelector, 3.183 -// PackageWriterWithClear> KlassPackageWriterWithClear; 3.184 - 3.185 -// typedef KlassToFieldEnvelope<PackageFieldSelector, 3.186 -// CompositePackageWriterWithClear> KlassCompositePackageWriterWithClear; 3.187 - 3.188 -// typedef JfrArtifactCallbackHost<PkgPtr, PackageWriterWithClear> PackageCallback; 3.189 -// typedef JfrArtifactCallbackHost<PkgPtr, CompositePackageWriterWithClear> CompositePackageCallback; 3.190 - 3.191 -// /* 3.192 -// * Composite operation 3.193 -// * 3.194 -// * LeakpPackageWriter -> 3.195 -// * PackageWriter -> 3.196 -// * ClearArtifact<PackageEntry> 3.197 -// * 3.198 -// */ 3.199 -// void JfrTypeSet::write_package_constants(JfrCheckpointWriter* writer, JfrCheckpointWriter* leakp_writer) { 3.200 -// assert(_artifacts->has_klass_entries(), "invariant"); 3.201 -// ClearArtifact<PkgPtr> clear(_class_unload); 3.202 -// PackageWriter pw(writer, _artifacts, _class_unload); 3.203 -// if (leakp_writer == NULL) { 3.204 -// PackageWriterWithClear pwwc(&pw, &clear); 3.205 -// KlassPackageWriterWithClear kpwwc(&pwwc); 3.206 -// _artifacts->iterate_klasses(kpwwc); 3.207 -// PackageCallback callback(&pwwc); 3.208 -// _subsystem_callback = &callback; 3.209 -// do_packages(); 3.210 -// return; 3.211 -// } 3.212 -// LeakPackageWriter lpw(leakp_writer, _artifacts, _class_unload); 3.213 -// CompositePackageWriter cpw(&lpw, &pw); 3.214 -// CompositePackageWriterWithClear cpwwc(&cpw, &clear); 3.215 -// KlassCompositePackageWriterWithClear ckpw(&cpwwc); 3.216 -// _artifacts->iterate_klasses(ckpw); 3.217 -// CompositePackageCallback callback(&cpwwc); 3.218 -// _subsystem_callback = &callback; 3.219 -// do_packages(); 3.220 -// } 3.221 - 3.222 -// typedef CompositeFunctor<ModPtr, 3.223 -// ModuleWriter, 3.224 -// ClearArtifact<ModPtr> > ModuleWriterWithClear; 3.225 - 3.226 -// typedef CompositeFunctor<ModPtr, 3.227 -// LeakModuleWriter, 3.228 -// ModuleWriter> CompositeModuleWriter; 3.229 - 3.230 -// typedef CompositeFunctor<ModPtr, 3.231 -// CompositeModuleWriter, 3.232 -// ClearArtifact<ModPtr> > CompositeModuleWriterWithClear; 3.233 - 3.234 -// typedef JfrArtifactCallbackHost<ModPtr, ModuleWriterWithClear> ModuleCallback; 3.235 -// typedef JfrArtifactCallbackHost<ModPtr, CompositeModuleWriterWithClear> CompositeModuleCallback; 3.236 - 3.237 -// XXX 3.238 -// class ModuleFieldSelector { 3.239 -// public: 3.240 -// typedef ModPtr TypePtr; 3.241 -// static TypePtr select(KlassPtr klass) { 3.242 -// assert(klass != NULL, "invariant"); 3.243 -// PkgPtr pkg = klass->package(); 3.244 -// return pkg != NULL ? pkg->module() : NULL; 3.245 -// } 3.246 -// }; 3.247 - 3.248 -// typedef KlassToFieldEnvelope<ModuleFieldSelector, 3.249 -// ModuleWriterWithClear> KlassModuleWriterWithClear; 3.250 - 3.251 -// typedef KlassToFieldEnvelope<ModuleFieldSelector, 3.252 -// CompositeModuleWriterWithClear> KlassCompositeModuleWriterWithClear; 3.253 - 3.254 typedef CompositeFunctor<CldPtr, CldWriter, ClearArtifact<CldPtr> > CldWriterWithClear; 3.255 typedef CompositeFunctor<CldPtr, LeakCldWriter, CldWriter> CompositeCldWriter; 3.256 typedef CompositeFunctor<CldPtr, CompositeCldWriter, ClearArtifact<CldPtr> > CompositeCldWriterWithClear; 3.257 @@ -791,30 +608,6 @@ 3.258 ClassLoaderDataGraph::classes_do(&do_klass); 3.259 } 3.260 3.261 -// XXX 3.262 -// void JfrTypeSet::do_unloaded_package(PackageEntry* entry) { 3.263 -// assert(entry != NULL, "invariant"); 3.264 -// assert(_subsystem_callback != NULL, "invariant"); 3.265 -// if (ANY_USED_THIS_EPOCH(entry)) { // includes leakp subset 3.266 -// _subsystem_callback->do_artifact(entry); 3.267 -// } 3.268 -// } 3.269 - 3.270 -// void JfrTypeSet::do_package(PackageEntry* entry) { 3.271 -// assert(_subsystem_callback != NULL, "invariant"); 3.272 -// if (ANY_USED_PREV_EPOCH(entry)) { // includes leakp subset 3.273 -// _subsystem_callback->do_artifact(entry); 3.274 -// } 3.275 -// } 3.276 - 3.277 -// void JfrTypeSet::do_packages() { 3.278 -// if (_class_unload) { 3.279 -// ClassLoaderDataGraph::packages_unloading_do(&do_unloaded_package); 3.280 -// return; 3.281 -// } 3.282 -// ClassLoaderDataGraph::packages_do(&do_package); 3.283 -// } 3.284 - 3.285 void JfrTypeSet::do_unloaded_class_loader_data(ClassLoaderData* cld) { 3.286 assert(_subsystem_callback != NULL, "invariant"); 3.287 if (ANY_USED_THIS_EPOCH(cld)) { // includes leakp subset 3.288 @@ -892,7 +685,6 @@ 3.289 // might tag an artifact to be written in a subsequent step 3.290 write_klass_constants(writer, leakp_writer); 3.291 if (_artifacts->has_klass_entries()) { 3.292 -// XXX write_package_constants(writer, leakp_writer); 3.293 write_class_loader_constants(writer, leakp_writer); 3.294 write_method_constants(writer, leakp_writer); 3.295 write_symbol_constants(writer, leakp_writer);
4.1 --- a/src/share/vm/jfr/recorder/checkpoint/types/jfrTypeSet.hpp Wed Jun 03 01:21:00 2020 +0100 4.2 +++ b/src/share/vm/jfr/recorder/checkpoint/types/jfrTypeSet.hpp Tue Jun 02 14:29:43 2020 +0800 4.3 @@ -33,8 +33,6 @@ 4.4 class JfrCheckpointWriter; 4.5 class Klass; 4.6 4.7 -// XXX class PackageEntry; 4.8 - 4.9 class JfrTypeSet : AllStatic { 4.10 friend class CLDCallback; 4.11 friend class JfrTypeManager; 4.12 @@ -48,17 +46,11 @@ 4.13 static void do_unloaded_klass(Klass* k); 4.14 static void do_klasses(); 4.15 4.16 - // XXX 4.17 - // static void do_package(PackageEntry* entry); 4.18 - // static void do_unloaded_package(PackageEntry* entry); 4.19 - // static void do_packages(); 4.20 - 4.21 static void do_class_loader_data(ClassLoaderData* cld); 4.22 static void do_unloaded_class_loader_data(ClassLoaderData* cld); 4.23 static void do_class_loaders(); 4.24 4.25 static void write_klass_constants(JfrCheckpointWriter* writer, JfrCheckpointWriter* leakp_writer); 4.26 -// XXX static void write_package_constants(JfrCheckpointWriter* writer, JfrCheckpointWriter* leakp_writer); 4.27 static void write_class_loader_constants(JfrCheckpointWriter* writer, JfrCheckpointWriter* leakp_writer); 4.28 static void write_method_constants(JfrCheckpointWriter* writer, JfrCheckpointWriter* leakp_writer); 4.29 static void write_symbol_constants(JfrCheckpointWriter* writer, JfrCheckpointWriter* leakp_writer);
5.1 --- a/src/share/vm/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp Wed Jun 03 01:21:00 2020 +0100 5.2 +++ b/src/share/vm/jfr/recorder/checkpoint/types/traceid/jfrTraceId.cpp Tue Jun 02 14:29:43 2020 +0800 5.3 @@ -61,12 +61,6 @@ 5.4 #endif 5.5 } 5.6 5.7 -// XXX 5.8 -// static traceid next_package_id() { 5.9 -// static volatile traceid package_id_counter = 1; 5.10 -// return atomic_inc(&package_id_counter) << TRACE_ID_SHIFT; 5.11 -// } 5.12 - 5.13 static traceid next_class_loader_data_id() { 5.14 static volatile traceid cld_id_counter = 1; 5.15 return atomic_inc(&cld_id_counter) << TRACE_ID_SHIFT; 5.16 @@ -104,12 +98,6 @@ 5.17 } 5.18 } 5.19 5.20 -// XXX 5.21 -// void JfrTraceId::assign(const PackageEntry* package) { 5.22 -// assert(package != NULL, "invariant"); 5.23 -// package->set_trace_id(next_package_id()); 5.24 -// } 5.25 - 5.26 void JfrTraceId::assign(const ClassLoaderData* cld) { 5.27 assert(cld != NULL, "invariant"); 5.28 if (cld->is_anonymous()) {
6.1 --- a/src/share/vm/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp Wed Jun 03 01:21:00 2020 +0100 6.2 +++ b/src/share/vm/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp Tue Jun 02 14:29:43 2020 +0800 6.3 @@ -32,7 +32,6 @@ 6.4 class ClassLoaderData; 6.5 class Klass; 6.6 class Method; 6.7 -// XXX class PackageEntry; 6.8 class Thread; 6.9 6.10 /* 6.11 @@ -54,7 +53,6 @@ 6.12 * 6.13 * Klass (includes Method) 6.14 * ClassLoaderData 6.15 - * XXX PackageEntry 6.16 * 6.17 * These classes have been extended to include a _traceid field (64-bits). 6.18 * 6.19 @@ -78,7 +76,6 @@ 6.20 class JfrTraceId : public AllStatic { 6.21 public: 6.22 static void assign(const Klass* klass); 6.23 - // XXX static void assign(const PackageEntry* package); 6.24 static void assign(const ClassLoaderData* cld); 6.25 static traceid assign_thread_id(); 6.26 6.27 @@ -90,7 +87,6 @@ 6.28 static traceid use(const Klass* klass, bool leakp = false); 6.29 static traceid use(jclass jc, bool leakp = false); 6.30 static traceid use(const Method* method, bool leakp = false); 6.31 - // XXX static traceid use(const PackageEntry* package, bool leakp = false); 6.32 static traceid use(const ClassLoaderData* cld, bool leakp = false); 6.33 6.34 static void remove(const Klass* klass);
7.1 --- a/src/share/vm/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp Wed Jun 03 01:21:00 2020 +0100 7.2 +++ b/src/share/vm/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp Tue Jun 02 14:29:43 2020 +0800 7.3 @@ -82,12 +82,6 @@ 7.4 return (METHOD_ID(klass, method)); 7.5 } 7.6 7.7 -// XXX 7.8 -//inline traceid JfrTraceId::use(const PackageEntry* package, bool leakp /* false */) { 7.9 -// assert(package != NULL, "invariant"); 7.10 -// return set_used_and_get_shifted(package, leakp); 7.11 -//} 7.12 - 7.13 inline traceid JfrTraceId::use(const ClassLoaderData* cld, bool leakp /* false */) { 7.14 assert(cld != NULL, "invariant"); 7.15 return cld->is_anonymous() ? 0 : set_used_and_get_shifted(cld, leakp);
8.1 --- a/src/share/vm/jfr/recorder/repository/jfrEmergencyDump.cpp Wed Jun 03 01:21:00 2020 +0100 8.2 +++ b/src/share/vm/jfr/recorder/repository/jfrEmergencyDump.cpp Tue Jun 02 14:29:43 2020 +0800 8.3 @@ -70,10 +70,9 @@ 8.4 Threads_lock->unlock(); 8.5 } 8.6 8.7 - // XXX (Module_lock -> PackageTable_lock) 8.8 - if (PackageTable_lock->owned_by_self()) { 8.9 - PackageTable_lock->unlock(); 8.10 - } 8.11 + if (PackageTable_lock->owned_by_self()) { 8.12 + PackageTable_lock->unlock(); 8.13 + } 8.14 8.15 if (Heap_lock->owned_by_self()) { 8.16 Heap_lock->unlock();
9.1 --- a/src/share/vm/jfr/writers/jfrWriterHost.hpp Wed Jun 03 01:21:00 2020 +0100 9.2 +++ b/src/share/vm/jfr/writers/jfrWriterHost.hpp Tue Jun 02 14:29:43 2020 +0800 9.3 @@ -32,7 +32,6 @@ 9.4 class ClassLoaderData; 9.5 class Klass; 9.6 class Method; 9.7 -// XXX class PackageEntry; 9.8 class Symbol; 9.9 class Thread; 9.10 9.11 @@ -80,7 +79,6 @@ 9.12 void write(const ClassLoaderData* cld); 9.13 void write(const Klass* klass); 9.14 void write(const Method* method); 9.15 -// XXX void write(const PackageEntry* package); 9.16 void write(const Symbol* symbol); 9.17 void write(const Ticks& time); 9.18 void write(const Tickspan& time);
10.1 --- a/src/share/vm/jfr/writers/jfrWriterHost.inline.hpp Wed Jun 03 01:21:00 2020 +0100 10.2 +++ b/src/share/vm/jfr/writers/jfrWriterHost.inline.hpp Tue Jun 02 14:29:43 2020 +0800 10.3 @@ -33,7 +33,6 @@ 10.4 #include "memory/resourceArea.hpp" 10.5 #include "oops/oop.hpp" 10.6 #include "oops/symbol.hpp" 10.7 -//#include "oops/typeArrayOop.inline.hpp" - XXX 10.8 10.9 inline bool compressed_integers() { 10.10 static const bool comp_integers = JfrOptionSet::compressed_integers(); 10.11 @@ -259,12 +258,6 @@ 10.12 tag_write(this, method); 10.13 } 10.14 10.15 -// XXX 10.16 -// template <typename BE, typename IE, typename WriterPolicyImpl> 10.17 -// void WriterHost<BE, IE, WriterPolicyImpl>::write(const PackageEntry* package) { 10.18 -// tag_write(this, package); 10.19 -// } 10.20 - 10.21 template <typename BE, typename IE, typename WriterPolicyImpl> 10.22 void WriterHost<BE, IE, WriterPolicyImpl>::write(const Symbol* symbol) { 10.23 ResourceMark rm;
