Changeset 346050


Ignore:
Timestamp:
02/08/15 20:18:23 (5 months ago)
Author:
Xin Zhao <xinzhao3@…>
Branches:
master
Children:
8c5cb1
Parents:
7dfe28
git-author:
Xin Zhao <xinzhao3@…> (02/04/15 18:29:40)
git-committer:
Xin Zhao <xinzhao3@…> (02/08/15 20:18:23)
Message:

Delete unnecessary code in SHM allocate / free.

We allocate / free SHM regions only when node_comm exists,
which means there are more than one processes on the same
node. When node_comm is NULL (only self process is on that
node), we call default allocate / free functions in CH3.
(Please refer to commit f02eed5b)

Here we delete unnecessary code dealing with node_comm being
NULL in SHM allocate / free functions.

Signed-off-by: Pavan Balaji <balaji@…>

Location:
src/mpid/ch3/channels/nemesis/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c

    r3850e6 r346050  
    108108           If node_comm == NULL, this process is the only one on this node, therefore 
    109109           we use comm_self as node comm. */ 
    110         if ((*win_ptr)->comm_ptr->node_comm != NULL) 
    111             node_comm_ptr = (*win_ptr)->comm_ptr->node_comm; 
    112         else 
    113             node_comm_ptr = MPIR_Process.comm_self; 
     110        node_comm_ptr = (*win_ptr)->comm_ptr->node_comm; 
    114111        MPIU_Assert(node_comm_ptr != NULL); 
    115112 
  • src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c

    r7b537b r346050  
    292292       If node_comm == NULL, this process is the only one on this node, therefore 
    293293       we use comm_self as node comm. */ 
    294     if ((*win_ptr)->comm_ptr->node_comm != NULL) 
    295         node_comm_ptr = (*win_ptr)->comm_ptr->node_comm; 
    296     else 
    297         node_comm_ptr = MPIR_Process.comm_self; 
     294    node_comm_ptr = (*win_ptr)->comm_ptr->node_comm; 
    298295    MPIU_Assert(node_comm_ptr != NULL); 
    299296    node_size = node_comm_ptr->local_size; 
Note: See TracChangeset for help on using the changeset viewer.