[ipbench-cvs] ipbench2/src/tests/nfs_latency nfs_latency.c, 1.16, 1.17 nfs_glue.h, 1.1, 1.2 nfs_glue.c, 1.9, 1.10

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/nfs_latency
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22962/src/tests/nfs_latency

Modified Files:
	nfs_latency.c nfs_glue.h nfs_glue.c 
Log Message:
Get rid of some fd leaks.


Index: nfs_latency.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/nfs_latency.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** nfs_latency.c	10 Feb 2010 00:55:34 -0000	1.16
--- nfs_latency.c	10 Feb 2010 01:35:57 -0000	1.17
***************
*** 225,228 ****
--- 225,229 ----
  	gettimeofday (stop, NULL);
  	dbprintf ("NFS_LATENCY STOP\n");
+ 	nfs_lat_cleanup();
  	return 0;
  }

Index: nfs_glue.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/nfs_glue.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nfs_glue.h	23 Jun 2005 04:27:33 -0000	1.1
--- nfs_glue.h	10 Feb 2010 01:35:57 -0000	1.2
***************
*** 2,3 ****
--- 2,4 ----
  int generate_request();
  int process_reply(uint64_t *timestamp);
+ void nfs_lat_cleanup(void);

Index: nfs_glue.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/nfs_glue.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** nfs_glue.c	10 Feb 2010 01:04:15 -0000	1.9
--- nfs_glue.c	10 Feb 2010 01:35:57 -0000	1.10
***************
*** 281,284 ****
--- 281,287 ----
  		microuptime_calibrate();
  		calibrated = 1;
+ 
+ 		/* XXX these should be dynamically controlled */
+ 		callback_init(10,100000);
  	}
  
***************
*** 288,293 ****
  	}
  
- 	/* XXX these should be dynamically controlled */
- 	callback_init(10,100000);
  
  	map_init(&addr);
--- 291,294 ----
***************
*** 302,305 ****
--- 303,307 ----
  	recursive_lookup(&pfh, filename, open_cb, 0);
  
+ 	initialised = 0;
  	while (initialised == 0){
  		struct pbuf buf;
***************
*** 315,316 ****
--- 317,326 ----
  	return 0;
  }
+ 
+ void
+ nfs_lat_cleanup(void)
+ {
+ 	nfs_cleanup();
+ 	mnt_cleanup();
+ 	map_cleanup();
+ }