[PVFS2-CVS] commit by rbross in pvfs2/test/io/bmi: bench-initialize.c bench-initialize.h bench-mem.c bench-mem.h driver-bw-multi.c driver-latency.c driver-simple.c test-bmi-client-gm.c test-bmi-client-list-gm.c test-bmi-client-list.c test-bmi-client.c test-bmi-server-gm.c test-bmi-server-list-gm.c test-bmi-server-list.c test-bmi-server.c

CVS commit program cvs at parl.clemson.edu
Mon Feb 16 16:35:32 EST 2004


Update of /projects/cvsroot/pvfs2/test/io/bmi
In directory parlweb:/tmp/cvs-serv32729/test/io/bmi

Modified Files:
	bench-initialize.c bench-initialize.h bench-mem.c bench-mem.h 
	driver-bw-multi.c driver-latency.c driver-simple.c 
	test-bmi-client-gm.c test-bmi-client-list-gm.c 
	test-bmi-client-list.c test-bmi-client.c test-bmi-server-gm.c 
	test-bmi-server-list-gm.c test-bmi-server-list.c 
	test-bmi-server.c 
Log Message:
Move from bmi_addr_t to PVFS_BMI_addr_t for consistency.


Index: bench-initialize.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/bench-initialize.c,v
diff -p -u -r1.6 -r1.7
--- bench-initialize.c	24 Sep 2003 16:02:34 -0000	1.6
+++ bench-initialize.c	16 Feb 2004 21:35:31 -0000	1.7
@@ -18,7 +18,7 @@
 #include <strings.h>
 
 int bench_init(struct bench_options* opts, int argc, char* argv[], int*
-	num_clients, int* world_rank, MPI_Comm* comm, bmi_addr_t**
+	num_clients, int* world_rank, MPI_Comm* comm, PVFS_BMI_addr_t**
 	bmi_peer_array, int** mpi_peer_array, bmi_context_id* context)
 {
 	int ret = -1;
@@ -54,7 +54,7 @@ int bench_init(struct bench_options* opt
 	if(*world_rank < opts->num_servers)
 	{
 		*bmi_peer_array =
-			(bmi_addr_t*)malloc((*num_clients)*sizeof(bmi_addr_t));
+			(PVFS_BMI_addr_t*)malloc((*num_clients)*sizeof(PVFS_BMI_addr_t));
 		*mpi_peer_array =
 			(int*)malloc((*num_clients)*sizeof(int));
 		if(!(*bmi_peer_array) || !(*mpi_peer_array))
@@ -71,7 +71,7 @@ int bench_init(struct bench_options* opt
 	else
 	{
 		*bmi_peer_array =
-			(bmi_addr_t*)malloc(opts->num_servers*sizeof(bmi_addr_t));
+			(PVFS_BMI_addr_t*)malloc(opts->num_servers*sizeof(PVFS_BMI_addr_t));
 		*mpi_peer_array =
 			(int*)malloc(opts->num_servers*sizeof(int));
 		if(!(*bmi_peer_array) || !(*mpi_peer_array))
@@ -211,7 +211,7 @@ int bench_initialize_mpi_params(int argc
 }
 
 int bench_initialize_bmi_addresses_server(int num_servers, int num_clients, 
-	bmi_addr_t* client_array, char* local_proc_name)
+	PVFS_BMI_addr_t* client_array, char* local_proc_name)
 {
 	int i=0;
 	int ret = -1;
@@ -250,7 +250,7 @@ int bench_initialize_bmi_addresses_serve
 }
 
 int bench_initialize_bmi_addresses_client(int num_servers, int num_clients, 
-	bmi_addr_t* server_array, char* method_name, bmi_context_id context)
+	PVFS_BMI_addr_t* server_array, char* method_name, bmi_context_id context)
 {
 	int i=0;
 	int ret = -1;

Index: bench-initialize.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/bench-initialize.h,v
diff -p -u -r1.3 -r1.4
--- bench-initialize.h	14 May 2003 20:07:07 -0000	1.3
+++ bench-initialize.h	16 Feb 2004 21:35:31 -0000	1.4
@@ -24,11 +24,11 @@ int bench_initialize_mpi_params(int argc
 	int* num_clients, int* world_rank, MPI_Comm* comm, 
 	char* local_proc_name);
 int bench_initialize_bmi_addresses_server(int num_servers, int num_clients, 
-	bmi_addr_t* client_array, char* local_proc_name);
+	PVFS_BMI_addr_t* client_array, char* local_proc_name);
 int bench_initialize_bmi_addresses_client(int num_servers, int num_clients, 
-	bmi_addr_t* client_array, char* method_name, bmi_context_id context);
+	PVFS_BMI_addr_t* client_array, char* method_name, bmi_context_id context);
 int bench_init(struct bench_options* opts, int argc, char* argv[], int*
-	num_clients, int* world_rank, MPI_Comm* comm, bmi_addr_t**
+	num_clients, int* world_rank, MPI_Comm* comm, PVFS_BMI_addr_t**
 	bmi_peer_array, int** mpi_peer_array, bmi_context_id* context);
 
 #endif /* __BENCH_INITIALIZE_H */

Index: bench-mem.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/bench-mem.c,v
diff -p -u -r1.2 -r1.3
--- bench-mem.c	30 May 2003 17:47:59 -0000	1.2
+++ bench-mem.c	16 Feb 2004 21:35:31 -0000	1.3
@@ -38,7 +38,7 @@ int alloc_buffers(struct mem_buffers* bu
 }
 
 int BMI_alloc_buffers(struct mem_buffers* bufs, int num_buffers, int
-	size, bmi_addr_t addr, enum bmi_op_type send_recv)
+	size, PVFS_BMI_addr_t addr, enum bmi_op_type send_recv)
 {
 
 	int i = 0;
@@ -78,7 +78,7 @@ int free_buffers(struct mem_buffers* buf
 	return(0);
 }
 
-int BMI_free_buffers(struct mem_buffers* bufs, bmi_addr_t addr,
+int BMI_free_buffers(struct mem_buffers* bufs, PVFS_BMI_addr_t addr,
 	enum bmi_op_type send_recv)
 {
 	int i=0;

Index: bench-mem.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/bench-mem.h,v
diff -p -u -r1.2 -r1.3
--- bench-mem.h	30 May 2003 17:47:59 -0000	1.2
+++ bench-mem.h	16 Feb 2004 21:35:31 -0000	1.3
@@ -24,10 +24,10 @@ struct mem_buffers
 
 int alloc_buffers(struct mem_buffers* bufs, int num_buffers, int size);
 int BMI_alloc_buffers(struct mem_buffers* bufs, int num_buffers, int
-	size, bmi_addr_t addr, enum bmi_op_type send_recv);
+	size, PVFS_BMI_addr_t addr, enum bmi_op_type send_recv);
 
 int free_buffers(struct mem_buffers* bufs);
-int BMI_free_buffers(struct mem_buffers* bufs, bmi_addr_t addr,
+int BMI_free_buffers(struct mem_buffers* bufs, PVFS_BMI_addr_t addr,
 	enum bmi_op_type send_recv);
 
 int mark_buffers(struct mem_buffers* bufs);

Index: driver-bw-multi.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/driver-bw-multi.c,v
diff -p -u -r1.6 -r1.7
--- driver-bw-multi.c	30 May 2003 19:46:29 -0000	1.6
+++ driver-bw-multi.c	16 Feb 2004 21:35:31 -0000	1.7
@@ -16,11 +16,11 @@
 #include <bench-mem.h>
 
 static int bmi_server_postall(struct bench_options* opts, struct
-	mem_buffers* bmi_buf_array, int num_clients, bmi_addr_t* addr_array, 
+	mem_buffers* bmi_buf_array, int num_clients, PVFS_BMI_addr_t* addr_array, 
 	enum bmi_buffer_type buffer_type, double* wtime, int world_rank, bmi_context_id
 	context);
 static int bmi_client_postall(struct bench_options* opts, struct
-	mem_buffers* bmi_buf_array, int num_servers, bmi_addr_t* addr_array, 
+	mem_buffers* bmi_buf_array, int num_servers, PVFS_BMI_addr_t* addr_array, 
 	enum bmi_buffer_type buffer_type, double* wtime, int world_rank, bmi_context_id
 	context);
 static int mpi_client_postall(struct bench_options* opts, struct 
@@ -35,7 +35,7 @@ int main( int argc, char *argv[])
 	int ret = -1;
 	int world_rank = 0;
 	MPI_Comm comm;
-	bmi_addr_t* bmi_peer_array;
+	PVFS_BMI_addr_t* bmi_peer_array;
 	int* mpi_peer_array;
 	int num_clients;
 	struct bench_options opts;
@@ -378,7 +378,7 @@ MPI_COMM_WORLD);
 
 
 static int bmi_server_postall(struct bench_options* opts, struct
-	mem_buffers* bmi_buf_array, int num_clients, bmi_addr_t* addr_array, 
+	mem_buffers* bmi_buf_array, int num_clients, PVFS_BMI_addr_t* addr_array, 
 	enum bmi_buffer_type buffer_type, double* wtime, int world_rank, bmi_context_id
 	context)
 {
@@ -555,7 +555,7 @@ static int bmi_server_postall(struct ben
 
 
 static int bmi_client_postall(struct bench_options* opts, struct
-	mem_buffers* bmi_buf_array, int num_servers, bmi_addr_t* addr_array, 
+	mem_buffers* bmi_buf_array, int num_servers, PVFS_BMI_addr_t* addr_array, 
 	enum bmi_buffer_type buffer_type, double* wtime, int world_rank, bmi_context_id
 	context)
 {

Index: driver-latency.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/driver-latency.c,v
diff -p -u -r1.7 -r1.8
--- driver-latency.c	30 Sep 2003 11:34:13 -0000	1.7
+++ driver-latency.c	16 Feb 2004 21:35:31 -0000	1.8
@@ -18,10 +18,10 @@
 #define ITERATIONS 1000
 
 static int bmi_server(struct bench_options* opts, struct mem_buffers*
-	bmi_recv_bufs, struct mem_buffers* bmi_send_bufs, bmi_addr_t addr,
+	bmi_recv_bufs, struct mem_buffers* bmi_send_bufs, PVFS_BMI_addr_t addr,
 	enum bmi_buffer_type buffer_type, double* wtime, bmi_context_id context);
 static int bmi_client(struct bench_options* opts, struct mem_buffers*
-	bmi_recv_bufs, struct mem_buffers* bmi_send_bufs, bmi_addr_t addr,
+	bmi_recv_bufs, struct mem_buffers* bmi_send_bufs, PVFS_BMI_addr_t addr,
 	enum bmi_buffer_type buffer_type, double* wtime, bmi_context_id context);
 static int mpi_server(struct bench_options* opts, struct mem_buffers*
 	mpi_recv_bufs, struct mem_buffers* mpi_send_bufs, int addr, double* wtime);
@@ -33,7 +33,7 @@ int main( int argc, char *argv[])
 	int ret = -1;
 	int world_rank = 0;
 	MPI_Comm comm;
-	bmi_addr_t* bmi_peer_array;
+	PVFS_BMI_addr_t* bmi_peer_array;
 	int* mpi_peer_array;
 	int num_clients;
 	struct bench_options opts;
@@ -216,7 +216,7 @@ int main( int argc, char *argv[])
 }
 
 static int bmi_server(struct bench_options* opts, struct mem_buffers*
-	bmi_recv_bufs, struct mem_buffers* bmi_send_bufs, bmi_addr_t addr,
+	bmi_recv_bufs, struct mem_buffers* bmi_send_bufs, PVFS_BMI_addr_t addr,
 	enum bmi_buffer_type buffer_type, double* wtime, bmi_context_id context)
 {
 	int i=0;
@@ -292,7 +292,7 @@ static int bmi_server(struct bench_optio
 
 
 static int bmi_client(struct bench_options* opts, struct mem_buffers*
-	bmi_recv_bufs, struct mem_buffers* bmi_send_bufs, bmi_addr_t addr,
+	bmi_recv_bufs, struct mem_buffers* bmi_send_bufs, PVFS_BMI_addr_t addr,
 	enum bmi_buffer_type buffer_type, double* wtime, bmi_context_id context)
 {
 	int i=0;

Index: driver-simple.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/driver-simple.c,v
diff -p -u -r1.2 -r1.3
--- driver-simple.c	7 Apr 2003 21:04:48 -0000	1.2
+++ driver-simple.c	16 Feb 2004 21:35:31 -0000	1.3
@@ -19,7 +19,7 @@ int main( int argc, char *argv[])
 	int ret = -1;
 	int world_rank = 0;
 	MPI_Comm comm;
-	bmi_addr_t* bmi_peer_array;
+	PVFS_BMI_addr_t* bmi_peer_array;
 	int* mpi_peer_array;
 	int num_clients;
 	struct bench_options opts;

Index: test-bmi-client-gm.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/test-bmi-client-gm.c,v
diff -p -u -r1.8 -r1.9
--- test-bmi-client-gm.c	16 Feb 2004 17:06:30 -0000	1.8
+++ test-bmi-client-gm.c	16 Feb 2004 21:35:31 -0000	1.9
@@ -45,7 +45,7 @@ int main(int argc, char **argv)	{
 	struct server_request* my_req = NULL;
 	struct server_ack* my_ack = NULL;
 	int ret = -1;
-	bmi_addr_t server_addr;
+	PVFS_BMI_addr_t server_addr;
 	bmi_op_id_t client_ops[2];
 	int outcount = 0;
 	bmi_error_code_t error_code;

Index: test-bmi-client-list-gm.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/test-bmi-client-list-gm.c,v
diff -p -u -r1.10 -r1.11
--- test-bmi-client-list-gm.c	16 Feb 2004 17:17:56 -0000	1.10
+++ test-bmi-client-list-gm.c	16 Feb 2004 21:35:31 -0000	1.11
@@ -53,7 +53,7 @@ int main(int argc, char **argv)	{
 	struct server_request* my_req = NULL;
 	struct server_ack* my_ack = NULL;
 	int ret = -1;
-	bmi_addr_t server_addr;
+	PVFS_BMI_addr_t server_addr;
 	void* send_buffer1 = NULL;
 	void* send_buffer2 = NULL;
 	void* send_buffer3 = NULL;

Index: test-bmi-client-list.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/test-bmi-client-list.c,v
diff -p -u -r1.8 -r1.9
--- test-bmi-client-list.c	30 Jan 2004 20:12:15 -0000	1.8
+++ test-bmi-client-list.c	16 Feb 2004 21:35:31 -0000	1.9
@@ -46,7 +46,7 @@ int main(int argc, char **argv)	{
 	struct server_request* my_req = NULL;
 	struct server_ack* my_ack = NULL;
 	int ret = -1;
-	bmi_addr_t server_addr;
+	PVFS_BMI_addr_t server_addr;
 	void* send_buffer1 = NULL;
 	void* send_buffer2 = NULL;
 	void* send_buffer3 = NULL;

Index: test-bmi-client.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/test-bmi-client.c,v
diff -p -u -r1.8 -r1.9
--- test-bmi-client.c	30 Jan 2004 20:12:15 -0000	1.8
+++ test-bmi-client.c	16 Feb 2004 21:35:31 -0000	1.9
@@ -44,7 +44,7 @@ int main(int argc, char **argv)	{
 	struct server_request* my_req = NULL;
 	struct server_ack* my_ack = NULL;
 	int ret = -1;
-	bmi_addr_t server_addr;
+	PVFS_BMI_addr_t server_addr;
 	void* send_buffer = NULL;
 	bmi_op_id_t client_ops[2];
 	int outcount = 0;

Index: test-bmi-server-gm.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/test-bmi-server-gm.c,v
diff -p -u -r1.10 -r1.11
--- test-bmi-server-gm.c	16 Feb 2004 17:17:56 -0000	1.10
+++ test-bmi-server-gm.c	16 Feb 2004 21:35:31 -0000	1.11
@@ -44,7 +44,7 @@ int main(int argc, char **argv)	{
 	struct server_request* my_req = NULL;
 	struct server_ack* my_ack = NULL;
 	int ret = -1;
-	bmi_addr_t client_addr;
+	PVFS_BMI_addr_t client_addr;
 	void* recv_buffer = NULL;
 	bmi_op_id_t server_ops[2];
 	bmi_error_code_t error_code;

Index: test-bmi-server-list-gm.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/test-bmi-server-list-gm.c,v
diff -p -u -r1.9 -r1.10
--- test-bmi-server-list-gm.c	16 Feb 2004 17:17:56 -0000	1.9
+++ test-bmi-server-list-gm.c	16 Feb 2004 21:35:31 -0000	1.10
@@ -42,7 +42,7 @@ int main(int argc, char **argv)	{
 	struct server_request* my_req = NULL;
 	struct server_ack* my_ack = NULL;
 	int ret = -1;
-	bmi_addr_t client_addr;
+	PVFS_BMI_addr_t client_addr;
 	void* recv_buffer1 = NULL;
 	void* recv_buffer2 = NULL;
 	bmi_op_id_t server_ops[2];

Index: test-bmi-server-list.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/test-bmi-server-list.c,v
diff -p -u -r1.9 -r1.10
--- test-bmi-server-list.c	30 Jan 2004 20:12:15 -0000	1.9
+++ test-bmi-server-list.c	16 Feb 2004 21:35:31 -0000	1.10
@@ -42,7 +42,7 @@ int main(int argc, char **argv)	{
 	struct server_request* my_req = NULL;
 	struct server_ack* my_ack = NULL;
 	int ret = -1;
-	bmi_addr_t client_addr;
+	PVFS_BMI_addr_t client_addr;
 	void* recv_buffer1 = NULL;
 	void* recv_buffer2 = NULL;
 	bmi_op_id_t server_ops[2];

Index: test-bmi-server.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/io/bmi/test-bmi-server.c,v
diff -p -u -r1.9 -r1.10
--- test-bmi-server.c	30 Jan 2004 20:12:15 -0000	1.9
+++ test-bmi-server.c	16 Feb 2004 21:35:31 -0000	1.10
@@ -43,7 +43,7 @@ int main(int argc, char **argv)	{
 	struct server_request* my_req = NULL;
 	struct server_ack* my_ack = NULL;
 	int ret = -1;
-	bmi_addr_t client_addr;
+	PVFS_BMI_addr_t client_addr;
 	void* recv_buffer = NULL;
 	bmi_op_id_t server_ops[2];
 	bmi_error_code_t error_code;



More information about the PVFS2-CVS mailing list