6843629: Make current hotspot build part of jdk5 control build

Source changes for older compilers plus makefile changes.

Reviewed-by: xlu
This commit is contained in:
Paul Hohensee 2009-12-16 12:54:49 -05:00
parent ab3b12bdbd
commit ce423c9e98
28 changed files with 162 additions and 103 deletions

View file

@ -60,24 +60,26 @@ enum ThreadPriority { // JLS 20.20.1-3
typedef void (*java_call_t)(JavaValue* value, methodHandle* method, JavaCallArguments* args, Thread* thread);
class os: AllStatic {
private:
public:
enum { page_sizes_max = 9 }; // Size of _page_sizes array (8 plus a sentinel)
private:
static OSThread* _starting_thread;
static address _polling_page;
static volatile int32_t * _mem_serialize_page;
static uintptr_t _serialize_page_mask;
public:
static size_t _page_sizes[page_sizes_max];
private:
static void init_page_sizes(size_t default_page_size) {
_page_sizes[0] = default_page_size;
_page_sizes[1] = 0; // sentinel
}
public:
static void init(void); // Called before command line parsing
static jint init_2(void); // Called after command line parsing
static void init(void); // Called before command line parsing
static jint init_2(void); // Called after command line parsing
// File names are case-insensitive on windows only
// Override me as needed
@ -141,6 +143,7 @@ class os: AllStatic {
static int processor_count() {
return _processor_count;
}
static void set_processor_count(int count) { _processor_count = count; }
// Returns the number of CPUs this process is currently allowed to run on.
// Note that on some OSes this can change dynamically.