[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b4-82-g0d6f27f

[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  0d6f27fb0333f17358552d1ea1c8acd803d678de (commit)
      from  2dba0efc81f00b3b41b6f1dfb71eef76a243bdd9 (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/0d6f27fb0333f17358552d1ea1c8acd803d678de

commit 0d6f27fb0333f17358552d1ea1c8acd803d678de
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Thu Aug 6 09:16:00 2015 -0500

    netmod/portals4: delete unused code
    
    No reviewer.

diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h
index 7ec7870..0f0cc64 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h
@@ -32,21 +32,11 @@ extern ptl_ni_limits_t MPIDI_nem_ptl_ni_limits;
 /* workaround for NULL operations */
 extern char dummy;
 
-#define MPID_NEM_PTL_MAX_OVERFLOW_DATA 32 /* that's way more than we need */
-typedef struct MPID_nem_ptl_pack_overflow
-{
-    MPI_Aint len;
-    MPI_Aint offset;
-    char buf[MPID_NEM_PTL_MAX_OVERFLOW_DATA];
-} MPID_nem_ptl_pack_overflow_t;
-
 typedef int (* event_handler_fn)(const ptl_event_t *e);
 
 #define MPID_NEM_PTL_NUM_CHUNK_BUFFERS 2
 
 typedef struct {
-    struct MPID_nem_ptl_pack_overflow overflow[MPID_NEM_PTL_NUM_CHUNK_BUFFERS];
-    int large;
     ptl_handle_md_t md;
     ptl_handle_me_t put_me;
     ptl_handle_me_t *get_me_p;
@@ -69,7 +59,6 @@ static inline MPID_nem_ptl_req_area * REQ_PTL(MPID_Request *req) {
         for (i = 0; i < MPID_NEM_PTL_NUM_CHUNK_BUFFERS; ++i) {  \
             REQ_PTL(req_)->chunk_buffer[i] = NULL;              \
         }                                                       \
-        REQ_PTL(req_)->large         = FALSE;                   \
         REQ_PTL(req_)->md            = PTL_INVALID_HANDLE;      \
         REQ_PTL(req_)->put_me        = PTL_INVALID_HANDLE;      \
         REQ_PTL(req_)->get_me_p      = NULL;                    \
@@ -163,10 +152,6 @@ int MPID_nem_ptl_poll(int is_blocking_poll);
 int MPID_nem_ptl_vc_terminated(MPIDI_VC_t *vc);
 int MPID_nem_ptl_get_id_from_bc(const char *business_card, ptl_process_t *id, ptl_pt_index_t *pt, ptl_pt_index_t *ptg,
                                 ptl_pt_index_t *ptc, ptl_pt_index_t *ptr, ptl_pt_index_t *ptrg, ptl_pt_index_t *ptrc);
-void MPI_nem_ptl_pack_byte(MPID_Segment *segment, MPI_Aint first, MPI_Aint last, void *buf,
-                           MPID_nem_ptl_pack_overflow_t *overflow);
-int MPID_nem_ptl_unpack_byte(MPID_Segment *segment, MPI_Aint first, MPI_Aint last, void *buf,
-                             MPID_nem_ptl_pack_overflow_t *overflow);
 
 /* comm override functions */
 int MPID_nem_ptl_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *req);
diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c
index 1ef148f..959f278 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c
@@ -217,7 +217,6 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void *
         MPIU_DBG_MSG(CH3_CHANNEL, VERBOSE, "Large contig message");
         big_meappend((char *)buf + dt_true_lb + PTL_LARGE_THRESHOLD, data_sz - PTL_LARGE_THRESHOLD, vc,
                      NPTL_MATCH(tag, comm->context_id + context_offset, comm->rank), sreq);
-        REQ_PTL(sreq)->large = TRUE;
 
         REQ_PTL(sreq)->event_handler = handler_send;
         ret = MPID_nem_ptl_rptl_put(MPIDI_nem_ptl_global_md, (ptl_size_t)((char *)buf + dt_true_lb), PTL_LARGE_THRESHOLD, PTL_NO_ACK_REQ, vc_ptl->id, vc_ptl->pt,
@@ -291,8 +290,6 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void *
                 ret = PtlMDBind(MPIDI_nem_ptl_ni, &md, &REQ_PTL(sreq)->md);
                 MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmdbind", "**ptlmdbind %s", MPID_nem_ptl_strerror(ret));
 
-                REQ_PTL(sreq)->large = TRUE;
-
                 REQ_PTL(sreq)->event_handler = handler_send;
                 ret = MPID_nem_ptl_rptl_put(REQ_PTL(sreq)->md, 0, PTL_LARGE_THRESHOLD, PTL_NO_ACK_REQ, vc_ptl->id, vc_ptl->pt,
                              NPTL_MATCH(tag, comm->context_id + context_offset, comm->rank), 0, sreq,
@@ -315,7 +312,6 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void *
 
     big_meappend((char *)REQ_PTL(sreq)->chunk_buffer[0] + PTL_LARGE_THRESHOLD, data_sz - PTL_LARGE_THRESHOLD, vc,
                  NPTL_MATCH(tag, comm->context_id + context_offset, comm->rank), sreq);
-    REQ_PTL(sreq)->large = TRUE;
 
     REQ_PTL(sreq)->event_handler = handler_send;
     ret = MPID_nem_ptl_rptl_put(MPIDI_nem_ptl_global_md, (ptl_size_t)REQ_PTL(sreq)->chunk_buffer[0], PTL_LARGE_THRESHOLD,

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

Summary of changes:
 .../channels/nemesis/netmod/portals4/ptl_impl.h    |   15 ---------------
 .../channels/nemesis/netmod/portals4/ptl_send.c    |    4 ----
 2 files changed, 0 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
MPICH primary repository