ix:improve fpgametrics output readability and (#3075) (#3085)

- update fpga metrics index numbered from 1-42 (instead of 0-41) - improve fpgametrics output readability - group power and thermal sensor strings and values Signed-off-by: anandaravuri <ananda.ravuri@intel.com>
OFS · Jan 22, 2024 · 1d8da42 · 1d8da42
1 parent 41f7de6
commit 1d8da42
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/binaries/fpgametrics/fpgametrics.c b/binaries/fpgametrics/fpgametrics.c
@@ -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);
@@ -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");
 		}

diff --git a/libraries/plugins/xfpga/metrics/metrics_max10.c b/libraries/plugins/xfpga/metrics/metrics_max10.c
@@ -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);