[ipbench-cvs] ipbench2/src/tests/nfs_latency/libnfs rpc.c,1.7,1.8

[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-serv5703

Modified Files:
	rpc.c 
Log Message:
Changed C style to be uniform with everywhere else;  disabled
debugging verbosity.


Index: rpc.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs/rpc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rpc.c	1 Feb 2010 23:59:52 -0000	1.7
--- rpc.c	8 Feb 2010 23:31:22 -0000	1.8
***************
*** 21,24 ****
--- 21,25 ----
  
  #define DEBUG_RPC
+ #undef DEBUG_RPC
  
  #ifdef DEBUG_RPC
***************
*** 61,70 ****
  	/* we always add the callback */
  	/* anything after here is just packet loss */
! 	if(c!=NULL){
  		xid = extract_xid(pbuf->buf);
  		callback_add(xid, *c);
  	}
  
! 	if(pbuf->pos==0)
  		return -1; /* don't send zero length rpc */
  
--- 62,71 ----
  	/* we always add the callback */
  	/* anything after here is just packet loss */
! 	if (c != NULL){
  		xid = extract_xid(pbuf->buf);
  		callback_add(xid, *c);
  	}
  
! 	if (pbuf->pos==0)
  		return -1; /* don't send zero length rpc */
  
***************
*** 73,82 ****
  	r = send(fd, pbuf->buf, pbuf->pos, 0);
  
! 	//if(r<0){
  	//	if(errno==EAGAIN){
  	//		return 0; /* sent 0 bytes successfully */
- 	//	}else{
- 	//		return -1;
  	//	}
  	//}
  
--- 74,82 ----
  	r = send(fd, pbuf->buf, pbuf->pos, 0);
  
! 	//if (r < 0) {
  	//	if(errno==EAGAIN){
  	//		return 0; /* sent 0 bytes successfully */
  	//	}
+ 	//	return -1;
  	//}
  
***************
*** 91,99 ****
  	struct callback c;
  
! 	if(timeout!=0){
  		int r;
  		struct pollfd p = {fd, POLLIN, 0};
  		r = poll(&p, 1, timeout);
! 		if(poll<=0){
  			return -1;
  		}
--- 91,99 ----
  	struct callback c;
  
! 	if (timeout != 0){
  		int r;
  		struct pollfd p = {fd, POLLIN, 0};
  		r = poll(&p, 1, timeout);
! 		if (poll <= 0) {
  			return -1;
  		}
***************
*** 108,117 ****
  	switch(x){
  	case -1:
! 		if(errno==EAGAIN){
  			return 0;
- 		}else{
- 			perror("rpc_recv(): recv failed");
- 			return -1;
  		}
  	case 0:
  		printf("rpc_recv(): remote host closed connection?\n");
--- 108,117 ----
  	switch(x){
  	case -1:
! 		if (errno == EAGAIN){
  			return 0;
  		}
+ 		perror("rpc_recv(): recv failed");
+ 		return -1;
+ 
  	case 0:
  		printf("rpc_recv(): remote host closed connection?\n");
***************
*** 123,131 ****
  	/* find and execute callback function */
  	xid = extract_xid(pbuf->buf);
! 	if(callback_del(xid, &c) < 0)
  		return -1;
  
  	/* do the callback */
! 	if(c.func!=NULL)
  		c.func(&c, pbuf);
  
--- 123,131 ----
  	/* find and execute callback function */
  	xid = extract_xid(pbuf->buf);
! 	if (callback_del(xid, &c) < 0)
  		return -1;
  
  	/* do the callback */
! 	if (c.func != NULL)
  		c.func(&c, pbuf);
  
***************
*** 155,159 ****
  
  	/* retransmit every 100ms until success */
! 	while(notify==0){
  		assert(rpc_send(snd, fd, tx)==snd->pos);
  		tx = NULL;
--- 155,159 ----
  
  	/* retransmit every 100ms until success */
! 	while (notify == 0){
  		assert(rpc_send(snd, fd, tx)==snd->pos);
  		tx = NULL;
***************
*** 161,165 ****
  	}
  
! 	assert(result==rcv);
  
  	/* parse the rpc headers */
--- 161,165 ----
  	}
  
! 	assert(result == rcv);
  
  	/* parse the rpc headers */
***************
*** 173,177 ****
  		getfrombuf(rcv, (char*) &r, sizeof(r), 1);
  
! 		if(r != MSG_ACCEPTED){
  			debug( "Message NOT accepted (%d)\n", r );
  
--- 173,177 ----
  		getfrombuf(rcv, (char*) &r, sizeof(r), 1);
  
! 		if (r != MSG_ACCEPTED) {
  			debug( "Message NOT accepted (%d)\n", r );
  
***************
*** 180,184 ****
  			debug( "Error code %d\n", r );
  
! 			if(r == 1) {
  				/* get the auth problem */
  				getfrombuf(rcv, (char*) &r, sizeof(r), 1);
--- 180,184 ----
  			debug( "Error code %d\n", r );
  
! 			if (r == 1) {
  				/* get the auth problem */
  				getfrombuf(rcv, (char*) &r, sizeof(r), 1);
***************
*** 197,201 ****
  		getfrombuf(rcv, (char*) &r, sizeof(r), 1);
  
! 		if( r != SUCCESS ){
  			debug("reply stat was %d\n", r);
  			return 0;
--- 197,201 ----
  		getfrombuf(rcv, (char*) &r, sizeof(r), 1);
  
! 		if (r != SUCCESS) {
  			debug("reply stat was %d\n", r);
  			return 0;