changeset 5086:33d39b75663f

Merge
author ehelin
date Thu, 15 Aug 2013 06:20:48 -0700
parents bd902affe102 274ce305e5b9
children 5a62937e55b3 8088d93a63e6
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp	Thu Aug 15 10:05:50 2013 +0200
+++ b/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp	Thu Aug 15 06:20:48 2013 -0700
@@ -32,6 +32,7 @@
 #if INCLUDE_SERVICES
 
 void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id, jlong timestamp) {
+#if INCLUDE_TRACE
   assert(Tracing::is_event_enabled(EventObjectCountAfterGC::eventId),
          "Only call this method if the event is enabled");
 
@@ -42,6 +43,7 @@
   event.set_totalSize(entry->words() * BytesPerWord);
   event.set_endtime(timestamp);
   event.commit();
+#endif // INCLUDE_TRACE
 }
 
 bool ObjectCountEventSender::should_send_event() {