From d7281e0a1edd4d667a8c12ce150a4a8f7dcb0245 Mon Sep 17 00:00:00 2001 From: "Keith W. Campbell" Date: Mon, 15 Aug 2022 11:59:16 -0400 Subject: [PATCH] Remove unused dump macros * remove J9RAS_DUMP_ON_*_BIT * remove J9RAS_DUMP_HOOK_TABLE_SIZE * remove unused array rasDumpOldHooks in trigger.c Signed-off-by: Keith W. Campbell --- debugtools/DDR_VM/data/superset-constants.dat | 27 ----------------- runtime/oti/j9dump.h | 29 +------------------ runtime/rasdump/trigger.c | 2 -- 3 files changed, 1 insertion(+), 57 deletions(-) diff --git a/debugtools/DDR_VM/data/superset-constants.dat b/debugtools/DDR_VM/data/superset-constants.dat index 31ba67dc733..1ae93dd33a1 100644 --- a/debugtools/DDR_VM/data/superset-constants.dat +++ b/debugtools/DDR_VM/data/superset-constants.dat @@ -3412,60 +3412,33 @@ C|J9RAS_DUMP_DO_MULTIPLE_HEAPS C|J9RAS_DUMP_DO_PREEMPT_THREADS C|J9RAS_DUMP_DO_PREPARE_HEAP_FOR_WALK C|J9RAS_DUMP_DO_SUSPEND_OTHER_DUMPS -C|J9RAS_DUMP_HOOK_TABLE_SIZE C|J9RAS_DUMP_ON_ABORT_SIGNAL -C|J9RAS_DUMP_ON_ABORT_SIGNAL_BIT C|J9RAS_DUMP_ON_ANY C|J9RAS_DUMP_ON_BREAKPOINT -C|J9RAS_DUMP_ON_BREAKPOINT_BIT C|J9RAS_DUMP_ON_CLASS_LOAD -C|J9RAS_DUMP_ON_CLASS_LOAD_BIT C|J9RAS_DUMP_ON_CLASS_UNLOAD -C|J9RAS_DUMP_ON_CLASS_UNLOAD_BIT C|J9RAS_DUMP_ON_CORRUPT_CACHE -C|J9RAS_DUMP_ON_CORRUPT_CACHE_BIT C|J9RAS_DUMP_ON_DEBUG_FRAME_POP -C|J9RAS_DUMP_ON_DEBUG_FRAME_POP_BIT C|J9RAS_DUMP_ON_EXCEPTION_CATCH -C|J9RAS_DUMP_ON_EXCEPTION_CATCH_BIT C|J9RAS_DUMP_ON_EXCEPTION_DESCRIBE -C|J9RAS_DUMP_ON_EXCEPTION_DESCRIBE_BIT C|J9RAS_DUMP_ON_EXCEPTION_SYSTHROW -C|J9RAS_DUMP_ON_EXCEPTION_SYSTHROW_BIT C|J9RAS_DUMP_ON_EXCEPTION_THROW -C|J9RAS_DUMP_ON_EXCEPTION_THROW_BIT C|J9RAS_DUMP_ON_EXCESSIVE_GC -C|J9RAS_DUMP_ON_EXCESSIVE_GC_BIT C|J9RAS_DUMP_ON_GLOBAL_GC -C|J9RAS_DUMP_ON_GLOBAL_GC_BIT C|J9RAS_DUMP_ON_GP_FAULT -C|J9RAS_DUMP_ON_GP_FAULT_BIT C|J9RAS_DUMP_ON_HEAP_EXPAND -C|J9RAS_DUMP_ON_HEAP_EXPAND_BIT C|J9RAS_DUMP_ON_OBJECT_ALLOCATION -C|J9RAS_DUMP_ON_OBJECT_ALLOCATION_BIT C|J9RAS_DUMP_ON_SLOW_EXCLUSIVE_ENTER -C|J9RAS_DUMP_ON_SLOW_EXCLUSIVE_ENTER_BIT C|J9RAS_DUMP_ON_THREAD_BLOCKED -C|J9RAS_DUMP_ON_THREAD_BLOCKED_BIT C|J9RAS_DUMP_ON_THREAD_END -C|J9RAS_DUMP_ON_THREAD_END_BIT C|J9RAS_DUMP_ON_THREAD_START -C|J9RAS_DUMP_ON_THREAD_START_BIT C|J9RAS_DUMP_ON_TRACE_ASSERT -C|J9RAS_DUMP_ON_TRACE_ASSERT_BIT C|J9RAS_DUMP_ON_USER_REQUEST -C|J9RAS_DUMP_ON_USER_REQUEST_BIT C|J9RAS_DUMP_ON_USER_SIGNAL -C|J9RAS_DUMP_ON_USER_SIGNAL_BIT C|J9RAS_DUMP_ON_VM_SHUTDOWN -C|J9RAS_DUMP_ON_VM_SHUTDOWN_BIT C|J9RAS_DUMP_ON_VM_STARTUP -C|J9RAS_DUMP_ON_VM_STARTUP_BIT C|J9RAS_DUMP_ON_VM_TENANT_SHUTDOWN -C|J9RAS_DUMP_ON_VM_TENANT_SHUTDOWN_BIT C|J9RAS_DUMP_ON_VM_TENANT_STARTUP -C|J9RAS_DUMP_ON_VM_TENANT_STARTUP_BIT S|J9RASdumpRequestState|J9RASdumpRequestStatePointer| C|J9RAS_DUMP_ATTACHED_THREAD C|J9RAS_DUMP_GOT_EXCLUSIVE_VM_ACCESS diff --git a/runtime/oti/j9dump.h b/runtime/oti/j9dump.h index 274014bac65..3b92f34f6f1 100644 --- a/runtime/oti/j9dump.h +++ b/runtime/oti/j9dump.h @@ -61,34 +61,7 @@ typedef struct J9RASdumpAgent { char* subFilter; } J9RASdumpAgent; -#define J9RAS_DUMP_ON_VM_STARTUP_BIT 0 -#define J9RAS_DUMP_ON_VM_SHUTDOWN_BIT 1 -#define J9RAS_DUMP_ON_CLASS_LOAD_BIT 2 -#define J9RAS_DUMP_ON_CLASS_UNLOAD_BIT 3 -#define J9RAS_DUMP_ON_EXCEPTION_THROW_BIT 4 -#define J9RAS_DUMP_ON_EXCEPTION_CATCH_BIT 5 -#define J9RAS_DUMP_ON_BREAKPOINT_BIT 6 -#define J9RAS_DUMP_ON_DEBUG_FRAME_POP_BIT 7 -#define J9RAS_DUMP_ON_THREAD_START_BIT 8 -#define J9RAS_DUMP_ON_THREAD_BLOCKED_BIT 9 -#define J9RAS_DUMP_ON_THREAD_END_BIT 10 -#define J9RAS_DUMP_ON_HEAP_EXPAND_BIT 11 -#define J9RAS_DUMP_ON_GLOBAL_GC_BIT 12 -#define J9RAS_DUMP_ON_GP_FAULT_BIT 13 -#define J9RAS_DUMP_ON_USER_SIGNAL_BIT 14 -#define J9RAS_DUMP_ON_EXCEPTION_DESCRIBE_BIT 15 -#define J9RAS_DUMP_ON_SLOW_EXCLUSIVE_ENTER_BIT 16 -#define J9RAS_DUMP_ON_ABORT_SIGNAL_BIT 17 -#define J9RAS_DUMP_ON_EXCEPTION_SYSTHROW_BIT 18 -#define J9RAS_DUMP_ON_TRACE_ASSERT_BIT 19 -#define J9RAS_DUMP_ON_USER_REQUEST_BIT 20 -#define J9RAS_DUMP_ON_OBJECT_ALLOCATION_BIT 21 -#define J9RAS_DUMP_ON_CORRUPT_CACHE_BIT 22 -#define J9RAS_DUMP_ON_EXCESSIVE_GC_BIT 23 -#define J9RAS_DUMP_ON_USER2_SIGNAL_BIT 24 -#define J9RAS_DUMP_HOOK_TABLE_SIZE 25 /* 1+ the last _BIT */ - -/* bit flags corresponding to the _BIT values above. Definitions must be simple so that DDR can process them. */ +/* Dump flags. Definitions must be simple so that DDR can process them. */ #define J9RAS_DUMP_ON_VM_STARTUP 1 #define J9RAS_DUMP_ON_VM_SHUTDOWN 2 #define J9RAS_DUMP_ON_CLASS_LOAD 4 diff --git a/runtime/rasdump/trigger.c b/runtime/rasdump/trigger.c index 30711260897..1d6437be38b 100644 --- a/runtime/rasdump/trigger.c +++ b/runtime/rasdump/trigger.c @@ -85,8 +85,6 @@ UDATA rasDumpPendingHooks = 0; /* Cached VM event handlers for use by J9VMRASdumpHooks */ UDATA rasDumpUnhookedEvents = J9RAS_DUMP_ON_ANY; -void *rasDumpOldHooks[J9RAS_DUMP_HOOK_TABLE_SIZE]; - static void rasDumpHookVmInit (J9HookInterface** hookInterface, UDATA eventNum, void* eventData, void* userData); static void rasDumpHookGCInitialized(J9HookInterface** hookInterface, UDATA eventNum, void* eventData, void* userData);