[C-MPI-commits] SF.net SVN: c-mpi:[180]
Status: Pre-Alpha
Brought to you by:
jmwozniak
Menu
▾
▴
[C-MPI-commits] SF.net SVN: c-mpi:[180]
|
From: <jmw...@us...> - 2011-04-15 21:45:14
|
Revision: 180
http://c-mpi.svn.sourceforge.net/c-mpi/?rev=180&view=rev
Author: jmwozniak
Date: 2011-04-15 21:45:08 +0000 (Fri, 15 Apr 2011)
Log Message:
-----------
Code improvements
Modified Paths:
--------------
include/cmpi_kda-2.h
include/mpirpc.h
src/cmpi/node.c
src/kda-2/kademlia.c
src/mpirpc/mpirpc.c
test/cmpi/test-manyputs.c
Modified: include/cmpi_kda-2.h
===================================================================
--- include/cmpi_kda-2.h 2011-04-15 21:44:49 UTC (rev 179)
+++ include/cmpi_kda-2.h 2011-04-15 21:45:08 UTC (rev 180)
@@ -4,3 +4,5 @@
//// Helpers:
void add_contacts(void);
+
+void listen_loop(void);
Modified: include/mpirpc.h
===================================================================
--- include/mpirpc.h 2011-04-15 21:44:49 UTC (rev 179)
+++ include/mpirpc.h 2011-04-15 21:45:08 UTC (rev 180)
@@ -30,9 +30,9 @@
int status;
char name[MPIRPC_MAX_NAME];
char args[MPIRPC_MAX_ARGS];
- void* blob;
+ char* blob;
int blob_length;
- void* result;
+ char* result;
int result_length;
void* extras;
void (*proceed) (struct mpirpc* rpc);
@@ -86,20 +86,20 @@
void* extras, void (*proceed)(MPIRPC*));
MPIRPC* MPIRPC_Call_blob(MPIRPC_Node target, char* name, char* args,
- void* blob, int blob_length,
+ char* blob, int blob_length,
void* extras, void (*proceed)(MPIRPC*));
-void* MPIRPC_Block(MPIRPC_Node target, char* name, char* args);
+char* MPIRPC_Block(MPIRPC_Node target, char* name, char* args);
-void* MPIRPC_Block_blob(MPIRPC_Node target, char* name, char* args,
- void* blob, int blob_length);
+char* MPIRPC_Block_blob(MPIRPC_Node target, char* name, char* args,
+ char* blob, int blob_length);
-void* MPIRPC_Wait(MPIRPC* rpc);
+char* MPIRPC_Wait(MPIRPC* rpc);
void MPIRPC_Null(MPIRPC_Node caller, int unique);
void MPIRPC_Return(MPIRPC_Node caller, int unique,
- void* result, int rlength);
+ char* result, int rlength);
MPIRPC_Node* MPIRPC_Node_create(MPI_Comm comm, int rank);
Modified: src/cmpi/node.c
===================================================================
--- src/cmpi/node.c 2011-04-15 21:44:49 UTC (rev 179)
+++ src/cmpi/node.c 2011-04-15 21:45:08 UTC (rev 180)
@@ -153,8 +153,10 @@
main(int argc, char* argv[])
{
gossip_debug_init();
- // gossip_set_debug_mask(true,MASK_DEBUG|MASK_MPIRPC|MASK_ADTS|
- // MASK_CMPI|MASK_DRIVER);
+
+ //gossip_set_debug_mask(true,MASK_DEBUG|MASK_MPIRPC|MASK_ADTS|
+ // MASK_CMPI|MASK_DRIVER);
+
gossip_enable_stdout();
// Comment out to achieve deterministic results:
Modified: src/kda-2/kademlia.c
===================================================================
--- src/kda-2/kademlia.c 2011-04-15 21:44:49 UTC (rev 179)
+++ src/kda-2/kademlia.c 2011-04-15 21:45:08 UTC (rev 180)
@@ -96,7 +96,6 @@
static KDA_ID make_id(int salt);
static char* id_tostring(void);
-static void listen_loop(void);
static void bootstrap(MPIRPC_Node node);
int KDA_Neighbor_table_size(void);
@@ -1059,7 +1058,7 @@
{
// NOTE_F;
char* result = buckets_tostring();
- printf(result);
+ printf("%s\n", result);
free(result);
}
Modified: src/mpirpc/mpirpc.c
===================================================================
--- src/mpirpc/mpirpc.c 2011-04-15 21:44:49 UTC (rev 179)
+++ src/mpirpc/mpirpc.c 2011-04-15 21:45:08 UTC (rev 180)
@@ -195,7 +195,7 @@
MPIRPC*
MPIRPC_Create(MPIRPC_Node target, char* name, char* args,
- void* blob, int blob_length,
+ char* blob, int blob_length,
void* extras, void (*proceed)(MPIRPC*))
{
// gossip_do(MASK_MPIRPC, NOTE_F);
@@ -258,7 +258,7 @@
*/
MPIRPC*
MPIRPC_Call_blob(MPIRPC_Node target, char* name, char* args,
- void* blob, int blob_length,
+ char* blob, int blob_length,
void* extras, void (*proceed)(MPIRPC* rpc))
{
assert(target.comm != MPI_COMM_NULL);
@@ -312,18 +312,18 @@
Copied into MPIRPC.
@param args The args to send. Copied into MPIRPC.
*/
-void*
+char*
MPIRPC_Block(MPIRPC_Node target, char* name, char* args)
{
//gossip_do(MASK_MPIRPC, NOTE_FS(name));
return MPIRPC_Block_blob(target, name, args, NULL, 0);
}
-void*
+char*
MPIRPC_Block_blob(MPIRPC_Node target, char* name, char* args,
- void* blob, int blob_length)
+ char* blob, int blob_length)
{
- void* result;
+ char* result;
gossip_do(MASK_MPIRPC, NOTE_FS(name));
MPIRPC* rpc = MPIRPC_Call_blob(target, name, args,
blob, blob_length, NULL, NULL);
@@ -411,7 +411,7 @@
MPIRPC_Return(caller, unique, NULL, -1);
}
-MPIRPC_Value* MPIRPC_Value_create(int unique, void* result, int length);
+MPIRPC_Value* MPIRPC_Value_create(int unique, char* result, int length);
/**
Return result to caller for unique RPC.
@@ -420,7 +420,7 @@
*/
void
MPIRPC_Return(MPIRPC_Node caller, int unique,
- void* result, int length)
+ char* result, int length)
{
gossip_do(MASK_MPIRPC, SHOW_FIII(caller.rank, unique, length));
@@ -479,7 +479,7 @@
MPIRPC_TAG_RESULT, sender.comm, &status);
}
else if (rpc->result_length == 0)
- rpc->result = heap("");
+ rpc->result = NULL;
else
rpc->result = NULL;
@@ -556,7 +556,7 @@
}
MPIRPC_Value*
-MPIRPC_Value_create(int unique, void* result, int length)
+MPIRPC_Value_create(int unique, char* result, int length)
{
MPIRPC_Value* value = malloc(sizeof(MPIRPC_Value));
@@ -597,7 +597,7 @@
MPIRPC_Free() or MPIRPC_Destroy() as proceed-functions.
@return rpc's result when obtained.
*/
-void*
+char*
MPIRPC_Wait(MPIRPC* rpc)
{
int unique = rpc->unique;
Modified: test/cmpi/test-manyputs.c
===================================================================
--- test/cmpi/test-manyputs.c 2011-04-15 21:44:49 UTC (rev 179)
+++ test/cmpi/test-manyputs.c 2011-04-15 21:45:08 UTC (rev 180)
@@ -45,6 +45,8 @@
cmpi_put(key, value, strlen(value)+1);
free(value);
}
+ double stop = MPI_Wtime();
+ printf("TOOK: %0.3f\n", stop-start);
double stop = MPI_Wtime();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
