ipbench-cvs — cvs commits

[ipbench-cvs] ipbench2/src/tests/cpu_target_lukem cpu_target_lukem.c,1.8,1.9

[Ian W. <del...@us...>]

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

Modified Files:
	cpu_target_lukem.c 
Log Message:
the freebsd pthreads implemenation has deadlock detection code that disables us using multiple locks


Index: cpu_target_lukem.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/cpu_target_lukem/cpu_target_lukem.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cpu_target_lukem.c	23 Feb 2005 02:45:31 -0000	1.8
--- cpu_target_lukem.c	23 Feb 2005 05:56:13 -0000	1.9
***************
*** 21,28 ****
  /* handle for the idle thread */
  static pthread_t ithr;
- static pthread_mutex_t thelock = PTHREAD_MUTEX_INITIALIZER;
  /* when we flip this, we stop calculating */
  static int calc = 1;
  
  void *idle_thread(void *arg)
  {
--- 21,29 ----
  /* handle for the idle thread */
  static pthread_t ithr;
  /* when we flip this, we stop calculating */
  static int calc = 1;
  
+ volatile static int running = 1;
+ 
  void *idle_thread(void *arg)
  {
***************
*** 103,110 ****
  			return -1;
  
- 	pthread_mutex_lock(&thelock);
  	/* create the idle thread */
  	pthread_create(&ithr, NULL, idle_thread, NULL);
! 	
  	return 0;
  }
--- 104,110 ----
  			return -1;
  
  	/* create the idle thread */
  	pthread_create(&ithr, NULL, idle_thread, NULL);
! 
  	return 0;
  }
***************
*** 113,119 ****
  cpu_target_lukem_start(struct timeval *start)
  {
  	gettimeofday(start, NULL);
  	dbprintf("Starting.\n");
! 	pthread_mutex_lock(&thelock);
  	dbprintf("Complete.\n");
  	return 0;
--- 113,121 ----
  cpu_target_lukem_start(struct timeval *start)
  {
+ 	int i;
  	gettimeofday(start, NULL);
  	dbprintf("Starting.\n");
! 	while (running);
! 		sleep(1);
  	dbprintf("Complete.\n");
  	return 0;
***************
*** 125,130 ****
  	gettimeofday(stop, NULL);
  	calc = 0;
  	dbprintf("Stopping.\n");
- 	pthread_mutex_unlock(&thelock);
  	return 0;
  }
--- 127,132 ----
  	gettimeofday(stop, NULL);
  	calc = 0;
+ 	running = 0;
  	dbprintf("Stopping.\n");
  	return 0;
  }

[ipbench-cvs] ipbench2/src/tests/wait wait.c,1.4,1.5

[Ian W. <del...@us...>]

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

Modified Files:
	wait.c 
Log Message:
pass an OK argument


Index: wait.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wait/wait.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wait.c	23 Feb 2005 01:17:04 -0000	1.4
--- wait.c	23 Feb 2005 02:45:49 -0000	1.5
***************
*** 44,49 ****
  wait_marshall (char **data, int * size, double running_time)
  {
! 	*size = strlen("OK");
! 	*data = "OK";
  	return 0;
  }
--- 44,51 ----
  wait_marshall (char **data, int * size, double running_time)
  {
! 	char *str = malloc(strlen("OK")+1);
! 	*size = strlen("OK") + 1;
! 	strcpy(str, "OK");
! 	*data = str;
  	return 0;
  }
***************
*** 52,56 ****
  wait_marshall_cleanup(char **data)
  {
! 	return;
  }
  
--- 54,58 ----
  wait_marshall_cleanup(char **data)
  {
! 	free(*data);
  }
  
***************
*** 59,64 ****
  		  int * data_len)
  {
! 	*data = "OK";
! 	*data_len = strlen("OK");
  	return 0;
  }
--- 61,67 ----
  		  int * data_len)
  {
! 	*data = malloc(input_len);
! 	memcpy(*data, input, input_len);
! 	*data_len = input_len;
  	return 0;
  }
***************
*** 73,76 ****
--- 76,80 ----
  wait_output(struct client_data data[], int nelem)
  {
+ 	printf("%s\n", data[0].data);
  	return 0;
  }

[ipbench-cvs] ipbench2/src/tests/cpu_target_lukem cpu_target_lukem.c,1.7,1.8

[Ian W. <del...@us...>]

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

Modified Files:
	cpu_target_lukem.c 
Log Message:
fix to work on amd 64


Index: cpu_target_lukem.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/cpu_target_lukem/cpu_target_lukem.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cpu_target_lukem.c	23 Feb 2005 01:17:03 -0000	1.7
--- cpu_target_lukem.c	23 Feb 2005 02:45:31 -0000	1.8
***************
*** 21,25 ****
  /* handle for the idle thread */
  static pthread_t ithr;
! 
  /* when we flip this, we stop calculating */
  static int calc = 1;
--- 21,25 ----
  /* handle for the idle thread */
  static pthread_t ithr;
! static pthread_mutex_t thelock = PTHREAD_MUTEX_INITIALIZER;
  /* when we flip this, we stop calculating */
  static int calc = 1;
***************
*** 103,106 ****
--- 103,107 ----
  			return -1;
  
+ 	pthread_mutex_lock(&thelock);
  	/* create the idle thread */
  	pthread_create(&ithr, NULL, idle_thread, NULL);
***************
*** 114,118 ****
  	gettimeofday(start, NULL);
  	dbprintf("Starting.\n");
! 	pthread_join(ithr, NULL);
  	dbprintf("Complete.\n");
  	return 0;
--- 115,119 ----
  	gettimeofday(start, NULL);
  	dbprintf("Starting.\n");
! 	pthread_mutex_lock(&thelock);
  	dbprintf("Complete.\n");
  	return 0;
***************
*** 125,128 ****
--- 126,130 ----
  	calc = 0;
  	dbprintf("Stopping.\n");
+ 	pthread_mutex_unlock(&thelock);
  	return 0;
  }
***************
*** 131,135 ****
  cpu_target_lukem_marshall(char **data, int *size, double running_time)
  {
! 	char *buf = malloc(BUFSIZ);
  	snprintf(buf, BUFSIZ, "%.1f\n", (1.f - 
  		((double)timer_buffer.idle/(double)timer_buffer.total)) 
--- 133,137 ----
  cpu_target_lukem_marshall(char **data, int *size, double running_time)
  {
! 	char buf[BUFSIZ];
  	snprintf(buf, BUFSIZ, "%.1f\n", (1.f - 
  		((double)timer_buffer.idle/(double)timer_buffer.total)) 
***************
*** 138,142 ****
  	dbprintf("Average CPU time is %s\n", buf );
  
! 	data = &buf;
  	*size = strlen(buf) + 1;
  
--- 140,145 ----
  	dbprintf("Average CPU time is %s\n", buf );
  
! 	*data = malloc(strlen(buf)+1);
! 	memcpy(*data, buf, strlen(buf)+1);
  	*size = strlen(buf) + 1;
  
***************
*** 144,153 ****
  }
  
- 
  void
  cpu_target_lukem_marshall_cleanup(char **data)
  {
  	free(*data);
- 	/* nothing */
  }
  
--- 147,154 ----

[ipbench-cvs] ipbench2/src ipbenchd.py,1.27,1.28

[Ian W. <del...@us...>]

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

Modified Files:
	ipbenchd.py 
Log Message:
move resuse socket to exendend from SocketServer class


Index: ipbenchd.py
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/ipbenchd.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ipbenchd.py	18 Feb 2005 02:44:58 -0000	1.27
--- ipbenchd.py	23 Feb 2005 02:44:49 -0000	1.28
***************
*** 439,443 ****
  ##
  class IpbenchRequestHandler(SocketServer.StreamRequestHandler):
-     allow_resue_addr = True
  
      def handle(self):
--- 439,442 ----
***************
*** 473,476 ****
--- 472,477 ----
  
  class IpbenchClientServer(SocketServer.ForkingMixIn,SocketServer.TCPServer):
+     allow_resue_addr = True
+ 
      def handle_error(self, request, client_address):
          """Handle an error gracefully.  Overrides standard method.

[ipbench-cvs] ipbench2/src plugin.h,1.15,1.16

[Ian W. <del...@us...>]

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

Modified Files:
	plugin.h 
Log Message:
convert void* to char* to fit in with python

Index: plugin.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/plugin.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** plugin.h	23 Feb 2005 00:38:28 -0000	1.15
--- plugin.h	23 Feb 2005 01:17:03 -0000	1.16
***************
*** 23,31 ****
  
  
! /* The data a client returns.  Note that size is an "int" rather than
!  * a "size_t" because that's what Python takes as a length argument */
  struct client_data
  {
! 	void *data;   // data from the client
  	int size;     // length of data
  	int valid;    // is this valid?
--- 23,32 ----
  
  
! /* The data a client returns.  Note that we use a char* and size is an
!  * "int" rather than a "size_t" because that's what Python takes as
!  * arguments. */
  struct client_data
  {
! 	char *data;   // data from the client
  	int size;     // length of data
  	int valid;    // is this valid?
***************
*** 62,72 ****
             running_time will be passed to the test as the difference between
             start and stop above */
! 	int (*marshall)(void **data, int *size, double running_time);
  	/* clean up after marshalling (get the block of data you passed to marshall as an argument) */
! 	void (*marshall_cleanup)(void **data);
  	/* called from controller to decode results */
! 	int (*unmarshall)(void *input, int input_len, void **data, int *data_len);
  	/* clean up after unmarshalling */
! 	void (*unmarshall_cleanup)(void **data);
  	/* called to aggregate and output results */
  #ifdef IPBENCH_TEST_CLIENT       
--- 63,73 ----
             running_time will be passed to the test as the difference between
             start and stop above */
! 	int (*marshall)(char **data, int *size, double running_time);
  	/* clean up after marshalling (get the block of data you passed to marshall as an argument) */
! 	void (*marshall_cleanup)(char **data);
  	/* called from controller to decode results */
! 	int (*unmarshall)(char *input, int input_len, char **data, int *data_len);
  	/* clean up after unmarshalling */
! 	void (*unmarshall_cleanup)(char **data);
  	/* called to aggregate and output results */
  #ifdef IPBENCH_TEST_CLIENT       

[ipbench-cvs] ipbench2/src/tests/latency latency.c,1.8,1.9 latency.h,1.7,1.8

[Ian W. <del...@us...>]

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

Modified Files:
	latency.c latency.h 
Log Message:
convert void* to char* to fit in with python

Index: latency.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/latency/latency.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** latency.h	23 Feb 2005 00:38:29 -0000	1.7
--- latency.h	23 Feb 2005 01:17:04 -0000	1.8
***************
*** 119,125 ****
  int latency_start(struct timeval *start);
  int latency_stop(struct timeval *stop);
! int latency_marshall(void **data, int *size, double running_time);
! void latency_marshall_cleanup(void **data);
! int latency_unmarshall(void *input, int input_len, void **data, int *data_len);
! void latency_unmarshall_cleanup(void **data);
  int latency_output(struct client_data data[], int nelem);
--- 119,125 ----
  int latency_start(struct timeval *start);
  int latency_stop(struct timeval *stop);
! int latency_marshall(char **data, int *size, double running_time);
! void latency_marshall_cleanup(char **data);
! int latency_unmarshall(char *input, int input_len, char **data, int *data_len);
! void latency_unmarshall_cleanup(char **data);
  int latency_output(struct client_data data[], int nelem);

Index: latency.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/latency/latency.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** latency.c	23 Feb 2005 00:38:29 -0000	1.8
--- latency.c	23 Feb 2005 01:17:04 -0000	1.9
***************
*** 550,554 ****
  }
  
! int latency_marshall(void **data, int *size, double running_time)
  {
          uint64_t i;
--- 550,554 ----
  }
  
! int latency_marshall(char **data, int *size, double running_time)
  {
          uint64_t i;
***************
*** 580,584 ****
  	tosend->throughput_sent = htonll(result.bps_sent);
  
! 	*data = tosend;
  	*size = sizeof(struct marshalled_result) + (sizeof(uint64_t) * samples);
  
--- 580,584 ----
  	tosend->throughput_sent = htonll(result.bps_sent);
  
! 	*data = (char *)tosend;
  	*size = sizeof(struct marshalled_result) + (sizeof(uint64_t) * samples);
  
***************
*** 586,590 ****
  }
  
! void latency_marshall_cleanup(void **data)
  {
  	free(*data);
--- 586,590 ----
  }
  
! void latency_marshall_cleanup(char **data)
  {
  	free(*data);
***************
*** 594,598 ****
   * Run in ipbench
   */
! int latency_unmarshall(void *input, int input_len, void **data,
  		       int *data_len)
  {
--- 594,598 ----
   * Run in ipbench
   */
! int latency_unmarshall(char *input, int input_len, char **data,
  		       int *data_len)
  {
***************
*** 634,638 ****
  }
  
! void latency_unmarshall_cleanup(void **data)
  {
  	free(*data);
--- 634,638 ----
  }
  
! void latency_unmarshall_cleanup(char **data)
  {
  	free(*data);

[ipbench-cvs] ipbench2/src/tests/cpu_target_lukem cpu_target_lukem.c,1.6,1.7

[Ian W. <del...@us...>]

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

Modified Files:
	cpu_target_lukem.c 
Log Message:
convert void* to char* to fit in with python

Index: cpu_target_lukem.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/cpu_target_lukem/cpu_target_lukem.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cpu_target_lukem.c	23 Feb 2005 00:38:28 -0000	1.6
--- cpu_target_lukem.c	23 Feb 2005 01:17:03 -0000	1.7
***************
*** 129,136 ****
  
  int
! cpu_target_lukem_marshall(void **data, int *size, double running_time)
  {
! 	static char buf[BUFSIZ];
! 
  	snprintf(buf, BUFSIZ, "%.1f\n", (1.f - 
  		((double)timer_buffer.idle/(double)timer_buffer.total)) 
--- 129,135 ----
  
  int
! cpu_target_lukem_marshall(char **data, int *size, double running_time)
  {
! 	char *buf = malloc(BUFSIZ);
  	snprintf(buf, BUFSIZ, "%.1f\n", (1.f - 
  		((double)timer_buffer.idle/(double)timer_buffer.total)) 
***************
*** 139,143 ****
  	dbprintf("Average CPU time is %s\n", buf );
  
! 	data = (void**)&buf;
  	*size = strlen(buf) + 1;
  
--- 138,142 ----
  	dbprintf("Average CPU time is %s\n", buf );
  
! 	data = &buf;
  	*size = strlen(buf) + 1;
  
***************
*** 147,152 ****
  
  void
! cpu_target_lukem_marshall_cleanup(void **data)
  {
  	/* nothing */
  }
--- 146,152 ----
  
  void
! cpu_target_lukem_marshall_cleanup(char **data)
  {
+ 	free(*data);
  	/* nothing */
  }
***************
*** 154,158 ****
  
  int
! cpu_target_lukem_unmarshall(void *input, int input_len, void **data,
  		  int *data_len)
  {
--- 154,158 ----
  
  int
! cpu_target_lukem_unmarshall(char *input, int input_len, char **data,
  		  int *data_len)
  {
***************
*** 168,172 ****
  
  void
! cpu_target_lukem_unmarshall_cleanup(void **data)
  {
  	free(*data);
--- 168,172 ----
  
  void
! cpu_target_lukem_unmarshall_cleanup(char **data)
  {
  	free(*data);

[ipbench-cvs] ipbench2/src/tests/dummy dummy.c,1.11,1.12 dummy.h,1.5,1.6 dummy_target.c,1.8,1.9 dummy_target.h,1.5,1.6

[Ian W. <del...@us...>]

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

Modified Files:
	dummy.c dummy.h dummy_target.c dummy_target.h 
Log Message:
convert void* to char* to fit in with python

Index: dummy_target.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy_target.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dummy_target.h	23 Feb 2005 00:38:29 -0000	1.5
--- dummy_target.h	23 Feb 2005 01:17:04 -0000	1.6
***************
*** 7,13 ****
  int dummy_target_start(struct timeval *start);
  int dummy_target_stop(struct timeval *stop);
! int dummy_target_marshall(void **data, int *size, double running_time);
! void dummy_target_marshall_cleanup(void **data);
! int dummy_target_unmarshall(void *input, int input_len, void **data, int *data_len);
! void dummy_target_unmarshall_cleanup(void **data);
  int dummy_target_output(struct client_data *data);
--- 7,13 ----
  int dummy_target_start(struct timeval *start);
  int dummy_target_stop(struct timeval *stop);
! int dummy_target_marshall(char **data, int *size, double running_time);
! void dummy_target_marshall_cleanup(char **data);
! int dummy_target_unmarshall(char *input, int input_len, char **data, int *data_len);
! void dummy_target_unmarshall_cleanup(char **data);
  int dummy_target_output(struct client_data *data);

Index: dummy.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dummy.h	23 Feb 2005 00:38:29 -0000	1.5
--- dummy.h	23 Feb 2005 01:17:04 -0000	1.6
***************
*** 8,14 ****
  int dummy_start(struct timeval *start);
  int dummy_stop(struct timeval *stop);
! int dummy_marshall(void **data, int *size, double running_time);
! void dummy_marshall_cleanup(void **data);
! int dummy_unmarshall(void *input, int input_len, void **data, int *data_len);
! void dummy_unmarshall_cleanup(void **data);
  int dummy_output(struct client_data data[], int nelem);
--- 8,14 ----
  int dummy_start(struct timeval *start);
  int dummy_stop(struct timeval *stop);
! int dummy_marshall(char **data, int *size, double running_time);
! void dummy_marshall_cleanup(char **data);
! int dummy_unmarshall(char *input, int input_len, char **data, int *data_len);
! void dummy_unmarshall_cleanup(char **data);
  int dummy_output(struct client_data data[], int nelem);

Index: dummy.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** dummy.c	23 Feb 2005 00:38:29 -0000	1.11
--- dummy.c	23 Feb 2005 01:17:04 -0000	1.12
***************
*** 57,61 ****
   */
  int
! dummy_marshall (void **data, int * size, double running_time)
  {
  	char *ok_string = "You have successfully called the dummy test!";
--- 57,61 ----
   */
  int
! dummy_marshall (char **data, int * size, double running_time)
  {
  	char *ok_string = "You have successfully called the dummy test!";
***************
*** 88,92 ****
   */
  void
! dummy_marshall_cleanup(void **data)
  {
  	dbprintf("DUMMY CLEANUP MARSHALL\n");
--- 88,92 ----
   */
  void
! dummy_marshall_cleanup(char **data)
  {
  	dbprintf("DUMMY CLEANUP MARSHALL\n");
***************
*** 105,109 ****
   */
  int
! dummy_unmarshall(void *input, int input_len, void **data,
  		  int * data_len)
  {
--- 105,109 ----
   */
  int
! dummy_unmarshall(char *input, int input_len, char **data,
  		  int * data_len)
  {
***************
*** 122,126 ****
   */
  void
! dummy_unmarshall_cleanup(void **data)
  {
  	free(*data);
--- 122,126 ----
   */
  void
! dummy_unmarshall_cleanup(char **data)
  {
  	free(*data);

Index: dummy_target.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy_target.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dummy_target.c	23 Feb 2005 00:38:29 -0000	1.8
--- dummy_target.c	23 Feb 2005 01:17:04 -0000	1.9
***************
*** 61,65 ****
   */
  int
! dummy_target_marshall(void **data, int * size, double running_time)
  {
  	char *ok_string = "You have successfully called the dummy target test!";
--- 61,65 ----
   */
  int
! dummy_target_marshall(char **data, int * size, double running_time)
  {
  	char *ok_string = "You have successfully called the dummy target test!";
***************
*** 77,81 ****
   */
  void
! dummy_target_marshall_cleanup(void **data)
  {
  	dbprintf("DUMMY TARGET CLEANUP MARSHALL\n");
--- 77,81 ----
   */
  void
! dummy_target_marshall_cleanup(char **data)
  {
  	dbprintf("DUMMY TARGET CLEANUP MARSHALL\n");
***************
*** 94,98 ****
   */
  int
! dummy_target_unmarshall(void *input, int input_len, void **data,
  		  int *data_len)
  {
--- 94,98 ----
   */
  int
! dummy_target_unmarshall(char *input, int input_len, char **data,
  		  int *data_len)
  {
***************
*** 110,114 ****
   */
  void
! dummy_target_unmarshall_cleanup(void **data)
  {
  	free(*data);
--- 110,114 ----
   */
  void
! dummy_target_unmarshall_cleanup(char **data)
  {
  	free(*data);

[ipbench-cvs] ipbench2/src/tests/wrapper client_wrapper.c,1.7,1.8 client_wrapper.h,1.5,1.6 common.c,1.6,1.7 common.h,1.4,1.5 target_wrapper.c,1.11,1.12 target_wrapper.h,1.6,1.7

[Ian W. <del...@us...>]

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

Modified Files:
	client_wrapper.c client_wrapper.h common.c common.h 
	target_wrapper.c target_wrapper.h 
Log Message:
convert void* to char* to fit in with python

Index: target_wrapper.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/target_wrapper.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** target_wrapper.c	23 Feb 2005 00:38:31 -0000	1.11
--- target_wrapper.c	23 Feb 2005 01:17:05 -0000	1.12
***************
*** 62,69 ****
  /* call the output script and dump data through to the client */
  int
! target_wrap_marshall(void **data, int *size, double running_time)
  {
  	int sts;
! 	void *retdata;
  	sts = common_marshall(&retdata, size, running_time);
  	*data = retdata;
--- 62,69 ----
  /* call the output script and dump data through to the client */
  int
! target_wrap_marshall(char **data, int *size, double running_time)
  {
  	int sts;
! 	char *retdata;
  	sts = common_marshall(&retdata, size, running_time);
  	*data = retdata;
***************
*** 72,76 ****
  
  void
! target_wrap_marshall_cleanup(void **data)
  {
  	/* data is return_data from above, which was malloced */
--- 72,76 ----
  
  void
! target_wrap_marshall_cleanup(char **data)
  {
  	/* data is return_data from above, which was malloced */
***************
*** 80,84 ****
  /* just copy */
  int
! target_wrap_unmarshall(void *input, int input_len, void **data,
  		  int *data_len)
  {
--- 80,84 ----
  /* just copy */
  int
! target_wrap_unmarshall(char *input, int input_len, char **data,
  		  int *data_len)
  {
***************
*** 92,96 ****
  
  void
! target_wrap_unmarshall_cleanup(void **data)
  {
  	free(*data);
--- 92,96 ----
  
  void
! target_wrap_unmarshall_cleanup(char **data)
  {
  	free(*data);

Index: common.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/common.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** common.h	23 Feb 2005 00:38:31 -0000	1.4
--- common.h	23 Feb 2005 01:17:05 -0000	1.5
***************
*** 1,3 ****
  /* common things for our wrapper scripts */
  int parse_arg(char *arg);
! int common_marshall (void **data, int *size, double running_time);
--- 1,3 ----
  /* common things for our wrapper scripts */
  int parse_arg(char *arg);
! int common_marshall (char **data, int *size, double running_time);

Index: client_wrapper.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/client_wrapper.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** client_wrapper.h	23 Feb 2005 00:38:31 -0000	1.5
--- client_wrapper.h	23 Feb 2005 01:17:05 -0000	1.6
***************
*** 13,19 ****
  int client_wrap_start(struct timeval *start);
  int client_wrap_stop(struct timeval *stop);
! int client_wrap_marshall(void **data, int *size, double running_time);
! void client_wrap_marshall_cleanup(void **data);
! int client_wrap_unmarshall(void *input, int input_len, void **data, int *data_len);
! void client_wrap_unmarshall_cleanup(void **data);
  int client_wrap_output(struct client_data data[], int nelem);
--- 13,19 ----
  int client_wrap_start(struct timeval *start);
  int client_wrap_stop(struct timeval *stop);
! int client_wrap_marshall(char **data, int *size, double running_time);
! void client_wrap_marshall_cleanup(char **data);
! int client_wrap_unmarshall(char *input, int input_len, char **data, int *data_len);
! void client_wrap_unmarshall_cleanup(char **data);
  int client_wrap_output(struct client_data data[], int nelem);

Index: target_wrapper.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/target_wrapper.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** target_wrapper.h	23 Feb 2005 00:38:31 -0000	1.6
--- target_wrapper.h	23 Feb 2005 01:17:05 -0000	1.7
***************
*** 12,18 ****
  int target_wrap_start(struct timeval *start);
  int target_wrap_stop(struct timeval *stop);
! int target_wrap_marshall(void **data, int *size, double running_time);
! void target_wrap_marshall_cleanup(void **data);
! int target_wrap_unmarshall(void *input, int input_len, void **data, int *data_len);
! void target_wrap_unmarshall_cleanup(void **data);
  int target_wrap_output(struct client_data *data);
--- 12,18 ----
  int target_wrap_start(struct timeval *start);
  int target_wrap_stop(struct timeval *stop);
! int target_wrap_marshall(char **data, int *size, double running_time);
! void target_wrap_marshall_cleanup(char **data);
! int target_wrap_unmarshall(char *input, int input_len, char **data, int *data_len);
! void target_wrap_unmarshall_cleanup(char **data);
  int target_wrap_output(struct client_data *data);

Index: client_wrapper.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/client_wrapper.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** client_wrapper.c	23 Feb 2005 00:38:30 -0000	1.7
--- client_wrapper.c	23 Feb 2005 01:17:05 -0000	1.8
***************
*** 31,38 ****
  
  int
! client_wrap_marshall (void **data, int *size, double running_time)
  {
  	int sts;
! 	void *retdata;
  	sts = common_marshall(&retdata, size, running_time);
  	*data = retdata;
--- 31,38 ----
  
  int
! client_wrap_marshall (char **data, int *size, double running_time)
  {
  	int sts;
! 	char *retdata;
  	sts = common_marshall(&retdata, size, running_time);
  	*data = retdata;
***************
*** 41,45 ****
  
  void
! client_wrap_marshall_cleanup(void **data)
  {
  	free(*data);
--- 41,45 ----
  
  void
! client_wrap_marshall_cleanup(char **data)
  {
  	free(*data);
***************
*** 49,53 ****
  /* just copy */
  int
! client_wrap_unmarshall(void *input, int input_len, void **data,
  		  int * data_len)
  {
--- 49,53 ----
  /* just copy */
  int
! client_wrap_unmarshall(char *input, int input_len, char **data,
  		  int * data_len)
  {
***************
*** 62,66 ****
  
  void
! client_wrap_unmarshall_cleanup(void **data)
  {
  	free(*data);
--- 62,66 ----
  
  void
! client_wrap_unmarshall_cleanup(char **data)
  {
  	free(*data);

Index: common.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/common.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** common.c	23 Feb 2005 00:38:31 -0000	1.6
--- common.c	23 Feb 2005 01:17:05 -0000	1.7
***************
*** 83,87 ****
  	
  int			     
! common_marshall (void **data, int *size, double running_time)
  {
  #define CHUNK_SIZE (100 * 1024)
--- 83,87 ----
  	
  int			     
! common_marshall (char **data, int *size, double running_time)
  {
  #define CHUNK_SIZE (100 * 1024)

[ipbench-cvs] ipbench2/src/tests/wait wait.c,1.3,1.4

[Ian W. <del...@us...>]

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

Modified Files:
	wait.c 
Log Message:
convert void* to char* to fit in with python

Index: wait.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wait/wait.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wait.c	23 Feb 2005 00:38:30 -0000	1.3
--- wait.c	23 Feb 2005 01:17:04 -0000	1.4
***************
*** 42,46 ****
  
  int
! wait_marshall (void **data, int * size, double running_time)
  {
  	*size = strlen("OK");
--- 42,46 ----
  
  int
! wait_marshall (char **data, int * size, double running_time)
  {
  	*size = strlen("OK");
***************
*** 50,54 ****
  
  void
! wait_marshall_cleanup(void **data)
  {
  	return;
--- 50,54 ----
  
  void
! wait_marshall_cleanup(char **data)
  {
  	return;
***************
*** 56,60 ****
  
  int
! wait_unmarshall(void *input, int input_len, void **data,
  		  int * data_len)
  {
--- 56,60 ----
  
  int
! wait_unmarshall(char *input, int input_len, char **data,
  		  int * data_len)
  {
***************
*** 65,69 ****
  
  void
! wait_unmarshall_cleanup(void **data)
  {
  	return;
--- 65,69 ----
  
  void
! wait_unmarshall_cleanup(char **data)
  {
  	return;

[ipbench-cvs] ipbench2/src/tests/nfsstone nfsstones.c,1.12,1.13 nfsstones.h,1.6,1.7

[Ian W. <del...@us...>]

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

Modified Files:
	nfsstones.c nfsstones.h 
Log Message:
convert void* to char* to fit in with python

Index: nfsstones.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfsstone/nfsstones.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** nfsstones.h	23 Feb 2005 00:38:30 -0000	1.6
--- nfsstones.h	23 Feb 2005 01:17:04 -0000	1.7
***************
*** 15,22 ****
  int  nfsstone_start(struct timeval *start);
  int  nfsstone_stop(struct timeval *stop);
! int  nfsstone_marshall(void **data, int *size, double running_time);
! void nfsstone_marshall_cleanup(void **data);
! int  nfsstone_unmarshall(void *input, int input_len, void **data, int *data_len);
! void nfsstone_unmarshall_cleanup(void **data);
  int  nfsstone_output(struct client_data data[], int nelem);
  int nfsstone_run(struct timeval *start, struct timeval *end_time);
--- 15,22 ----
  int  nfsstone_start(struct timeval *start);
  int  nfsstone_stop(struct timeval *stop);
! int  nfsstone_marshall(char **data, int *size, double running_time);
! void nfsstone_marshall_cleanup(char **data);
! int  nfsstone_unmarshall(char *input, int input_len, char **data, int *data_len);
! void nfsstone_unmarshall_cleanup(char **data);
  int  nfsstone_output(struct client_data data[], int nelem);
  int nfsstone_run(struct timeval *start, struct timeval *end_time);

Index: nfsstones.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfsstone/nfsstones.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** nfsstones.c	23 Feb 2005 00:38:30 -0000	1.12
--- nfsstones.c	23 Feb 2005 01:17:04 -0000	1.13
***************
*** 269,284 ****
  	return error;
  }
! int  nfsstone_marshall(void **data, int *size, double running_time)
  {
! 	*data = &results;
  	*size = sizeof(results) + 1;
  	return OK;
  }
! void nfsstone_marshall_cleanup(void **data)
  {
  	dbprintf("[%d][nfsstone_marshall_cleanup]\n",__LINE__);
  	return;
  }
! int  nfsstone_unmarshall(void *input, int input_len, void **data, int *data_len)
  {
  	char *res = malloc(input_len);
--- 269,286 ----
  	return error;
  }
! int  nfsstone_marshall(char **data, int *size, double running_time)
  {
! 	data = malloc(sizeof(results));
! 	memcpy(data, &results, sizeof(results));
  	*size = sizeof(results) + 1;
  	return OK;
  }
! void nfsstone_marshall_cleanup(char **data)
  {
+ 	free(*data);
  	dbprintf("[%d][nfsstone_marshall_cleanup]\n",__LINE__);
  	return;
  }
! int  nfsstone_unmarshall(char *input, int input_len, char **data, int *data_len)
  {
  	char *res = malloc(input_len);
***************
*** 297,301 ****
  	return OK;
  }
! void nfsstone_unmarshall_cleanup(void **data)
  {
  	dbprintf("[%d][nfsstone_unmarshall_cleanup]\n",__LINE__);
--- 299,303 ----
  	return OK;
  }
! void nfsstone_unmarshall_cleanup(char **data)
  {
  	dbprintf("[%d][nfsstone_unmarshall_cleanup]\n",__LINE__);

[ipbench-cvs] ipbench2/src/tests/cpu_target cpu_target.c,1.9,1.10

[Ian W. <del...@us...>]

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

Modified Files:
	cpu_target.c 
Log Message:
convert void* to char* to fit in with python

Index: cpu_target.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/cpu_target/cpu_target.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cpu_target.c	23 Feb 2005 00:38:28 -0000	1.9
--- cpu_target.c	23 Feb 2005 01:17:03 -0000	1.10
***************
*** 394,398 ****
  
  int
! cpu_target_marshall(void **data, int *size, double running_time)
  {
  	static char buf[BUFSIZ];
--- 394,398 ----
  
  int
! cpu_target_marshall(char **data, int *size, double running_time)
  {
  	static char buf[BUFSIZ];
***************
*** 412,416 ****
  
  void
! cpu_target_marshall_cleanup(void **data)
  {
  	free(cpu_load);
--- 412,416 ----
  
  void
! cpu_target_marshall_cleanup(char **data)
  {
  	free(cpu_load);
***************
*** 419,423 ****
  
  int
! cpu_target_unmarshall(void *input, int input_len, void **data,
  		  int *data_len)
  {
--- 419,423 ----
  
  int
! cpu_target_unmarshall(char *input, int input_len, char **data,
  		  int *data_len)
  {
***************
*** 433,437 ****
  
  void
! cpu_target_unmarshall_cleanup(void **data)
  {
  	free(*data);
--- 433,437 ----
  
  void
! cpu_target_unmarshall_cleanup(char **data)
  {
  	free(*data);

[ipbench-cvs] ipbench2/src/pymod ipbench.c,1.11,1.12

[Ian W. <del...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/pymod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24925/pymod

Modified Files:
	ipbench.c 
Log Message:
convert void* to char* to fit in with python

Index: ipbench.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/pymod/ipbench.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ipbench.c	22 Feb 2005 05:51:07 -0000	1.11
--- ipbench.c	23 Feb 2005 01:17:03 -0000	1.12
***************
*** 211,218 ****
   * This is accessed from python as a vector (return value, data)
   */
! int marshall(char **marshalled_data, size_t *marshalled_data_size)
  {
  	int sts;
! 	void *ret_data;
  	sts = ipbench_plugin->marshall(&ret_data, marshalled_data_size, run_secs);
  	dbprintf("[marshall] plugin marshall return code %d [len %d]\n", 
--- 211,218 ----
   * This is accessed from python as a vector (return value, data)
   */
! int marshall(char **marshalled_data, int *marshalled_data_size)
  {
  	int sts;
! 	char *ret_data;
  	sts = ipbench_plugin->marshall(&ret_data, marshalled_data_size, run_secs);
  	dbprintf("[marshall] plugin marshall return code %d [len %d]\n", 
***************
*** 232,239 ****
  #ifdef IPBENCH_TEST_CLIENT
  /* for client test, we are passed the clientid of the data */
! int unmarshall(int clientid, char *data, size_t len, int valid)
  {
  	int sts;
! 	void *ret_data;
  	dbprintf("[unmarshall] data for client %d \"%s\" [len %d] [%s]\n", 
  		 clientid, data, len, valid ? "invalid" : "valid");
--- 232,239 ----
  #ifdef IPBENCH_TEST_CLIENT
  /* for client test, we are passed the clientid of the data */
! int unmarshall(int clientid, char *data, int len, int valid)
  {
  	int sts;
! 	char *ret_data;
  	dbprintf("[unmarshall] data for client %d \"%s\" [len %d] [%s]\n", 
  		 clientid, data, len, valid ? "invalid" : "valid");
***************
*** 248,255 ****
  #elif defined IPBENCH_TEST_TARGET
  /* for target test, we just put it straight into target_data */
! int unmarshall(char *data, size_t len, int valid)
  {
  	int sts;
! 	void *ret_data;
  	dbprintf("[unmarshall] data for target \"%s\" [len %d] [%s]\n", 
  		 data, len, valid ? "invalid" : "valid");
--- 248,255 ----
  #elif defined IPBENCH_TEST_TARGET
  /* for target test, we just put it straight into target_data */
! int unmarshall(char *data, int len, int valid)
  {
  	int sts;
! 	char *ret_data;
  	dbprintf("[unmarshall] data for target \"%s\" [len %d] [%s]\n", 
  		 data, len, valid ? "invalid" : "valid");

[ipbench-cvs] ipbench2/src/pymod ipbench.i.in,1.7,1.8

[Ian W. <del...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/pymod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15398

Modified Files:
	ipbench.i.in 
Log Message:
match def to typemap


Index: ipbench.i.in
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/pymod/ipbench.i.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ipbench.i.in	23 Feb 2005 00:38:28 -0000	1.7
--- ipbench.i.in	23 Feb 2005 00:42:32 -0000	1.8
***************
*** 36,40 ****
  extern int stop(void);
  %cstring_output_allocate_size(void **marshalled_data, int *marshalled_data_size, ipbench_plugin->marshall_cleanup($1));
! extern int marshall(char **marshalled_data, int *marshalled_data_size);
  %apply (char *STRING, int LENGTH) { (char *data, int len) };
  #ifdef IPBENCH_TEST_client
--- 36,40 ----
  extern int stop(void);
  %cstring_output_allocate_size(void **marshalled_data, int *marshalled_data_size, ipbench_plugin->marshall_cleanup($1));
! extern int marshall(void **marshalled_data, int *marshalled_data_size);
  %apply (char *STRING, int LENGTH) { (char *data, int len) };
  #ifdef IPBENCH_TEST_client

[ipbench-cvs] ipbench2/src/tests/cpu_target cpu_target.c,1.8,1.9

[Ian W. <del...@us...>]

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

Modified Files:
	cpu_target.c 
Log Message:
We have to use ints for size ... since that's what Python likes

Index: cpu_target.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/cpu_target/cpu_target.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** cpu_target.c	21 Feb 2005 05:33:13 -0000	1.8
--- cpu_target.c	23 Feb 2005 00:38:28 -0000	1.9
***************
*** 394,398 ****
  
  int
! cpu_target_marshall(void **data, size_t *size, double running_time)
  {
  	static char buf[BUFSIZ];
--- 394,398 ----
  
  int
! cpu_target_marshall(void **data, int *size, double running_time)
  {
  	static char buf[BUFSIZ];
***************
*** 419,424 ****
  
  int
! cpu_target_unmarshall(void *input, size_t input_len, void **data,
! 		  size_t *data_len)
  {
  	dbprintf("[cpu_target_unmarhsall] start\n");
--- 419,424 ----
  
  int
! cpu_target_unmarshall(void *input, int input_len, void **data,
! 		  int *data_len)
  {
  	dbprintf("[cpu_target_unmarhsall] start\n");

[ipbench-cvs] ipbench2/src/pymod ipbench.i.in,1.6,1.7

[Ian W. <del...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/pymod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13965/src/pymod

Modified Files:
	ipbench.i.in 
Log Message:
We have to use ints for size ... since that's what Python likes

Index: ipbench.i.in
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/pymod/ipbench.i.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ipbench.i.in	22 Feb 2005 05:50:36 -0000	1.6
--- ipbench.i.in	23 Feb 2005 00:38:28 -0000	1.7
***************
*** 14,19 ****
  %include "cstring.i"
  
- /*%apply unsigned long { size_t };*/
- 
  %exception {
  	$action
--- 14,17 ----
***************
*** 37,47 ****
  extern int start(void);
  extern int stop(void);
! %cstring_output_allocate_size(void **marshalled_data, size_t *marshalled_data_size, ipbench_plugin->marshall_cleanup($1));
! extern int marshall(char **marshalled_data, size_t *marshalled_data_size);
! %apply (char *STRING, int LENGTH) { (char *data, size_t len) };
  #ifdef IPBENCH_TEST_client
! extern int unmarshall(int, char *data, size_t len, int);
  #elif defined IPBENCH_TEST_target
! extern int unmarshall(char *data, size_t len, int);
  #endif
  extern int output(void);
\ No newline at end of file
--- 35,45 ----
  extern int start(void);
  extern int stop(void);
! %cstring_output_allocate_size(void **marshalled_data, int *marshalled_data_size, ipbench_plugin->marshall_cleanup($1));
! extern int marshall(char **marshalled_data, int *marshalled_data_size);
! %apply (char *STRING, int LENGTH) { (char *data, int len) };
  #ifdef IPBENCH_TEST_client
! extern int unmarshall(int, char *data, int len, int);
  #elif defined IPBENCH_TEST_target
! extern int unmarshall(char *data, int len, int);
  #endif
  extern int output(void);
\ No newline at end of file

[ipbench-cvs] ipbench2/src plugin.h,1.14,1.15

[Ian W. <del...@us...>]

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

Modified Files:
	plugin.h 
Log Message:
We have to use ints for size ... since that's what Python likes

Index: plugin.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/plugin.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** plugin.h	21 Feb 2005 05:36:08 -0000	1.14
--- plugin.h	23 Feb 2005 00:38:28 -0000	1.15
***************
*** 22,29 ****
  #define IPBENCH_TARGET 1
  
  struct client_data
  {
  	void *data;   // data from the client
! 	size_t size;  // length of data
  	int valid;    // is this valid?
  	int type;     // either IPBENCH_CLIENT || IPBENCH_TARGET
--- 22,32 ----
  #define IPBENCH_TARGET 1
  
+ 
+ /* The data a client returns.  Note that size is an "int" rather than
+  * a "size_t" because that's what Python takes as a length argument */
  struct client_data
  {
  	void *data;   // data from the client
! 	int size;     // length of data
  	int valid;    // is this valid?
  	int type;     // either IPBENCH_CLIENT || IPBENCH_TARGET
***************
*** 59,67 ****
             running_time will be passed to the test as the difference between
             start and stop above */
! 	int (*marshall)(void **data, size_t *size, double running_time);
  	/* clean up after marshalling (get the block of data you passed to marshall as an argument) */
  	void (*marshall_cleanup)(void **data);
  	/* called from controller to decode results */
! 	int (*unmarshall)(void *input, size_t input_len, void **data, size_t *data_len);
  	/* clean up after unmarshalling */
  	void (*unmarshall_cleanup)(void **data);
--- 62,70 ----
             running_time will be passed to the test as the difference between
             start and stop above */
! 	int (*marshall)(void **data, int *size, double running_time);
  	/* clean up after marshalling (get the block of data you passed to marshall as an argument) */
  	void (*marshall_cleanup)(void **data);
  	/* called from controller to decode results */
! 	int (*unmarshall)(void *input, int input_len, void **data, int *data_len);
  	/* clean up after unmarshalling */
  	void (*unmarshall_cleanup)(void **data);

[ipbench-cvs] ipbench2/src/tests/wrapper client_wrapper.c,1.6,1.7 client_wrapper.h,1.4,1.5 common.c,1.5,1.6 common.h,1.3,1.4 target_wrapper.c,1.10,1.11 target_wrapper.h,1.5,1.6

[Ian W. <del...@us...>]

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

Modified Files:
	client_wrapper.c client_wrapper.h common.c common.h 
	target_wrapper.c target_wrapper.h 
Log Message:
We have to use ints for size ... since that's what Python likes

Index: target_wrapper.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/target_wrapper.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** target_wrapper.c	21 Feb 2005 05:33:15 -0000	1.10
--- target_wrapper.c	23 Feb 2005 00:38:31 -0000	1.11
***************
*** 62,66 ****
  /* call the output script and dump data through to the client */
  int
! target_wrap_marshall(void **data, size_t *size, double running_time)
  {
  	int sts;
--- 62,66 ----
  /* call the output script and dump data through to the client */
  int
! target_wrap_marshall(void **data, int *size, double running_time)
  {
  	int sts;
***************
*** 80,85 ****
  /* just copy */
  int
! target_wrap_unmarshall(void *input, size_t input_len, void **data,
! 		  size_t *data_len)
  {
  	char *buf = malloc (input_len);
--- 80,85 ----
  /* just copy */
  int
! target_wrap_unmarshall(void *input, int input_len, void **data,
! 		  int *data_len)
  {
  	char *buf = malloc (input_len);

Index: common.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/common.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** common.h	21 Feb 2005 05:33:15 -0000	1.3
--- common.h	23 Feb 2005 00:38:31 -0000	1.4
***************
*** 1,3 ****
  /* common things for our wrapper scripts */
  int parse_arg(char *arg);
! int common_marshall (void **data, size_t *size, double running_time);
--- 1,3 ----
  /* common things for our wrapper scripts */
  int parse_arg(char *arg);
! int common_marshall (void **data, int *size, double running_time);

Index: client_wrapper.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/client_wrapper.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** client_wrapper.h	21 Feb 2005 05:33:15 -0000	1.4
--- client_wrapper.h	23 Feb 2005 00:38:31 -0000	1.5
***************
*** 13,19 ****
  int client_wrap_start(struct timeval *start);
  int client_wrap_stop(struct timeval *stop);
! int client_wrap_marshall(void **data, size_t *size, double running_time);
  void client_wrap_marshall_cleanup(void **data);
! int client_wrap_unmarshall(void *input, size_t input_len, void **data, size_t *data_len);
  void client_wrap_unmarshall_cleanup(void **data);
  int client_wrap_output(struct client_data data[], int nelem);
--- 13,19 ----
  int client_wrap_start(struct timeval *start);
  int client_wrap_stop(struct timeval *stop);
! int client_wrap_marshall(void **data, int *size, double running_time);
  void client_wrap_marshall_cleanup(void **data);
! int client_wrap_unmarshall(void *input, int input_len, void **data, int *data_len);
  void client_wrap_unmarshall_cleanup(void **data);
  int client_wrap_output(struct client_data data[], int nelem);

Index: target_wrapper.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/target_wrapper.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** target_wrapper.h	21 Feb 2005 05:33:15 -0000	1.5
--- target_wrapper.h	23 Feb 2005 00:38:31 -0000	1.6
***************
*** 12,18 ****
  int target_wrap_start(struct timeval *start);
  int target_wrap_stop(struct timeval *stop);
! int target_wrap_marshall(void **data, size_t *size, double running_time);
  void target_wrap_marshall_cleanup(void **data);
! int target_wrap_unmarshall(void *input, size_t input_len, void **data, size_t *data_len);
  void target_wrap_unmarshall_cleanup(void **data);
  int target_wrap_output(struct client_data *data);
--- 12,18 ----
  int target_wrap_start(struct timeval *start);
  int target_wrap_stop(struct timeval *stop);
! int target_wrap_marshall(void **data, int *size, double running_time);
  void target_wrap_marshall_cleanup(void **data);
! int target_wrap_unmarshall(void *input, int input_len, void **data, int *data_len);
  void target_wrap_unmarshall_cleanup(void **data);
  int target_wrap_output(struct client_data *data);

Index: client_wrapper.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/client_wrapper.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** client_wrapper.c	21 Feb 2005 05:33:15 -0000	1.6
--- client_wrapper.c	23 Feb 2005 00:38:30 -0000	1.7
***************
*** 31,35 ****
  
  int
! client_wrap_marshall (void **data, size_t *size, double running_time)
  {
  	int sts;
--- 31,35 ----
  
  int
! client_wrap_marshall (void **data, int *size, double running_time)
  {
  	int sts;
***************
*** 49,54 ****
  /* just copy */
  int
! client_wrap_unmarshall(void *input, size_t input_len, void **data,
! 		  size_t * data_len)
  {
  	char *buf = malloc (input_len);
--- 49,54 ----
  /* just copy */
  int
! client_wrap_unmarshall(void *input, int input_len, void **data,
! 		  int * data_len)
  {
  	char *buf = malloc (input_len);

Index: common.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/common.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** common.c	11 Nov 2004 05:41:03 -0000	1.5
--- common.c	23 Feb 2005 00:38:31 -0000	1.6
***************
*** 83,87 ****
  	
  int			     
! common_marshall (void **data, size_t *size, double running_time)
  {
  #define CHUNK_SIZE (100 * 1024)
--- 83,87 ----
  	
  int			     
! common_marshall (void **data, int *size, double running_time)
  {
  #define CHUNK_SIZE (100 * 1024)

[ipbench-cvs] ipbench2/src/tests/dummy dummy.c,1.10,1.11 dummy.h,1.4,1.5 dummy_target.c,1.7,1.8 dummy_target.h,1.4,1.5

[Ian W. <del...@us...>]

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

Modified Files:
	dummy.c dummy.h dummy_target.c dummy_target.h 
Log Message:
We have to use ints for size ... since that's what Python likes

Index: dummy_target.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy_target.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dummy_target.h	21 Feb 2005 05:33:13 -0000	1.4
--- dummy_target.h	23 Feb 2005 00:38:29 -0000	1.5
***************
*** 7,13 ****
  int dummy_target_start(struct timeval *start);
  int dummy_target_stop(struct timeval *stop);
! int dummy_target_marshall(void **data, size_t *size, double running_time);
  void dummy_target_marshall_cleanup(void **data);
! int dummy_target_unmarshall(void *input, size_t input_len, void **data, size_t *data_len);
  void dummy_target_unmarshall_cleanup(void **data);
  int dummy_target_output(struct client_data *data);
--- 7,13 ----
  int dummy_target_start(struct timeval *start);
  int dummy_target_stop(struct timeval *stop);
! int dummy_target_marshall(void **data, int *size, double running_time);
  void dummy_target_marshall_cleanup(void **data);
! int dummy_target_unmarshall(void *input, int input_len, void **data, int *data_len);
  void dummy_target_unmarshall_cleanup(void **data);
  int dummy_target_output(struct client_data *data);

Index: dummy.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dummy.h	21 Feb 2005 05:33:13 -0000	1.4
--- dummy.h	23 Feb 2005 00:38:29 -0000	1.5
***************
*** 8,14 ****
  int dummy_start(struct timeval *start);
  int dummy_stop(struct timeval *stop);
! int dummy_marshall(void **data, size_t *size, double running_time);
  void dummy_marshall_cleanup(void **data);
! int dummy_unmarshall(void *input, size_t input_len, void **data, size_t *data_len);
  void dummy_unmarshall_cleanup(void **data);
  int dummy_output(struct client_data data[], int nelem);
--- 8,14 ----
  int dummy_start(struct timeval *start);
  int dummy_stop(struct timeval *stop);
! int dummy_marshall(void **data, int *size, double running_time);
  void dummy_marshall_cleanup(void **data);
! int dummy_unmarshall(void *input, int input_len, void **data, int *data_len);
  void dummy_unmarshall_cleanup(void **data);
  int dummy_output(struct client_data data[], int nelem);

Index: dummy.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dummy.c	21 Feb 2005 05:33:13 -0000	1.10
--- dummy.c	23 Feb 2005 00:38:29 -0000	1.11
***************
*** 57,61 ****
   */
  int
! dummy_marshall (void **data, size_t * size, double running_time)
  {
  	char *ok_string = "You have successfully called the dummy test!";
--- 57,61 ----
   */
  int
! dummy_marshall (void **data, int * size, double running_time)
  {
  	char *ok_string = "You have successfully called the dummy test!";
***************
*** 105,110 ****
   */
  int
! dummy_unmarshall(void *input, size_t input_len, void **data,
! 		  size_t * data_len)
  {
  	char *buf = malloc (input_len);
--- 105,110 ----
   */
  int
! dummy_unmarshall(void *input, int input_len, void **data,
! 		  int * data_len)
  {
  	char *buf = malloc (input_len);

Index: dummy_target.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy_target.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dummy_target.c	21 Feb 2005 05:33:13 -0000	1.7
--- dummy_target.c	23 Feb 2005 00:38:29 -0000	1.8
***************
*** 61,65 ****
   */
  int
! dummy_target_marshall(void **data, size_t * size, double running_time)
  {
  	char *ok_string = "You have successfully called the dummy target test!";
--- 61,65 ----
   */
  int
! dummy_target_marshall(void **data, int * size, double running_time)
  {
  	char *ok_string = "You have successfully called the dummy target test!";
***************
*** 94,99 ****
   */
  int
! dummy_target_unmarshall(void *input, size_t input_len, void **data,
! 		  size_t *data_len)
  {
  	char *buf = malloc (input_len);
--- 94,99 ----
   */
  int
! dummy_target_unmarshall(void *input, int input_len, void **data,
! 		  int *data_len)
  {
  	char *buf = malloc (input_len);

[ipbench-cvs] ipbench2/src/tests/latency latency.c,1.7,1.8 latency.h,1.6,1.7

[Ian W. <del...@us...>]

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

Modified Files:
	latency.c latency.h 
Log Message:
We have to use ints for size ... since that's what Python likes

Index: latency.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/latency/latency.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** latency.h	21 Feb 2005 05:33:13 -0000	1.6
--- latency.h	23 Feb 2005 00:38:29 -0000	1.7
***************
*** 119,125 ****
  int latency_start(struct timeval *start);
  int latency_stop(struct timeval *stop);
! int latency_marshall(void **data, size_t *size, double running_time);
  void latency_marshall_cleanup(void **data);
! int latency_unmarshall(void *input, size_t input_len, void **data, size_t *data_len);
  void latency_unmarshall_cleanup(void **data);
  int latency_output(struct client_data data[], int nelem);
--- 119,125 ----
  int latency_start(struct timeval *start);
  int latency_stop(struct timeval *stop);
! int latency_marshall(void **data, int *size, double running_time);
  void latency_marshall_cleanup(void **data);
! int latency_unmarshall(void *input, int input_len, void **data, int *data_len);
  void latency_unmarshall_cleanup(void **data);
  int latency_output(struct client_data data[], int nelem);

Index: latency.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/latency/latency.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** latency.c	21 Feb 2005 05:33:13 -0000	1.7
--- latency.c	23 Feb 2005 00:38:29 -0000	1.8
***************
*** 550,554 ****
  }
  
! int latency_marshall(void **data, size_t *size, double running_time)
  {
          uint64_t i;
--- 550,554 ----
  }
  
! int latency_marshall(void **data, int *size, double running_time)
  {
          uint64_t i;
***************
*** 594,599 ****
   * Run in ipbench
   */
! int latency_unmarshall(void *input, size_t input_len, void **data,
! 		       size_t *data_len)
  {
  	dbprintf("Latency unmarshall arguments.\n");
--- 594,599 ----
   * Run in ipbench
   */
! int latency_unmarshall(void *input, int input_len, void **data,
! 		       int *data_len)
  {
  	dbprintf("Latency unmarshall arguments.\n");

[ipbench-cvs] ipbench2/src/tests/nfsstone nfsstones.c,1.11,1.12 nfsstones.h,1.5,1.6

[Ian W. <del...@us...>]

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

Modified Files:
	nfsstones.c nfsstones.h 
Log Message:
We have to use ints for size ... since that's what Python likes

Index: nfsstones.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfsstone/nfsstones.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nfsstones.h	21 Feb 2005 05:33:14 -0000	1.5
--- nfsstones.h	23 Feb 2005 00:38:30 -0000	1.6
***************
*** 15,21 ****
  int  nfsstone_start(struct timeval *start);
  int  nfsstone_stop(struct timeval *stop);
! int  nfsstone_marshall(void **data, size_t *size, double running_time);
  void nfsstone_marshall_cleanup(void **data);
! int  nfsstone_unmarshall(void *input, size_t input_len, void **data, size_t *data_len);
  void nfsstone_unmarshall_cleanup(void **data);
  int  nfsstone_output(struct client_data data[], int nelem);
--- 15,21 ----
  int  nfsstone_start(struct timeval *start);
  int  nfsstone_stop(struct timeval *stop);
! int  nfsstone_marshall(void **data, int *size, double running_time);
  void nfsstone_marshall_cleanup(void **data);
! int  nfsstone_unmarshall(void *input, int input_len, void **data, int *data_len);
  void nfsstone_unmarshall_cleanup(void **data);
  int  nfsstone_output(struct client_data data[], int nelem);

Index: nfsstones.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfsstone/nfsstones.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** nfsstones.c	21 Feb 2005 05:33:14 -0000	1.11
--- nfsstones.c	23 Feb 2005 00:38:30 -0000	1.12
***************
*** 269,273 ****
  	return error;
  }
! int  nfsstone_marshall(void **data, size_t *size, double running_time)
  {
  	*data = &results;
--- 269,273 ----
  	return error;
  }
! int  nfsstone_marshall(void **data, int *size, double running_time)
  {
  	*data = &results;
***************
*** 280,284 ****
  	return;
  }
! int  nfsstone_unmarshall(void *input, size_t input_len, void **data, size_t *data_len)
  {
  	char *res = malloc(input_len);
--- 280,284 ----
  	return;
  }
! int  nfsstone_unmarshall(void *input, int input_len, void **data, int *data_len)
  {
  	char *res = malloc(input_len);

[ipbench-cvs] ipbench2/src/tests/cpu_target_lukem cpu_target_lukem.c,1.5,1.6

[Ian W. <del...@us...>]

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

Modified Files:
	cpu_target_lukem.c 
Log Message:
We have to use ints for size ... since that's what Python likes

Index: cpu_target_lukem.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/cpu_target_lukem/cpu_target_lukem.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cpu_target_lukem.c	21 Feb 2005 05:33:13 -0000	1.5
--- cpu_target_lukem.c	23 Feb 2005 00:38:28 -0000	1.6
***************
*** 129,133 ****
  
  int
! cpu_target_lukem_marshall(void **data, size_t *size, double running_time)
  {
  	static char buf[BUFSIZ];
--- 129,133 ----
  
  int
! cpu_target_lukem_marshall(void **data, int *size, double running_time)
  {
  	static char buf[BUFSIZ];
***************
*** 154,159 ****
  
  int
! cpu_target_lukem_unmarshall(void *input, size_t input_len, void **data,
! 		  size_t *data_len)
  {
  	dbprintf("[cpu_target_lukem_unmarhsall] start\n");
--- 154,159 ----
  
  int
! cpu_target_lukem_unmarshall(void *input, int input_len, void **data,
! 		  int *data_len)
  {
  	dbprintf("[cpu_target_lukem_unmarhsall] start\n");

[ipbench-cvs] ipbench2/src/tests/wait wait.c,1.2,1.3

[Ian W. <del...@us...>]

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

Modified Files:
	wait.c 
Log Message:
We have to use ints for size ... since that's what Python likes

Index: wait.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wait/wait.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wait.c	21 Feb 2005 05:33:14 -0000	1.2
--- wait.c	23 Feb 2005 00:38:30 -0000	1.3
***************
*** 42,46 ****
  
  int
! wait_marshall (void **data, size_t * size, double running_time)
  {
  	*size = strlen("OK");
--- 42,46 ----
  
  int
! wait_marshall (void **data, int * size, double running_time)
  {
  	*size = strlen("OK");
***************
*** 56,61 ****
  
  int
! wait_unmarshall(void *input, size_t input_len, void **data,
! 		  size_t * data_len)
  {
  	*data = "OK";
--- 56,61 ----
  
  int
! wait_unmarshall(void *input, int input_len, void **data,
! 		  int * data_len)
  {
  	*data = "OK";

[ipbench-cvs] ipbench2/src Makefile.am,1.10,1.11

[Ian W. <del...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
clean up


Index: Makefile.am
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile.am	22 Oct 2004 02:24:36 -0000	1.10
--- Makefile.am	22 Feb 2005 05:53:32 -0000	1.11
***************
*** 3,7 ****
  SUBDIRS=lib tests pymod
  
- AM_CFLAGS=-Wall -DPLUGIN_DIR=\"$(libdir)/ipbench\"
  AM_LDFLAGS=-Wl,--export-dynamic
  
--- 3,6 ----

[ipbench-cvs] ipbench2/src/pymod ipbench.c,1.10,1.11

[Ian W. <del...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/pymod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17990

Modified Files:
	ipbench.c 
Log Message:
remove all warnings but those from swig


Index: ipbench.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/pymod/ipbench.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ipbench.c	18 Feb 2005 03:06:30 -0000	1.10
--- ipbench.c	22 Feb 2005 05:51:07 -0000	1.11
***************
*** 140,144 ****
  
  #ifdef IPBENCH_TEST_CLIENT
! int setup(const char *hostname, const int port, const char *clientargs)
  {
  	int ret;
--- 140,144 ----
  
  #ifdef IPBENCH_TEST_CLIENT
! int setup(char *hostname, int port, char *clientargs)
  {
  	int ret;
***************
*** 159,169 ****
   * start() and not returning, we never give python a chance!
   */
! int sigusr1_handler(int sig)
  {
  	dbprintf("--- GOT SIGUSR1 ---\n");
! 	return stop();
  }
  
! int setup(const char *clientargs)
  {
  	int ret;
--- 159,169 ----
   * start() and not returning, we never give python a chance!
   */
! void sigusr1_handler(int sig)
  {
  	dbprintf("--- GOT SIGUSR1 ---\n");
! 	stop();
  }
  
! int setup(char *clientargs)
  {
  	int ret;
***************
*** 211,215 ****
   * This is accessed from python as a vector (return value, data)
   */
! int marshall(char **marshalled_data, int *marshalled_data_size)
  {
  	int sts;
--- 211,215 ----
   * This is accessed from python as a vector (return value, data)
   */
! int marshall(char **marshalled_data, size_t *marshalled_data_size)
  {
  	int sts;
***************
*** 232,236 ****
  #ifdef IPBENCH_TEST_CLIENT
  /* for client test, we are passed the clientid of the data */
! int unmarshall(int clientid, char *data, int len, int valid)
  {
  	int sts;
--- 232,236 ----
  #ifdef IPBENCH_TEST_CLIENT
  /* for client test, we are passed the clientid of the data */
! int unmarshall(int clientid, char *data, size_t len, int valid)
  {
  	int sts;
***************
*** 248,252 ****
  #elif defined IPBENCH_TEST_TARGET
  /* for target test, we just put it straight into target_data */
! int unmarshall(char *data, int len, int valid)
  {
  	int sts;
--- 248,252 ----
  #elif defined IPBENCH_TEST_TARGET
  /* for target test, we just put it straight into target_data */
! int unmarshall(char *data, size_t len, int valid)
  {
  	int sts;