[ipbench-cvs] ipbench2/src/tests/wrapper client_wrapper.c,1.8,1.9 client_wrapper.h,1.6,1.7 client_wrapper_plugin.c,1.1,1.2 target_wrapper.c,1.12,1.13 target_wrapper.h,1.7,1.8 target_wrapper_plugin.c,1.1,1.2

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

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

Modified Files:
	client_wrapper.c client_wrapper.h client_wrapper_plugin.c 
	target_wrapper.c target_wrapper.h target_wrapper_plugin.c 
Log Message:
controller setup api changes


Index: target_wrapper_plugin.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/target_wrapper_plugin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** target_wrapper_plugin.c	27 Oct 2004 01:53:15 -0000	1.1
--- target_wrapper_plugin.c	5 May 2005 02:37:34 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
  	.type = IPBENCH_TARGET,
  	.setup = &target_wrap_setup,
+ 	.setup_controller = &target_wrap_setup_controller,
  	.start = &target_wrap_start,
  	.stop = &target_wrap_stop,

Index: target_wrapper.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/target_wrapper.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** target_wrapper.c	23 Feb 2005 01:17:05 -0000	1.12
--- target_wrapper.c	5 May 2005 02:37:34 -0000	1.13
***************
*** 13,16 ****
--- 13,22 ----
  
  int
+ target_wrap_controller_setup(char *arg)
+ {
+ 	return 0;
+ }
+ 
+ int
  target_wrap_start (struct timeval *start)
  {

Index: client_wrapper_plugin.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/client_wrapper_plugin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** client_wrapper_plugin.c	27 Oct 2004 01:53:15 -0000	1.1
--- client_wrapper_plugin.c	5 May 2005 02:37:34 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
  	.type = IPBENCH_CLIENT,
  	.setup = &client_wrap_setup,
+ 	.setup_controller = &client_wrap_setup_controller,
  	.start = &client_wrap_start,
  	.stop = &client_wrap_stop,

Index: target_wrapper.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/target_wrapper.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** target_wrapper.h	23 Feb 2005 01:17:05 -0000	1.7
--- target_wrapper.h	5 May 2005 02:37:34 -0000	1.8
***************
*** 10,13 ****
--- 10,14 ----
  
  int target_wrap_setup(char* arg);
+ int target_wrap_setup_controller(char *arg);
  int target_wrap_start(struct timeval *start);
  int target_wrap_stop(struct timeval *stop);

Index: client_wrapper.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/client_wrapper.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** client_wrapper.h	23 Feb 2005 01:17:05 -0000	1.6
--- client_wrapper.h	5 May 2005 02:37:34 -0000	1.7
***************
*** 11,14 ****
--- 11,15 ----
  /* function definitions for dummy test */
  int client_wrap_setup(char *hostname, int port, char* arg);
+ int client_wrap_setup_controller(char *arg);
  int client_wrap_start(struct timeval *start);
  int client_wrap_stop(struct timeval *stop);

Index: client_wrapper.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/client_wrapper.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** client_wrapper.c	23 Feb 2005 01:17:05 -0000	1.8
--- client_wrapper.c	5 May 2005 02:37:34 -0000	1.9
***************
*** 9,12 ****
--- 9,18 ----
  
  int
+ client_wrap_controller_setup(char *arg)
+ {
+ 	return 0;
+ }
+ 
+ int
  client_wrap_start (struct timeval *start)
  {