From 4a285f2a203d999f5fbb75fc30cc2c4a14bd4722 Mon Sep 17 00:00:00 2001 From: Nick Kamal Date: Mon, 9 Dec 2024 07:40:36 -0500 Subject: [PATCH] updated arg to maxstringlength + formatting --- runtime/oti/j9trace.h | 8 +++++- runtime/rasdump/dmpsup.c | 1 + runtime/rastrace/j9rastrace.h | 8 +++--- runtime/rastrace/method_trace.c | 10 ++++---- runtime/rastrace/method_trigger.c | 41 ++++++++++++++----------------- runtime/rastrace/trcengine.c | 2 +- 6 files changed, 36 insertions(+), 34 deletions(-) diff --git a/runtime/oti/j9trace.h b/runtime/oti/j9trace.h index ec6624c0e00..149f73ed3ec 100644 --- a/runtime/oti/j9trace.h +++ b/runtime/oti/j9trace.h @@ -63,13 +63,19 @@ typedef struct RasGlobalStorage { void * traceMethodTable; int stackdepth; unsigned int stackCompressionLevel; - unsigned int methodStrArgLength; + unsigned int maxStringLength; ConfigureTraceFunction configureTraceEngine; #if defined(J9VM_OPT_CRIU_SUPPORT) CRIURestoreInitializeTrace criuRestoreInitializeTrace; #endif /* defined(J9VM_OPT_CRIU_SUPPORT) */ } RasGlobalStorage; +/* + * Default and maximum values for RasGlobalStorage.maxStringLength. + */ +#define RAS_MAX_STRING_LENGTH_DEFAULT 32 +#define RAS_MAX_STRING_LENGTH_LIMIT 128 + #define RAS_GLOBAL(x) ((RasGlobalStorage *)thr->javaVM->j9rasGlobalStorage)->x #define RAS_GLOBAL_FROM_JAVAVM(x,vm) ((RasGlobalStorage *)vm->j9rasGlobalStorage)->x diff --git a/runtime/rasdump/dmpsup.c b/runtime/rasdump/dmpsup.c index 5c62fbb1ad9..14f2ff74ab4 100644 --- a/runtime/rasdump/dmpsup.c +++ b/runtime/rasdump/dmpsup.c @@ -1571,6 +1571,7 @@ J9VMDllMain(J9JavaVM *vm, IDATA stage, void *reserved) vm->j9rasGlobalStorage = j9mem_allocate_memory(sizeof(RasGlobalStorage), OMRMEM_CATEGORY_VM); if (vm->j9rasGlobalStorage != NULL) { memset (vm->j9rasGlobalStorage, '\0', sizeof(RasGlobalStorage)); + RAS_GLOBAL_FROM_JAVAVM(maxStringLength, vm) = RAS_MAX_STRING_LENGTH_DEFAULT; } } break; diff --git a/runtime/rastrace/j9rastrace.h b/runtime/rastrace/j9rastrace.h index e743f1e4259..4ff7add4425 100644 --- a/runtime/rastrace/j9rastrace.h +++ b/runtime/rastrace/j9rastrace.h @@ -54,7 +54,7 @@ extern "C" { #define RAS_STACKDEPTH_KEYWORD "STACKDEPTH" #define RAS_SLEEPTIME_KEYWORD "SLEEPTIME" #define RAS_COMPRESSION_LEVEL_KEYWORD "STACKCOMPRESSIONLEVEL" -#define RAS_MAX_STRING_LENGTH_KEYWORD "MAXSTRINGLENGTHINMETHODPARAMETER" +#define RAS_MAX_STRING_LENGTH_KEYWORD "MAXSTRINGLENGTH" /* * ====================================================================== @@ -129,9 +129,9 @@ void rasTriggerMethod(J9VMThread *thr, J9Method *mb, I_32 entry, const TriggerPh BOOLEAN matchMethod (RasMethodTable * methodTable, J9Method *method); omr_error_t processTriggerMethodClause(OMR_VMThread *, char *, BOOLEAN atRuntime); void doTriggerActionJstacktrace(OMR_VMThread *thr); -omr_error_t setStackDepth(J9JavaVM *thr, const char * value, BOOLEAN atRuntime); -omr_error_t setStackCompressionLevel(J9JavaVM * vm, const char *str, BOOLEAN atRuntime); -omr_error_t setMethodStrArgLength(J9JavaVM * vm, const char *str, BOOLEAN atRuntime); +omr_error_t setStackDepth(J9JavaVM *thr, const char *value, BOOLEAN atRuntime); +omr_error_t setStackCompressionLevel(J9JavaVM *vm, const char *str, BOOLEAN atRuntime); +omr_error_t setMaxStringLength(J9JavaVM *vm, const char *str, BOOLEAN atRuntime); /* * ============================================================================= diff --git a/runtime/rastrace/method_trace.c b/runtime/rastrace/method_trace.c index 9d70cbd9413..fcbdc74d58e 100644 --- a/runtime/rastrace/method_trace.c +++ b/runtime/rastrace/method_trace.c @@ -476,13 +476,13 @@ traceMethodArgObject(J9VMThread *thr, UDATA* arg0EA, char* cursor, UDATA length) } else { J9Class *clazz = J9OBJECT_CLAZZ(thr, object); J9JavaVM *vm = thr->javaVM; - const unsigned int methodStrArgLength = ((RasGlobalStorage *)thr->javaVM->j9rasGlobalStorage)->methodStrArgLength; + const unsigned int maxStringLength = ((RasGlobalStorage *)vm->j9rasGlobalStorage)->maxStringLength; if (clazz == J9VMJAVALANGSTRING_OR_NULL(vm) - && (0 != methodStrArgLength) + && (0 != maxStringLength) ) { /* string argument */ - char utf8Buffer[128]; + char utf8Buffer[RAS_MAX_STRING_LENGTH_LIMIT + 1]; UDATA utf8Length = 0; char *utf8String = vm->internalVMFunctions->copyStringToUTF8WithMemAlloc( @@ -497,8 +497,8 @@ traceMethodArgObject(J9VMThread *thr, UDATA* arg0EA, char* cursor, UDATA length) if (NULL == utf8String) { j9str_printf(PORTLIB, cursor, length, "(String)"); - } else if (utf8Length > methodStrArgLength) { - j9str_printf(PORTLIB, cursor, length, "(String)\"%.*s\"...", (U_32)methodStrArgLength, utf8String); + } else if (utf8Length > maxStringLength) { + j9str_printf(PORTLIB, cursor, length, "(String)\"%.*s\"...", (U_32)maxStringLength, utf8String); } else { j9str_printf(PORTLIB, cursor, length, "(String)\"%.*s\"", (U_32)utf8Length, utf8String); } diff --git a/runtime/rastrace/method_trigger.c b/runtime/rastrace/method_trigger.c index 5a76147a18f..9f61d1dbc7d 100644 --- a/runtime/rastrace/method_trigger.c +++ b/runtime/rastrace/method_trigger.c @@ -547,47 +547,40 @@ decimalString2Int(J9PortLibrary* portLibrary, const char *decString, I_32 signed } /************************************************************************** - * name - setMethodStrArgLength - * description - Set method string argument length + * name - setMaxStringLength + * description - Set max method string argument length * parameters - thr, trace options, atRuntime flag * returns - JNI return code *************************************************************************/ omr_error_t -setMethodStrArgLength(J9JavaVM *vm, const char *str, BOOLEAN atRuntime) +setMaxStringLength(J9JavaVM *vm, const char *str, BOOLEAN atRuntime) { -#define MAX_STRING_LENGTH 128 PORT_ACCESS_FROM_JAVAVM(vm); - int value, length; + int value = 0; + int length = 0; omr_error_t rc = OMR_ERROR_NONE; - const char *p; + const char *param; - if (getParmNumber(str) != 1) { + if (1 != getParmNumber(str)) { goto err; } - p = getPositionalParm(1, str, &length); - - if (length > 3) { - goto err; - } + param = getPositionalParm(1, str, &length); - value = decimalString2Int(PORTLIB, p, FALSE, &rc); + value = decimalString2Int(PORTLIB, param, FALSE, &rc); if (OMR_ERROR_NONE != rc) { goto err; } - if ((0 > value) - || (MAX_STRING_LENGTH < value) + if ((0 <= value) + && (value <= RAS_MAX_STRING_LENGTH_LIMIT) ) { - goto err; + RAS_GLOBAL_FROM_JAVAVM(maxStringLength, vm) = (unsigned int)value; + return OMR_ERROR_NONE; } - - RAS_GLOBAL_FROM_JAVAVM(methodStrArgLength,vm) = (unsigned int)value; - return OMR_ERROR_NONE; err: - vaReportJ9VMCommandLineError(PORTLIB, "methodstrarglen takes an unsigned integer value from 1 to %d", MAX_STRING_LENGTH); + vaReportJ9VMCommandLineError(PORTLIB, "maxstringlength takes an unsigned integer value from 1 to %d", RAS_MAX_STRING_LENGTH_LIMIT); return OMR_ERROR_INTERNAL; -#undef MAX_STRING_LENGTH } /************************************************************************** @@ -701,8 +694,10 @@ addTriggeredMethodSpec(J9VMThread *thr, const char *ptrMethodSpec, const struct /* set up the current method spec to be enabled for trace */ setMethod(thr->javaVM, ptrMethodSpec, FALSE); } - if (methodRule->exitAction != NULL && methodRule->exitAction->name != NULL - && j9_cmdla_stricmp((char *)methodRule->exitAction->name, "jstacktrace") == 0) { + if ((NULL != methodRule->exitAction) + && (NULL != methodRule->exitAction->name) + && (0 == j9_cmdla_stricmp((char *)methodRule->exitAction->name, "jstacktrace")) + ) { /* set up the current method spec to be enabled for trace */ setMethod(thr->javaVM, ptrMethodSpec, FALSE); } diff --git a/runtime/rastrace/trcengine.c b/runtime/rastrace/trcengine.c index 6406a04ce1a..8ccd68d94c2 100644 --- a/runtime/rastrace/trcengine.c +++ b/runtime/rastrace/trcengine.c @@ -117,7 +117,7 @@ const struct traceOption TRACE_OPTIONS[] = {RAS_METHODS_KEYWORD, FALSE, setMethod}, {RAS_STACKDEPTH_KEYWORD, TRUE, setStackDepth}, {RAS_COMPRESSION_LEVEL_KEYWORD, TRUE, setStackCompressionLevel}, - {RAS_MAX_STRING_LENGTH_KEYWORD, FALSE, setMethodStrArgLength}, + {RAS_MAX_STRING_LENGTH_KEYWORD, FALSE, setMaxStringLength}, }; #define NUMBER_OF_TRACE_OPTIONS ( sizeof(TRACE_OPTIONS) / sizeof(struct traceOption))