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

Jump to bottom

fix:improve fpgametrics output readability and #3075

Merged
merged 2 commits into from Jan 17, 2024
Merged

fix:improve fpgametrics output readability and #3075

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f70cc8e
ix:improve fpgametrics output readability and
anandaravuri Jan 12, 2024
4fd3d5b
Merge branch 'master' into aravuri/fix_fpgamatrics
anandaravuri Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 15 additions & 16 deletions binaries/fpgametrics/fpgametrics.c
View file
Open in desktop
Expand Up @@ -254,14 +254,13 @@ int main(int argc, char *argv[])
}

printf("---------------------------------------------------------------------------------------------------\n");
printf("metric_num qualifier_name group_name metric_name metric_units\n");
printf("%-11s | %-19s | %-50s | %-5s \n", "metric_num", "group_name", "metric_name", "metric_units");
printf("---------------------------------------------------------------------------------------------------\n");

for (i = 0; i < num_metrics; i++) {

printf("%-3ld | %-30s | %-15s | %-30s | %-10s \n",
metric_info[i].metric_num,
metric_info[i].qualifier_name,
printf("%-10ld | %-20s | %-50s | %-1s \n",
metric_info[i].metric_num + 1,
metric_info[i].group_name,
metric_info[i].metric_name,
metric_info[i].metric_units);
Expand All @@ -279,36 +278,36 @@ int main(int argc, char *argv[])
ON_ERR_GOTO(res, out_close, "get num of metrics value by index");

printf("\n\n\n");
printf("-------------------------------------------------------------------------------------------------\n ");
printf(" metric_num qualifier_name metric_name value \n ");
printf("-------------------------------------------------------------------------------------------------\n ");
printf("-------------------------------------------------------------------------------------------------\n");
printf("%-11s | %-19s | %-50s | %-20s \n", "metric_num", "group_name", "metric_name", "value");
printf("-------------------------------------------------------------------------------------------------\n");

for (i = 0; i < num_metrics; i++) {

uint64_t num = metric_array[i].metric_num;
if (metric_info[num].metric_datatype == FPGA_METRIC_DATATYPE_INT &&
metric_array[i].isvalid) {

printf("%-20ld | %-30s | %-25s | %ld %-20s \n ",
metric_info[num].metric_num,
metric_info[num].qualifier_name,
printf("%-10ld | %-19s | %-50s | %ld %-20s \n",
metric_info[num].metric_num +1,
metric_info[i].group_name,
metric_info[num].metric_name,
metric_array[i].value.ivalue,
metric_info[num].metric_units);
} else if (metric_info[num].metric_datatype == FPGA_METRIC_DATATYPE_DOUBLE &&
metric_array[i].isvalid) {

printf("%-20ld | %-30s | %-25s | %0.2f %-20s \n ",
metric_info[num].metric_num,
metric_info[num].qualifier_name,
printf("%-10ld | %-19s | %-50s | %0.2f %-20s \n",
metric_info[num].metric_num + 1,
metric_info[i].group_name,
metric_info[num].metric_name,
metric_array[i].value.dvalue,
metric_info[num].metric_units);
} else {

printf("%-20ld | %-30s | %-25s | %s \n ",
metric_info[num].metric_num,
metric_info[num].qualifier_name,
printf("%-10ld | %-19s | %-50s | %s \n",
metric_info[num].metric_num + 1,
metric_info[i].group_name,
metric_info[num].metric_name,
"Fails to read metric value");
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/plugins/xfpga/metrics/metrics_max10.c
View file
Open in desktop
Expand Up @@ -217,7 +217,7 @@ fpga_result dfl_enum_max10_metrics_info_pattern(struct _fpga_handle *_handle,
}
strncat(sysfspath, DFL_MAX10_SYSFS_LABEL, strlen(DFL_MAX10_SYSFS_LABEL) + 1);

gres = opae_glob(sysfspath, GLOB_NOSORT, NULL, &pglob);
gres = opae_glob(sysfspath, 0, NULL, &pglob);
if (gres) {
OPAE_ERR("Failed pattern match %s: %s", sysfspath, strerror(errno));
opae_globfree(&pglob);
Expand Down