pmdainfiniband: remove a leftover diagnostic, fix indendation

Author: natoscott

qa/1996.out

@@ -3,7 +3,6 @@ QA output created by 1996
 == Testing InfiniBand PMDA with mock libraries - ib-root-001.tgz ==
 
 === HCA (Host Channel Adapter) metrics ===
-pminfo[PID] Info: mthca0
 pminfo[PID] Info: No IB ports found to monitor
 
 infiniband.hca.numports PMID: 91.0.2 [Number of ports on HCA]
@@ -19,7 +18,6 @@ Help:
 Number of protection domains currently allocated on this HCA.
 
 === Port state metrics ===
-pminfo[PID] Info: mthca0
 pminfo[PID] Info: No IB ports found to monitor
 
 infiniband.port.state PMID: 91.0.10 [Port's state]
@@ -29,7 +27,6 @@ Help:
 Port's state - can be Active, Down, NoChange, Armed or Initialize
 
 === Port performance counters ===
-pminfo[PID] Info: mthca0
 pminfo[PID] Info: No IB ports found to monitor
 
 infiniband.port.in.bytes PMID: 91.1.0 [Bytes received]
@@ -59,7 +56,6 @@ counter. When a value of saturated counter reaches predefined threshold,
 the counter is reset after its value is copied into internal state.
 
 === Sysfs-based metrics ===
-pminfo[PID] Info: mthca0
 pminfo[PID] Info: No IB ports found to monitor
 
 infiniband.hca.board_id PMID: 91.0.17 [HCA board identifier]
@@ -80,7 +76,6 @@ Text description of the node this port belongs to.
 == Testing InfiniBand PMDA with mock libraries - ib-root-002.tgz ==
 
 === HCA (Host Channel Adapter) metrics ===
-pminfo[PID] Info: mthca0
 pminfo[PID] Info: No IB ports found to monitor
 
 infiniband.hca.numports PMID: 91.0.2 [Number of ports on HCA]
@@ -96,7 +91,6 @@ Help:
 Number of protection domains currently allocated on this HCA.
 
 === Port state metrics ===
-pminfo[PID] Info: mthca0
 pminfo[PID] Info: No IB ports found to monitor
 
 infiniband.port.state PMID: 91.0.10 [Port's state]
@@ -106,7 +100,6 @@ Help:
 Port's state - can be Active, Down, NoChange, Armed or Initialize
 
 === Port performance counters ===
-pminfo[PID] Info: mthca0
 pminfo[PID] Info: No IB ports found to monitor
 
 infiniband.port.in.bytes PMID: 91.1.0 [Bytes received]
@@ -136,7 +129,6 @@ counter. When a value of saturated counter reaches predefined threshold,
 the counter is reset after its value is copied into internal state.
 
 === Sysfs-based metrics ===
-pminfo[PID] Info: mthca0
 pminfo[PID] Info: No IB ports found to monitor
 
 infiniband.hca.board_id PMID: 91.0.17 [HCA board identifier]

src/pmdas/infiniband/ib.c

@@ -391,25 +391,24 @@ ib_load_config(const char *cp, int writeconf, pmdaIndom *itab, unsigned int nind
     /* else no config file: Just monitor local ports */
 
     for (i=0; i < n; i++) {
-		print(hcas[i]);
-		if (umad_get_ca(hcas[i], &st[i].ca) == 0) {
-			int e = pmdaCacheStore(itab[IB_HCA_INDOM].it_indom, PMDA_CACHE_ADD,
-						st[i].ca.ca_name, &st[i].ca);
-
-			if (e < 0) {
-				pmNotifyErr(LOG_ERR, 
-					"Cannot add instance for %s to the cache - %s\n",
-					st[i].ca.ca_name, pmErrStr(e));
-				continue;
-			}
+	if (umad_get_ca(hcas[i], &st[i].ca) == 0) {
+	    sts = pmdaCacheStore(itab[IB_HCA_INDOM].it_indom, PMDA_CACHE_ADD,
+					st[i].ca.ca_name, &st[i].ca);
+
+	    if (sts < 0) {
+		pmNotifyErr(LOG_ERR, 
+			"Cannot add instance for %s to the cache - %s\n",
+			st[i].ca.ca_name, pmErrStr(sts));
+		continue;
+	    }
 
-			foreachport(st+i, openumadport, NULL);
-			if (fconf == NULL)
-			/* No config file - monitor local ports */
-			foreachport(st+i, monitorport, itab);
-			if (writeconf)
-			foreachport(st+i, printportconfig, fconf);
-		}
+	    foreachport(st+i, openumadport, NULL);
+	    if (fconf == NULL)
+		/* No config file - monitor local ports */
+		foreachport(st+i, monitorport, itab);
+	    if (writeconf)
+		foreachport(st+i, printportconfig, fconf);
+	}
     }
 
     if (fconf) {
@@ -441,7 +440,6 @@ ib_load_config(const char *cp, int writeconf, pmdaIndom *itab, unsigned int nind
     for (i=0; i < ARRAYSZ(mad_cnt_descriptors); i++) {
 	itab[IB_CNT_INDOM].it_set[i].i_inst = i;
 	itab[IB_CNT_INDOM].it_set[i].i_name = mad_cnt_descriptors[i].name;
-
     }
 
     return 0;
@@ -591,13 +589,13 @@ char* read_sysfs_file(const char* filename)
     FILE *file;
     char *buffer = NULL;
     size_t total_size = 0;
-    size_t buffer_size = 0;
-	const size_t CHUNK_SIZE = 256;
+    size_t buffer_size;
+    const size_t CHUNK_SIZE = 256;
     char chunk[CHUNK_SIZE];
 
     file = fopen(filename, "r");
     if (file == NULL) {
-        pmNotifyErr(LOG_INFO, "Failed to open file");
+        pmNotifyErr(LOG_INFO, "Failed to open file: %s", filename);
         return NULL;
     }
 
@@ -631,7 +629,7 @@ char* read_sysfs_file(const char* filename)
     buffer[total_size] = '\0';
 
     if (ferror(file)) {
-        pmNotifyErr(LOG_INFO, "Error reading file");
+        pmNotifyErr(LOG_INFO, "Error reading sysfs file");
         free(buffer);
         buffer = NULL;
     }