Merge

Thu, 15 Aug 2013 06:20:48 -0700

author
ehelin
date
Thu, 15 Aug 2013 06:20:48 -0700
changeset 5521
33d39b75663f
parent 5519
bd902affe102
parent 5520
274ce305e5b9
child 5522
5a62937e55b3
child 5549
8088d93a63e6

Merge

     1.1 --- a/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp	Thu Aug 15 10:05:50 2013 +0200
     1.2 +++ b/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp	Thu Aug 15 06:20:48 2013 -0700
     1.3 @@ -32,6 +32,7 @@
     1.4  #if INCLUDE_SERVICES
     1.5  
     1.6  void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id, jlong timestamp) {
     1.7 +#if INCLUDE_TRACE
     1.8    assert(Tracing::is_event_enabled(EventObjectCountAfterGC::eventId),
     1.9           "Only call this method if the event is enabled");
    1.10  
    1.11 @@ -42,6 +43,7 @@
    1.12    event.set_totalSize(entry->words() * BytesPerWord);
    1.13    event.set_endtime(timestamp);
    1.14    event.commit();
    1.15 +#endif // INCLUDE_TRACE
    1.16  }
    1.17  
    1.18  bool ObjectCountEventSender::should_send_event() {

mercurial