fix elan4_probe_cmdq compatibility
This commit was SVN r2326.
Этот коммит содержится в:
родитель
1df5cca479
Коммит
2ba24b4a0d
@ -551,8 +551,7 @@ ompi_init_elan_putget (mca_ptl_elan_component_t * emp,
|
|||||||
/* construct the lock variable */
|
/* construct the lock variable */
|
||||||
OBJ_CONSTRUCT (&putget->pg_lock, ompi_mutex_t);
|
OBJ_CONSTRUCT (&putget->pg_lock, ompi_mutex_t);
|
||||||
|
|
||||||
cqp = elan4_probe_cmdq(ctx,
|
cqp = OMPI_PTL_ELAN_PROBE_CMDQ (ctx, rail->r_alloc,
|
||||||
rail->r_alloc,
|
|
||||||
0x10, CQ_AutoCtrlFlowOn);
|
0x10, CQ_AutoCtrlFlowOn);
|
||||||
|
|
||||||
putget->put_cmdq = OMPI_PTL_ELAN_ALLOC_CMDQ(ctx,
|
putget->put_cmdq = OMPI_PTL_ELAN_ALLOC_CMDQ(ctx,
|
||||||
|
@ -105,11 +105,13 @@ do { \
|
|||||||
#define OMPI_PTL_ELAN_ALIGNUP(x,a) (((unsigned int)(x) + ((a)-1)) & (-(a)))
|
#define OMPI_PTL_ELAN_ALIGNUP(x,a) (((unsigned int)(x) + ((a)-1)) & (-(a)))
|
||||||
|
|
||||||
#if (QSNETLIBS_VERSION_CODE <= QSNETLIBS_VERSION(1,6,6))
|
#if (QSNETLIBS_VERSION_CODE <= QSNETLIBS_VERSION(1,6,6))
|
||||||
#define OMPI_PTL_ELAN_ALLOC_CMDQ(ctx, alloc, size, bits, params) \
|
#define OMPI_PTL_ELAN_ALLOC_CMDQ elan4_alloc_cmdq
|
||||||
elan4_alloc_cmdq (ctx, alloc, size, bits, params)
|
#define OMPI_PTL_ELAN_PROBE_CMDQ elan4_probe_cmdq
|
||||||
#else
|
#else
|
||||||
#define OMPI_PTL_ELAN_ALLOC_CMDQ(ctx, alloc, size, bits, params) \
|
#define OMPI_PTL_ELAN_ALLOC_CMDQ(ctx, alloc, size, bits, params) \
|
||||||
elan4_alloc_cmdq (ctx, size, bits, params)
|
elan4_alloc_cmdq (ctx, size, bits, params)
|
||||||
|
#define OMPI_PTL_ELAN_PROBE_CMDQ(ctx, alloc, maxcmds, flags) \
|
||||||
|
elan4_probe_cmdq (ctx, maxcmds, flags)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define OMPI_PTL_ELAN_CHECK_UNEX(value, unexp, errno, output) \
|
#define OMPI_PTL_ELAN_CHECK_UNEX(value, unexp, errno, output) \
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user