ipbench-cvs — cvs commits

[ipbench-cvs] ipbench2 ChangeLog,1.16,1.17

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

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

Modified Files:
	ChangeLog 
Log Message:
update


Index: ChangeLog
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ChangeLog	2 Mar 2005 00:44:13 -0000	1.16
--- ChangeLog	5 May 2005 04:22:34 -0000	1.17
***************
*** 1,6 ****
  2005-03-02  Ian Wienand  <ia...@ge...>
  
  	* src/tests/latency/latency.c : modify printf specifier for
! 	tick_rate 
  	* src/ipbench.py : add more information to execption
  	errors including return code and error strings.
--- 1,14 ----
+ 2005-05-05  Ian Wienand  <ia...@ge...>
+ 
+ 	* src/ipbench.py, src/pymod/*, src/tests/* : modify API to have a
+ 	controller setup function and phase.  This was we can pass
+ 	arguments to the controller.
+ 	* src/tests/latency.c : add ability to dump out client results to
+ 	a file
+ 
  2005-03-02  Ian Wienand  <ia...@ge...>
  
  	* src/tests/latency/latency.c : modify printf specifier for
! 	tick_rate
  	* src/ipbench.py : add more information to execption
  	errors including return code and error strings.
***************
*** 11,19 ****
  	condition variable to support FreeBSD.  also nice() process before
  	starting usage thread.
! 	
  2005-02-22  Ian Wienand  <ia...@ge...>
  
  	* many: changes to bring consisentcy to types; turn on -Wall,
! 	-Werror; modify to build 
  	* configure.in: version to 2.0.2
  
--- 19,27 ----
  	condition variable to support FreeBSD.  also nice() process before
  	starting usage thread.
! 
  2005-02-22  Ian Wienand  <ia...@ge...>
  
  	* many: changes to bring consisentcy to types; turn on -Wall,
! 	-Werror; modify to build
  	* configure.in: version to 2.0.2
  

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

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

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

Modified Files:
	plugin.h 
Log Message:


Index: plugin.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/plugin.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** plugin.h	23 Feb 2005 01:17:03 -0000	1.16
--- plugin.h	5 May 2005 04:20:31 -0000	1.17
***************
*** 56,59 ****
--- 56,61 ----
  #error "Please define either IPBENCH_TEST_CLIENT or IPBENCH_TEST_TARGET"
  #endif
+ 	/* any arguments the controller may need to parse */
+ 	int (*setup_controller)(char *arg);
  	/* start the test.  Timestamp *start with gettimeofday */
  	int (*start)(struct timeval *start);

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

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

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

Modified Files:
	latency.c latency.h 
Log Message:
parse controller options


Index: latency.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/latency/latency.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** latency.h	23 Feb 2005 01:17:04 -0000	1.8
--- latency.h	5 May 2005 04:20:10 -0000	1.9
***************
*** 117,120 ****
--- 117,121 ----
  /* these are the functions we implement */
  int latency_setup(char *hostname, int port, char* arg);
+ int latency_setup_controller(char* arg);
  int latency_start(struct timeval *start);
  int latency_stop(struct timeval *stop);

Index: latency.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/latency/latency.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** latency.c	1 Mar 2005 23:25:33 -0000	1.11
--- latency.c	5 May 2005 04:20:10 -0000	1.12
***************
*** 73,76 ****
--- 73,77 ----
  static char ifname[IFNAMSIZ];
  char sockopts[200];
+ static char *dump_dir, *dump_prefix, dump_filename[MAXPATHLEN];
  
  static struct packet_list_node *packet_list = NULL;
***************
*** 443,446 ****
--- 444,460 ----
  			  with_cpu_target = 1;
  		  }
+ 		  else if (!strcmp(cmd, "dump_dir")) {
+ 			  struct stat s;
+ 			  if (stat (val, &s) == -1 || ! S_ISDIR (s.st_mode)) {
+ 				  dbprintf("Invalid dump directory (%s)!\n", strerror(errno));
+ 				  return -1;
+ 			  }
+ 			  dump_dir = malloc(strlen(val)+1);
+ 			  strncpy(dump_dir, val, strlen(val)+1);
+ 		  }
+ 		  else if (!strcmp(cmd, "dump_prefix")) {
+ 			  dump_prefix = malloc(strlen(val)+1);
+ 			  strncpy(dump_prefix, val, strlen(val)+1);
+ 		  }
  		  else {
  			  dbprintf("Invlid argument %s=%s.\n", cmd, val);
***************
*** 692,695 ****
--- 706,727 ----
  		dbprintf("\n");
  #endif
+ 
+ 		if (dump_dir != NULL)
+ 		{
+ 			FILE *f;
+ 			uint64_t s;
+ 			snprintf(dump_filename, MAXPATHLEN, "%s/%s_%d.dmp", dump_dir, dump_prefix, i);
+ 			dbprintf("Dumping client data into %s\n", dump_filename);
+ 			f = fopen(dump_filename, "w");
+ 			if (fd == -1) {
+ 				dbprintf("Can't create dump file (%s)\n", strerror(errno));
+ 				continue;
+ 			}
+ 			for (s = 0 ; s < samples ; s++)
+ 			{
+ 				fprintf(f, "%"PRId64"%s", rtt_totals[s], (s == samples-1)?"":",");
+ 			}
+ 			fclose(f);
+ 		}
  	}
  
***************
*** 729,732 ****
--- 761,774 ----
  }
  
+ int latency_setup_controller(char *arg)
+ {
+ 	dbprintf("Setting up controller (%s)\n", arg);
+ 	/* a bit of a hack ... */
+ 	if (strlen(arg) != 0)
+ 		if (parse_arg(arg))
+ 			return -1;
+ 	return 0;
+ }
+ 
  struct ipbench_plugin ipbench_plugin = 
  {
***************
*** 737,740 ****
--- 779,783 ----
  	.default_port = 7,
  	.setup = &latency_setup,
+ 	.setup_controller = &latency_setup_controller,
  	.start = &latency_start,
  	.stop = &latency_stop,

[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 *);

[ipbench-cvs] ipbench2/src ipbench.py,1.29,1.30

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

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

Modified Files:
	ipbench.py 
Log Message:
controller api changes


Index: ipbench.py
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/ipbench.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** ipbench.py	2 Mar 2005 00:42:53 -0000	1.29
--- ipbench.py	5 May 2005 02:46:07 -0000	1.30
***************
*** 22,26 ****
          self.value = value
      def __str__(self):
!         return repr(self.value)      
  
  class IpbenchTestClient :
--- 22,26 ----
          self.value = value
      def __str__(self):
!         return repr(self.value)
  
  class IpbenchTestClient :
***************
*** 56,75 ****
              status["str"] = data[4:f].strip()
              status["msg"] = data[f+1:f2].strip()
!             
!         dbprint( "[parse_return_code] : " 
                   + " code=" +`status["code"]`
                   + "|str=" + status["str"]
                   + "|msg=" + status["msg"]+"|")
-         
          return status
!      
      def parse_return_code(self):
          data = self.s.recv(1024)
          return self._parse_return_code(data)
!                 
      def send_command(self, cmd):
          dbprint("[send_command] : " + cmd)
          self.s.send(cmd + "\n")
!             
      def connect(self):
          global options
--- 56,74 ----
              status["str"] = data[4:f].strip()
              status["msg"] = data[f+1:f2].strip()
! 
!         dbprint( "[parse_return_code] : "
                   + " code=" +`status["code"]`
                   + "|str=" + status["str"]
                   + "|msg=" + status["msg"]+"|")
          return status
! 
      def parse_return_code(self):
          data = self.s.recv(1024)
          return self._parse_return_code(data)
! 
      def send_command(self, cmd):
          dbprint("[send_command] : " + cmd)
          self.s.send(cmd + "\n")
! 
      def connect(self):
          global options
***************
*** 98,102 ****
                  if (status["code"] != 100):
                      raise IpbenchError("Invalid Version Flag")
!             #continue    
              #TODO: check versions
              self.send_command("HELLO")
--- 97,101 ----
                  if (status["code"] != 100):
                      raise IpbenchError("Invalid Version Flag")
!             #continue
              #TODO: check versions
              self.send_command("HELLO")
***************
*** 125,129 ****
          except IpbenchError:
              raise
!                         
      def start(self):
          # return is parsed in unmarshall
--- 124,128 ----
          except IpbenchError:
              raise
! 
      def start(self):
          # return is parsed in unmarshall
***************
*** 164,169 ****
          #wrapper, as the target test doesn't need to be passed an id
          self.call_test_unmarshall(client_data, valid)
!             
!     def close(self):        
          self.send_command("QUIT")
          self.s.close()
--- 163,168 ----
          #wrapper, as the target test doesn't need to be passed an id
          self.call_test_unmarshall(client_data, valid)
! 
!     def close(self):
          self.send_command("QUIT")
          self.s.close()
***************
*** 203,207 ****
      def call_test_unmarshall(self, client_data, valid):
          self.test_ptr.unmarshall(client_data, valid)
-     
  
  ##
--- 202,205 ----
***************
*** 212,216 ****
      clients = []
      targets = []
!     
      usage = "usage: %prog [options]"
      parser = OptionParser(usage, version="%prog 2.0")
--- 210,214 ----
      clients = []
      targets = []
! 
      usage = "usage: %prog [options]"
      parser = OptionParser(usage, version="%prog 2.0")
***************
*** 257,261 ****
                        help="Port to talk to the target test daemon",
                        default=8037)
!     
      (options, args) = parser.parse_args()
  
--- 255,267 ----
                        help="Port to talk to the target test daemon",
                        default=8037)
! 
!     parser.add_option("--test-controller-args", dest="controller_args", action="store", type="string",
!                       help="Arguments for the controller for the main test",
!                       default=None)
! 
!     parser.add_option("--target-test-controller-args", dest="target_controller_args", action="store", type="string",
!                       help="Arguments for the controller for the target test",
!                       default=None)
! 
      (options, args) = parser.parse_args()
  
***************
*** 401,409 ****
          print "Please specify a test"
          sys.exit(1)
!     
      if ( not len(clients) ):
          print "Please specify some clients"
          sys.exit(1)
-     
  
      # seeing as all clients are running the same test, we
--- 407,414 ----
          print "Please specify a test"
          sys.exit(1)
! 
      if ( not len(clients) ):
          print "Please specify some clients"
          sys.exit(1)
  
      # seeing as all clients are running the same test, we
***************
*** 411,429 ****
      client_test = ipbench_client
      if (options.debug):
!         client_test.enable_debug()   
!     client_test.setup_controller(len(clients))
      client_test.load_plugin(options.test)
!     
      try:
          #setup each of the targets
          for target in targets:
              dbprint("[main] setting up target " + target["hostname"])
!                     
              target["shuntobj"] = ipbench_target
              if (options.debug):
                  target["shuntobj"].enable_debug()
-             target["shuntobj"].setup_controller()
              target["shuntobj"].load_plugin(target["test"])
!             
              target["testobj"] = IpbenchTestTarget(target["hostname"], target["port"],
                                                    target["test_args"], target["test"],
--- 416,434 ----
      client_test = ipbench_client
      if (options.debug):
!         client_test.enable_debug()
      client_test.load_plugin(options.test)
!     client_test.setup_controller(len(clients), options.controller_args)
! 
      try:
          #setup each of the targets
          for target in targets:
              dbprint("[main] setting up target " + target["hostname"])
! 
              target["shuntobj"] = ipbench_target
              if (options.debug):
                  target["shuntobj"].enable_debug()
              target["shuntobj"].load_plugin(target["test"])
!             target["shuntobj"].setup_controller(options.target_controller_args)
! 
              target["testobj"] = IpbenchTestTarget(target["hostname"], target["port"],
                                                    target["test_args"], target["test"],
***************
*** 463,467 ****
              wait_for_error.append(target["testobj"])
  
!         #simply select() on all the fd's of the clients 
          #(client["testobj"].fileno() provides the fd)
          #once they have data, unmarshall it.
--- 468,472 ----
              wait_for_error.append(target["testobj"])
  
!         #simply select() on all the fd's of the clients
          #(client["testobj"].fileno() provides the fd)
          #once they have data, unmarshall it.
***************
*** 490,501 ****
          for target in targets:
              target["shuntobj"].output()
!         
      except IpbenchError, e:
          print "Ipbench failed : " + e.value
!     
      #close all connections and quit
      for client in clients + targets:
          client["testobj"].close()
!         
  if __name__ == "__main__":
      main()
--- 495,506 ----
          for target in targets:
              target["shuntobj"].output()
! 
      except IpbenchError, e:
          print "Ipbench failed : " + e.value
! 
      #close all connections and quit
      for client in clients + targets:
          client["testobj"].close()
! 
  if __name__ == "__main__":
      main()

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

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

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

Modified Files:
	wait.c 
Log Message:
controller api changes


Index: wait.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wait/wait.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wait.c	23 Feb 2005 02:45:49 -0000	1.5
--- wait.c	5 May 2005 02:45:13 -0000	1.6
***************
*** 21,24 ****
--- 21,29 ----
  }
  
+ int wait_setup_controller(char *arg)
+ {
+ 	return 0;
+ }
+ 
  int
  wait_start (struct timeval *start)
***************
*** 88,91 ****
--- 93,97 ----
  	.type = IPBENCH_CLIENT,
  	.setup = &wait_setup,
+ 	.setup_controller = &wait_setup_controller,
  	.start = &wait_start,
  	.stop = &wait_stop,

[ipbench-cvs] ipbench2/src/tests/nfsstone nfsstones.c,1.13,1.14 nfsstones.h,1.7,1.8 plugin.c,1.1,1.2

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

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

Modified Files:
	nfsstones.c nfsstones.h plugin.c 
Log Message:
controller api changes


Index: nfsstones.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfsstone/nfsstones.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** nfsstones.h	23 Feb 2005 01:17:04 -0000	1.7
--- nfsstones.h	5 May 2005 02:43:57 -0000	1.8
***************
*** 13,16 ****
--- 13,17 ----
  /* function definitions for nfsstone test */
  int  nfsstone_setup(char *hostname, int port, char* arg);
+ int  nfsstone_setup_controller(char *arg);
  int  nfsstone_start(struct timeval *start);
  int  nfsstone_stop(struct timeval *stop);

Index: plugin.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfsstone/plugin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** plugin.c	23 Sep 2004 05:40:27 -0000	1.1
--- plugin.c	5 May 2005 02:43:57 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
  	.type = IPBENCH_CLIENT,
  	.setup = &nfsstone_setup,
+ 	.setup_controller = &nfsstone_setup_controller,
  	.start = &nfsstone_start,
  	.stop = &nfsstone_stop,

Index: nfsstones.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfsstone/nfsstones.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** nfsstones.c	23 Feb 2005 01:17:04 -0000	1.13
--- nfsstones.c	5 May 2005 02:43:57 -0000	1.14
***************
*** 135,138 ****
--- 135,143 ----
  int buf[BYTES_PER_BLOCK/sizeof(int)];
  
+ int nfsstone_setup_controller(char *arg)
+ {
+ 	return 0;
+ }
+ 
  int nfsstone_setup(char *hostname, int port, char* arg)
  {

[ipbench-cvs] ipbench2/src/tests/cpu_target_lukem cpu_target_lukem.c,1.12,1.13

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

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

Modified Files:
	cpu_target_lukem.c 
Log Message:
controller api chage


Index: cpu_target_lukem.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/cpu_target_lukem/cpu_target_lukem.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** cpu_target_lukem.c	24 Feb 2005 05:32:15 -0000	1.12
--- cpu_target_lukem.c	5 May 2005 02:42:21 -0000	1.13
***************
*** 93,96 ****
--- 93,102 ----
  
  
+ int 
+ cpu_target_lukem_setup_controller(char *arg)
+ {
+ 	return 0;
+ }
+ 
  int
  cpu_target_lukem_setup (char *arg)
***************
*** 201,204 ****
--- 207,211 ----
  	.default_port = 7,
  	.setup = &cpu_target_lukem_setup,
+ 	.setup_controller = &cpu_target_lukem_setup_controller,
  	.start = &cpu_target_lukem_start,
  	.stop = &cpu_target_lukem_stop,

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

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

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

Modified Files:
	cpu_target.c 
Log Message:
controller api changes


Index: cpu_target.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/cpu_target/cpu_target.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** cpu_target.c	24 Feb 2005 05:32:15 -0000	1.11
--- cpu_target.c	5 May 2005 02:40:34 -0000	1.12
***************
*** 329,332 ****
--- 329,338 ----
  
  
+ int 
+ cpu_target_controller_setup(char *arg)
+ {
+ 	return 0;
+ }
+ 
  int
  cpu_target_setup (char *arg)
***************
*** 458,461 ****
--- 464,468 ----
  	.default_port = 7,
  	.setup = &cpu_target_setup,
+ 	.setup_controller = &cpu_target_controller_setup,
  	.start = &cpu_target_start,
  	.stop = &cpu_target_stop,

[ipbench-cvs] ipbench2/src/tests/dummy dummy.c,1.12,1.13 dummy.h,1.6,1.7 dummy_target.c,1.9,1.10 dummy_target.h,1.6,1.7 plugin.c,1.3,1.4 target_plugin.c,1.2,1.3

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

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

Modified Files:
	dummy.c dummy.h dummy_target.c dummy_target.h plugin.c 
	target_plugin.c 
Log Message:
controller setup api


Index: dummy_target.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy_target.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dummy_target.h	23 Feb 2005 01:17:04 -0000	1.6
--- dummy_target.h	5 May 2005 02:38:11 -0000	1.7
***************
*** 5,8 ****
--- 5,9 ----
  
  int dummy_target_setup(char* arg);
+ int dummy_target_setup_controller(char* arg);
  int dummy_target_start(struct timeval *start);
  int dummy_target_stop(struct timeval *stop);

Index: dummy.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** dummy.c	23 Feb 2005 01:17:04 -0000	1.12
--- dummy.c	5 May 2005 02:38:10 -0000	1.13
***************
*** 14,17 ****
--- 14,23 ----
  }
  
+ int dummy_setup_controller(char *arg)
+ {
+ 	dbprintf("dummy_setup_controller - %s\n", arg);
+ 	return 0;
+ }
+ 
  /*
   * Start your test -- timestamp start with gettimeofday() as the last

Index: target_plugin.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/target_plugin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** target_plugin.c	17 Sep 2004 02:58:10 -0000	1.2
--- target_plugin.c	5 May 2005 02:38:11 -0000	1.3
***************
*** 9,12 ****
--- 9,13 ----
  	.type = IPBENCH_TARGET,
  	.setup = &dummy_target_setup,
+ 	.setup_controller = &dummy_target_setup_controller,
  	.start = &dummy_target_start,
  	.stop = &dummy_target_stop,

Index: dummy.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dummy.h	23 Feb 2005 01:17:04 -0000	1.6
--- dummy.h	5 May 2005 02:38:10 -0000	1.7
***************
*** 6,9 ****
--- 6,10 ----
  /* function definitions for dummy test */
  int dummy_setup(char *hostname, int port, char* arg);
+ int dummy_setup_controller(char* arg);
  int dummy_start(struct timeval *start);
  int dummy_stop(struct timeval *stop);

Index: dummy_target.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/dummy_target.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dummy_target.c	23 Feb 2005 01:17:04 -0000	1.9
--- dummy_target.c	5 May 2005 02:38:11 -0000	1.10
***************
*** 17,20 ****
--- 17,28 ----
  }
  
+ int
+ dummy_target_setup_controller(char *arg)
+ {
+ 	dbprintf ("[target] [target_setup_controller] : START\n");
+ 	dbprintf ("dummy_target_setup - %s\n", arg);
+ 	return 0;
+ }
+ 
  /*
   * Start your test -- timestamp start with gettimeofday() as the last

Index: plugin.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/plugin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** plugin.c	16 Sep 2004 02:29:24 -0000	1.3
--- plugin.c	5 May 2005 02:38:11 -0000	1.4
***************
*** 9,12 ****
--- 9,13 ----
  	.type = IPBENCH_CLIENT,
  	.setup = &dummy_setup,
+ 	.setup_controller = &dummy_setup_controller,
  	.start = &dummy_start,
  	.stop = &dummy_stop,

[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)
  {

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

[Mark T. <b0...@us...>]

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

Modified Files:
	ipbenchd.py 
Log Message:
Mark Tsui 7/3/05:
   * Added --ip option to specify an ip address to bind to.
   * Corrected printf format type in calibrate.c 


Index: ipbenchd.py
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/ipbenchd.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ipbenchd.py	23 Feb 2005 02:44:49 -0000	1.28
--- ipbenchd.py	7 Mar 2005 06:12:26 -0000	1.29
***************
*** 505,508 ****
--- 505,510 ----
      usage = "usage: %prog [options]"
      parser = OptionParser(usage, version="%prog 2.0")
+     parser.add_option("-i", "--ip", dest="ip",
+                       help="Ip to bind to", type="string", default="127.0.0.1", action="store")
      parser.add_option("-p", "--port", dest="port",
                        help="Port to listen on", type="int", default=8036, action="store")
***************
*** 517,521 ****
          options.port = 8037 
  
!     server = IpbenchClientServer(("", options.port), IpbenchRequestHandler)
  
    
--- 519,523 ----
          options.port = 8037 
  
!     server = IpbenchClientServer((options.ip, options.port), IpbenchRequestHandler)
  
    

[ipbench-cvs] ipbench2/src/tests/cpu_target_lukem calibrate.c,1.1,1.2

[Mark T. <b0...@us...>]

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

Modified Files:
	calibrate.c 
Log Message:
Mark Tsui 7/3/05:
   * Added --ip option to specify an ip address to bind to.
   * Corrected printf format type in calibrate.c 


Index: calibrate.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/cpu_target_lukem/calibrate.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** calibrate.c	24 Jan 2005 05:08:19 -0000	1.1
--- calibrate.c	7 Mar 2005 06:12:29 -0000	1.2
***************
*** 5,8 ****
--- 5,10 ----
  #include <stdint.h>
  #include <signal.h>
+ #include <inttypes.h>
+ 
  
  #include "cpu_target_lukem.h"
***************
*** 60,64 ****
  		else {
  			for (cal_count = PROFILE_TO_AVG; cal_count > 0 ; cal_count--)
! 				printf("%ld\n", profiles[cal_count]);
  			exit(0);
  		}
--- 62,66 ----
  		else {
  			for (cal_count = PROFILE_TO_AVG; cal_count > 0 ; cal_count--)
! 				printf("%"PRId64"\n", profiles[cal_count]);
  			exit(0);
  		}

[ipbench-cvs] ipbench2 ChangeLog,1.15,1.16

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

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

Modified Files:
	ChangeLog 
Log Message:
update


Index: ChangeLog
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ChangeLog	24 Feb 2005 04:55:21 -0000	1.15
--- ChangeLog	2 Mar 2005 00:44:13 -0000	1.16
***************
*** 1,2 ****
--- 1,9 ----
+ 2005-03-02  Ian Wienand  <ia...@ge...>
+ 
+ 	* src/tests/latency/latency.c : modify printf specifier for
+ 	tick_rate 
+ 	* src/ipbench.py : add more information to execption
+ 	errors including return code and error strings.
+ 
  2005-02-24  Ian Wienand  <ia...@ge...>
  

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

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

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

Modified Files:
	ipbench.py 
Log Message:
add better error handling feedback


Index: ipbench.py
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/ipbench.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ipbench.py	25 Jan 2005 10:59:31 -0000	1.28
--- ipbench.py	2 Mar 2005 00:42:53 -0000	1.29
***************
*** 103,111 ****
              status = self.parse_return_code()
              if (status["code"] != 200):
!                 raise IpbenchError("HELLO failed")
              self.send_command("LOAD " + self.test_name)
              status = self.parse_return_code()
              if (status["code"] == 421):
!                 raise IpbenchError("LOAD Failed ("+ status["msg"] + ")")
              elif (status["code"] != 200):
                  raise IpbenchError("LOAD Failed")
--- 103,111 ----
              status = self.parse_return_code()
              if (status["code"] != 200):
!                 raise IpbenchError("HELLO to " + self.hostname + " failed (" + status["code"] + " " + status["str"] + ")")
              self.send_command("LOAD " + self.test_name)
              status = self.parse_return_code()
              if (status["code"] == 421):
!                 raise IpbenchError("LOAD to " + self.hostname + " failed ("+ status["msg"] + ")")
              elif (status["code"] != 200):
                  raise IpbenchError("LOAD Failed")
***************
*** 122,126 ****
              status = self.parse_return_code()
              if (status["code"] != 200):
!                 raise IpbenchError("SETUP Failed")
          except IpbenchError:
              raise
--- 122,126 ----
              status = self.parse_return_code()
              if (status["code"] != 200):
!                 raise IpbenchError("SETUP to " + self.hostname + "failed (" + status["code"] + " " + status["str"] + ")")
          except IpbenchError:
              raise
***************
*** 188,195 ****
  
          try:
              self.send_command('SETUP args::"' + self.test_args + '"')
              status = self.parse_return_code()
              if (status["code"] != 200):
!                 raise IpbenchError("SETUP Failed")
          except IpbenchError:
              raise
--- 188,197 ----
  
          try:
+             if (self.test_args == None):
+                 self.test_args = ""
              self.send_command('SETUP args::"' + self.test_args + '"')
              status = self.parse_return_code()
              if (status["code"] != 200):
!                 raise IpbenchError("SETUP Failed (" + status["code"] + " " + status["str"] + ")")
          except IpbenchError:
              raise

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

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

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

Modified Files:
	latency.c 
Log Message:
use correct printf specifier for tick_rate


Index: latency.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/latency/latency.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** latency.c	24 Feb 2005 05:32:15 -0000	1.10
--- latency.c	1 Mar 2005 23:25:33 -0000	1.11
***************
*** 255,259 ****
  	send_rate = (double)bps / (8.0 * US_PER_S * size * tick_rate);
  
! 	dbprintf("Calculating send rate (8.0 * %d * %d * %d)\n", US_PER_S, size, tick_rate);
  
  	dbprintf("About to start sending.  send_rate is %g, start_time is %llu, warmup_time %llu, cooldown %llu\n",
--- 255,259 ----
  	send_rate = (double)bps / (8.0 * US_PER_S * size * tick_rate);
  
! 	dbprintf("Calculating send rate (8.0 * %d * %d * %g)\n", US_PER_S, size, tick_rate);
  
  	dbprintf("About to start sending.  send_rate is %g, start_time is %llu, warmup_time %llu, cooldown %llu\n",

[ipbench-cvs] ipbench2/doc README,1.2,1.3

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

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

Modified Files:
	README 
Log Message:
add a quickstart guide


Index: README
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/doc/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README	24 Feb 2005 04:37:31 -0000	1.2
--- README	24 Feb 2005 05:36:08 -0000	1.3
***************
*** 188,189 ****
--- 188,242 ----
   ] cpu_target_lukem
      An alternative target test which is based on more accurate cycle counting
+ 
+ 
+ * Quickstart Guide
+ ------------------
+ 
+  1) Build the current cvs sources and install.
+      - use the autogen.sh script in the top level directory
+      - ./configure && make && make install
+ 
+  2) Start up three terminal windows, one is the controller, one is a
+     client and the other is a target
+ 
+  3) In the client window start ipbenchd.py
+ 
+     $ python /usr/local/bin/ipbenchd.py --debug
+ 
+  4) In the target window, start ipbenchd.py --target
+ 
+     $ python /usr/local/bin/ipbenchd.py --target --debug
+ 
+  5) In the controller, run
+ 
+     $ python /usr/local/bin/ipbench.py --test=wait --client=localhost \
+              --test-target=localhost --target-test=cpu_usage_lukem    \
+ 	     --target-hostname=localhost
+ 
+  6) You should see something like
+ 
+   ] Client 
+ 
+   ---
+   [run] start
+   [parse_common_opts]: got line START
+   [run] starting actual test 
+   Please press ENTER or send a SIGINT to 4576 to stop the test
+   ---
+   
+   Press Enter in this window to complete the test
+ 
+ 
+   ] Target
+   ---
+   [run] start
+   [parse_common_opts]: got line START
+   [run] starting target test
+   [16:32.40] dbg: Starting.
+   ---
+ 
+   ] Controller (after pressing enter in the client window)
+   --- 
+   OK   <--- reponse from client
+   5.8  <--- respose from target (your CPU usage)
+   ---

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

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

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

Modified Files:
	latency.c 
Log Message:
handle non-arguments better


Index: latency.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/latency/latency.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** latency.c	23 Feb 2005 01:17:04 -0000	1.9
--- latency.c	24 Feb 2005 05:32:15 -0000	1.10
***************
*** 400,406 ****
  	char *p, cmd[200], *val;
  
- 	if (arg == NULL)
- 		return 0;
- 
  	while (next_token(&arg, cmd, " \t,"))
  	  {
--- 400,403 ----
***************
*** 467,472 ****
  
  	dbprintf("Latency setup begin (target %s [port %d]).\n", hostname, port);
! 	if (parse_arg(arg))
! 		return -1;
  
  	/* 
--- 464,470 ----
  
  	dbprintf("Latency setup begin (target %s [port %d]).\n", hostname, port);
! 	if (strlen(arg) != 0)
! 		if (parse_arg(arg))
! 			return -1;
  
  	/* 

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

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

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

Modified Files:
	cpu_target_lukem.c 
Log Message:
handle non-arguments better


Index: cpu_target_lukem.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/cpu_target_lukem/cpu_target_lukem.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** cpu_target_lukem.c	24 Feb 2005 00:37:59 -0000	1.11
--- cpu_target_lukem.c	24 Feb 2005 05:32:15 -0000	1.12
***************
*** 62,68 ****
  	char *arg_ptr, *cmd_ptr;
  
- 	if (arg == NULL)
- 		return 0;
- 
  	c = strtok_r(arg, ",", &arg_ptr);
  	if (c == NULL) {
--- 62,65 ----
***************
*** 99,105 ****
  cpu_target_lukem_setup (char *arg)
  {
! 	dbprintf ("Setup test.\n");
  
! 	if (arg != NULL)
  		if (parse_arg(arg))
  			return -1;
--- 96,102 ----
  cpu_target_lukem_setup (char *arg)
  {
! 	dbprintf ("Setup test [%c].\n", *arg);
  
! 	if (strlen(arg) != 0)
  		if (parse_arg(arg))
  			return -1;

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

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

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

Modified Files:
	cpu_target.c 
Log Message:
handle non-arguments better


Index: cpu_target.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/cpu_target/cpu_target.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** cpu_target.c	23 Feb 2005 01:17:03 -0000	1.10
--- cpu_target.c	24 Feb 2005 05:32:15 -0000	1.11
***************
*** 296,302 ****
  	char *arg_ptr, *cmd_ptr;
  
- 	if (arg == NULL)
- 		return 0;
- 
  	c = strtok_r(arg, ",", &arg_ptr);
  	if (c == NULL) {
--- 296,299 ----
***************
*** 339,344 ****
  	dbprintf ("Setup test.\n");
  
! 	if (parse_arg(arg))
! 		return -1;
  
  	/* XXX : get_cpus() (no SMP support) */
--- 336,342 ----
  	dbprintf ("Setup test.\n");
  
! 	if (strlen(arg) != 0)
! 		if (parse_arg(arg))
! 			return -1;
  
  	/* XXX : get_cpus() (no SMP support) */

[ipbench-cvs] ipbench2 ChangeLog,1.14,1.15

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

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

Modified Files:
	ChangeLog 
Log Message:
update


Index: ChangeLog
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ChangeLog	23 Feb 2005 23:56:55 -0000	1.14
--- ChangeLog	24 Feb 2005 04:55:21 -0000	1.15
***************
*** 2,7 ****
  
  	* src/tests/cpu_target_lukem/cpu_target_lukem.c : wait on a
! 	condition variable to support FreeBSD.
! 
  2005-02-22  Ian Wienand  <ia...@ge...>
  
--- 2,8 ----
  
  	* src/tests/cpu_target_lukem/cpu_target_lukem.c : wait on a
! 	condition variable to support FreeBSD.  also nice() process before
! 	starting usage thread.
! 	
  2005-02-22  Ian Wienand  <ia...@ge...>
  

[ipbench-cvs] ipbench2/doc README,1.1,1.2

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

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

Modified Files:
	README 
Log Message:
update with some new tests


Index: README
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/doc/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README	1 Oct 2004 04:27:08 -0000	1.1
--- README	24 Feb 2005 04:37:31 -0000	1.2
***************
*** 167,171 ****
  
   ] nfsstone
!     A work in process version of nfsstone
  
  * Target tests
--- 167,174 ----
  
   ] nfsstone
!     A version of nfsstone
! 
!  ] wrapper
!     A test that can execute shell scripts (or any other system commands)
  
  * Target tests
***************
*** 183,184 ****
--- 186,189 ----
      cycle soaking children.
  
+  ] cpu_target_lukem
+     An alternative target test which is based on more accurate cycle counting

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

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

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

Modified Files:
	cpu_target_lukem.c 
Log Message:
add a nice call to lower priority


Index: cpu_target_lukem.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/cpu_target_lukem/cpu_target_lukem.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** cpu_target_lukem.c	23 Feb 2005 22:45:38 -0000	1.10
--- cpu_target_lukem.c	24 Feb 2005 00:37:59 -0000	1.11
***************
*** 104,107 ****
--- 104,110 ----
  		if (parse_arg(arg))
  			return -1;
+ 	
+ 	/* put ourselves at a low priority */
+ 	nice(20);
  
  	/* create the idle thread */

[ipbench-cvs] ipbench2 ChangeLog,1.13,1.14

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

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

Modified Files:
	ChangeLog 
Log Message:
update


Index: ChangeLog
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ChangeLog	22 Feb 2005 04:43:41 -0000	1.13
--- ChangeLog	23 Feb 2005 23:56:55 -0000	1.14
***************
*** 1,2 ****
--- 1,7 ----
+ 2005-02-24  Ian Wienand  <ia...@ge...>
+ 
+ 	* src/tests/cpu_target_lukem/cpu_target_lukem.c : wait on a
+ 	condition variable to support FreeBSD.
+ 
  2005-02-22  Ian Wienand  <ia...@ge...>
  

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

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

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

Modified Files:
	cpu_target_lukem.c 
Log Message:
use a conditional variable to sleep on


Index: cpu_target_lukem.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/cpu_target_lukem/cpu_target_lukem.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cpu_target_lukem.c	23 Feb 2005 05:56:13 -0000	1.9
--- cpu_target_lukem.c	23 Feb 2005 22:45:38 -0000	1.10
***************
*** 24,28 ****
  static int calc = 1;
  
! volatile static int running = 1;
  
  void *idle_thread(void *arg)
--- 24,29 ----
  static int calc = 1;
  
! static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
! static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
  
  void *idle_thread(void *arg)
***************
*** 107,110 ****
--- 108,114 ----
  	pthread_create(&ithr, NULL, idle_thread, NULL);
  
+ 	/* lock the mutex */
+ 	pthread_mutex_lock(&mutex);
+ 
  	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;
--- 117,126 ----
  cpu_target_lukem_start(struct timeval *start)
  {
  	gettimeofday(start, NULL);
  	dbprintf("Starting.\n");
! 	
! 	/* wait on the conditional */
! 	pthread_cond_wait(&cond, &mutex);
! 
  	dbprintf("Complete.\n");
  	return 0;
***************
*** 127,131 ****
  	gettimeofday(stop, NULL);
  	calc = 0;
! 	running = 0;
  	dbprintf("Stopping.\n");
  	return 0;
--- 132,136 ----
  	gettimeofday(stop, NULL);
  	calc = 0;
! 	pthread_cond_signal(&cond);
  	dbprintf("Stopping.\n");
  	return 0;