Changeset 3611b8


Ignore:
Timestamp:
10/20/14 11:21:49 (7 months ago)
Author:
Wesley Bland <wbland@…>
Branches:
master
Children:
c1e81b
Parents:
f86004
git-author:
Wesley Bland <wbland@…> (08/21/14 10:21:10)
git-committer:
Wesley Bland <wbland@…> (10/20/14 11:21:49)
Message:

Fix FUNC_ENTER macros for some ft functions

The calls in MPID_Comm_get_all_failed_procs and MPID_Comm_agree were the
wrong macros for entering and exiting an MPID function. This corrects it.

Signed-off-by: Huiwei Lu <huiweilu@…>

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

Legend:

Unmodified
Added
Removed
  • src/mpid/ch3/src/mpid_comm_agree.c

    r3ffe73 r3611b8  
    6565    int tmp_flag; 
    6666 
    67     MPID_MPI_STATE_DECL(MPID_STATE_MPID_COMM_AGREE); 
    68     MPID_MPI_FUNC_ENTER(MPID_STATE_MPID_COMM_AGREE); 
     67    MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_AGREE); 
     68    MPIDI_FUNC_ENTER(MPID_STATE_MPID_COMM_AGREE); 
    6969 
    7070    children = (int *) MPIU_Malloc(sizeof(int) * ((comm_ptr->local_size) / 2)); 
     
    114114 
    115115  fn_exit: 
    116     MPID_MPI_FUNC_EXIT(MPID_STATE_MPID_COMM_AGREE); 
     116    MPIDI_FUNC_EXIT(MPID_STATE_MPID_COMM_AGREE); 
    117117    return mpi_errno; 
    118118  fn_fail: 
  • src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c

    r92ff14 r3611b8  
    9191    MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_GET_ALL_FAILED_PROCS); 
    9292 
    93     MPID_MPI_FUNC_ENTER(MPID_STATE_MPID_COMM_GET_ALL_FAILED_PROCS); 
     93    MPIDI_FUNC_ENTER(MPID_STATE_MPID_COMM_GET_ALL_FAILED_PROCS); 
    9494 
    9595    /* Kick the progress engine in case it's been a while so we get all the 
     
    153153 
    154154  fn_exit: 
    155     MPID_MPI_FUNC_EXIT(MPID_STATE_MPID_COMM_GET_ALL_FAILED_PROCS); 
     155    MPIDI_FUNC_EXIT(MPID_STATE_MPID_COMM_GET_ALL_FAILED_PROCS); 
    156156    return mpi_errno; 
    157157  fn_fail: 
Note: See TracChangeset for help on using the changeset viewer.