[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-221-g3597849

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  3597849645820f870f947ef7c5b4ccf56f0a2e2f (commit)
       via  d5a91cdb9ec0a22208efd60ff5680acfc0f37a62 (commit)
      from  72519477377a3ff41fd165a96ecc15b596498de7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/3597849645820f870f947ef7c5b4ccf56f0a2e2f

commit 3597849645820f870f947ef7c5b4ccf56f0a2e2f
Author: Charles J Archer <charles.j.archer at intel.com>
Date:   Mon Jul 13 08:52:25 2015 -0700

    OFI Netmod:  Temporary VC fixes for spawn tests
    
    Change-Id: I7a545dd67491bf102a61856d75f6d10c9c1fcea4
    Signed-off-by: Charles J Archer <charles.j.archer at intel.com>

diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c
index b951a5c..f6ac722 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c
@@ -468,14 +468,17 @@ int MPID_nem_ofi_vc_init(MPIDI_VC_t * vc)
 int MPID_nem_ofi_vc_destroy(MPIDI_VC_t * vc)
 {
     BEGIN_FUNC(FCNAME);
-    if (vc && (VC_OFI(vc)->is_cmvc == 1) && (VC_OFI(vc)->ready == 1)) {
+    if (gl_data.cm_vcs && vc && (VC_OFI(vc)->is_cmvc == 1)) {
         if (vc->pg != NULL) {
             printf("ERROR: VC Destroy (%p) pg = %s\n", vc, (char *) vc->pg->id);
         }
         MPIDI_VC_t *prev = gl_data.cm_vcs;
         while (prev && prev != vc && VC_OFI(prev)->next != vc) {
-            prev = VC_OFI(vc)->next;
+            prev = VC_OFI(prev)->next;
         }
+
+        MPIU_Assert(prev != NULL);
+
         if (VC_OFI(prev)->next == vc) {
             VC_OFI(prev)->next = VC_OFI(vc)->next;
         }

http://git.mpich.org/mpich.git/commitdiff/d5a91cdb9ec0a22208efd60ff5680acfc0f37a62

commit d5a91cdb9ec0a22208efd60ff5680acfc0f37a62
Author: Charles J Archer <charles.j.archer at intel.com>
Date:   Mon Jul 13 08:54:22 2015 -0700

    OFI Netmod:  Use max port name for maximum bound address length
    
    Change-Id: I3afc79775536b4ea1447bf7d0bbe2ce978785d65
    Signed-off-by: Charles J Archer <charles.j.archer at intel.com>

diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h
index 25d5570..ba8fcf8 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h
+++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h
@@ -22,6 +22,33 @@
 #include <netdb.h>
 
 #include "ofi_tag_layout.h"
+
+/*
+ * Port name consists of tag and business card fields
+ * and has a limit in length up to 256 (MPI_MAX_PORT_NAME).
+ *
+ * Port name has the following format:
+ * <tag><business card>.
+ *
+ * <tag> has the following format:
+ * tag<delim>tag_value<separ>\0
+ * where "tag" is constant string (3 chars),
+ * <delim>  and <separ> are one-char delimeters (2 chars),
+ * tag_value is integer value (12 chars are enough for max value).
+ *
+ * <business card> has the following format:
+ * OFI<delim>address<separ>
+ * where "OFI" is constant string (3 chars),
+ * <delim>  and <separ> are one-char delimeters (2 chars).
+ * address is variable string.
+ *
+ * Address is provider specific and have encoded form
+ * (that increase the original address length in 2 times).
+ * Hence taking in account MPI_MAX_PORT_NAME
+ * the original address length has a limit on top (OFI_MAX_ADDR_LEN).
+ */
+#define OFI_MAX_ADDR_LEN (((MPI_MAX_PORT_NAME) - 23)/2)
+
 /* ************************************************************************** */
 /* Type Definitions                                                           */
 /* ************************************************************************** */
@@ -43,7 +70,7 @@ typedef int (*req_fn) (MPIDI_VC_t *, MPID_Request *, int *);
 /* Global Object for state tracking */
 /* ******************************** */
 typedef struct {
-    char bound_addr[128];       /* This ranks bound address    */
+    char bound_addr[OFI_MAX_ADDR_LEN];       /* This ranks bound address    */
     fi_addr_t any_addr;         /* Specifies any source        */
     size_t bound_addrlen;       /* length of the bound address */
     struct fid_fabric *fabric;  /* fabric object               */

-----------------------------------------------------------------------

Summary of changes:
 src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c  |    7 +++-
 .../ch3/channels/nemesis/netmod/ofi/ofi_impl.h     |   29 +++++++++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository