From 5ec927b448f1198eab66879468ac27a5b6594b5e Mon Sep 17 00:00:00 2001 From: Ann Gentile Date: Thu, 16 Nov 2023 20:52:54 -0700 Subject: [PATCH] fixes to tx2mon due to log change and other errors --- ldms/src/sampler/tx2mon/tx2mon.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ldms/src/sampler/tx2mon/tx2mon.c b/ldms/src/sampler/tx2mon/tx2mon.c index 4c67e1ece..d432c52f2 100644 --- a/ldms/src/sampler/tx2mon/tx2mon.c +++ b/ldms/src/sampler/tx2mon/tx2mon.c @@ -311,7 +311,7 @@ static bool get_bool(const char *val, char *name) return false; default: ovis_log(mylog, OVIS_LERROR, "%s: bad bool value %s for %s\n", - val, name); + SAMP, val, name); return false; } } @@ -361,7 +361,7 @@ static int create_metric_set(base_data_t base) mcprc = parse_mc_oper_region(); if (mcprc != 0) { ovis_log(mylog, OVIS_LERROR, "unable to read the node file for the sample (%s)\n", - pids, STRERROR(mcprc)); + STRERROR(mcprc)); return mcprc; } @@ -414,7 +414,7 @@ static int create_metric_set(base_data_t base) ldms_set_delete(base->set); base->set = NULL; errno = rc; - base->log(OVIS_LERROR,"base_set_new: ldms_set_publish failed for %s\n", + ovis_log(mylog, OVIS_LERROR, SAMP ": ldms_set_publish failed for %s\n", base->instance_name); return EINVAL; } @@ -913,8 +913,8 @@ static int parse_mc_oper_region() tx2mon->cpu[i].node = i; tx2mon->cpu[i].fd = open(filename, O_RDONLY); if (tx2mon->cpu[i].fd < 0) { - ovis_log(mylog, OVIS_LERROR, "Error reading node%i entry.\n", i); - ovis_log(mylog, OVIS_LERROR, "Is tx2mon_kmod in the kernel?\n", i); + ovis_log(mylog, OVIS_LERROR, "Error reading node%d entry.\n", i); + ovis_log(mylog, OVIS_LERROR, "Is tx2mon_kmod in the kernel (node%d)?\n", i); return errno; } ret = tx2mon_read_node(&tx2mon->cpu[i]);