comparison src/share/vm/runtime/os.hpp @ 6080:7432b9db36ff

7165755: OS Information much longer on linux than other platforms Reviewed-by: sla, dholmes
author nloodin
date Thu, 10 May 2012 15:44:19 +0200
parents da4be62fb889
children d2a62e0f25eb
comparison
equal deleted inserted replaced
6079:9793f47cdebc 6080:7432b9db36ff
490 static void dll_unload(void *lib); 490 static void dll_unload(void *lib);
491 491
492 // Print out system information; they are called by fatal error handler. 492 // Print out system information; they are called by fatal error handler.
493 // Output format may be different on different platforms. 493 // Output format may be different on different platforms.
494 static void print_os_info(outputStream* st); 494 static void print_os_info(outputStream* st);
495 static void print_os_info_brief(outputStream* st);
495 static void print_cpu_info(outputStream* st); 496 static void print_cpu_info(outputStream* st);
496 static void pd_print_cpu_info(outputStream* st); 497 static void pd_print_cpu_info(outputStream* st);
497 static void print_memory_info(outputStream* st); 498 static void print_memory_info(outputStream* st);
498 static void print_dll_info(outputStream* st); 499 static void print_dll_info(outputStream* st);
499 static void print_environment_variables(outputStream* st, const char** env_list, char* buffer, int len); 500 static void print_environment_variables(outputStream* st, const char** env_list, char* buffer, int len);
683 public: 684 public:
684 685
685 // Platform dependent stuff 686 // Platform dependent stuff
686 #ifdef TARGET_OS_FAMILY_linux 687 #ifdef TARGET_OS_FAMILY_linux
687 # include "os_linux.hpp" 688 # include "os_linux.hpp"
689 # include "os_posix.hpp"
688 #endif 690 #endif
689 #ifdef TARGET_OS_FAMILY_solaris 691 #ifdef TARGET_OS_FAMILY_solaris
690 # include "os_solaris.hpp" 692 # include "os_solaris.hpp"
693 # include "os_posix.hpp"
691 #endif 694 #endif
692 #ifdef TARGET_OS_FAMILY_windows 695 #ifdef TARGET_OS_FAMILY_windows
693 # include "os_windows.hpp" 696 # include "os_windows.hpp"
694 #endif 697 #endif
695 #ifdef TARGET_OS_FAMILY_bsd 698 #ifdef TARGET_OS_FAMILY_bsd
699 # include "os_posix.hpp"
696 # include "os_bsd.hpp" 700 # include "os_bsd.hpp"
697 #endif 701 #endif
698 #ifdef TARGET_OS_ARCH_linux_x86 702 #ifdef TARGET_OS_ARCH_linux_x86
699 # include "os_linux_x86.hpp" 703 # include "os_linux_x86.hpp"
700 #endif 704 #endif