[ipbench-cvs] ipbench2/src/pymod ipbench.c,1.12,1.13 ipbench.i.in,1.8,1.9

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

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

Modified Files:
	ipbench.c ipbench.i.in 
Log Message:
controller api changes


Index: ipbench.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/pymod/ipbench.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ipbench.c	23 Feb 2005 01:17:03 -0000	1.12
--- ipbench.c	5 May 2005 02:47:04 -0000	1.13
***************
*** 49,53 ****
  
  #ifdef IPBENCH_TEST_CLIENT
! int setup_controller(int totalclients)
  {
  	/* allocate memory for the client_data array */
--- 49,53 ----
  
  #ifdef IPBENCH_TEST_CLIENT
! int setup_controller(int totalclients, char *args)
  {
  	/* allocate memory for the client_data array */
***************
*** 56,65 ****
  	if ((client_data = malloc(nclients * sizeof(struct client_data))) == NULL)
  		return ipbench_error(ipbench_RuntimeError, "nclients not set!");
  	return 0;
  }
  #elif defined IPBENCH_TEST_TARGET
! int setup_controller(void)
  {
! 	/* we don't need to do anything */
  	return 0;
  }
--- 56,68 ----
  	if ((client_data = malloc(nclients * sizeof(struct client_data))) == NULL)
  		return ipbench_error(ipbench_RuntimeError, "nclients not set!");
+ 
+ 	ipbench_plugin->setup_controller(args);
+ 
  	return 0;
  }
  #elif defined IPBENCH_TEST_TARGET
! int setup_controller(char *args)
  {
! 	ipbench_plugin->setup_controller(args);
  	return 0;
  }

Index: ipbench.i.in
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/pymod/ipbench.i.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ipbench.i.in	23 Feb 2005 00:42:32 -0000	1.8
--- ipbench.i.in	5 May 2005 02:47:04 -0000	1.9
***************
*** 23,29 ****
  extern int get_default_port(void);
  #ifdef IPBENCH_TEST_client
! extern int setup_controller(int);
  #elif  defined IPBENCH_TEST_target
! extern int setup_controller(void);
  #endif
  extern int load_plugin(const char *);
--- 23,29 ----
  extern int get_default_port(void);
  #ifdef IPBENCH_TEST_client
! extern int setup_controller(int, char*);
  #elif  defined IPBENCH_TEST_target
! extern int setup_controller(char*);
  #endif
  extern int load_plugin(const char *);