[PVFS2-CVS] commit by slang in pvfs2/test/io/trove: test-listio-aio-convert.c test-listio.c test-listio2.c test-listio3.c test-listio4.c test-listio5.c test-trove-cancel.c trove-ls.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/test/io/trove
In directory parlweb:/tmp/cvs-serv2348/test/io/trove

Modified Files:
      Tag: slang-sio-branch
	test-listio-aio-convert.c test-listio.c test-listio2.c 
	test-listio3.c test-listio4.c test-listio5.c 
	test-trove-cancel.c trove-ls.c 
Log Message:
fixes to small io stuff to get test-zero-fill working again.  Also committing updates from HEAD to make things easier for merge.


Index: test-listio-aio-convert.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/test-listio-aio-convert.c,v
diff -p -u -r1.3 -r1.3.22.1
--- test-listio-aio-convert.c	16 Oct 2003 14:42:23 -0000	1.3
+++ test-listio-aio-convert.c	11 Nov 2005 22:19:29 -0000	1.3.22.1
@@ -23,6 +23,7 @@
 
 #include "trove.h"
 #include "dbpf-bstream.h"
+#include "pvfs2-internal.h"
 
 #define AIOCB_ARRAY_SZ 20
 
@@ -101,10 +102,10 @@ int main(int argc, char *argv[])
                                 "aiocb_cnt=%d\n", aiocb_inuse_count);
 			fprintf(stderr, "lio_state: mct=%d,sct=%d,"
                                 "cur_mem_size: %d, cur_mem_off:%p, "
-                                "cur_stream_size: %Ld, cur_stream_off:%Ld\n", 
+                                "cur_stream_size: %lld, cur_stream_off:%lld\n", 
                                 lio_state.mem_ct, lio_state.stream_ct, 
                                 lio_state.cur_mem_size, lio_state.cur_mem_off,
-                                Ld(lio_state.cur_stream_size), Ld(lio_state.cur_stream_off));
+                                lld(lio_state.cur_stream_size), lld(lio_state.cur_stream_off));
 		}
 	}
 

Index: test-listio.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/test-listio.c,v
diff -p -u -r1.11 -r1.11.20.1
--- test-listio.c	22 Mar 2004 22:22:31 -0000	1.11
+++ test-listio.c	11 Nov 2005 22:19:29 -0000	1.11.20.1
@@ -12,7 +12,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+#include <stdlib.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 
 #include "trove.h"
 

Index: test-listio2.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/test-listio2.c,v
diff -p -u -r1.4 -r1.4.20.1
--- test-listio2.c	22 Mar 2004 22:22:31 -0000	1.4
+++ test-listio2.c	11 Nov 2005 22:19:29 -0000	1.4.20.1
@@ -12,7 +12,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+#include <stdlib.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 
 #include "trove.h"
 

Index: test-listio3.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/test-listio3.c,v
diff -p -u -r1.2 -r1.2.20.1
--- test-listio3.c	22 Mar 2004 22:22:31 -0000	1.2
+++ test-listio3.c	11 Nov 2005 22:19:29 -0000	1.2.20.1
@@ -12,7 +12,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+#include <stdlib.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 
 #include "trove.h"
 

Index: test-listio4.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/test-listio4.c,v
diff -p -u -r1.2 -r1.2.20.1
--- test-listio4.c	22 Mar 2004 22:22:31 -0000	1.2
+++ test-listio4.c	11 Nov 2005 22:19:29 -0000	1.2.20.1
@@ -12,7 +12,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+#include <stdlib.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 
 #include "trove.h"
 

Index: test-listio5.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/test-listio5.c,v
diff -p -u -r1.3 -r1.3.18.1
--- test-listio5.c	15 Jun 2004 19:18:45 -0000	1.3
+++ test-listio5.c	11 Nov 2005 22:19:29 -0000	1.3.18.1
@@ -12,7 +12,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+#include <stdlib.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 
 #include "trove.h"
 #include "gossip.h"

Index: test-trove-cancel.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/test-trove-cancel.c,v
diff -p -u -r1.4 -r1.4.20.1
--- test-trove-cancel.c	3 Feb 2004 20:12:15 -0000	1.4
+++ test-trove-cancel.c	11 Nov 2005 22:19:29 -0000	1.4.20.1
@@ -8,7 +8,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+#include <stdlib.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 
 #include "gossip.h"
 #include "trove.h"

Index: trove-ls.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/trove/trove-ls.c,v
diff -p -u -r1.19 -r1.19.18.1
--- trove-ls.c	28 Jul 2004 14:33:07 -0000	1.19
+++ trove-ls.c	11 Nov 2005 22:19:29 -0000	1.19.18.1
@@ -12,6 +12,7 @@
 
 #include <trove.h>
 #include "trove-test.h"
+#include "pvfs2-internal.h"
 
 char storage_space[SSPACE_SIZE] = "/tmp/trove-test-space";
 char file_system[FS_SIZE] = "fs-foo";
@@ -146,10 +147,10 @@ int main(int argc, char **argv)
                 coll_id, op_id, trove_context, &count, NULL, NULL, &state,
                 TROVE_DEFAULT_TEST_TIMEOUT);
 
-	    printf("%s/%s (handle = %Lu, uid = %d, gid = %d, perm = %o, type = %d, b_size = %d, k_size = %d)\n",
+	    printf("%s/%s (handle = %llu, uid = %d, gid = %d, perm = %o, type = %d, b_size = %d, k_size = %d)\n",
 		   path_name,
 		   (char *) key[i].buffer,
-		   Lu(*(TROVE_handle *) val[i].buffer),
+		   llu(*(TROVE_handle *) val[i].buffer),
 		   (int) ds_attr.uid,
 		   (int) ds_attr.gid,
 		   ds_attr.mode,