Mercurial > hg > graal-compiler

comparison src/share/vm/runtime/java.cpp @ 10408:836a62f43af9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents 197426668a5d f2110083203d
children 6b0fd0964b87
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
1 /* 1 /*
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2013, 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.
61 #include "runtime/timer.hpp" 61 #include "runtime/timer.hpp"
62 #include "runtime/vm_operations.hpp" 62 #include "runtime/vm_operations.hpp"
63 #include "services/memReporter.hpp" 63 #include "services/memReporter.hpp"
64 #include "services/memTracker.hpp" 64 #include "services/memTracker.hpp"
65 #include "trace/tracing.hpp" 65 #include "trace/tracing.hpp"
66 #include "trace/traceEventTypes.hpp"
67 #include "utilities/dtrace.hpp" 66 #include "utilities/dtrace.hpp"
68 #include "utilities/globalDefinitions.hpp" 67 #include "utilities/globalDefinitions.hpp"
69 #include "utilities/histogram.hpp" 68 #include "utilities/histogram.hpp"
70 #include "utilities/macros.hpp" 69 #include "utilities/macros.hpp"
71 #include "utilities/vmError.hpp" 70 #include "utilities/vmError.hpp"
538 537
539 if (JvmtiExport::should_post_thread_life()) { 538 if (JvmtiExport::should_post_thread_life()) {
540 JvmtiExport::post_thread_end(thread); 539 JvmtiExport::post_thread_end(thread);
541 } 540 }
542 541
543 EVENT_BEGIN(TraceEventThreadEnd, event); 542
544 EVENT_COMMIT(event, 543 EventThreadEnd event;
545 EVENT_SET(event, javalangthread, java_lang_Thread::thread_id(thread->threadObj()))); 544 if (event.should_commit()) {
545 event.set_javalangthread(java_lang_Thread::thread_id(thread->threadObj()));
546 event.commit();
547 }
546 548
547 // Always call even when there are not JVMTI environments yet, since environments 549 // Always call even when there are not JVMTI environments yet, since environments
548 // may be attached late and JVMTI must track phases of VM execution 550 // may be attached late and JVMTI must track phases of VM execution
549 JvmtiExport::post_vm_death(); 551 JvmtiExport::post_vm_death();
550 Threads::shutdown_vm_agents(); 552 Threads::shutdown_vm_agents();