ipbench-cvs — cvs commits

[ipbench-cvs] ipbench2/src/tests/nfs_latency/libnfs callback.c, 1.2, 1.3 mount.c, 1.3, 1.4

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27701/src/tests/nfs_latency/libnfs

Modified Files:
	callback.c mount.c 
Log Message:
xGet rid of yet more ad-hoc debugging.


Index: mount.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs/mount.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mount.c	9 Feb 2010 01:04:25 -0000	1.3
--- mount.c	9 Feb 2010 02:52:50 -0000	1.4
***************
*** 58,62 ****
  	}
  
! 	printf("mnt_init(): connecting to port %d\n", port);
  
  	s.sin_port = htons(port);
--- 58,62 ----
  	}
  
! 	dbprintf("mnt_init(): connecting to port %d\n", port);
  
  	s.sin_port = htons(port);

Index: callback.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs/callback.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** callback.c	14 Sep 2005 00:47:09 -0000	1.2
--- callback.c	9 Feb 2010 02:52:48 -0000	1.3
***************
*** 7,10 ****
--- 7,11 ----
  #include <inttypes.h>
  
+ #include "lib/util.h"
  #include "rpc.h"
  #include "callback.h"
***************
*** 45,49 ****
  	if(last_xid>0){
  		if(xid != (last_xid+1)){
! 			printf("xid=%d, last_xid=%d\n", xid, last_xid);
  			assert(xid > last_xid);
  		}
--- 46,50 ----
  	if(last_xid>0){
  		if(xid != (last_xid+1)){
! 			dbprintf("xid=%d, last_xid=%d\n", xid, last_xid);
  			assert(xid > last_xid);
  		}

[ipbench-cvs] ipbench2/src/tests/nfs_latency/libnfs portmap.c, 1.1, 1.2 mount.c, 1.2, 1.3

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13882/src/tests/nfs_latency/libnfs

Modified Files:
	portmap.c mount.c 
Log Message:
Get rid of more ad-hoc debugging.


Index: mount.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs/mount.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mount.c	9 Feb 2010 00:24:16 -0000	1.2
--- mount.c	9 Feb 2010 01:04:25 -0000	1.3
***************
*** 6,15 ****
  #include <string.h>
  
  #include "nfs.h"
  #include "rpc.h"
  #include "xdr.h"
  
- #define debug(x...) fprintf(stderr,x)
- 
  #define MOUNT_TCP 0
  
--- 6,14 ----
  #include <string.h>
  
+ #include "lib/util.h"
  #include "nfs.h"
  #include "rpc.h"
  #include "xdr.h"
  
  #define MOUNT_TCP 0
  
***************
*** 22,26 ****
  	uint16_t port;
  
! 	debug("mnt_init(): called\n");
  	
  	/* make RPC to get mountd info */
--- 21,25 ----
  	uint16_t port;
  
! 	dbprintf("mnt_init(): called\n");
  	
  	/* make RPC to get mountd info */
***************
*** 34,45 ****
  #endif
  	if (map_getport(&map) == 0) {
! 		debug("mountd port number is %d\n", map.port);
  		port = map.port;
  		if (port == 0) {
! 			debug("mnt_init(): mount port invalid\n");
  			return 1;
  		} 
  	} else {
! 		debug("mnt_init(): error getting mountd port number\n");
  		return 1;
  	}
--- 33,44 ----
  #endif
  	if (map_getport(&map) == 0) {
! 		dbprintf("mountd port number is %d\n", map.port);
  		port = map.port;
  		if (port == 0) {
! 			dbprintf("mnt_init(): mount port invalid\n");
  			return 1;
  		} 
  	} else {
! 		dbprintf("mnt_init(): error getting mountd port number\n");
  		return 1;
  	}
***************
*** 73,77 ****
          assert(fcntl(mount_fd, F_SETFL, O_NONBLOCK)!=-1);
  
! 	debug("mnt_init(): done");
  
  	return 0;
--- 72,76 ----
          assert(fcntl(mount_fd, F_SETFL, O_NONBLOCK)!=-1);
  
! 	dbprintf("mnt_init(): done");
  
  	return 0;
***************
*** 90,101 ****
  	
  	while (getfrombuf(&ret, (char *)&opt, sizeof(opt), 1), opt) {
! 		printf("NFS Export...\n");
  		getstring(&ret, str, 100);
! 		printf("* Export name is %s\n", (char *)&str);
  		
  		/* now to extract more stuff... */ 
  		while (getfrombuf(&ret, (char *)&opt, sizeof(opt), 1), opt) {
  			getstring(&ret, str, 100);
! 			printf("* Group %s\n", (char *)str);
  		} 
  	} 
--- 89,100 ----
  	
  	while (getfrombuf(&ret, (char *)&opt, sizeof(opt), 1), opt) {
! 		dbprintf("NFS Export...\n");
  		getstring(&ret, str, 100);
! 		dbprintf("* Export name is %s\n", (char *)&str);
  		
  		/* now to extract more stuff... */ 
  		while (getfrombuf(&ret, (char *)&opt, sizeof(opt), 1), opt) {
  			getstring(&ret, str, 100);
! 			dbprintf("* Group %s\n", (char *)str);
  		} 
  	} 
***************
*** 109,113 ****
  	int status;
  
! 	debug("mnt_mount(): mounting \"%s\"\n", dir);
  
  	initbuf(&pbuf, MNT_NUMBER, MNT_VERSION, MNTPROC_MNT);
--- 108,112 ----
  	int status;
  
! 	dbprintf("mnt_mount(): mounting \"%s\"\n", dir);
  
  	initbuf(&pbuf, MNT_NUMBER, MNT_VERSION, MNTPROC_MNT);
***************
*** 121,125 ****
  
  	if (status != 0) {
! 		debug("mnt_mount(): could not mount \"%s\": %d\n", dir, status);
  		return status;	
  	}
--- 120,124 ----
  
  	if (status != 0) {
! 		dbprintf("mnt_mount(): could not mount \"%s\": %d\n", dir, status);
  		return status;	
  	}
***************
*** 127,131 ****
  	getfrombuf(&ret, (char *)pfh, sizeof(struct cookie), 1);
  
! 	debug("mnt_mount(): \"%s\" has been mounted\n", dir);
  
  	return 0;
--- 126,130 ----
  	getfrombuf(&ret, (char *)pfh, sizeof(struct cookie), 1);
  
! 	dbprintf("mnt_mount(): \"%s\" has been mounted\n", dir);
  
  	return 0;

Index: portmap.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs/portmap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** portmap.c	21 Jun 2005 02:57:38 -0000	1.1
--- portmap.c	9 Feb 2010 01:04:23 -0000	1.2
***************
*** 9,17 ****
  #include <sys/socket.h>
  
  #include "nfs.h"
  #include "rpc.h"
  #include "xdr.h"
  
- #define debug(x...) fprintf(stderr,x)
  
  #define PORTMAP_TCP 0
--- 9,17 ----
  #include <sys/socket.h>
  
+ #include "lib/util.h"
  #include "nfs.h"
  #include "rpc.h"
  #include "xdr.h"
  
  
  #define PORTMAP_TCP 0
***************
*** 23,27 ****
  	struct sockaddr_in s;
  
! 	debug("map_init(): called\n");
  
  	memcpy(&s, name, sizeof(struct sockaddr_in));
--- 23,27 ----
  	struct sockaddr_in s;
  
! 	dbprintf("map_init(): called\n");
  
  	memcpy(&s, name, sizeof(struct sockaddr_in));
***************
*** 50,54 ****
          assert(fcntl(map_fd, F_SETFL, O_NONBLOCK)!=-1);
  
! 	debug("map_init(): done\n");
  
  	return 0;
--- 50,54 ----
          assert(fcntl(map_fd, F_SETFL, O_NONBLOCK)!=-1);
  
! 	dbprintf("map_init(): done\n");
  
  	return 0;
***************
*** 61,65 ****
  	struct pbuf pbuf, ret;
  	
! 	debug("map_getport(): called\n");
  	
  	pmap->port = 0;
--- 61,65 ----
  	struct pbuf pbuf, ret;
  	
! 	dbprintf("map_getport(): called\n");
  	
  	pmap->port = 0;
***************
*** 71,80 ****
  	addtobuf(&pbuf, (char *)pmap, sizeof(mapping_t), 1);
  
! 	debug("map_getport(): doing rpc_call()\n");
  	
  	/* make the call */ 
  	assert(rpc_call(&pbuf, &ret, map_fd)==0);
  
! 	debug("map_getport(): rpc_call() returned\n");
  	
  	/* now we can extract the port */ 
--- 71,80 ----
  	addtobuf(&pbuf, (char *)pmap, sizeof(mapping_t), 1);
  
! 	dbprintf("map_getport(): doing rpc_call()\n");
  	
  	/* make the call */ 
  	assert(rpc_call(&pbuf, &ret, map_fd)==0);
  
! 	dbprintf("map_getport(): rpc_call() returned\n");
  	
  	/* now we can extract the port */ 
***************
*** 83,87 ****
  	pmap->port = port;
  	
! 	debug("map_getport(): got port %d\n", port);
  	
  	return 0;
--- 83,87 ----
  	pmap->port = port;
  	
! 	dbprintf("map_getport(): got port %d\n", port);
  	
  	return 0;

[ipbench-cvs] ipbench2/src/lib microuptime.h,1.1,1.2

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/lib
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13828/src/lib

Modified Files:
	microuptime.h 
Log Message:
#include <stdint.h> to allow standalone inclusion.


Index: microuptime.h
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/lib/microuptime.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** microuptime.h	23 Jun 2005 01:57:15 -0000	1.1
--- microuptime.h	9 Feb 2010 01:03:49 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  #include <sys/time.h>
  #include <time.h>
+ #include <stdint.h>
  
  #ifndef US_PER_S

[ipbench-cvs] ipbench2/src/tests/nfs_latency/libnfs Makefile, 1.1, 1.2 mount.c, 1.1, 1.2 nfs.c, 1.2, 1.3

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10376/src/tests/nfs_latency/libnfs

Modified Files:
	Makefile mount.c nfs.c 
Log Message:
Use ipbench utility for debug output; allow pathnames in nfs_lookup();
slightly better error reporting.


Index: Makefile
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	21 Jun 2005 02:57:38 -0000	1.1
--- Makefile	9 Feb 2010 00:24:16 -0000	1.2
***************
*** 1,5 ****
! CFLAGS=-g -O2 -Wall -Werror
  
! default: test
  
  nfs.o: nfs.c
--- 1,5 ----
! CFLAGS=-g -O2 -Wall -Werror -I../../../ -DIPBENCH_TEST_CLIENT
  
! default: objs
  
  nfs.o: nfs.c
***************
*** 24,28 ****
  	$(CC) $(CFLAGS) -c -o test.o test.c
  
! test: test.o portmap.o mount.o nfs.o rpc.o xdr.o callback.o
  	$(CC) $(CCFLAGS) -o test test.o portmap.o mount.o nfs.o \
  	                    rpc.o xdr.o callback.o
--- 24,29 ----
  	$(CC) $(CFLAGS) -c -o test.o test.c
  
! objs: test.o portmap.o mount.o nfs.o rpc.o xdr.o callback.o
! test: objs
  	$(CC) $(CCFLAGS) -o test test.o portmap.o mount.o nfs.o \
  	                    rpc.o xdr.o callback.o

Index: mount.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs/mount.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mount.c	21 Jun 2005 02:57:38 -0000	1.1
--- mount.c	9 Feb 2010 00:24:16 -0000	1.2
***************
*** 121,126 ****
  
  	if (status != 0) {
! 		debug("mnt_mount(): could not mount \"%s\"\n", dir);
! 		return 0;	
  	}
  
--- 121,126 ----
  
  	if (status != 0) {
! 		debug("mnt_mount(): could not mount \"%s\": %d\n", dir, status);
! 		return status;	
  	}
  

Index: nfs.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs/nfs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nfs.c	15 Aug 2005 06:56:23 -0000	1.2
--- nfs.c	9 Feb 2010 00:24:20 -0000	1.3
***************
*** 6,15 ****
  #include <string.h>
  
  #include "nfs.h"
  #include "rpc.h"
  #include "xdr.h"
  
- #define debug(x...) fprintf(stderr,x)
- 
  int nfs_fd;
  
--- 6,14 ----
  #include <string.h>
  
+ #include "plugin.h"
  #include "nfs.h"
  #include "rpc.h"
  #include "xdr.h"
  
  int nfs_fd;
  
***************
*** 35,39 ****
  	if (map_getport(&map) == 0) {
  		port = map.port;
! 		debug("nfs port number is %d\n", port);
  	} else {
  		if (port == 0) {
--- 34,38 ----
  	if (map_getport(&map) == 0) {
  		port = map.port;
! 		dbprintf("nfs port number is %d\n", port);
  	} else {
  		if (port == 0) {
***************
*** 41,45 ****
  			return 1;
  		}
! 		debug("Error getting NFS port number\n");
  		return 1;
  	}
--- 40,44 ----
  			return 1;
  		}
! 		dbprintf("Error getting NFS port number\n");
  		return 1;
  	}
***************
*** 327,331 ****
  		}
  	}
! 	debug("NFS CREATE CALLBACK\n");
  
  	cb(token, status, &new_fh, &pattrs);
--- 326,330 ----
  		}
  	}
! 	dbprintf("NFS CREATE CALLBACK\n");
  
  	cb(token, status, &new_fh, &pattrs);
***************
*** 366,377 ****
  	getfrombuf(pbuf, (char *)&tmp, sizeof(tmp), 1);
  
! 	debug("Got entry: %d\n", tmp);
  
  	while (tmp) {
  		getfrombuf(pbuf, (char *)&fileid, sizeof(fileid), 1);
  		skipstring(pbuf);
! 		debug("Skipped string\n");
  		getfrombuf(pbuf, (char *)cookie, sizeof(int), 1);
! 		debug("Skipped string %d\n", *cookie);
  		count++;
  		getfrombuf(pbuf, (char *)&tmp, sizeof(tmp), 1);
--- 365,376 ----
  	getfrombuf(pbuf, (char *)&tmp, sizeof(tmp), 1);
  
! 	dbprintf("Got entry: %d\n", tmp);
  
  	while (tmp) {
  		getfrombuf(pbuf, (char *)&fileid, sizeof(fileid), 1);
  		skipstring(pbuf);
! 		dbprintf("Skipped string\n");
  		getfrombuf(pbuf, (char *)cookie, sizeof(int), 1);
! 		dbprintf("Skipped string %d\n", *cookie);
  		count++;
  		getfrombuf(pbuf, (char *)&tmp, sizeof(tmp), 1);
***************
*** 385,389 ****
  	pbuf->pos = old_pos;
  
! 	debug("Returning: %d\n", count);
  
  	return count;
--- 384,388 ----
  	pbuf->pos = old_pos;
  
! 	dbprintf("Returning: %d\n", count);
  
  	return count;
***************
*** 400,404 ****
  	int count = 0;
  
! 	debug("NFS READDIR CALLBACK\n");
  	assert(callback != NULL);
  
--- 399,403 ----
  	int count = 0;
  
! 	dbprintf("NFS READDIR CALLBACK\n");
  	assert(callback != NULL);
  
***************
*** 411,415 ****
  		if (status == NFS_OK) {
  			int tmp, fileid, cookie;
! 			debug("Getting entries\n");
  
  			num_entries = getentries_readdir(pbuf, &next_cookie);
--- 410,414 ----
  		if (status == NFS_OK) {
  			int tmp, fileid, cookie;
! 			dbprintf("Getting entries\n");
  
  			num_entries = getentries_readdir(pbuf, &next_cookie);
***************
*** 418,422 ****
  
  			getfrombuf(pbuf, (char *)&tmp, sizeof(tmp), 1);
! 			debug("Got entry: %d\n", tmp);
  
  			while (tmp) {
--- 417,421 ----
  
  			getfrombuf(pbuf, (char *)&tmp, sizeof(tmp), 1);
! 			dbprintf("Got entry: %d\n", tmp);
  
  			while (tmp) {
***************
*** 425,434 ****
  					   sizeof(fileid), 1);
  
! 				debug("Got filed: %d\n", fileid);
  
  				getfrombuf(pbuf, (char *)&entries[count].size,
  					   sizeof(int), 1);
  
! 				debug("Got size: %d\n", entries[count].size);
  
  				entries[count].file = &pbuf->buf[pbuf->pos];
--- 424,433 ----
  					   sizeof(fileid), 1);
  
! 				dbprintf("Got filed: %d\n", fileid);
  
  				getfrombuf(pbuf, (char *)&entries[count].size,
  					   sizeof(int), 1);
  
! 				dbprintf("Got size: %d\n", entries[count].size);
  
  				entries[count].file = &pbuf->buf[pbuf->pos];
***************
*** 439,443 ****
  
  				pbuf->pos += size;
! 				debug("Got size: %d\n", pbuf->pos);
  
  				getfrombuf(pbuf, (char *)&cookie,
--- 438,442 ----
  
  				pbuf->pos += size;
! 				dbprintf("Got size: %d\n", pbuf->pos);
  
  				getfrombuf(pbuf, (char *)&cookie,
***************
*** 499,505 ****
  
  	if (ctype != MSG_REPLY) {
! 		debug("Got a reply to something else!!\n");
! 		debug("Looking for msgtype %d\n", MSG_REPLY);
! 		debug("Got msgtype %d\n", ctype);
  		return ERR_BAD_MSG;
  	}
--- 498,504 ----
  
  	if (ctype != MSG_REPLY) {
! 		dbprintf("Got a reply to something else!!\n");
! 		dbprintf("Looking for msgtype %d\n", MSG_REPLY);
! 		dbprintf("Got msgtype %d\n", ctype);
  		return ERR_BAD_MSG;
  	}
***************
*** 508,521 ****
  	getfrombuf(pbuf, (char *)&r, sizeof(r), 1);
  	if (r != MSG_ACCEPTED) {
! 		debug("Message NOT accepted (%d)\n", r);
  
  		/* extract error code */
  		getfrombuf(pbuf, (char *)&r, sizeof(r), 1);
! 		debug("Error code %d\n", r);
  
  		if (r == 1) {
  			/* get the auth problem */
  			getfrombuf(pbuf, (char *)&r, sizeof(r), 1);
! 			debug("auth_stat %d\n", r);
  		}
  		return ERR_NOT_ACCEPTED;
--- 507,520 ----
  	getfrombuf(pbuf, (char *)&r, sizeof(r), 1);
  	if (r != MSG_ACCEPTED) {
! 		dbprintf("Message NOT accepted (%d)\n", r);
  
  		/* extract error code */
  		getfrombuf(pbuf, (char *)&r, sizeof(r), 1);
! 		dbprintf("Error code %d\n", r);
  
  		if (r == 1) {
  			/* get the auth problem */
  			getfrombuf(pbuf, (char *)&r, sizeof(r), 1);
! 			dbprintf("auth_stat %d\n", r);
  		}
  		return ERR_NOT_ACCEPTED;
***************
*** 533,539 ****
  	if (r == SUCCESS) {
  		return 0;
- 	} else {
- 		debug("reply stat was %d\n", r);
- 		return ERR_FAILURE;
  	}
  }
--- 532,537 ----
  	if (r == SUCCESS) {
  		return 0;
  	}
+ 	dbprintf("reply stat was %d\n", r);
+ 	return ERR_FAILURE;
  }

[ipbench-cvs] ipbench2/src/tests/nfs_latency Makefile.am, 1.4, 1.5 nfs_glue.c, 1.6, 1.7 nfs_latency.c, 1.14, 1.15

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/nfs_latency
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10376/src/tests/nfs_latency

Modified Files:
	Makefile.am nfs_glue.c nfs_latency.c 
Log Message:
Use ipbench utility for debug output; allow pathnames in nfs_lookup();
slightly better error reporting.


Index: nfs_latency.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/nfs_latency.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** nfs_latency.c	8 Mar 2006 01:32:00 -0000	1.14
--- nfs_latency.c	9 Feb 2010 00:24:16 -0000	1.15
***************
*** 102,108 ****
  
  	x = init_and_open(hostname, nfs_options.path, nfs_options.filename);
! 	assert(x==0);
  
! 	return 0;
  }
  
--- 102,108 ----
  
  	x = init_and_open(hostname, nfs_options.path, nfs_options.filename);
! 	
  
! 	return x;
  }
  

Index: nfs_glue.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/nfs_glue.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** nfs_glue.c	14 Sep 2005 02:39:45 -0000	1.6
--- nfs_glue.c	9 Feb 2010 00:24:16 -0000	1.7
***************
*** 188,193 ****
  	struct hostent *hp;
  
! 	if((hp = gethostbyname(name))==NULL)
  		return -1;
  
  	memset(sock, 0, sizeof(struct sockaddr_in));
--- 188,195 ----
  	struct hostent *hp;
  
! 	if ((hp = gethostbyname(name)) == NULL) {
! 		dbprintf("Cannot resolve %s\n", name);
  		return -1;
+ 	}
  
  	memset(sock, 0, sizeof(struct sockaddr_in));
***************
*** 209,216 ****
  	idem = 1;
  
! 	if(status==NFS_OK){
  		nfs_file_handle = *fh;
  		initialised = 1;
! 	}else{
  		initialised = -1;
  	}
--- 211,218 ----
  	idem = 1;
  
! 	if (status == NFS_OK){
  		nfs_file_handle = *fh;
  		initialised = 1;
! 	} else {
  		initialised = -1;
  	}
***************
*** 219,222 ****
--- 221,277 ----
  }
  
+ struct lookup_dir {
+ 	char *tail;
+ 	char *linkname;
+ 	struct cookie cwd;
+ 	int ok;
+ };
+ 
+ static void
+ dir_cb(uintptr_t token, int status, struct cookie *fh, fattr_t *pattrs){
+ 	struct lookup_dir *ldp = (struct lookup_dir *)token;
+ 
+ 	if (status == NFS_OK) {
+ 		ldp->cwd = *fh;
+ 		ldp->ok = 1;
+ 	} else {
+ 		ldp->ok = -11;
+ 	}
+ }
+ 
+ 
+ void
+ recursive_lookup(struct cookie *cwd, char *name, 
+ 	   void (*func) (uintptr_t, int, struct cookie *, fattr_t *),
+ 	   uintptr_t token)
+ {
+ 	struct lookup_dir ld;
+ 	char *slashp;
+ 	char *s;
+ 	s = ld.tail = strdup(name);
+ 	ld.cwd = *cwd;
+ 	do {
+ 		ld.ok = 0;
+ 		ld.linkname = ld.tail;
+ 		while (*ld.linkname == '/')
+ 			ld.linkname++;
+ 		slashp = strchr(ld.linkname, '/');
+ 		if (slashp) {
+ 			*slashp= '\0';
+ 			ld.tail = slashp + 1;
+ 			dbprintf("Looking up %s\n", ld.linkname);
+ 			nfs_lookup(&ld.cwd, ld.linkname, dir_cb, (uintptr_t)&ld);
+ 			do {
+ 				struct pbuf buf;
+ 				rpc_recv(&buf, nfs_fd, -1);
+ 			} while (!ld.ok);
+ 		} else {
+ 			dbprintf("Final component: %s\n", ld.linkname);
+ 			nfs_lookup(&ld.cwd, ld.linkname, func, token);
+ 		}
+ 	} while (slashp && ld.ok >= 0);
+ 	free(s);
+ }		 
+ 
  int
  init_and_open(char *hostname, char *mountpoint, char *filename){
***************
*** 226,231 ****
  	microuptime_calibrate();
  
! 	if(resolve(hostname, &addr) < 0){
! 		printf("error resolving \"%s\"\n", hostname);
  		exit(-1);
  	}
--- 281,286 ----
  	microuptime_calibrate();
  
! 	if (resolve(hostname, &addr) < 0){
! 		dbprintf("error resolving \"%s\"\n", hostname);
  		exit(-1);
  	}
***************
*** 239,251 ****
  
  	mnt_get_export_list();
! 	mnt_mount(mountpoint, &pfh);
! 	nfs_lookup(&pfh, filename, open_cb, 0);
  
! 	while(initialised==0){
  		struct pbuf buf;
  		rpc_recv(&buf, nfs_fd, -1);
  	}
  
! 	if(initialised < 0){
  		return -1;
  	}
--- 294,309 ----
  
  	mnt_get_export_list();
! 	if (mnt_mount(mountpoint, &pfh)) {
! 		printf("Can't mount\n");
! 		return -1;
! 	}
! 	recursive_lookup(&pfh, filename, open_cb, 0);
  
! 	while (initialised == 0){
  		struct pbuf buf;
  		rpc_recv(&buf, nfs_fd, -1);
  	}
  
! 	if (initialised < 0){
  		return -1;
  	}

Index: Makefile.am
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	23 Jun 2005 04:27:33 -0000	1.4
--- Makefile.am	9 Feb 2010 00:24:06 -0000	1.5
***************
*** 1,3 ****
! AM_CFLAGS = $(WARNINGCFLAGS) 
  
  plugindir=$(libdir)/ipbench
--- 1,3 ----
! AM_CFLAGS = $(WARNINGCFLAGS)
  
  plugindir=$(libdir)/ipbench
***************
*** 9,11 ****
  libnfs_latency_la_SOURCES=nfs_glue.c nfs_latency.c plugin.c nfs_glue.h nfs_latency.h $(LIBNFS_FILES)
  libnfs_latency_la_LIBADD = ../../lib/libipbench.la
! 
--- 9,11 ----
  libnfs_latency_la_SOURCES=nfs_glue.c nfs_latency.c plugin.c nfs_glue.h nfs_latency.h $(LIBNFS_FILES)
  libnfs_latency_la_LIBADD = ../../lib/libipbench.la
! libnfs_latency_la_CPPFLAGS =   -DIPBENCH_TEST_CLIENT
\ No newline at end of file

[ipbench-cvs] ipbench2/src/tests/nfs_latency .cvsignore,1.1,1.2

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/nfs_latency
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10857/src/tests/nfs_latency

Modified Files:
	.cvsignore 
Log Message:
Use ipbench utility for debug output; allow pathnames in nfs_lookup();
slightly better error reporting.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	7 Feb 2010 23:08:27 -0000	1.1
--- .cvsignore	9 Feb 2010 00:29:17 -0000	1.2
***************
*** 4,7 ****
--- 4,16 ----
  callback.lo
  libnfs_latency.la
+ libnfs_latency_la-callback.lo
+ libnfs_latency_la-mount.lo
+ libnfs_latency_la-nfs.lo
+ libnfs_latency_la-nfs_glue.lo
+ libnfs_latency_la-nfs_latency.lo
+ libnfs_latency_la-plugin.lo
+ libnfs_latency_la-portmap.lo
+ libnfs_latency_la-rpc.lo
+ libnfs_latency_la-xdr.lo
  mount.lo
  nfs.lo

[ipbench-cvs] ipbench2/src ipbench.py,1.35,1.36

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6528/src

Modified Files:
	ipbench.py 
Log Message:
Make more rubust in presence of errors -- make error output more
friendly.  But there's a long way to go!


Index: ipbench.py
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/ipbench.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** ipbench.py	3 Feb 2010 00:21:03 -0000	1.35
--- ipbench.py	8 Feb 2010 23:40:37 -0000	1.36
***************
*** 38,41 ****
--- 38,44 ----
          self.test_name = test_name
          self.test_ptr = test_ptr
+         if (self.test_args == None):
+             self.test_args = ""
+ 
          dbprint("[IpbenchTestClient:__init__] : client " + self.hostname +
                  " port " + `self.port` + " test_port " + `self.test_port` + " test_args " + self.test_args)
***************
*** 105,109 ****
              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()
--- 108,112 ----
              status = self.parse_return_code()
              if (status["code"] != 200):
!                 raise IpbenchError("HELLO to " + self.hostname + " failed (" + str(status["code"]) + " " + status["str"] + ")")
              self.send_command("LOAD " + self.test_name)
              status = self.parse_return_code()
***************
*** 119,122 ****
--- 122,135 ----
  
          try:
+             if (self.test_port == None):
+                 self.test_port = 0
+             if (self.test_target == None):
+                 raise IpBenchError("Must specify --test-target");
+             if (self.test_args == None):
+                 self.test_args = ""
+         
+             dbprint("[Setup]: target: " + self.test_target);
+             dbprint("[Setup]: port: " + str(self.test_port));
+             dbprint("[Setup]: args: " + self.test_args);
              self.send_command("SETUP target::" + self.test_target + "||" +
                                "port::" + `self.test_port` + "||"
***************
*** 124,128 ****
              status = self.parse_return_code()
              if (status["code"] != 200):
!                 raise IpbenchError("SETUP to " + self.hostname + "failed (" + status["code"] + " " + status["str"] + ")")
          except IpbenchError:
              raise
--- 137,141 ----
              status = self.parse_return_code()
              if (status["code"] != 200):
!                 raise IpbenchError("SETUP to " + self.hostname + "failed (" + str(status["code"]) + " " + status["str"] + ")")
          except IpbenchError:
              raise
***************
*** 195,199 ****
              status = self.parse_return_code()
              if (status["code"] != 200):
!                 raise IpbenchError("SETUP Failed (" + status["code"] + " " + status["str"] + ")")
          except IpbenchError:
              raise
--- 208,212 ----
              status = self.parse_return_code()
              if (status["code"] != 200):
!                 raise IpbenchError("SETUP Failed (" + str(status["code"]) + " " + status["str"] + ")")
          except IpbenchError:
              raise

[ipbench-cvs] ipbench2/src/tests/nfs_latency/libnfs rpc.c,1.7,1.8

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5703

Modified Files:
	rpc.c 
Log Message:
Changed C style to be uniform with everywhere else;  disabled
debugging verbosity.


Index: rpc.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/nfs_latency/libnfs/rpc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rpc.c	1 Feb 2010 23:59:52 -0000	1.7
--- rpc.c	8 Feb 2010 23:31:22 -0000	1.8
***************
*** 21,24 ****
--- 21,25 ----
  
  #define DEBUG_RPC
+ #undef DEBUG_RPC
  
  #ifdef DEBUG_RPC
***************
*** 61,70 ****
  	/* we always add the callback */
  	/* anything after here is just packet loss */
! 	if(c!=NULL){
  		xid = extract_xid(pbuf->buf);
  		callback_add(xid, *c);
  	}
  
! 	if(pbuf->pos==0)
  		return -1; /* don't send zero length rpc */
  
--- 62,71 ----
  	/* we always add the callback */
  	/* anything after here is just packet loss */
! 	if (c != NULL){
  		xid = extract_xid(pbuf->buf);
  		callback_add(xid, *c);
  	}
  
! 	if (pbuf->pos==0)
  		return -1; /* don't send zero length rpc */
  
***************
*** 73,82 ****
  	r = send(fd, pbuf->buf, pbuf->pos, 0);
  
! 	//if(r<0){
  	//	if(errno==EAGAIN){
  	//		return 0; /* sent 0 bytes successfully */
- 	//	}else{
- 	//		return -1;
  	//	}
  	//}
  
--- 74,82 ----
  	r = send(fd, pbuf->buf, pbuf->pos, 0);
  
! 	//if (r < 0) {
  	//	if(errno==EAGAIN){
  	//		return 0; /* sent 0 bytes successfully */
  	//	}
+ 	//	return -1;
  	//}
  
***************
*** 91,99 ****
  	struct callback c;
  
! 	if(timeout!=0){
  		int r;
  		struct pollfd p = {fd, POLLIN, 0};
  		r = poll(&p, 1, timeout);
! 		if(poll<=0){
  			return -1;
  		}
--- 91,99 ----
  	struct callback c;
  
! 	if (timeout != 0){
  		int r;
  		struct pollfd p = {fd, POLLIN, 0};
  		r = poll(&p, 1, timeout);
! 		if (poll <= 0) {
  			return -1;
  		}
***************
*** 108,117 ****
  	switch(x){
  	case -1:
! 		if(errno==EAGAIN){
  			return 0;
- 		}else{
- 			perror("rpc_recv(): recv failed");
- 			return -1;
  		}
  	case 0:
  		printf("rpc_recv(): remote host closed connection?\n");
--- 108,117 ----
  	switch(x){
  	case -1:
! 		if (errno == EAGAIN){
  			return 0;
  		}
+ 		perror("rpc_recv(): recv failed");
+ 		return -1;
+ 
  	case 0:
  		printf("rpc_recv(): remote host closed connection?\n");
***************
*** 123,131 ****
  	/* find and execute callback function */
  	xid = extract_xid(pbuf->buf);
! 	if(callback_del(xid, &c) < 0)
  		return -1;
  
  	/* do the callback */
! 	if(c.func!=NULL)
  		c.func(&c, pbuf);
  
--- 123,131 ----
  	/* find and execute callback function */
  	xid = extract_xid(pbuf->buf);
! 	if (callback_del(xid, &c) < 0)
  		return -1;
  
  	/* do the callback */
! 	if (c.func != NULL)
  		c.func(&c, pbuf);
  
***************
*** 155,159 ****
  
  	/* retransmit every 100ms until success */
! 	while(notify==0){
  		assert(rpc_send(snd, fd, tx)==snd->pos);
  		tx = NULL;
--- 155,159 ----
  
  	/* retransmit every 100ms until success */
! 	while (notify == 0){
  		assert(rpc_send(snd, fd, tx)==snd->pos);
  		tx = NULL;
***************
*** 161,165 ****
  	}
  
! 	assert(result==rcv);
  
  	/* parse the rpc headers */
--- 161,165 ----
  	}
  
! 	assert(result == rcv);
  
  	/* parse the rpc headers */
***************
*** 173,177 ****
  		getfrombuf(rcv, (char*) &r, sizeof(r), 1);
  
! 		if(r != MSG_ACCEPTED){
  			debug( "Message NOT accepted (%d)\n", r );
  
--- 173,177 ----
  		getfrombuf(rcv, (char*) &r, sizeof(r), 1);
  
! 		if (r != MSG_ACCEPTED) {
  			debug( "Message NOT accepted (%d)\n", r );
  
***************
*** 180,184 ****
  			debug( "Error code %d\n", r );
  
! 			if(r == 1) {
  				/* get the auth problem */
  				getfrombuf(rcv, (char*) &r, sizeof(r), 1);
--- 180,184 ----
  			debug( "Error code %d\n", r );
  
! 			if (r == 1) {
  				/* get the auth problem */
  				getfrombuf(rcv, (char*) &r, sizeof(r), 1);
***************
*** 197,201 ****
  		getfrombuf(rcv, (char*) &r, sizeof(r), 1);
  
! 		if( r != SUCCESS ){
  			debug("reply stat was %d\n", r);
  			return 0;
--- 197,201 ----
  		getfrombuf(rcv, (char*) &r, sizeof(r), 1);
  
! 		if (r != SUCCESS) {
  			debug("reply stat was %d\n", r);
  			return 0;

[ipbench-cvs] ipbench2/debian .cvsignore,1.1,1.2

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/debian
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/debian

Modified Files:
	.cvsignore 
Log Message:
Ignore generated files.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/debian/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	22 Dec 2004 05:04:54 -0000	1.1
--- .cvsignore	7 Feb 2010 23:08:24 -0000	1.2
***************
*** 1,7 ****
  ipbench-client
  ipbench-dev
  ipbench-docs
  ipbench-plugins
  ipbench-target
  libipbench1
! tmp
\ No newline at end of file
--- 1,35 ----
+ compat
+ files
+ foo
  ipbench-client
+ ipbench-client.debhelper.log
+ ipbench-client.postinst.debhelper
+ ipbench-client.postrm.debhelper
+ ipbench-client.substvars
+ ipbench-controller
+ ipbench-controller.debhelper.log
+ ipbench-daemon
+ ipbench-daemon.debhelper.log
+ ipbench-daemon.dirs
  ipbench-dev
+ ipbench-dev.debhelper.log
  ipbench-docs
+ ipbench-docs.debhelper.log
  ipbench-plugins
+ ipbench-plugins.debhelper.log
+ ipbench-plugins.postinst.debhelper
+ ipbench-plugins.postrm.debhelper
+ ipbench-plugins.substvars
  ipbench-target
+ ipbench-target.debhelper.log
+ ipbench-target.postinst.debhelper
+ ipbench-target.postrm.debhelper
+ ipbench-target.substvars
  libipbench1
! libipbench1.debhelper.log
! libipbench1.postinst.debhelper
! libipbench1.postrm.debhelper
! libipbench1.substvars
! stamp-autotools-files
! stamp-makefile-build
! tmp

[ipbench-cvs] ipbench2 .cvsignore,1.1.1.1,1.2

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328

Modified Files:
	.cvsignore 
Log Message:
Ignore generated files.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/.cvsignore,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** .cvsignore	28 Jun 2004 05:19:13 -0000	1.1.1.1
--- .cvsignore	7 Feb 2010 23:08:10 -0000	1.2
***************
*** 3,8 ****
--- 3,16 ----
  aclocal.m4
  autom4te.cache
+ config.guess
+ config.guess.cdbs-orig
  config.log
  config.status
+ config.sub
+ config.sub.cdbs-orig
  configure
  depcomp
+ install-sh
+ libtool
+ ltmain.sh
+ missing

[ipbench-cvs] ipbench2/src/tests/nfsstone .cvsignore,NONE,1.1

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/nfsstone
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/src/tests/nfsstone

Added Files:
	.cvsignore 
Log Message:
Ignore generated files.


--- NEW FILE: .cvsignore ---
.libs
Makefile
Makefile.in
libnfsstones.la
nfsstones.lo
plugin.lo

[ipbench-cvs] ipbench2/src/tests/wait .cvsignore,NONE,1.1

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/wait
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/src/tests/wait

Added Files:
	.cvsignore 
Log Message:
Ignore generated files.


--- NEW FILE: .cvsignore ---
.libs
Makefile
Makefile.in
libwait.la
wait.lo

[ipbench-cvs] ipbench2/src/tests/dummy .cvsignore,1.1.1.1,1.2

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/dummy
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/src/tests/dummy

Modified Files:
	.cvsignore 
Log Message:
Ignore generated files.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/dummy/.cvsignore,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** .cvsignore	28 Jun 2004 05:19:14 -0000	1.1.1.1
--- .cvsignore	7 Feb 2010 23:08:26 -0000	1.2
***************
*** 1,3 ****
--- 1,10 ----
  .deps
+ .libs
  Makefile
  Makefile.in
+ dummy.lo
+ dummy_target.lo
+ libdummy.la
+ libdummy_target.la
+ plugin.lo
+ target_plugin.lo

[ipbench-cvs] ipbench2/src/tests/cpu_target_lukem .cvsignore, NONE, 1.1

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/cpu_target_lukem
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/src/tests/cpu_target_lukem

Added Files:
	.cvsignore 
Log Message:
Ignore generated files.


--- NEW FILE: .cvsignore ---
.libs
Makefile
Makefile.in
calibrate
cpu_target_lukem.lo
libcpu_target_lukem.la

[ipbench-cvs] ipbench2/src/tests/http .cvsignore,NONE,1.1

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/http
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/src/tests/http

Added Files:
	.cvsignore 
Log Message:
Ignore generated files.


--- NEW FILE: .cvsignore ---
Makefile
Makefile.in

[ipbench-cvs] ipbench2/doc/manual .cvsignore,NONE,1.1

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/doc/manual
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/doc/manual

Added Files:
	.cvsignore 
Log Message:
Ignore generated files.


--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
manual.pdf

[ipbench-cvs] ipbench2/src/tests/nfs_latency .cvsignore,NONE,1.1

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/nfs_latency
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/src/tests/nfs_latency

Added Files:
	.cvsignore 
Log Message:
Ignore generated files.


--- NEW FILE: .cvsignore ---
.libs
Makefile
Makefile.in
callback.lo
libnfs_latency.la
mount.lo
nfs.lo
nfs_glue.lo
nfs_latency.lo
plugin.lo
portmap.lo
rpc.lo
xdr.lo

[ipbench-cvs] ipbench2/src/tests/cpu_target .cvsignore,NONE,1.1

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/cpu_target
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/src/tests/cpu_target

Added Files:
	.cvsignore 
Log Message:
Ignore generated files.


--- NEW FILE: .cvsignore ---
.libs
Makefile
Makefile.in
libcpu_target.la
libcpu_target_la-cpu_target.lo

[ipbench-cvs] ipbench2/src/tests/wrapper .cvsignore,NONE,1.1

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/wrapper
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/src/tests/wrapper

Added Files:
	.cvsignore 
Log Message:
Ignore generated files.


--- NEW FILE: .cvsignore ---
.libs
Makefile
Makefile.in
client_wrapper.lo
client_wrapper_plugin.lo
common.lo
libwrapper_client.la
libwrapper_target.la
target_wrapper.lo
target_wrapper_plugin.lo

[ipbench-cvs] ipbench2/doc .cvsignore,NONE,1.1

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/doc
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/doc

Added Files:
	.cvsignore 
Log Message:
Ignore generated files.


--- NEW FILE: .cvsignore ---
Makefile
Makefile.in

[ipbench-cvs] ipbench2/src/pymod .cvsignore,NONE,1.1

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/pymod
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/src/pymod

Added Files:
	.cvsignore 
Log Message:
Ignore generated files.


--- NEW FILE: .cvsignore ---
.libs
Makefile
Makefile.in
ipbench_client.i
ipbench_client.py
ipbench_client_wrap.c
ipbench_target.i
ipbench_target.py
ipbench_target_wrap.c
libipbenchClientPython.la
libipbenchClientPython_la-except.lo
libipbenchClientPython_la-ipbench.lo
libipbenchClientPython_la-ipbench_client_wrap.lo
libipbenchTargetPython.la
libipbenchTargetPython_la-except.lo
libipbenchTargetPython_la-ipbench.lo
libipbenchTargetPython_la-ipbench_target_wrap.lo

[ipbench-cvs] ipbench2/src/lib .cvsignore,NONE,1.1

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/lib
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/src/lib

Added Files:
	.cvsignore 
Log Message:
Ignore generated files.


--- NEW FILE: .cvsignore ---
.libs
Makefile
Makefile.in
libipbench.la
libipbench_la-microuptime.lo
libipbench_la-util.lo

[ipbench-cvs] ipbench2/src/tests/latency .cvsignore,1.1.1.1,1.2

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/latency
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23328/src/tests/latency

Modified Files:
	.cvsignore 
Log Message:
Ignore generated files.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/latency/.cvsignore,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** .cvsignore	28 Jun 2004 05:19:14 -0000	1.1.1.1
--- .cvsignore	7 Feb 2010 23:08:27 -0000	1.2
***************
*** 1,3 ****
--- 1,8 ----
  .deps
+ .libs
  Makefile
  Makefile.in
+ liblatency.la
+ liblatency_la-ip.lo
+ liblatency_la-latency.lo
+ liblatency_la-raw.lo

[ipbench-cvs] ipbench2/debian changelog,1.4,1.5

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/debian
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26200/debian

Modified Files:
	changelog 
Log Message:
Fix signature.


Index: changelog
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/debian/changelog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** changelog	3 Feb 2010 00:24:32 -0000	1.4
--- changelog	3 Feb 2010 01:56:57 -0000	1.5
***************
*** 5,9 ****
    * Move from python-xml to eventtree for compatibility with python 2.[56].
  
!  -- Peter Chubb <Peter Chubb <pet...@ni...>>  Wed, 03 Feb 2010 11:23:09 +1100
  
  ipbench (2.0.1-2) unstable; urgency=low
--- 5,9 ----
    * Move from python-xml to eventtree for compatibility with python 2.[56].
  
!  -- Peter Chubb <pet...@ni...>  Wed, 03 Feb 2010 11:23:09 +1100
  
  ipbench (2.0.1-2) unstable; urgency=low

[ipbench-cvs] ipbench2/src/tests/wrapper client_wrapper.c, 1.9, 1.10 common.c, 1.7, 1.8

[Peter C. <pc...@us...>]

Update of /cvsroot/ipbench/ipbench2/src/tests/wrapper
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20202/src/tests/wrapper

Modified Files:
	client_wrapper.c common.c 
Log Message:
Many minor mods:
 --- rename ipbench.py and ipbenchd.py to remove suffix
 --- Check return values on system() , nice() etc., to allow building with -Werror
 --- Fix installation varation between Ubuntu and Debian: site-packages vs dist-packages.


Index: client_wrapper.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/client_wrapper.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** client_wrapper.c	5 May 2005 02:37:34 -0000	1.9
--- client_wrapper.c	3 Feb 2010 01:26:51 -0000	1.10
***************
*** 21,25 ****
  
  	/* XXX arguments */
! 	system(start_filename);
  
  	return 0;
--- 21,28 ----
  
  	/* XXX arguments */
! 	if (system(start_filename) == -1) {
! 		dbprintf("%s failed: %s\n", start_filename, strerror(errno));
! 		return 1;
! 	}
  
  	return 0;
***************
*** 32,36 ****
  	dbprintf ("[client_wrap_stop] calling %s \n", stop_filename);
  
! 	system(stop_filename);
  	return 0;
  }
--- 35,42 ----
  	dbprintf ("[client_wrap_stop] calling %s \n", stop_filename);
  
! 	if (system(stop_filename) == -1) {
! 		dbprintf("%s failed: %s\n", strerror(errno));
! 		return 1;
! 	}
  	return 0;
  }

Index: common.c
===================================================================
RCS file: /cvsroot/ipbench/ipbench2/src/tests/wrapper/common.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** common.c	23 Feb 2005 01:17:05 -0000	1.7
--- common.c	3 Feb 2010 01:26:51 -0000	1.8
***************
*** 74,78 ****
  		}
  		else {
! 			dbprintf("Invlid argument %s=%s.\n", cmd, val);
  			return -1;
  		}
--- 74,78 ----
  		}
  		else {
! 			dbprintf("Invalid argument %s=%s.\n", cmd, val);
  			return -1;
  		}
***************
*** 90,94 ****
  	pid_t pid;
  	
! 	pipe(p);
  
  	pid = fork();
--- 90,98 ----
  	pid_t pid;
  	
! 	if (pipe(p)) {
! 		dbprintf("pipe: %s\n", strerror(errno));
! 		return -1;
! 	}
! 		
  
  	pid = fork();
***************
*** 101,105 ****
  		/* capture stdout */
  		dup2(p[1],1);
! 		system(output_filename);
  		close(p[1]);
  		exit(0);
--- 105,112 ----
  		/* capture stdout */
  		dup2(p[1],1);
! 		if (system(output_filename) == -1) {
! 			dbprintf("[target_wrap_marshall] %s failed\n", output_filename);
! 			exit(1);
! 		}
  		close(p[1]);
  		exit(0);