Fixed misc compiler warnings
This commit was SVN r5962.
Этот коммит содержится в:
Galen Shipman
родитель
732103f794
Коммит
8bfb3d229d
@ -156,8 +156,8 @@ int mca_bmi_ib_free(
|
||||
mca_bmi_base_descriptor_t* des)
|
||||
{
|
||||
mca_bmi_ib_frag_t* frag = (mca_bmi_ib_frag_t*)des;
|
||||
MCA_BMI_IB_FRAG_RETURN1(bmi, frag);
|
||||
|
||||
MCA_BMI_IB_FRAG_RETURN1(bmi, frag);
|
||||
return frag->rc;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -215,16 +215,13 @@ int mca_bmi_ib_send(
|
||||
{
|
||||
|
||||
mca_bmi_ib_frag_t* frag = (mca_bmi_ib_frag_t*)descriptor;
|
||||
int rc;
|
||||
mca_bmi_ib_module_t* ib_bmi = (mca_bmi_ib_module_t*)bmi;
|
||||
|
||||
|
||||
frag->hdr->tag = tag;
|
||||
frag->type = MCA_BMI_IB_FRAG_SEND;
|
||||
rc = mca_bmi_ib_endpoint_send(endpoint, frag);
|
||||
frag->rc = rc;
|
||||
|
||||
return rc;
|
||||
frag->rc = mca_bmi_ib_endpoint_send(endpoint, frag);
|
||||
|
||||
return frag->rc;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -48,17 +48,6 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
#if 1
|
||||
#define D_PRINT(fmt, args...) { \
|
||||
ompi_output(0, "[%s:%d:%s] " fmt, __FILE__, __LINE__, __func__, \
|
||||
##args); \
|
||||
}
|
||||
#else
|
||||
#define D_PRINT(fmt, args...)
|
||||
#endif
|
||||
|
||||
|
||||
/**
|
||||
* Infiniband (IB) BMI component.
|
||||
*/
|
||||
|
||||
@ -161,7 +161,7 @@ mca_bmi_base_module_t** mca_bmi_ib_component_init(int *num_bmi_modules,
|
||||
VAPI_ret_t vapi_ret;
|
||||
VAPI_hca_id_t* hca_ids;
|
||||
mca_bmi_base_module_t** bmis;
|
||||
int i, ret, length;
|
||||
int i, length;
|
||||
mca_common_vapi_hca_pd_t hca_pd;
|
||||
|
||||
/* initialization */
|
||||
|
||||
@ -81,14 +81,14 @@ OBJ_CLASS_DECLARATION(mca_bmi_ib_recv_frag_t);
|
||||
#define MCA_BMI_IB_FRAG_ALLOC1(bmi, frag, rc) \
|
||||
{ \
|
||||
\
|
||||
ompi_list_item_t *item; \
|
||||
ompi_list_item_t *item; \
|
||||
OMPI_FREE_LIST_WAIT(&((mca_bmi_ib_module_t*)bmi)->send_free, item, rc); \
|
||||
frag = (mca_bmi_ib_frag_t*) item; \
|
||||
}
|
||||
|
||||
#define MCA_BMI_IB_FRAG_RETURN1(bmi, frag) \
|
||||
{ \
|
||||
OMPI_FREE_LIST_RETURN(&((mca_bmi_ib_module_t*)bmi)->send_free, &frag->base.super); \
|
||||
OMPI_FREE_LIST_RETURN(&((mca_bmi_ib_module_t*)bmi)->send_free, (ompi_list_item_t*)(frag)); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -23,6 +23,6 @@
|
||||
|
||||
void mca_bmi_ib_sendfrag_complete( mca_bmi_ib_module_t * ib_bmi, mca_bmi_ib_send_frag_t* frag)
|
||||
{
|
||||
frag->base.des_cbfunc(&ib_bmi->super, &frag->endpoint, &frag->base, frag->rc);
|
||||
frag->base.des_cbfunc(&ib_bmi->super,(mca_bmi_base_endpoint_t*) &frag->endpoint, &frag->base, frag->rc);
|
||||
|
||||
}
|
||||
|
||||
@ -60,7 +60,7 @@
|
||||
}
|
||||
|
||||
/* Debug Print */
|
||||
#if 0
|
||||
#if 1
|
||||
#define D_PRINT(fmt, args...) { \
|
||||
ompi_output(0, "[%s:%d:%s] " fmt, __FILE__, __LINE__, __func__, \
|
||||
##args); \
|
||||
|
||||
@ -212,7 +212,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
|
||||
*
|
||||
* @retval addr virtual address
|
||||
*/
|
||||
void* mca_common_sm_mmap_alloc(size_t* size, void* user_in, void* user_out)
|
||||
void* mca_common_sm_mmap_alloc(size_t* size, void* user_in, void** user_out)
|
||||
{
|
||||
mca_common_sm_mmap_t* map = mca_common_sm_mmap;
|
||||
mca_common_sm_file_header_t* seg = map->map_seg;
|
||||
|
||||
@ -88,7 +88,7 @@ OBJ_CLASS_DECLARATION(mca_common_sm_mmap_t);
|
||||
|
||||
mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
|
||||
size_t size_ctl_structure, size_t data_seg_alignment);
|
||||
void* mca_common_sm_mmap_alloc(size_t* size, void* user_in, void* user_out);
|
||||
void* mca_common_sm_mmap_alloc(size_t* size, void* user_in, void** user_out);
|
||||
void mca_common_sm_mmap_free(void* addr);
|
||||
|
||||
/*
|
||||
|
||||
@ -38,17 +38,17 @@ typedef void* (*mca_mpool_base_module_address_fn_t)(struct mca_mpool_base_module
|
||||
/**
|
||||
* allocate function typedef
|
||||
*/
|
||||
typedef void* (*mca_mpool_base_module_alloc_fn_t)(struct mca_mpool_base_module_t* mpool, size_t size, size_t align, void* user_out);
|
||||
typedef void* (*mca_mpool_base_module_alloc_fn_t)(struct mca_mpool_base_module_t* mpool, size_t size, size_t align, void** user_out);
|
||||
|
||||
/**
|
||||
* allocate function typedef
|
||||
*/
|
||||
typedef void* (*mca_mpool_base_module_alloc_and_register_fn_t)(struct mca_mpool_base_module_t* mpool,size_t size, size_t align, void* user_out);
|
||||
typedef void* (*mca_mpool_base_module_alloc_and_register_fn_t)(struct mca_mpool_base_module_t* mpool,size_t size, size_t align, void** user_out);
|
||||
|
||||
/**
|
||||
* realloc function typedef
|
||||
*/
|
||||
typedef void* (*mca_mpool_base_module_realloc_fn_t)(struct mca_mpool_base_module_t* mpool, void* addr, size_t size, void* user_out);
|
||||
typedef void* (*mca_mpool_base_module_realloc_fn_t)(struct mca_mpool_base_module_t* mpool, void* addr, size_t size, void** user_out);
|
||||
|
||||
/**
|
||||
* free function typedef
|
||||
|
||||
@ -100,7 +100,8 @@ static mca_mpool_base_module_t* mca_mpool_sm_init(void * user_in)
|
||||
char *file_name;
|
||||
int len;
|
||||
mca_mpool_sm_module_t* mpool_module;
|
||||
mca_allocator_base_component_t* allocator_component = mca_allocator_component_lookup(
|
||||
mca_allocator_base_component_t* allocator_component;
|
||||
allocator_component = mca_allocator_component_lookup(
|
||||
mca_mpool_sm_component.sm_allocator_name);
|
||||
|
||||
/* if specified allocator cannout be loaded - look for an alternative */
|
||||
|
||||
@ -86,6 +86,14 @@ AC_DEFUN([MCA_CONFIGURE_STUB],[
|
||||
# some versions of Mellanox (v3.1), we need to expliitly link in
|
||||
# the thread libraries. #$%#@$%@%#$!!!
|
||||
|
||||
|
||||
# Many vapi.h's have horrid semantics and don't obey ISOC99
|
||||
# standards. So we have to turn off flags like -pedantic. Sigh.
|
||||
|
||||
CFLAGS="`echo $CFLAGS | sed 's/-pedantic//g'`"
|
||||
|
||||
|
||||
|
||||
mca_ptl_ib_try_find_libvapi() {
|
||||
func1=[$]1
|
||||
func2=[$]2
|
||||
|
||||
@ -72,6 +72,7 @@ void* mca_mpool_vapi_realloc(mca_mpool_base_module_t* mpool, void* addr, size_t
|
||||
*/
|
||||
void mca_mpool_vapi_free(mca_mpool_base_module_t* mpool, void *);
|
||||
|
||||
void* mca_common_vapi_segment_alloc(size_t* size, void* user_in, void** user_out);
|
||||
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
}
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user