Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes to tx2mon due to log change and other errors #1298

Merged
merged 1 commit into from
Nov 17, 2023
Merged

fixes to tx2mon due to log change and other errors #1298

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ldms/src/sampler/tx2mon/tx2mon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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]);
Expand Down