[netperf-dev] netperf2 commit notice r489 - in trunk: . src

[raj at netperf.org]

Author: raj
Date: 2011-09-13 13:32:39 -0700 (Tue, 13 Sep 2011)
New Revision: 489

Modified:
   trunk/Release_Notes
   trunk/src/net_uuid.c
   trunk/src/netdrv_ethtool.c
   trunk/src/netslot_linux.c
Log:
plug a few more file descriptor leaks

Modified: trunk/Release_Notes
===================================================================
--- trunk/Release_Notes	2011-09-13 20:11:13 UTC (rev 488)
+++ trunk/Release_Notes	2011-09-13 20:32:39 UTC (rev 489)
@@ -1,5 +1,8 @@
 These are the Release Notes for post Revision 2.5.0 top-of-trunk netperf:
 
+*) Stop leaking file descriptors when looking-up probable egress
+   interface names and I/O slot numbers.
+
 *) The global -Y option can be used to set IP_TOS on those platforms
    which support it.  Since this is specific to IP (v4 or v6) it may
    move to a test-specific otion in the future.  It is presently

Modified: trunk/src/net_uuid.c
===================================================================
--- trunk/src/net_uuid.c	2011-09-13 20:11:13 UTC (rev 488)
+++ trunk/src/net_uuid.c	2011-09-13 20:32:39 UTC (rev 489)
@@ -155,6 +155,7 @@
 
   if (NULL != fp) {
     fread(seed,sizeof(seed),1,fp);
+    fclose(fp);
     return;
   }
 

Modified: trunk/src/netdrv_ethtool.c
===================================================================
--- trunk/src/netdrv_ethtool.c	2011-09-13 20:11:13 UTC (rev 488)
+++ trunk/src/netdrv_ethtool.c	2011-09-13 20:32:39 UTC (rev 489)
@@ -81,6 +81,7 @@
     version[len-1] = 0;
     firmware[len-1] = 0;
     bus[len-1] = 0;
+    close(s);
     return;
   }
   strncpy(driver,drvinfo.driver,len);
@@ -91,7 +92,9 @@
   version[len-1] = 0;
   firmware[len-1] = 0;
   bus[len-1] = 0;
-  
+
+  close(s);
+
   return;
 }
 
@@ -108,7 +111,7 @@
     fprintf(stderr,"%s <interface>\n",argv[0]);
     return -1;
   }
-
+p
   find_driver_info(argv[1],driver, version, firmware, businfo, 32);
 
   printf("For %s driver %s version %s firmware %s businfo %s\n",

Modified: trunk/src/netslot_linux.c
===================================================================
--- trunk/src/netslot_linux.c	2011-09-13 20:11:13 UTC (rev 488)
+++ trunk/src/netslot_linux.c	2011-09-13 20:32:39 UTC (rev 489)
@@ -122,10 +122,14 @@
   if (valfile == NULL) return -1;
 
   ret = fread(buffer,1,sizeof(buffer), valfile);
-  if (ret != sizeof(buffer)) return -1;
+  if (ret != sizeof(buffer)) {
+    fclose(valfile);
+    return -1;
+  }
 
   ret = (int)strtol(buffer,NULL,0);
 
+  fclose(valfile);
   return ret;
   
 }