[ipbench-cvs] ipbench2/src/tests/nfs_latency/libnfs nfs.c, 1.4, 1.5 nfsrpc.h, 1.1, 1.2

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

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

Modified Files:
	nfs.c nfsrpc.h 
Log Message:
added standard deviation, and absulte deviation from median stats

Index: nfsrpc.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs/nfsrpc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nfsrpc.h	21 Jun 2005 02:57:38 -0000	1.1
--- nfsrpc.h	12 Mar 2010 03:03:47 -0000	1.2
***************
*** 268,281 ****
  
  struct nfs_filename {
- 	
  	int             size;
! 	               
! 	                const char *file;
! 	               
  };
  
  
  #define COOKIE_START 0
- 
  typedef int     nfscookie_t;
  
--- 268,277 ----
  
  struct nfs_filename {
  	int             size;
!         const char *file;
  };
  
  
  #define COOKIE_START 0
  typedef int     nfscookie_t;
  
***************
*** 284,295 ****
  typedef struct readdirargs 
  {
- 	
  	struct cookie   dir;
! 	               
! 	                nfscookie_t cookie;
! 	               
  	unsigned int    count;
! 	               
! }               readdirargs_t;
  
  
--- 280,287 ----
  typedef struct readdirargs 
  {
  	struct cookie   dir;
!         nfscookie_t cookie;
  	unsigned int    count;
! } readdirargs_t;
  
  
***************
*** 311,316 ****
   struct 
   {
!  fhandle
!  * file;
   fattr   attributes;
   } diropok;
--- 303,307 ----
   struct 
   {
!  fhandle  * file;
   fattr   attributes;
   } diropok;
***************
*** 323,327 ****
  typedef enum ftype 
  {
- 	
  	NFNON = 0, 
  	NFREG = 1, 
--- 314,317 ----
***************
*** 391,405 ****
  typedef struct readargs 
  {
- 	
  	struct cookie   file;
- 	               
  	unsigned        offset;
- 	               
  	unsigned        count;
- 	               
  	unsigned        totalcount;
! 	               
! 	               
! }               readargs_t;
  
  
--- 381,389 ----
  typedef struct readargs 
  {
  	struct cookie   file;
  	unsigned        offset;
  	unsigned        count;
  	unsigned        totalcount;
! } readargs_t;
  
  
***************
*** 408,416 ****
   union readres switch (stat status)
   {
!  case NFS_OK:
!  fattr attributes;
!  * fsdata data;
!  default:
!  void;
   };
   */ 
--- 392,400 ----
   union readres switch (stat status)
   {
! 	case NFS_OK:
! 		 fattr attributes;
! 		 * fsdata data;
! 		 default:
! 		 void;
   };
   */ 
***************
*** 422,438 ****
  typedef struct writeargs 
  {
- 	
  	struct cookie   file;
- 	               
  	int             beginoffset;
- 	               
  	int             offset;
- 	               
  	int             totalcount;
- 	               
- 	               
  	 /* nfsdata data; */ 
! }               writeargs_t;
! 
  
   /* attrstat NFSPROC_WRITE(writeargs) = 8; */ 
--- 406,415 ----
  typedef struct writeargs 
  {
  	struct cookie   file;
  	int             beginoffset;
  	int             offset;
  	int             totalcount;
  	 /* nfsdata data; */ 
! } writeargs_t;
  
   /* attrstat NFSPROC_WRITE(writeargs) = 8; */ 

Index: nfs.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs/nfs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** nfs.c	10 Feb 2010 01:35:57 -0000	1.4
--- nfs.c	12 Mar 2010 03:03:47 -0000	1.5
***************
*** 48,51 ****
--- 48,52 ----
  
  	if ((nfs_fd = socket(PF_INET, SOCK_DGRAM, 0)) < 0) {
+ 	        dbprintf("socket failed: %s\n", strerror(errno));
  		return -1;
  	}
***************
*** 54,57 ****
--- 55,60 ----
  	if (connect(nfs_fd, (struct sockaddr *) & s,
  		    sizeof(struct sockaddr_in)) < 0) {
+ 	        dbprintf("connect failed: %s\n", strerror(errno));
+ 
  		close(nfs_fd);
  		return -1;