From 9587670300dfb59bb03465358e41737c8ee2975a Mon Sep 17 00:00:00 2001 From: sakeerthy Date: Wed, 26 Feb 2020 21:11:45 -0500 Subject: [PATCH 1/5] WIP zowelog zss format handler Signed-off-by: sakeerthy --- c/crossmemory.c | 17 +++--- c/logging.c | 139 ++++++++++++++++++++++++++++++++++++++++++++---- h/logging.h | 27 +++++++--- 3 files changed, 158 insertions(+), 25 deletions(-) diff --git a/c/crossmemory.c b/c/crossmemory.c index abd405155..87c60c3f3 100644 --- a/c/crossmemory.c +++ b/c/crossmemory.c @@ -281,8 +281,8 @@ void wtoPrintf2(int consoleID, CART cart, char *formatString, ...) { } -static void printWithPrefix(LoggingContext *context, LoggingComponent *component, void *data, char *formatString, va_list argList); -static char *dumpWithEmptyMessageID(char *workBuffer, int workBufferSize, void *data, int dataSize, int lineNumber); +static void printWithPrefix(LoggingContext *context, LoggingComponent *component, char* path, int line, int level, uint64 compID, void *data, char *formatString, va_list argList); +static char *dumpWithEmptyMessageID(char *workBuffer, int workBufferSize, void *data, int dataSize, int lineNumber, char* path, int line); void cmsInitializeLogging() { @@ -503,7 +503,7 @@ static void initLogMessagePrefix(LogMessagePrefix *prefix) { #define PREFIXED_LINE_MAX_COUNT 1000 #define PREFIXED_LINE_MAX_MSG_LENGTH 4096 -static void printWithPrefix(LoggingContext *context, LoggingComponent *component, void *data, char *formatString, va_list argList) { +static void printWithPrefix(LoggingContext *context, LoggingComponent *component, char* path, int line, int level, uint64 compID, void *data, char *formatString, va_list argList) { char messageBuffer[PREFIXED_LINE_MAX_MSG_LENGTH]; size_t messageLength = vsnprintf(messageBuffer, sizeof(messageBuffer), formatString, argList); @@ -535,7 +535,7 @@ static void printWithPrefix(LoggingContext *context, LoggingComponent *component #define MESSAGE_ID_SHIFT 10 /* this is a copy of the dumper function from logging.c, it's been modified to occupy less space and print an empty message ID */ -static char *dumpWithEmptyMessageID(char *workBuffer, int workBufferSize, void *data, int dataSize, int lineNumber) { +static char *dumpWithEmptyMessageID(char *workBuffer, int workBufferSize, void *data, int dataSize, int lineNumber, char* path, int line) { int formatWidth = 16; int index = lineNumber * formatWidth; @@ -2808,12 +2808,13 @@ static void printDisplayConfigCommandResponse(CrossMemoryServer *server, CMSWTOR int consoleID = routeInfo->consoleID; CrossMemoryServerGlobalArea *globalArea = server->globalArea; - zowelog(NULL, LOG_COMP_ID_CMS, ZOWE_LOG_INFO, #ifdef CROSS_MEMORY_SERVER_DEBUG - CMS_LOG_DISP_CMD_RESULT_MSG"Server name - \'%16.16s\' (debug mode)\n" + char* formatStringPrefix = CMS_LOG_DISP_CMD_RESULT_MSG"Server name - \'%16.16s\' (debug mode)\n"; #else - CMS_LOG_DISP_CMD_RESULT_MSG"Server name - \'%16.16s\'\n" + char* formatStringPrefix = CMS_LOG_DISP_CMD_RESULT_MSG"Server name - \'%16.16s\'\n"; #endif + + zowelog(NULL, LOG_COMP_ID_CMS, ZOWE_LOG_INFO, strcat(formatStringPrefix, " Global area address = 0x%p\n" " Version = %d\n" " Key = %d\n" @@ -2828,7 +2829,7 @@ static void printDisplayConfigCommandResponse(CrossMemoryServer *server, CMSWTOR " PC-ss seq number = 0x%08X\n" " PC-cp PC number = 0x%08X\n" " PC-cp seq number = 0x%08X\n" - " PC log level = %d\n", + " PC log level = %d\n"), server->name.nameSpacePadded, globalArea, globalArea->version, diff --git a/c/logging.c b/c/logging.c index 82561a5a9..118ebf9d3 100644 --- a/c/logging.c +++ b/c/logging.c @@ -37,6 +37,11 @@ #include "logging.h" #include "printables_for_dump.h" +#include "timeutls.h" +#include "zos.h" +#include "openprims.h" +#include "zssLogging.h" + #ifdef __ZOWE_OS_ZOS #include "le.h" #endif @@ -311,8 +316,8 @@ static void lastResortLog(char *s){ } /* default dumper, based on dumpBufferToStream from utils.c */ -static char *standardDumperFunction(char *workBuffer, int workBufferSize, - void *data, int dataSize, int lineNumber){ +char *standardDumperFunction(char *workBuffer, int workBufferSize, + void *data, int dataSize, int lineNumber, char* path, int line){ int formatWidth = 32; int index = lineNumber * formatWidth; @@ -455,7 +460,7 @@ LoggingDestination *logConfigureDestination2(LoggingContext *context, return destination; } -void printStdout(LoggingContext *context, LoggingComponent *component, void *data, char *formatString, va_list argList){ +void printStdout(LoggingContext *context, LoggingComponent *component, char* path, int line, int level, uint64 compID, void *data, char *formatString, va_list argList){ #ifdef METTLE printf("broken printf in logging.c\n"); #else @@ -463,7 +468,7 @@ void printStdout(LoggingContext *context, LoggingComponent *component, void *dat #endif } -void printStderr(LoggingContext *context, LoggingComponent *component, void *data, char *formatString, va_list argList){ +void printStderr(LoggingContext *context, LoggingComponent *component, char* path, int line, int level, uint64 compID, void *data, char *formatString, va_list argList){ #ifdef METTLE printf("broken printf in logging.c\n"); #else @@ -647,7 +652,119 @@ int logGetLevel(LoggingContext *context, uint64 compID){ return component ? component->currentDetailLevel : ZOWE_LOG_NA; } -void zowelog(LoggingContext *context, uint64 compID, int level, char *formatString, ...){ +static void getLogTimestamp(char *date) { + int64 stck = 0; + char timestamp[14]; // unformated time + uint32 out_secs = 0; + uint32 out_micros = 0; + + getSTCK(&stck); + int64 unixTime = stckToUnix(stck); // gets unixTime + stckToUnixSecondsAndMicros(stck, &out_secs, &out_micros); // calculates microseconds + out_micros = out_micros/1000; + unixToTimestamp((uint64) unixTime, timestamp); + + // format: 2019-03-19 11:23:57.776 + snprintf(date,24, "%.4s-%.2s-%.2s %.2s:%.2s:%.2s.%.3d" + ,timestamp, timestamp+4,timestamp+6,timestamp+8,timestamp+10,timestamp+12,(unsigned int) out_micros); +} + +static void getLevel(int level, char *logLevel) { + + switch(level) { + case 0: snprintf(logLevel,7,"SEVERE"); + break; + case 1: snprintf(logLevel,8,"WARN"); + break; + case 2: snprintf(logLevel,5,"INFO"); + break; + case 3: snprintf(logLevel,5,"DEBUG"); + break; + case 4: snprintf(logLevel,6,"DEBUG"); + break; + case 5: snprintf(logLevel,7,"TRACE"); + break; + } +} + +static void getLocationData(char *path, int line, char **locationInfo, uint64 compID, LoggingComponent *component) { + + char prefix[128]; + char suffix[128]; + + unsigned int id = compID & 0xFFFFFFFF; + if(compID >= LOG_PROD_COMMON && compID < LOG_PROD_ZIS) { + snprintf(prefix,5,"_zcc"); + switch (id) { // most of these don't actally log, but are defined in logging.h + case 0x10000: snprintf(suffix,6,"alloc"); + break; + case 0x20000: snprintf(suffix,6,"utils"); + break; + case 0x30000: snprintf(suffix,12,"collections"); + break; + case 0x40000: snprintf(suffix,14,"serialization"); + break; + case 0x50000: snprintf(suffix,9,"zlparser"); + break; + case 0x60000: snprintf(suffix,11,"zlcompiler"); + break; + case 0x70000: snprintf(suffix,10,"zlruntime"); + break; + case 0x80000: snprintf(suffix,8,"stcbase"); + break; + case 0x90000: snprintf(suffix,11,"httpserver"); + break; + case 0xA0000: snprintf(suffix,10,"discovery"); + break; + case 0xB0000: snprintf(suffix,12,"dataservice"); + break; + case 0xC0000: snprintf(suffix,4,"cms"); + break; + case 0xC0001: snprintf(suffix,4,"cms"); + break; + case 0xC0002: snprintf(suffix,6,"cmspc"); + break; + case 0xD0000: snprintf(suffix,4,"lpa"); + break; + case 0xE0000: snprintf(suffix,12,"restdataset"); + break; + case 0xF0000: snprintf(suffix,9,"restfile"); + break; + } + } + else if (compID >= LOG_PROD_ZIS && compID < LOG_PROD_ZSS) { + snprintf(prefix,5,"_zis"); + } + else if (compID >= LOG_PROD_ZSS && compID < LOG_PROD_PLUGINS ) { + snprintf(prefix,5,"_zss"); + switch (id) { + case 0x10000: snprintf(suffix,4,"zss"); + break; + case 0x20000: snprintf(suffix,5,"ctds"); + break; + case 0x30000: snprintf(suffix,9,"security"); + break; + case 0x40000: snprintf(suffix,9, "unixfile"); + break; + } + } + else if (compID > LOG_PROD_PLUGINS) { + snprintf(suffix,strlen(component->name),"%s",(strrchr(component->name, '/')+1)); // given more characters than it writes + snprintf(prefix,strlen(component->name)-strlen(suffix),"%s",component->name); + } + + char *filename; + filename = strrchr(path, '/'); // returns a pointer to the last occurence of '/' + filename+=1; + // formatting + prefix + suffix + filename + line number + int locationSize = 7 + strlen(prefix) + strlen(suffix) + strlen(filename) + 5; + *locationInfo = (char*) safeMalloc(locationSize,"locationInfo"); + snprintf(*locationInfo,locationSize+1," (%s:%s,%s:%d) ",prefix,suffix,filename,line); +} + + +void _zowelog(LoggingContext *context, uint64 compID, char* path, int line, int level, char *formatString, ...){ +//void zowelog(LoggingContext *context, uint64 compID, int level, char *formatString, ...){ if (logShouldTrace(context, compID, level) == FALSE) { return; @@ -688,7 +805,7 @@ void zowelog(LoggingContext *context, uint64 compID, int level, char *formatStri /* here, pass to a var-args handler */ va_start(argPointer, formatString); - destination->handler(context,component,destination->data,formatString,argPointer); + destination->handler(context,component,path,line,level,compID,destination->data,formatString,argPointer); va_end(argPointer); } @@ -698,14 +815,16 @@ void zowelog(LoggingContext *context, uint64 compID, int level, char *formatStri static void printToDestination(LoggingDestination *destination, struct LoggingContext_tag *context, LoggingComponent *component, + char* path, int line, + int level, uint64 compID, void *data, char *formatString, ...){ va_list argPointer; va_start(argPointer, formatString); - destination->handler(context,component,destination->data,formatString,argPointer); + destination->handler(context,component,path,line,level,compID,destination->data,formatString,argPointer); va_end(argPointer); } -void zowedump(LoggingContext *context, uint64 compID, int level, void *data, int dataSize){ +void _zowedump(LoggingContext *context, uint64 compID, int level, void *data, int dataSize, char* path, int line){ if (logShouldTrace(context, compID, level) == FALSE) { return; @@ -744,9 +863,9 @@ void zowedump(LoggingContext *context, uint64 compID, int level, void *data, int char workBuffer[4096]; for (int i = 0; ; i++){ - char *result = destination->dumper(workBuffer, sizeof(workBuffer), data, dataSize, i); + char *result = destination->dumper(workBuffer, sizeof(workBuffer), data, dataSize, i, path, line); if (result != NULL){ - printToDestination(destination, context, component, destination->data, "%s\n", result); + printToDestination(destination, context, component, path, line, level, compID, destination->data, "%s\n", result); } else { break; diff --git a/h/logging.h b/h/logging.h index 69816a9f5..b4cf35021 100644 --- a/h/logging.h +++ b/h/logging.h @@ -100,11 +100,14 @@ ZOWE_PRAGMA_PACK_RESET struct LoggingContext_tag; typedef void (*LogHandler)(struct LoggingContext_tag *context, - LoggingComponent *component, + LoggingComponent *component, + char* path, int line, + int level, + uint64 compID, void *data, char *formatString, va_list argList); -typedef char *(*DataDumper)(char *workBuffer, int workBufferSize, void *data, int dataSize, int lineNumber); +typedef char *(*DataDumper)(char *workBuffer, int workBufferSize, void *data, int dataSize, int lineNumber, char* path, int line); ZOWE_PRAGMA_PACK @@ -297,15 +300,25 @@ bool logShouldTraceInternal(LoggingContext *context, uint64 componentID, int lev /* this log message will be sent to the destination associated to the component */ +void _zowelog(LoggingContext *context, uint64 compID, char* path, int line, int level, char *formatString, ...); +//void zowelog(LoggingContext *context, uint64 compID, int level, char *formatString, ...); +//void zowedump(LoggingContext *context, uint64 compID, int level, void *data, int dataSize); +void _zowedump(LoggingContext *context, uint64 compID, int level, void *data, int dataSize, char* path, int line); -void zowelog(LoggingContext *context, uint64 compID, int level, char *formatString, ...); -void zowedump(LoggingContext *context, uint64 compID, int level, void *data, int dataSize); - +char *standardDumperFunction(char *workBuffer, int workBufferSize, + void *data, int dataSize, int lineNumber, char* path, int line); #define LOGCHECK(context,component,level) \ ((component > MAX_LOGGING_COMPONENTS) ? \ (context->applicationComponents[component].level >= level) : \ (context->coreComponents[component].level >= level) ) + +#define zowelog(context, compID, level, formatString, ...) \ + _zowelog(context, compID, __FILE__, __LINE__, level, formatString, ##__VA_ARGS__); + +#define zowedump(context, compID, level, data, dataSize) \ + _zowedump(context, compID, level, data, dataSize, __FILE__, __LINE__); + LoggingDestination *logConfigureDestination(LoggingContext *context, unsigned int id, char *name, @@ -332,8 +345,8 @@ int logGetLevel(LoggingContext *context, uint64 compID); extern int logSetExternalContext(LoggingContext *context); extern LoggingContext *logGetExternalContext(); -void printStdout(LoggingContext *context, LoggingComponent *component, void *data, char *formatString, va_list argList); -void printStderr(LoggingContext *context, LoggingComponent *component, void *data, char *formatString, va_list argList); +void printStdout(LoggingContext *context, LoggingComponent *component, char* path, int line, int level, uint64 compID, void *data, char *formatString, va_list argList); +void printStderr(LoggingContext *context, LoggingComponent *component, char* path, int line, int level, uint64 compID, void *data, char *formatString, va_list argList); #endif From 6b3f1c6516357e7cc0447fcd62f3bfa6db76bfa6 Mon Sep 17 00:00:00 2001 From: sakeerthy Date: Wed, 26 Feb 2020 21:30:52 -0500 Subject: [PATCH 2/5] removed code Signed-off-by: sakeerthy --- c/logging.c | 109 ---------------------------------------------------- 1 file changed, 109 deletions(-) diff --git a/c/logging.c b/c/logging.c index 118ebf9d3..9610434c7 100644 --- a/c/logging.c +++ b/c/logging.c @@ -652,115 +652,6 @@ int logGetLevel(LoggingContext *context, uint64 compID){ return component ? component->currentDetailLevel : ZOWE_LOG_NA; } -static void getLogTimestamp(char *date) { - int64 stck = 0; - char timestamp[14]; // unformated time - uint32 out_secs = 0; - uint32 out_micros = 0; - - getSTCK(&stck); - int64 unixTime = stckToUnix(stck); // gets unixTime - stckToUnixSecondsAndMicros(stck, &out_secs, &out_micros); // calculates microseconds - out_micros = out_micros/1000; - unixToTimestamp((uint64) unixTime, timestamp); - - // format: 2019-03-19 11:23:57.776 - snprintf(date,24, "%.4s-%.2s-%.2s %.2s:%.2s:%.2s.%.3d" - ,timestamp, timestamp+4,timestamp+6,timestamp+8,timestamp+10,timestamp+12,(unsigned int) out_micros); -} - -static void getLevel(int level, char *logLevel) { - - switch(level) { - case 0: snprintf(logLevel,7,"SEVERE"); - break; - case 1: snprintf(logLevel,8,"WARN"); - break; - case 2: snprintf(logLevel,5,"INFO"); - break; - case 3: snprintf(logLevel,5,"DEBUG"); - break; - case 4: snprintf(logLevel,6,"DEBUG"); - break; - case 5: snprintf(logLevel,7,"TRACE"); - break; - } -} - -static void getLocationData(char *path, int line, char **locationInfo, uint64 compID, LoggingComponent *component) { - - char prefix[128]; - char suffix[128]; - - unsigned int id = compID & 0xFFFFFFFF; - if(compID >= LOG_PROD_COMMON && compID < LOG_PROD_ZIS) { - snprintf(prefix,5,"_zcc"); - switch (id) { // most of these don't actally log, but are defined in logging.h - case 0x10000: snprintf(suffix,6,"alloc"); - break; - case 0x20000: snprintf(suffix,6,"utils"); - break; - case 0x30000: snprintf(suffix,12,"collections"); - break; - case 0x40000: snprintf(suffix,14,"serialization"); - break; - case 0x50000: snprintf(suffix,9,"zlparser"); - break; - case 0x60000: snprintf(suffix,11,"zlcompiler"); - break; - case 0x70000: snprintf(suffix,10,"zlruntime"); - break; - case 0x80000: snprintf(suffix,8,"stcbase"); - break; - case 0x90000: snprintf(suffix,11,"httpserver"); - break; - case 0xA0000: snprintf(suffix,10,"discovery"); - break; - case 0xB0000: snprintf(suffix,12,"dataservice"); - break; - case 0xC0000: snprintf(suffix,4,"cms"); - break; - case 0xC0001: snprintf(suffix,4,"cms"); - break; - case 0xC0002: snprintf(suffix,6,"cmspc"); - break; - case 0xD0000: snprintf(suffix,4,"lpa"); - break; - case 0xE0000: snprintf(suffix,12,"restdataset"); - break; - case 0xF0000: snprintf(suffix,9,"restfile"); - break; - } - } - else if (compID >= LOG_PROD_ZIS && compID < LOG_PROD_ZSS) { - snprintf(prefix,5,"_zis"); - } - else if (compID >= LOG_PROD_ZSS && compID < LOG_PROD_PLUGINS ) { - snprintf(prefix,5,"_zss"); - switch (id) { - case 0x10000: snprintf(suffix,4,"zss"); - break; - case 0x20000: snprintf(suffix,5,"ctds"); - break; - case 0x30000: snprintf(suffix,9,"security"); - break; - case 0x40000: snprintf(suffix,9, "unixfile"); - break; - } - } - else if (compID > LOG_PROD_PLUGINS) { - snprintf(suffix,strlen(component->name),"%s",(strrchr(component->name, '/')+1)); // given more characters than it writes - snprintf(prefix,strlen(component->name)-strlen(suffix),"%s",component->name); - } - - char *filename; - filename = strrchr(path, '/'); // returns a pointer to the last occurence of '/' - filename+=1; - // formatting + prefix + suffix + filename + line number - int locationSize = 7 + strlen(prefix) + strlen(suffix) + strlen(filename) + 5; - *locationInfo = (char*) safeMalloc(locationSize,"locationInfo"); - snprintf(*locationInfo,locationSize+1," (%s:%s,%s:%d) ",prefix,suffix,filename,line); -} void _zowelog(LoggingContext *context, uint64 compID, char* path, int line, int level, char *formatString, ...){ From 98252ff85f3b217084f63ebf743064534ac3057b Mon Sep 17 00:00:00 2001 From: sakeerthy Date: Fri, 28 Feb 2020 14:31:40 -0500 Subject: [PATCH 3/5] Added constants for component names Signed-off-by: sakeerthy --- h/logging.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/h/logging.h b/h/logging.h index b4cf35021..84a43f76a 100644 --- a/h/logging.h +++ b/h/logging.h @@ -93,6 +93,23 @@ ZOWE_PRAGMA_PACK_RESET #define LOG_COMP_RESTDATASET 0x008F0001000E0000LLU #define LOG_COMP_RESTFILE 0x008F0001000F0000LLU + +#define LOG_COMP_TEXT_ALLOC "alloc" +#define LOG_COMP_TEXT_UTILS "utils" +#define LOG_COMP_TEXT_COLLECTIONS "collections" +#define LOG_COMP_TEXT_SERIALIZATION "serialization" +#define LOG_COMP_TEXT_ZLPARSER "zlparser" +#define LOG_COMP_TEXT_ZLCOMPILER "zlcompiler" +#define LOG_COMP_TEXT_ZLRUNTIME "zlruntime" +#define LOG_COMP_TEXT_STCBASE "stcbase" +#define LOG_COMP_TEXT_HTTPSERVER "httpserver" +#define LOG_COMP_TEXT_DISCOVERY "discovery" +#define LOG_COMP_TEXT_DATASERVICE "dataservice" +#define LOG_COMP_TEXT_CMS "cms" +#define LOG_COMP_TEXT_LPA "lpa" +#define LOG_COMP_TEXT_RESTDATASET "restdataset" +#define LOG_COMP_TEXT_RESTFILE "restfile" + #define LOG_DEST_DEV_NULL 0x008F0000 #define LOG_DEST_PRINTF_STDOUT 0x008F0001 #define LOG_DEST_PRINTF_STDERR 0x008F0002 From 994754bec961c074a202270855f296c6799a97e0 Mon Sep 17 00:00:00 2001 From: sakeerthy Date: Fri, 28 Feb 2020 14:47:06 -0500 Subject: [PATCH 4/5] Removed unneeded passed args Signed-off-by: sakeerthy --- c/crossmemory.c | 4 ++-- c/logging.c | 4 ++-- h/logging.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/c/crossmemory.c b/c/crossmemory.c index 87c60c3f3..260b80d0f 100644 --- a/c/crossmemory.c +++ b/c/crossmemory.c @@ -282,7 +282,7 @@ void wtoPrintf2(int consoleID, CART cart, char *formatString, ...) { } static void printWithPrefix(LoggingContext *context, LoggingComponent *component, char* path, int line, int level, uint64 compID, void *data, char *formatString, va_list argList); -static char *dumpWithEmptyMessageID(char *workBuffer, int workBufferSize, void *data, int dataSize, int lineNumber, char* path, int line); +static char *dumpWithEmptyMessageID(char *workBuffer, int workBufferSize, void *data, int dataSize, int lineNumber); void cmsInitializeLogging() { @@ -535,7 +535,7 @@ static void printWithPrefix(LoggingContext *context, LoggingComponent *component #define MESSAGE_ID_SHIFT 10 /* this is a copy of the dumper function from logging.c, it's been modified to occupy less space and print an empty message ID */ -static char *dumpWithEmptyMessageID(char *workBuffer, int workBufferSize, void *data, int dataSize, int lineNumber, char* path, int line) { +static char *dumpWithEmptyMessageID(char *workBuffer, int workBufferSize, void *data, int dataSize, int lineNumber) { int formatWidth = 16; int index = lineNumber * formatWidth; diff --git a/c/logging.c b/c/logging.c index 9610434c7..042648b3a 100644 --- a/c/logging.c +++ b/c/logging.c @@ -317,7 +317,7 @@ static void lastResortLog(char *s){ /* default dumper, based on dumpBufferToStream from utils.c */ char *standardDumperFunction(char *workBuffer, int workBufferSize, - void *data, int dataSize, int lineNumber, char* path, int line){ + void *data, int dataSize, int lineNumber){ int formatWidth = 32; int index = lineNumber * formatWidth; @@ -754,7 +754,7 @@ void _zowedump(LoggingContext *context, uint64 compID, int level, void *data, in char workBuffer[4096]; for (int i = 0; ; i++){ - char *result = destination->dumper(workBuffer, sizeof(workBuffer), data, dataSize, i, path, line); + char *result = destination->dumper(workBuffer, sizeof(workBuffer), data, dataSize, i); if (result != NULL){ printToDestination(destination, context, component, path, line, level, compID, destination->data, "%s\n", result); } diff --git a/h/logging.h b/h/logging.h index 84a43f76a..ff184c1d9 100644 --- a/h/logging.h +++ b/h/logging.h @@ -124,7 +124,7 @@ typedef void (*LogHandler)(struct LoggingContext_tag *context, void *data, char *formatString, va_list argList); -typedef char *(*DataDumper)(char *workBuffer, int workBufferSize, void *data, int dataSize, int lineNumber, char* path, int line); +typedef char *(*DataDumper)(char *workBuffer, int workBufferSize, void *data, int dataSize, int lineNumber); ZOWE_PRAGMA_PACK @@ -323,7 +323,7 @@ void _zowelog(LoggingContext *context, uint64 compID, char* path, int line, int void _zowedump(LoggingContext *context, uint64 compID, int level, void *data, int dataSize, char* path, int line); char *standardDumperFunction(char *workBuffer, int workBufferSize, - void *data, int dataSize, int lineNumber, char* path, int line); + void *data, int dataSize, int lineNumber); #define LOGCHECK(context,component,level) \ ((component > MAX_LOGGING_COMPONENTS) ? \ (context->applicationComponents[component].level >= level) : \ From e74f43c11b98e0381859152cf26362fd7e528c9c Mon Sep 17 00:00:00 2001 From: sakeerthy Date: Fri, 28 Feb 2020 15:06:55 -0500 Subject: [PATCH 5/5] Removed old zowelog/zowedump Signed-off-by: sakeerthy --- h/logging.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/h/logging.h b/h/logging.h index ff184c1d9..5c3037215 100644 --- a/h/logging.h +++ b/h/logging.h @@ -318,8 +318,6 @@ bool logShouldTraceInternal(LoggingContext *context, uint64 componentID, int lev /* this log message will be sent to the destination associated to the component */ void _zowelog(LoggingContext *context, uint64 compID, char* path, int line, int level, char *formatString, ...); -//void zowelog(LoggingContext *context, uint64 compID, int level, char *formatString, ...); -//void zowedump(LoggingContext *context, uint64 compID, int level, void *data, int dataSize); void _zowedump(LoggingContext *context, uint64 compID, int level, void *data, int dataSize, char* path, int line); char *standardDumperFunction(char *workBuffer, int workBufferSize,