[Pvfs2-cvs] commit by kunkel in pvfs2/test/posix: openg-mpi.c iox.c io.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/test/posix
In directory parlweb1:/tmp/cvs-serv19417/test/posix

Modified Files:
      Tag: kunkel-hint-branch
	openg-mpi.c iox.c io.c 
Log Message:
Synchronization with HEAD


Index: openg-mpi.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/posix/openg-mpi.c,v
diff -p -u -r1.2.6.1 -r1.2.6.2
--- openg-mpi.c	25 Sep 2006 12:40:09 -0000	1.2.6.1
+++ openg-mpi.c	13 Jan 2007 10:16:52 -0000	1.2.6.2
@@ -34,11 +34,16 @@
 #define __NR_openfh 274
 #endif
 
-static long openg(const char *, void *, size_t *, int, int);
-static long openfh(const void *, size_t);
+static long openg(const char *pathname, void *uhandle, size_t *uhandle_len,
+                  int flags, int mode)
+{
+    return syscall(__NR_openg, pathname, uhandle, uhandle_len, flags, mode);
+}
 
-_syscall2(long, openfh, const void *, uhandle, size_t, handle_len);
-_syscall5(long, openg, const char *, pathname, void *, uhandle, size_t *, uhandle_len, int, flags, int, mode);
+static long openfh(const void *uhandle, size_t handle_len)
+{
+    return syscall(__NR_openfh, uhandle, handle_len);
+}
 
 #define MAX_LENGTH 128
 
@@ -98,7 +103,6 @@ int main(int argc, char *argv[])
 {
 	int c, fd, err;
 	int i, rank, np, do_unlink = 0, do_create = 0;
-	size_t len;
 	char opt[] = "n:f:cu", *fname = NULL;
 	double begin_openg, end_openg, begin_openfh, end_openfh, begin_total, end_total;
 	double openg_total = 0.0, openfh_total = 0.0, time_total = 0.0;
@@ -172,8 +176,9 @@ int main(int argc, char *argv[])
 		/* Broadcast the handle buffer to everyone */
 		if ((err = MPI_Bcast(&hb, 1, d, 0, MPI_COMM_WORLD)) != MPI_SUCCESS) {
 			char str[256];
-			len = 256;
-			MPI_Error_string(err, str, (int *) &len);
+			int len = sizeof(str);
+
+			MPI_Error_string(err, str, &len);
 			fprintf(stderr, "MPI_Bcast failed: %s\n", str);
 			MPI_Finalize();
 			exit(1);

Index: iox.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/posix/iox.c,v
diff -p -u -r1.3.2.1 -r1.3.2.2
--- iox.c	25 Sep 2006 12:40:09 -0000	1.3.2.1
+++ iox.c	13 Jan 2007 10:16:52 -0000	1.3.2.2
@@ -53,13 +53,17 @@ struct xtvec {
 
 static ssize_t readx(unsigned long fd,
 		const struct iovec * iov, unsigned long iovlen, 
-		const struct xtvec * xtv, unsigned long xtvlen);
+		const struct xtvec * xtv, unsigned long xtvlen)
+{
+	 return syscall(__NR_readx, fd, iov, iovlen, xtv, xtvlen);
+}
+
 static ssize_t writex(unsigned long fd, 
 		const struct iovec * iov, unsigned long iovlen,
-		const struct xtvec * xtv, unsigned long xtvlen);
-
-_syscall5(ssize_t, readx, unsigned long, fd, const struct iovec *, iov, unsigned long, iovlen, const struct xtvec *, xtv, unsigned long, xtvlen);
-_syscall5(ssize_t, writex, unsigned long, fd, const struct iovec *, iov, unsigned long, iovlen, const struct xtvec *, xtv, unsigned long, xtvlen);
+		const struct xtvec * xtv, unsigned long xtvlen)
+{
+	 return syscall(__NR_writex, fd, iov, iovlen, xtv, xtvlen);
+}
 
 #ifndef min
 #define min(a, b) (a) < (b) ? (a) : (b)

Index: io.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/posix/io.c,v
diff -p -u -r1.3.2.1 -r1.3.2.2
--- io.c	25 Sep 2006 12:40:09 -0000	1.3.2.1
+++ io.c	13 Jan 2007 10:16:52 -0000	1.3.2.2
@@ -136,11 +136,11 @@ int main(int argc, char **argv)
 
 			if (err < 0)
 				fprintf(stderr, "node %d, write error, loc = %Ld: %s\n",
-						  mynod, mynod*opt_block, strerror(myerrno));
+						  mynod, (long long) mynod*opt_block, strerror(myerrno));
 			/* only way sync_err can be nonzero is if opt_sync set*/
 			if (opt_sync && sync_err < 0)
 				fprintf(stderr, "node %d, sync error, loc = %Ld: %s\n",
-						  mynod, mynod*opt_block, strerror(sync_errno));
+						  mynod, (long long) mynod*opt_block, strerror(sync_errno));
 			
 		} /* end of write loop */
 
@@ -187,7 +187,7 @@ int main(int argc, char **argv)
 
 			if (err < 0)
 				fprintf(stderr, "node %d, read error, loc = %Ld: %s\n", mynod,
-						  mynod*opt_block, strerror(myerrno));
+						  (long long) mynod*opt_block, strerror(myerrno));
 
 			/* if the user wanted to check correctness, compare the write
 			 * buffer to the read buffer
@@ -274,9 +274,9 @@ int main(int argc, char **argv)
 		(max_write_tim*1000000.0);
 		
 		printf("nr_procs = %d, nr_iter = %d, blk_sz = %Ld\n",
-		nprocs, opt_iter, opt_block);
+		nprocs, opt_iter, (long long) opt_block);
 		
-		printf("# total_size = %Ld\n", (opt_block*nprocs*opt_iter));
+		printf("# total_size = %Ld\n", (long long) opt_block*nprocs*opt_iter);
 		
 		if (opt_write)
 			printf("# Write:  min_t = %f, max_t = %f, mean_t = %f, var_t = %f\n",