comparison src/share/vm/runtime/task.cpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents f34d701e952e
children f2110083203d
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
24 24
25 #include "precompiled.hpp" 25 #include "precompiled.hpp"
26 #include "memory/allocation.hpp" 26 #include "memory/allocation.hpp"
27 #include "runtime/init.hpp" 27 #include "runtime/init.hpp"
28 #include "runtime/task.hpp" 28 #include "runtime/task.hpp"
29 #include "runtime/thread.inline.hpp"
29 #include "runtime/timer.hpp" 30 #include "runtime/timer.hpp"
30 #ifdef TARGET_OS_FAMILY_linux 31 #ifdef TARGET_OS_FAMILY_linux
31 # include "os_linux.inline.hpp" 32 # include "os_linux.inline.hpp"
32 # include "thread_linux.inline.hpp"
33 #endif 33 #endif
34 #ifdef TARGET_OS_FAMILY_solaris 34 #ifdef TARGET_OS_FAMILY_solaris
35 # include "os_solaris.inline.hpp" 35 # include "os_solaris.inline.hpp"
36 # include "thread_solaris.inline.hpp"
37 #endif 36 #endif
38 #ifdef TARGET_OS_FAMILY_windows 37 #ifdef TARGET_OS_FAMILY_windows
39 # include "os_windows.inline.hpp" 38 # include "os_windows.inline.hpp"
40 # include "thread_windows.inline.hpp"
41 #endif 39 #endif
42 #ifdef TARGET_OS_FAMILY_bsd 40 #ifdef TARGET_OS_FAMILY_bsd
43 # include "os_bsd.inline.hpp" 41 # include "os_bsd.inline.hpp"
44 # include "thread_bsd.inline.hpp"
45 #endif 42 #endif
46 43
47 int PeriodicTask::_num_tasks = 0; 44 int PeriodicTask::_num_tasks = 0;
48 PeriodicTask* PeriodicTask::_tasks[PeriodicTask::max_tasks]; 45 PeriodicTask* PeriodicTask::_tasks[PeriodicTask::max_tasks];
49 #ifndef PRODUCT 46 #ifndef PRODUCT