mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 15:24:43 +02:00
8011661: Insufficient memory message says "malloc" when sometimes it should say "mmap"
Reviewed-by: coleenp, zgu, hseigel
This commit is contained in:
parent
a2f5f4ca1b
commit
0f7adcc3d9
31 changed files with 78 additions and 59 deletions
|
@ -174,9 +174,9 @@ do { \
|
|||
} while (0)
|
||||
|
||||
// out of memory
|
||||
#define vm_exit_out_of_memory(size, msg) \
|
||||
#define vm_exit_out_of_memory(size, vm_err_type, msg) \
|
||||
do { \
|
||||
report_vm_out_of_memory(__FILE__, __LINE__, size, msg); \
|
||||
report_vm_out_of_memory(__FILE__, __LINE__, size, vm_err_type, msg); \
|
||||
BREAKPOINT; \
|
||||
} while (0)
|
||||
|
||||
|
@ -204,12 +204,20 @@ do { \
|
|||
BREAKPOINT; \
|
||||
} while (0);
|
||||
|
||||
|
||||
// types of VM error - originally in vmError.hpp
|
||||
enum VMErrorType {
|
||||
INTERNAL_ERROR = 0xe0000000,
|
||||
OOM_MALLOC_ERROR = 0xe0000001,
|
||||
OOM_MMAP_ERROR = 0xe0000002
|
||||
};
|
||||
|
||||
// error reporting helper functions
|
||||
void report_vm_error(const char* file, int line, const char* error_msg,
|
||||
const char* detail_msg = NULL);
|
||||
void report_fatal(const char* file, int line, const char* message);
|
||||
void report_vm_out_of_memory(const char* file, int line, size_t size,
|
||||
const char* message);
|
||||
VMErrorType vm_err_type, const char* message);
|
||||
void report_should_not_call(const char* file, int line);
|
||||
void report_should_not_reach_here(const char* file, int line);
|
||||
void report_unimplemented(const char* file, int line);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue