comparison src/os/linux/vm/os_linux.cpp @ 1123:167c2986d91b

6843629: Make current hotspot build part of jdk5 control build Summary: Source changes for older compilers plus makefile changes. Reviewed-by: xlu
author phh
date Wed, 16 Dec 2009 12:54:49 -0500
parents 95e9083cf4a7
children 3b3d12e645e7
comparison
equal deleted inserted replaced
1122:dcb15a6f342d 1123:167c2986d91b
221 static const char *unstable_chroot_error = "/proc file system not found.\n" 221 static const char *unstable_chroot_error = "/proc file system not found.\n"
222 "Java may be unstable running multithreaded in a chroot " 222 "Java may be unstable running multithreaded in a chroot "
223 "environment on Linux when /proc filesystem is not mounted."; 223 "environment on Linux when /proc filesystem is not mounted.";
224 224
225 void os::Linux::initialize_system_info() { 225 void os::Linux::initialize_system_info() {
226 _processor_count = sysconf(_SC_NPROCESSORS_CONF); 226 set_processor_count(sysconf(_SC_NPROCESSORS_CONF));
227 if (_processor_count == 1) { 227 if (processor_count() == 1) {
228 pid_t pid = os::Linux::gettid(); 228 pid_t pid = os::Linux::gettid();
229 char fname[32]; 229 char fname[32];
230 jio_snprintf(fname, sizeof(fname), "/proc/%d", pid); 230 jio_snprintf(fname, sizeof(fname), "/proc/%d", pid);
231 FILE *fp = fopen(fname, "r"); 231 FILE *fp = fopen(fname, "r");
232 if (fp == NULL) { 232 if (fp == NULL) {
234 } else { 234 } else {
235 fclose(fp); 235 fclose(fp);
236 } 236 }
237 } 237 }
238 _physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE); 238 _physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE);
239 assert(_processor_count > 0, "linux error"); 239 assert(processor_count() > 0, "linux error");
240 } 240 }
241 241
242 void os::init_system_properties_values() { 242 void os::init_system_properties_values() {
243 // char arch[12]; 243 // char arch[12];
244 // sysinfo(SI_ARCHITECTURE, arch, sizeof(arch)); 244 // sysinfo(SI_ARCHITECTURE, arch, sizeof(arch));