Changeset 5647

Show
Ignore:
Timestamp:
10/31/09 09:43:33 (3 weeks ago)
Author:
buntinas
Message:

added error macros for internal errors

Location:
mpich2/trunk/src
Files:
17 modified

Legend:

Unmodified
Added
Removed

  • mpich2/trunk/src/include/mpierrs.h

    r5603 r5647  
    566566#define MPIU_ERR_CHKFATALANDJUMP4(cond_,err_,class_,gmsg_,smsg_,arg1_,arg2_,arg3_,arg4_) \ 
    567567     MPIU_ERR_CHKFATALANDSTMT4(cond_,err_,class_,goto fn_fail,gmsg_,smsg_,arg1_,arg2_,arg3_,arg4_) 
     568 
     569#define MPIU_ERR_INTERNAL(err_, msg_)   \ 
     570    MPIU_ERR_SETFATAL1(err_, MPI_ERR_INTERN, "**intern", "**intern %s", msg_) 
     571#define MPIU_ERR_INTERNALANDSTMT(err_, msg_, stmt_) \ 
     572    MPIU_ERR_SETANDSTMT1(err_, MPI_ERR_INTERN, stmt_, "**intern", "**intern %s", msg_) 
     573#define MPIU_ERR_INTERNALANDJUMP(err_, msg_) \ 
     574    MPIU_ERR_INTERNALANDSTMT(err_, msg_, goto fn_fail) 
     575#define MPIU_ERR_CHKINTERNAL(cond_, err_, msg_) \ 
     576    do {if (cond_) MPIU_ERR_INTERNALANDJUMP(err_, msg_);} while(0) 
     577 
    568578/* --END ERROR MACROS-- */ 
    569579 

  • mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/include/mpid_nem_impl.h

    r5325 r5647  
    226226            break; 
    227227        default: 
    228             MPIU_ERR_SETANDJUMP1(mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "unexpected request type"); 
     228            MPIU_ERR_INTERNALANDJUMP(mpi_errno, "unexpected request type"); 
    229229            break; 
    230230    } 

  • mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/gm/gm_send.c

    r5035 r5647  
    9090                break; 
    9191            default: 
    92                 MPIU_ERR_SETANDJUMP (mpi_errno, MPI_ERR_OTHER, "**intern"); 
     92                MPIU_ERR_INTERNALANDJUMP(mpi_errno, "unexpected rdma type"); 
    9393                break; 
    9494            } 
    9595            break; 
    9696        default: 
    97             MPIU_ERR_SETANDJUMP (mpi_errno, MPI_ERR_OTHER, "**intern"); 
     97            MPIU_ERR_INTERNALANDJUMP(mpi_errno, "unexpected operation type"); 
    9898            break; 
    9999        } 

  • mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_poll.c

    r5433 r5647  
    347347     { 
    348348         /* Error : unknown REQ type */ 
    349          MPIU_ERR_CHKANDJUMP1(TRUE, mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "unknown REQ type"); 
     349         MPIU_ERR_CHKINTERNAL(TRUE, mpi_errno, "unknown REQ type"); 
    350350     } 
    351351   } 
    … …  
    388388     { 
    389389         /* Error : unknown REQ type */ 
    390          MPIU_ERR_CHKANDJUMP1(TRUE, mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "unknown REQ type"); 
     390         MPIU_ERR_CHKINTERNAL(TRUE, mpi_errno, "unknown REQ type"); 
    391391     } 
    392392   }    

  • mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/tcp/tcp_utility.c

    r5529 r5647  
    4747    if (mpi_errno) MPIU_ERR_POP (mpi_errno); 
    4848 
    49     MPIU_ERR_CHKANDJUMP1 (pg == NULL, mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "invalid PG"); 
    50     MPIU_ERR_CHKANDJUMP1 (pg_rank < 0 || pg_rank > MPIDI_PG_Get_size (pg), mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "invalid pg_rank"); 
     49    MPIU_ERR_CHKINTERNAL(pg == NULL, mpi_errno, "invalid PG"); 
     50    MPIU_ERR_CHKINTERNAL(pg_rank < 0 || pg_rank > MPIDI_PG_Get_size (pg), mpi_errno, "invalid pg_rank"); 
    5151         
    5252    MPIDI_PG_Get_vc_set_active (pg, pg_rank, vc); 

  • mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_alloc.c

    r5560 r5647  
    249249            mpi_errno = PMI2_Info_GetNodeAttr("sharedFilename", val, PMI2_MAX_VALLEN, &found, TRUE); 
    250250            if (mpi_errno) MPIU_ERR_POP(mpi_errno); 
    251             MPIU_ERR_CHKANDJUMP1(!found, mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "nodeattr not found"); 
     251            MPIU_ERR_CHKINTERNAL(!found, mpi_errno, "nodeattr not found"); 
    252252 
    253253            mpi_errno = MPIU_SHMW_Hnd_deserialize(memory->hnd, val, strlen(val)); 
    … …  
    507507        MPID_nem_asymm_base_addr = MPID_nem_mem_region.memory.base_addr; 
    508508#ifdef MPID_NEM_SYMMETRIC_QUEUES 
    509         MPIU_ERR_SETFATALANDJUMP1(mpi_errno, MPI_ERR_INTERN, "**intern", "**intern %s", "queues are not symmetrically allocated as expected"); 
     509        MPIU_ERR_INTERNALANDJUMP(mpi_errno, "queues are not symmetrically allocated as expected"); 
    510510#endif 
    511511    } 

  • mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_barrier.c

    r5322 r5647  
    5050        goto fn_exit; 
    5151 
    52     MPIU_ERR_CHKANDJUMP1 (!barrier_init, mpi_errno, MPI_ERR_INTERN, "**intern", "**intern %s", "barrier not initialized"); 
     52    MPIU_ERR_CHKINTERNAL(!barrier_init, mpi_errno, "barrier not initialized"); 
    5353 
    5454    if (OPA_fetch_and_incr_int(&MPID_nem_mem_region.barrier->val) == MPID_nem_mem_region.num_local - 1) 

  • mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_ckpt.c

    r4511 r5647  
    137137        --MPID_nem_ckpt_sending_markers; 
    138138        ret = cli_on_marker_receive (&marker, rank); 
    139         MPIU_ERR_CHKANDJUMP (ret != CLI_CP_MARKED, mpi_errno, MPI_ERR_OTHER, "**intern"); 
     139        MPIU_ERR_CHKINTERNAL(ret != CLI_CP_MARKED, mpi_errno, "expecting CLI_CP_MARKED"); 
    140140        --MPID_nem_ckpt_logging_messages; 
    141141        log_msg[rank] = 0; 
    … …  
    170170        break; 
    171171    default: 
    172         MPIU_ERR_CHKANDJUMP (ret != CLI_CP_MARKED, mpi_errno, MPI_ERR_OTHER, "**intern"); 
     172        MPIU_ERR_CHKINTERNAL(ret != CLI_CP_MARKED, mpi_errno, "expecting CLI_CP_MARKED"); 
    173173    } 
    174174 
    … …  
    242242        --MPID_nem_ckpt_sending_markers; 
    243243        ret = cli_on_marker_receive (&marker, rank); 
    244         MPIU_ERR_CHKANDJUMP (ret != CLI_CP_MARKED, mpi_errno, MPI_ERR_OTHER, "**intern"); 
     244        MPIU_ERR_CHKINTERNAL(ret != CLI_CP_MARKED, mpi_errno, "Expecting CLI_CP_MARKED"); 
    245245        --MPID_nem_ckpt_logging_messages; 
    246246        log_msg[rank] = 0; 
    … …  
    284284        } 
    285285    default: 
    286         MPIU_ERR_CHKANDJUMP (ret != CLI_CP_MARKED, mpi_errno, MPI_ERR_OTHER, "**intern"); 
     286        MPIU_ERR_CHKINTERNAL(ret != CLI_CP_MARKED, mpi_errno, "Expecting CLI_CP_MARKED"); 
    287287        return; 
    288288    } 

  • mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_lmt.c

    r4888 r5647  
    371371        break; 
    372372    default: 
    373         MPIU_ERR_SETANDJUMP1(mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "unexpected request type"); 
     373        MPIU_ERR_INTERNALANDJUMP(mpi_errno, "unexpected request type"); 
    374374        break; 
    375375    } 

  • mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/src/mpid_nem_lmt_vmsplice.c

    r4551 r5647  
    326326                break; 
    327327            default: 
    328                 MPIU_ERR_SETANDJUMP1(mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "unexpected request type"); 
     328                MPIU_ERR_INTERNALANDJUMP(mpi_errno, "unexpected request type"); 
    329329                break; 
    330330        } 

  • mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_comm_spawn.c

    r4369 r5647  
    8686#undef FCNAME 
    8787#define FCNAME MPIDI_QUOTE(FUNCNAME) 
    88 int MPIDI_CH3_Get_business_card (int myRank, char *value, int length) 
     88int MPIDI_CH3_Get_business_card(int myRank, char *value, int length) 
    8989{ 
    9090    int mpi_errno = MPI_SUCCESS; 
    91     int ret; 
    9291    MPIDI_STATE_DECL(MPIDI_STATE_MPIDI_CH3_GET_BUSINESS_CARD); 
    9392 
    9493    MPIDI_FUNC_ENTER(MPIDI_STATE_MPIDI_CH3_GET_BUSINESS_CARD); 
    9594 
    96     ret = MPID_nem_get_business_card (myRank, value, length); 
    97     if (ret != 0) 
    98         mpi_errno =  MPIR_Err_create_code (MPI_SUCCESS, MPIR_ERR_FATAL, FCNAME, __LINE__, MPI_ERR_INTERN, "**intern", 0); 
     95    mpi_errno = MPID_nem_get_business_card(myRank, value, length); 
     96    if (mpi_errno) MPIU_ERR_POP(mpi_errno); 
    9997 
     98fn_exit: 
    10099    MPIDI_FUNC_EXIT(MPIDI_STATE_MPIDI_CH3_GET_BUSINESS_CARD); 
    101100    return mpi_errno; 
     101fn_fail: 
     102    goto fn_exit; 
    102103} 

  • mpich2/trunk/src/mpid/ch3/channels/nemesis/src/ch3_init.c

    r4888 r5647  
    193193 
    194194    /* init channel portion of vc */ 
    195     MPIU_ERR_CHKANDJUMP (!nemesis_initialized, mpi_errno, MPI_ERR_OTHER, "**intern"); 
     195    MPIU_ERR_CHKINTERNAL(!nemesis_initialized, mpi_errno, "Nemesis not initialized"); 
    196196    ((MPIDI_CH3I_VC *)vc->channel_private)->recv_active = NULL; 
    197197    MPIDI_CHANGE_VC_STATE(vc, ACTIVE); 

  • mpich2/trunk/src/mpid/ch3/src/mpid_get_universe_size.c

    r5487 r5647  
    3939    else { 
    4040        *universe_size = strtol(val, &endptr, 0); 
    41         MPIU_ERR_CHKANDJUMP(endptr - val != strlen(val), mpi_errno, MPI_ERR_OTHER, "**intern"); 
     41        MPIU_ERR_CHKINTERNAL(endptr - val != strlen(val), mpi_errno, "can't parse universe size"); 
    4242    } 
    4343 

  • mpich2/trunk/src/mpid/ch3/src/mpid_vc.c

    r5505 r5647  
    453453                            int size, const int lpids[] ) 
    454454{ 
     455    int mpi_errno = MPI_SUCCESS; 
    455456    MPID_Comm *commworld_ptr; 
    456457    int i; 
    … …  
    485486            do { 
    486487                MPIDI_PG_Get_next( &iter, &pg ); 
    487                 if (!pg) { 
    488                     return MPIR_Err_create_code( MPI_SUCCESS,  
    489                                      MPIR_ERR_RECOVERABLE, 
    490                                      "MPID_VCR_CommFromLpids", __LINE__, 
    491                                      MPI_ERR_INTERN, "**intern", 0 ); 
    492                 } 
     488                MPIU_ERR_CHKINTERNAL(!pg, mpi_errno, "no pg"); 
    493489                /* FIXME: a quick check on the min/max values of the lpid 
    494490                   for this process group could help speed this search */ 
    … …  
    513509        MPID_VCR_Dup( vc, &newcomm_ptr->vcr[i] ); 
    514510    } 
    515     return 0; 
     511fn_exit: 
     512    return mpi_errno; 
     513fn_fail: 
     514    goto fn_exit; 
    516515} 
    517516 
    … …  
    812811 
    813812 
    814 #define parse_error() MPIU_ERR_SETANDJUMP1(mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "parse error") 
     813#define parse_error() MPIU_ERR_INTERNALANDJUMP(mpi_errno, "parse error") 
    815814/* advance _c until we find a non whitespace character */ 
    816815#define skip_space(_c) while (isspace(*(_c))) ++(_c) 
    … …  
    10171016 
    10181017    if (NULL_MAPPING == mt) goto fn_fail; 
    1019     MPIU_ERR_CHKANDJUMP1(mt != VECTOR_MAPPING, mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "unsupported mapping type"); 
     1018    MPIU_ERR_CHKINTERNAL(mt != VECTOR_MAPPING, mpi_errno, "unsupported mapping type"); 
    10201019 
    10211020    rank = 0; 
    … …  
    11321131        mpi_errno = PMI2_Info_GetJobAttrIntArray("nodeIDs", node_ids, pg->size, &outlen, &found); 
    11331132        if (mpi_errno) MPIU_ERR_POP(mpi_errno); 
    1134         MPIU_ERR_CHKANDJUMP1(!found, mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "nodeIDs attribute not found"); 
    1135         MPIU_ERR_CHKANDJUMP1(outlen != pg->size, mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "did not receive enough nodeids"); 
     1133        MPIU_ERR_CHKINTERNAL(!found, mpi_errno, "nodeIDs attribute not found"); 
     1134        MPIU_ERR_CHKINTERNAL(outlen != pg->size, mpi_errno, "did not receive enough nodeids"); 
    11361135        g_num_nodes = 0; 
    11371136        for (i = 0; i < pg->size; ++i) { 
    … …  
    11601159        mpi_errno = PMI2_Info_GetJobAttr("process-mapping", process_mapping, sizeof(process_mapping), &found); 
    11611160        if (mpi_errno) MPIU_ERR_POP(mpi_errno); 
    1162         MPIU_ERR_CHKANDJUMP1(!found, mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "process-mapping attribute not found"); 
     1161        MPIU_ERR_CHKINTERNAL(!found, mpi_errno, "process-mapping attribute not found"); 
    11631162        /* this code currently assumes pg is comm_world */ 
    11641163        mpi_errno = populate_ids_from_mapping(process_mapping, &num_nodes, pg, &did_map); 
    11651164        if (mpi_errno) MPIU_ERR_POP(mpi_errno); 
    1166         MPIU_ERR_CHKANDJUMP1(!did_map, mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "unable to populate node ids from process-mapping"); 
     1165        MPIU_ERR_CHKINTERNAL(!did_map, mpi_errno, "unable to populate node ids from process-mapping"); 
    11671166        g_num_nodes = num_nodes; 
    11681167    } 

  • mpich2/trunk/src/mpid/ch3/src/mpidi_pg.c

    r5499 r5647  
    907907    return MPI_SUCCESS; 
    908908} 
     909 
     910#undef FUNCNAME 
     911#define FUNCNAME connToString 
     912#undef FCNAME 
     913#define FCNAME MPIDI_QUOTE(FUNCNAME) 
    909914static int connToString( char **buf_p, int *slen, MPIDI_PG_t *pg ) 
    910915{ 
     916    int mpi_errno = MPI_SUCCESS; 
    911917    char *str = NULL, *pg_id; 
    912918    int  i, len=0; 
    913      
     919    MPIU_CHKPMEM_DECL(1); 
    914920    MPIDI_ConnInfo *connInfo = (MPIDI_ConnInfo *)pg->connData; 
    915921 
    916922    /* Create this from the string array */ 
    917     str = (char *)MPIU_Malloc( connInfo->toStringLen ); 
     923    MPIU_CHKPMEM_MALLOC(str, char *, connInfo->toStringLen, mpi_errno, "str"); 
    918924 
    919925#if defined(MPICH_DEBUG_MEMINIT) 
    … …  
    935941#endif 
    936942    } 
     943     
    937944    while (*pg_id) str[len++] = *pg_id++; 
    938945    str[len++] = 0; 
    … …  
    952959        *buf_p = 0; 
    953960        *slen  = 0; 
    954         return MPIR_Err_create_code(MPI_SUCCESS,MPIR_ERR_FATAL,"connToString", 
    955                             __LINE__, MPI_ERR_INTERN, "**intern", NULL); 
     961        MPIU_ERR_INTERNALANDJUMP(mpi_errno, "len > connInfo->toStringLen"); 
    956962    } 
    957963 
    … …  
    959965    *slen = len; 
    960966 
    961     return MPI_SUCCESS; 
     967fn_exit: 
     968    MPIU_CHKPMEM_COMMIT(); 
     969    return mpi_errno; 
     970fn_fail: 
     971    MPIU_CHKPMEM_REAP(); 
     972    goto fn_exit; 
     973     
    962974} 
    963975static int connFromString( const char *buf, MPIDI_PG_t *pg ) 

  • mpich2/trunk/src/util/dbg/dbg_printf.c

    r5606 r5647  
    837837     
    838838    ret = MPIU_Strncpy(temp_filename, filePattern, MAXPATHLEN); 
    839     MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "logfile path too long"); 
     839    MPIU_ERR_CHKINTERNAL(ret, mpi_errno, "logfile path too long"); 
    840840 
    841841    MPIU_Basename(temp_filename, &basename); 
    842842 
    843843    /* make sure there's enough room in temp_filename to store temp_pattern */ 
    844     MPIU_ERR_CHKANDJUMP1(basename - temp_filename > MAXPATHLEN - sizeof(temp_pattern), mpi_errno, MPI_ERR_OTHER, "**intern", "**intern %s", "logfile path too long"); 
     844    MPIU_ERR_CHKINTERNAL(basename - temp_filename > MAXPATHLEN - sizeof(temp_pattern), mpi_errno, "logfile path too long"); 
    845845 
    846846    MPIU_Strncpy(basename, temp_pattern, sizeof(temp_pattern)); 

  • mpich2/trunk/src/util/wrappers/mpiu_shm_wrappers.h

    r5492 r5647  
    342342 
    343343    MPIU_Assert(MPIU_SHMW_Hnd_is_init(hnd)); 
    344     MPIU_ERR_CHKANDJUMP1(!str_hnd, mpi_errno, MPI_ERR_OTHER,  
    345         "**intern", "**intern %s", "ser hnd is null"); 
     344    MPIU_ERR_CHKINTERNAL(!str_hnd, mpi_errno, "ser hnd is null"); 
    346345    MPIU_ERR_CHKANDJUMP(str_hnd_len>=MPIU_SHMW_GHND_SZ, 
    347346        mpi_errno, MPI_ERR_OTHER, "**shmw_deserbufbig"); 
    … …  
    414413    MPIU_Assert(ser_hnd_ptr); 
    415414 
    416     MPIU_ERR_CHKANDJUMP1(!(*ser_hnd_ptr), mpi_errno, MPI_ERR_OTHER,  
    417         "**intern", "**intern %s", "ser hnd is null"); 
     415    MPIU_ERR_CHKINTERNAL(!(*ser_hnd_ptr), mpi_errno, "ser hnd is null"); 
    418416 
    419417    MPIU_SHMW_Hnd_reset_val(hnd); 
    … …  
    567565        mpi_errno, MPI_ERR_OTHER, "**shmw_badhnd"); 
    568566    MPIU_Assert(shm_addr_ptr); 
    569     MPIU_ERR_CHKANDJUMP1(!(*shm_addr_ptr), mpi_errno, MPI_ERR_OTHER,  
    570         "**intern", "**intern %s", "shm address is null"); 
     567    MPIU_ERR_CHKINTERNAL(!(*shm_addr_ptr), mpi_errno, "shm address is null"); 
    571568 
    572569    rc = shmdt(*shm_addr_ptr); 
    … …  
    716713 
    717714    MPIU_Assert(shm_addr_ptr); 
    718     MPIU_ERR_CHKANDJUMP1(!(*shm_addr_ptr), mpi_errno, MPI_ERR_OTHER,  
    719         "**intern", "**intern %s", "shm address is null"); 
     715    MPIU_ERR_CHKINTERNAL(!(*shm_addr_ptr), mpi_errno, "shm address is null"); 
    720716 
    721717    rc = munmap(*shm_addr_ptr, seg_sz); 
    … …  
    836832        mpi_errno, MPI_ERR_OTHER, "**shmw_badhnd"); 
    837833    MPIU_Assert(shm_addr_ptr); 
    838     MPIU_ERR_CHKANDJUMP1(!(*shm_addr_ptr), mpi_errno, MPI_ERR_OTHER,  
    839         "**intern", "**intern %s", "shm address is null"); 
     834    MPIU_ERR_CHKINTERNAL(!(*shm_addr_ptr), mpi_errno, "shm address is null"); 
    840835 
    841836    rc = UnmapViewOfFile(*shm_addr_ptr);