[ipbench-cvs] ipbench2/src/tests/nfs_latency nfs_glue.c,1.1,1.2 nfs_latency.c,1.3,1.4

[Luke M. <lu...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/nfs_latency
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9702

Modified Files:
	nfs_glue.c nfs_latency.c 
Log Message:
simple test loop, change rpc_send semantics 


Index: nfs_latency.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/nfs_latency.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nfs_latency.c	23 Jun 2005 04:27:33 -0000	1.3
--- nfs_latency.c	27 Jun 2005 04:23:22 -0000	1.4
***************
*** 24,28 ****
  }
  
! int nfs_latency_setup_controller(char *arg)
  {
  	dbprintf("nfs_latency_setup_controller - %s\n", arg);
--- 24,29 ----
  }
  
! int
! nfs_latency_setup_controller(char *arg)
  {
  	dbprintf("nfs_latency_setup_controller - %s\n", arg);
***************
*** 38,49 ****
  nfs_latency_start (struct timeval *start)
  {
! 	dbprintf("DUMMY START\n");
  	gettimeofday(start, NULL);
  
! 	/* put test here */
! 	dbprintf("Running test (sleep 5)\n");
! 	sleep(5);
! 	dbprintf("Test done!\n");
  
  	return 0;
  }
--- 39,60 ----
  nfs_latency_start (struct timeval *start)
  {
! 	int samples=0;
! 	int target=1000;
! 	int r;
! 	uint64_t now, then, delta;
! 
! 	dbprintf("NFS_LATENCY START\n");
  	gettimeofday(start, NULL);
+ 	dbprintf("NFS latency start,\n");
  
! 	while(samples<target){
! 		now = time_stamp();
! 		r = generate_request(now);
! 		r = process_reply(&then);
! 		delta = now - then;
! 		dbprintf("delta = %ld\n", delta);
! 	}
  
+ 	dbprintf("NFS latency test complete.\n");
  	return 0;
  }
***************
*** 57,61 ****
  {
  	gettimeofday (stop, NULL);
! 	dbprintf ("DUMMY STOP\n");
  	return 0;
  }
--- 68,72 ----
  {
  	gettimeofday (stop, NULL);
! 	dbprintf ("NFS_LATENCY STOP\n");
  	return 0;
  }
***************
*** 75,82 ****
  nfs_latency_marshall (char **data, int * size, double running_time)
  {
! 	char *ok_string = "You have successfully called the dummy test!";
! 	char *not_ok_string = "You have unsuccessfully called the dummy test!\n";
  
! 	dbprintf("DUMMY MARSHALL\n");
  
  	/* We randomly fail this */
--- 86,93 ----
  nfs_latency_marshall (char **data, int * size, double running_time)
  {
! 	char *ok_string = "You have successfully called the nfs_latency test!";
! 	char *not_ok_string = "You have unsuccessfully called the nfs_latency test!\n";
  
! 	dbprintf("NFS_LATENCY MARSHALL\n");
  
  	/* We randomly fail this */
***************
*** 106,110 ****
  nfs_latency_marshall_cleanup(char **data)
  {
! 	dbprintf("DUMMY CLEANUP MARSHALL\n");
  }
  
--- 117,121 ----
  nfs_latency_marshall_cleanup(char **data)
  {
! 	dbprintf("NFS_LATENCY CLEANUP MARSHALL\n");
  }
  
***************
*** 156,160 ****
  {
  	int i, ret = 0;
! 	dbprintf("DUMMY OUTPUT (nelem %d)\n", nelem);
  	for (i = 0; i < nelem; i++) {
  		if (!data[i].valid) {
--- 167,171 ----
  {
  	int i, ret = 0;
! 	dbprintf("NFS_LATENCY OUTPUT (nelem %d)\n", nelem);
  	for (i = 0; i < nelem; i++) {
  		if (!data[i].valid) {
***************
*** 162,168 ****
  			ret = 1;
  		}
! 		printf ("DUMMY RETURNED: %s\n", (char *)data[i].data);
  	}
! 	dbprintf ("DUMMY DONE\n");
  	return ret;
  }
--- 173,179 ----
  			ret = 1;
  		}
! 		printf ("NFS_LATENCY RETURNED: %s\n", (char*)data[i].data);
  	}
! 	dbprintf ("NFS_LATENCY DONE\n");
  	return ret;
  }

Index: nfs_glue.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/nfs_glue.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nfs_glue.c	23 Jun 2005 04:27:33 -0000	1.1
--- nfs_glue.c	27 Jun 2005 04:23:22 -0000	1.2
***************
*** 110,114 ****
   */
  static int
! generate_read_request(){
  	struct pbuf pbuf;
  	struct callback c;
--- 110,114 ----
   */
  static int
! generate_read_request(uint64_t timestamp){
  	struct pbuf pbuf;
  	struct callback c;
***************
*** 117,121 ****
  	/* set up callback */
  	c.func = read_callback;
! 	c.param.time.timestamp = time_stamp();
  
  	/* set up buffer */
--- 117,121 ----
  	/* set up callback */
  	c.func = read_callback;
! 	c.param.time.timestamp = timestamp;
  
  	/* set up buffer */
***************
*** 136,142 ****
   */
  int
! generate_request(){
  	assert(initialised==1);
! 	return generate_read_request();
  }
  
--- 136,142 ----
   */
  int
! generate_request(uint64_t timestamp){
  	assert(initialised==1);
! 	return generate_read_request(timestamp);
  }