Be aware that the openib CPCs have changed considerably on the /tmp-
public/openib-cpc2 branch...
I guess we'll need to merge this stuff in when we merge step2b and
openib-cpc2 together. There's been a little discussion of whether to
merge the openib-cpc2 branch down to the step2b branch (and then let
it come in to the trunk when step2b is merged to the trunk), or
whether the cpc2 branch should be merged to the trunk first.
Unfortunately, we don't have an answer yet because the cpc2 branch is
not yet complete...
On Feb 25, 2008, at 7:51 AM, tpr...@osl.iu.edu wrote:
Author: tprins
Date: 2008-02-25 07:51:06 EST (Mon, 25 Feb 2008)
New Revision: 17573
URL: https://svn.open-mpi.org/trac/ompi/changeset/17573
Log:
First cut at updating the xoob cpc to work with the new orte
interfaces. I have no way to test if this code compiles or works,
but it stands a better chance now than it did.
Text files modified:
tmp/rhc-step2b/ompi/mca/btl/openib/connect/
btl_openib_connect_xoob.c | 14 ++++++--------
tmp/rhc-step2b/ompi/mca/dpm/
dpm.h | 13 +++++++------
2 files changed, 13 insertions(+), 14 deletions(-)
Modified: tmp/rhc-step2b/ompi/mca/btl/openib/connect/
btl_openib_connect_xoob.c
=
=
=
=
=
=
=
=
======================================================================
--- tmp/rhc-step2b/ompi/mca/btl/openib/connect/
btl_openib_connect_xoob.c (original)
+++ tmp/rhc-step2b/ompi/mca/btl/openib/connect/
btl_openib_connect_xoob.c 2008-02-25 07:51:06 EST (Mon, 25 Feb 2008)
@@ -10,11 +10,11 @@
#include "ompi_config.h"
-#include "orte/mca/ns/base/base.h"
-#include "orte/mca/oob/base/base.h"
+#include "orte/util/name_fns.h"
#include "orte/mca/rml/rml.h"
#include "orte/mca/errmgr/errmgr.h"
#include "opal/dss/dss.h"
+#include "ompi/mca/dpm/dpm.h"
#include "btl_openib.h"
#include "btl_openib_endpoint.h"
@@ -55,8 +55,6 @@
ENDPOINT_XOOB_CONNECT_XRC_NR_RESPONSE /* The xrc recv qp already
was destroyed */
} connect_message_type_t;
-#define XOOB_TAG (ORTE_RML_TAG_DYNAMIC - 1)
-
#define XOOB_SET_REMOTE_INFO(EP,
INFO) \
do
{ \
/* copy the rem_info stuff
*/ \
@@ -343,7 +341,7 @@
/* send to remote endpoint */
rc = orte_rml.send_buffer_nb(&endpoint->endpoint_proc->proc_guid,
- buffer, XOOB_TAG, 0,
+ buffer, OMPI_RML_TAG_XOPENIB, 0,
xoob_rml_send_cb, NULL);
if (ORTE_SUCCESS != rc) {
ORTE_ERROR_LOG(rc);
@@ -642,7 +640,7 @@
ib_proc != (mca_btl_openib_proc_t*)
opal_list_get_end(&mca_btl_openib_component.ib_procs);
ib_proc =
(mca_btl_openib_proc_t*)opal_list_get_next(ib_proc)) {
- if (orte_ns.compare_fields(ORTE_NS_CMP_ALL,
+ if (orte_util_compare_name_fields(ORTE_NS_CMP_ALL,
&ib_proc->proc_guid, process_name) ==
OPAL_EQUAL) {
found = true;
break;
@@ -947,7 +945,7 @@
int rc;
rc = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD,
- XOOB_TAG,
+ OMPI_RML_TAG_XOPENIB,
ORTE_RML_PERSISTENT,
xoob_rml_recv_cb,
NULL);
@@ -1018,6 +1016,6 @@
*/
static int xoob_finalize(void)
{
- orte_rml.recv_cancel(ORTE_NAME_WILDCARD, XOOB_TAG);
+ orte_rml.recv_cancel(ORTE_NAME_WILDCARD, OMPI_RML_TAG_XOPENIB);
return OMPI_SUCCESS;
}
Modified: tmp/rhc-step2b/ompi/mca/dpm/dpm.h
=
=
=
=
=
=
=
=
======================================================================
--- tmp/rhc-step2b/ompi/mca/dpm/dpm.h (original)
+++ tmp/rhc-step2b/ompi/mca/dpm/dpm.h 2008-02-25 07:51:06 EST (Mon,
25 Feb 2008)
@@ -42,12 +42,13 @@
#define OMPI_RML_TAG_UDAPL OMPI_RML_TAG_BASE+1
#define OMPI_RML_TAG_OPENIB OMPI_RML_TAG_BASE+2
-#define OMPI_RML_TAG_COMM_CID_INTRA OMPI_RML_TAG_BASE+3
-#define OMPI_RML_TAG_XOOB OMPI_RML_TAG_BASE+4
-#define OMPI_RML_TAG_SM_BACK_FILE_CREATED OMPI_RML_TAG_BASE+5
-#define OMPI_RML_TAG_WIREUP OMPI_RML_TAG_BASE+6
-#define OMPI_CRCP_COORD_BOOKMARK_TAG OMPI_RML_TAG_BASE+7
-#define OMPI_COMM_JOIN_TAG OMPI_RML_TAG_BASE+8
+#define OMPI_RML_TAG_XOPENIB OMPI_RML_TAG_BASE+3
+#define OMPI_RML_TAG_COMM_CID_INTRA OMPI_RML_TAG_BASE+4
+#define OMPI_RML_TAG_XOOB OMPI_RML_TAG_BASE+5
+#define OMPI_RML_TAG_SM_BACK_FILE_CREATED OMPI_RML_TAG_BASE+6
+#define OMPI_RML_TAG_WIREUP OMPI_RML_TAG_BASE+7
+#define OMPI_CRCP_COORD_BOOKMARK_TAG OMPI_RML_TAG_BASE+8
+#define OMPI_COMM_JOIN_TAG OMPI_RML_TAG_BASE+9
#define OMPI_RML_TAG_DYNAMIC OMPI_RML_TAG_BASE+200
_______________________________________________
svn-private-full mailing list
svn-private-f...@open-mpi.org
http://www.open-mpi.org/mailman/listinfo.cgi/svn-private-full
--
Jeff Squyres
Cisco Systems
