[C-mpi-commits] SF.net SVN: c-mpi:[6] include
Status: Pre-Alpha
Brought to you by:
jmwozniak
Menu
▾
▴
[C-mpi-commits] SF.net SVN: c-mpi:[6] include
|
From: <jmw...@us...> - 2010-04-20 04:14:40
|
Revision: 6
http://c-mpi.svn.sourceforge.net/c-mpi/?rev=6&view=rev
Author: jmwozniak
Date: 2010-04-20 04:14:33 +0000 (Tue, 20 Apr 2010)
Log Message:
-----------
Use only MPIRPC-2.
Modified Paths:
--------------
Makefile.in
configure.ac
include/mpirpc.h
Removed Paths:
-------------
include/mpirpc-2.h
Modified: Makefile.in
===================================================================
--- Makefile.in 2010-04-20 04:12:34 UTC (rev 5)
+++ Makefile.in 2010-04-20 04:14:33 UTC (rev 6)
@@ -5,7 +5,7 @@
# clean cleans up make-created files
# cleaner cleans up configure-created files
# distclean _really_ cleans up; returns to pristine tree
-# etags generates tags file for use by editors
+# tags generates etags file for use by editors
# INPUT CONTROL VARIABLES
# D : if 1, turn on debugging output in CMPI programs
@@ -547,14 +547,12 @@
$(Q) " CPP $@"
$(E)$(CC) $(LIBCFLAGS) $(CFLAGS) $(call modcflags,$<) $< -E -o $@
-TAGS:
- $(Q) " TAGS "
- $(E) find $(srcdir) -name '*.[ch]' | xargs etags -a $(ETAGS_FLAGS)
+tags: TAGS
# Generate TAGS based on only files used by CMPI as configured:
-TAGS.config: deps.config.txt
+TAGS: deps.config.txt
$(Q) " TAGS "
- $(E)etags -o $(@) $(ETAGS_FLAGS) `cat deps.config.txt`
+ $(E)etags $(ETAGS_FLAGS) `cat deps.config.txt`
# $(E)etags `cat deps.txt`
# Extract all files from *.d files, format and sort:
@@ -591,7 +589,7 @@
# some stuff that is cleaned in both distclean and dist targets
cleaner: clean
$(Q) " CLEANER"
- $(E)rm -fvr TAGS TAGS.config deps.config.txt \
+ $(E)rm -fvr TAGS deps.config.txt \
maint/mpi-depend.sh \
examples/pvfs2-server.rc \
/doxygen/pvfs2-doxygen.conf \
@@ -637,7 +635,7 @@
%.d: %.c
$(Q) " DEP $@"
# $(E) $(MPICC) -M $(CFLAGS) $(<) | sed -e 's@.*\.o:@@;s@\\@@' > $(@)
- $(E) CC="$(MPICC)" $(srcdir)/maint/depend.sh $(call dirname,$*) $(CFLAGS) $(call modcflags,$<) $< > $@
+ $(E) CC="$(MPICC)" $(srcdir)/depend.sh $(call dirname,$*) $(CFLAGS) $(call modcflags,$<) $< > $@
SPLINTOPTS = +posixlib +gnuextensions # -preproc
SPLINT_GS_S := $(shell find . -name "*.gs.s")
Modified: configure.ac
===================================================================
--- configure.ac 2010-04-20 04:12:34 UTC (rev 5)
+++ configure.ac 2010-04-20 04:14:33 UTC (rev 6)
@@ -367,19 +367,6 @@
USE_COMM_WORLD=1],
[USE_TABLE_DENSE_1=0])
-AC_ARG_ENABLE([table-kda-1],
- AS_HELP_STRING(
- [--enable-table-kda-1],
- [use kademlia-1 implementation]),
- [AC_MSG_RESULT([using kademlia-1 implementation...] )
- AC_DEFINE([USE_TABLE_KDA_1], [1], [Using Kademlia-1])
- AC_DEFINE([USE_MPIRPC_1], [1], [Using MPIRPC-1])
- AC_DEFINE([USE_COMM_WORLD], [1], [Using MPI_COMM_WORLD])
- USE_TABLE_KDA_1=1
- USE_MPIRPC_1=1
- USE_COMM_WORLD=1],
- [USE_TABLE_KDA_1=0])
-
AC_ARG_ENABLE([table-kda-2A],
AS_HELP_STRING(
[--enable-table-kda-2A],
Deleted: include/mpirpc-2.h
===================================================================
--- include/mpirpc-2.h 2010-04-20 04:12:34 UTC (rev 5)
+++ include/mpirpc-2.h 2010-04-20 04:14:33 UTC (rev 6)
@@ -1,199 +0,0 @@
-
-#ifndef MPIRPC_2_H
-#define MPIRPC_2_H
-
-#define _XOPEN_SOURCE 500
-
-#include <stdbool.h>
-#include <unistd.h>
-
-#include <cmpi-config.h>
-
-#include <list.h>
-#include <itable.h>
-#include <hashtable.h>
-
-#include <mpi_tools.h>
-
-#ifdef DMALLOC
-#include <dmalloc.h>
-#endif
-
-extern int unique;
-
-extern useconds_t snooze_max;
-
-#define MPIRPC_MAX_NAME 128
-#define MPIRPC_MAX_ARGS 256
-#define MPIRPC_PROCEED_NULL ((void (*)(MPIRPC*)) 1)
-
-typedef struct
-{
- MPI_Comm comm;
- int rank;
-} MPIRPC_Node;
-
-typedef struct
-{
- MPI_Comm comm;
- MPI_Request request;
-} MPIRPC_Channel;
-
-typedef struct mpirpc
-{
- MPIRPC_Node target;
- int status;
- char name[MPIRPC_MAX_NAME];
- char args[MPIRPC_MAX_ARGS];
- char* blob;
- int blob_length;
- char* result;
- int result_length;
- void* extras;
- void (*proceed) (struct mpirpc* rpc);
- int unique;
- bool cancelled;
-
- // Internals:
- /**
- name_length is transferred via Isend().
- */
- int name_length;
-
- /**
- args_length is transferred via Isend().
- */
- int args_length;
-
- /**
- Array of Isend() requests to be freed on return.
- */
- MPI_Request request[8];
-} MPIRPC;
-
-/**
- Internal MPIRPC return value. Used for garbage collection.
-*/
-typedef struct mpirpc_value MPIRPC_Value;
-struct mpirpc_value
-{
- int unique;
- int length;
- char* result;
- MPI_Request request[4];
-};
-
-//// API...
-
-void MPIRPC_Init(void);
-
-bool MPIRPC_Check(void);
-
-void MPIRPC_Recv(MPI_Comm comm);
-
-void MPIRPC_Register(char* name,
- void (*f)(MPIRPC_Node,int,char*,char*,int));
-
-bool MPIRPC_Comm_add(MPI_Comm comm);
-
-void MPIRPC_Close(MPIRPC_Channel* channel);
-
-MPIRPC* MPIRPC_Call(MPIRPC_Node target, char* name, char* args,
- void* extras, void (*proceed)(MPIRPC*));
-
-MPIRPC* MPIRPC_Call_blob(MPIRPC_Node target, char* name, char* args,
- char* blob, int blob_length,
- void* extras, void (*proceed)(MPIRPC*));
-
-char* MPIRPC_Block(MPIRPC_Node target, char* name, char* args);
-
-char* MPIRPC_Block_blob(MPIRPC_Node target, char* name, char* args,
- char* blob, int blob_length);
-
-char* MPIRPC_Wait(MPIRPC* rpc);
-
-void MPIRPC_Null(MPIRPC_Node caller, int unique);
-
-void MPIRPC_Return(MPIRPC_Node caller, int unique,
- char* result, int rlength);
-
-MPIRPC_Node* MPIRPC_Node_create(MPI_Comm comm, int rank);
-
-MPIRPC_Node* MPIRPC_Node_make(MPI_Comm comm, int rank,
- MPIRPC_Node* node);
-
-void MPIRPC_Garbage_collect(void);
-
-struct list* MPIRPC_Comms(void);
-
-void MPIRPC_Dump(MPIRPC* rpc);
-
-void MPIRPC_Dump_portmap(void);
-
-void MPIRPC_Dump_channels(void);
-
-MPIRPC* MPIRPC_Lookup(int unique);
-
-void MPIRPC_Flush_returns(void);
-
-char* MPIRPC_Comm_get_name(MPI_Comm comm);
-
-void MPIRPC_Free(MPIRPC* rpc);
-
-void MPIRPC_Snooze(void);
-
-void MPIRPC_Snooze_reset(void);
-
-//// Internal routines...
-
-bool MPIRPC_Garbage_collect_value(void);
-
-void MPIRPC_Value_free(MPIRPC_Value* value);
-
-MPIRPC_Value* MPIRPC_Value_create(int unique, char* result, int length);
-
-//// Data structure helpers...
-
-int MPIRPC_Node_cmp(void* node1, void* node2);
-
-int MPIRPC_Channel_cmp(void* c1, void* c2);
-
-int MPIRPC_Channel_comm_cmp(void* c1, void* c2);
-
-MPIRPC_Channel* MPIRPC_Channel_for_node(MPIRPC_Node node);
-
-void MPIRPC_Finalize(void);
-
-/**
- MPIRPC stati.
-*/
-enum
-{
- MPIRPC_STATUS_PROTO,
- MPIRPC_STATUS_CALLED,
- MPIRPC_STATUS_RETURNED
-};
-
-/**
- Tags used by MPIRPC.
-*/
-enum
-{
- MPIRPC_TAG_CONTROL,
- MPIRPC_TAG_UNIQUE,
- MPIRPC_TAG_NAME,
- MPIRPC_TAG_LENGTH,
- MPIRPC_TAG_ARGS,
- MPIRPC_TAG_RESULT
-};
-
-enum
-{
- MPIRPC_MSG_CALL = 12,
- MPIRPC_MSG_RETURN = 13,
- MPIRPC_MSG_DISCONNECT = 14,
- MPIRPC_MSG_OK = 15,
- MPIRPC_MSG_FAIL = 16
-};
-
-#endif
Modified: include/mpirpc.h
===================================================================
--- include/mpirpc.h 2010-04-20 04:12:34 UTC (rev 5)
+++ include/mpirpc.h 2010-04-20 04:14:33 UTC (rev 6)
@@ -2,12 +2,196 @@
#ifndef MPIRPC_H
#define MPIRPC_H
+#include <stdbool.h>
+#include <unistd.h>
+
#include <cmpi-config.h>
-#if USE_MPIRPC_1 == 1
-#include <mpirpc-1.h>
-#else
-#include <mpirpc-2.h>
+#include <list.h>
+#include <itable.h>
+#include <hashtable.h>
+
+#include <mpi_tools.h>
+
+#ifdef DMALLOC
+#include <dmalloc.h>
#endif
+extern int unique;
+
+extern useconds_t snooze_max;
+
+#define MPIRPC_MAX_NAME 128
+#define MPIRPC_MAX_ARGS 256
+#define MPIRPC_PROCEED_NULL ((void (*)(MPIRPC*)) 1)
+
+typedef struct
+{
+ MPI_Comm comm;
+ int rank;
+} MPIRPC_Node;
+
+typedef struct
+{
+ MPI_Comm comm;
+ MPI_Request request;
+} MPIRPC_Channel;
+
+typedef struct mpirpc
+{
+ MPIRPC_Node target;
+ int status;
+ char name[MPIRPC_MAX_NAME];
+ char args[MPIRPC_MAX_ARGS];
+ char* blob;
+ int blob_length;
+ char* result;
+ int result_length;
+ void* extras;
+ void (*proceed) (struct mpirpc* rpc);
+ int unique;
+ bool cancelled;
+
+ // Internals:
+ /**
+ name_length is transferred via Isend().
+ */
+ int name_length;
+
+ /**
+ args_length is transferred via Isend().
+ */
+ int args_length;
+
+ /**
+ Array of Isend() requests to be freed on return.
+ */
+ MPI_Request request[8];
+} MPIRPC;
+
+/**
+ Internal MPIRPC return value. Used for garbage collection.
+*/
+typedef struct mpirpc_value MPIRPC_Value;
+struct mpirpc_value
+{
+ int unique;
+ int length;
+ char* result;
+ MPI_Request request[4];
+};
+
+//// API...
+
+void MPIRPC_Init(void);
+
+bool MPIRPC_Check(void);
+
+void MPIRPC_Recv(MPI_Comm comm);
+
+void MPIRPC_Register(char* name,
+ void (*f)(MPIRPC_Node,int,char*,char*,int));
+
+bool MPIRPC_Comm_add(MPI_Comm comm);
+
+void MPIRPC_Close(MPIRPC_Channel* channel);
+
+MPIRPC* MPIRPC_Call(MPIRPC_Node target, char* name, char* args,
+ void* extras, void (*proceed)(MPIRPC*));
+
+MPIRPC* MPIRPC_Call_blob(MPIRPC_Node target, char* name, char* args,
+ char* blob, int blob_length,
+ void* extras, void (*proceed)(MPIRPC*));
+
+char* MPIRPC_Block(MPIRPC_Node target, char* name, char* args);
+
+char* MPIRPC_Block_blob(MPIRPC_Node target, char* name, char* args,
+ char* blob, int blob_length);
+
+char* MPIRPC_Wait(MPIRPC* rpc);
+
+void MPIRPC_Null(MPIRPC_Node caller, int unique);
+
+void MPIRPC_Return(MPIRPC_Node caller, int unique,
+ char* result, int rlength);
+
+MPIRPC_Node* MPIRPC_Node_create(MPI_Comm comm, int rank);
+
+MPIRPC_Node* MPIRPC_Node_make(MPI_Comm comm, int rank,
+ MPIRPC_Node* node);
+
+void MPIRPC_Garbage_collect(void);
+
+struct list* MPIRPC_Comms(void);
+
+void MPIRPC_Dump(MPIRPC* rpc);
+
+void MPIRPC_Dump_portmap(void);
+
+void MPIRPC_Dump_channels(void);
+
+MPIRPC* MPIRPC_Lookup(int unique);
+
+void MPIRPC_Flush_returns(void);
+
+char* MPIRPC_Comm_get_name(MPI_Comm comm);
+
+void MPIRPC_Free(MPIRPC* rpc);
+
+void MPIRPC_Snooze(void);
+
+void MPIRPC_Snooze_reset(void);
+
+//// Internal routines...
+
+bool MPIRPC_Garbage_collect_value(void);
+
+void MPIRPC_Value_free(MPIRPC_Value* value);
+
+MPIRPC_Value* MPIRPC_Value_create(int unique, char* result, int length);
+
+//// Data structure helpers...
+
+int MPIRPC_Node_cmp(void* node1, void* node2);
+
+int MPIRPC_Channel_cmp(void* c1, void* c2);
+
+int MPIRPC_Channel_comm_cmp(void* c1, void* c2);
+
+MPIRPC_Channel* MPIRPC_Channel_for_node(MPIRPC_Node node);
+
+void MPIRPC_Finalize(void);
+
+/**
+ MPIRPC stati.
+*/
+enum
+{
+ MPIRPC_STATUS_PROTO,
+ MPIRPC_STATUS_CALLED,
+ MPIRPC_STATUS_RETURNED
+};
+
+/**
+ Tags used by MPIRPC.
+*/
+enum
+{
+ MPIRPC_TAG_CONTROL,
+ MPIRPC_TAG_UNIQUE,
+ MPIRPC_TAG_NAME,
+ MPIRPC_TAG_LENGTH,
+ MPIRPC_TAG_ARGS,
+ MPIRPC_TAG_RESULT
+};
+
+enum
+{
+ MPIRPC_MSG_CALL = 12,
+ MPIRPC_MSG_RETURN = 13,
+ MPIRPC_MSG_DISCONNECT = 14,
+ MPIRPC_MSG_OK = 15,
+ MPIRPC_MSG_FAIL = 16
+};
+
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
