ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Remove a static build conflict between UNIQ and TEG. Change the mca_pml_base_ptl_t to mca_pml_uniq_ptl_t

Просмотр исходного кода 
This commit was SVN r8227.
Этот коммит содержится в:
George Bosilca 2005-11-22 03:44:18 +00:00
родитель 1aa6d27ffe
Коммит bec02702b7
6 изменённых файлов: 17 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
ompi/mca/pml/uniq/pml_uniq.c
Просмотреть файл

@ -275,16 +275,16 @@ int mca_pml_uniq_add_procs(ompi_proc_t** procs, size_t nprocs)
NULL != ptl->ptl_request_init && NULL != ptl->ptl_request_init &&
NULL != ptl->ptl_request_fini) { NULL != ptl->ptl_request_fini) {
mca_pml_base_ptl_t* ptl_base = OBJ_NEW(mca_pml_base_ptl_t); mca_pml_uniq_ptl_t* ptl_base = OBJ_NEW(mca_pml_uniq_ptl_t);
ptl_base->ptl = ptl; ptl_base->ptl = ptl;
ptl_base->ptl_cache_size = ptl->ptl_cache_size; ptl_base->ptl_cache_size = ptl->ptl_cache_size;
ptl->ptl_base = ptl_base; ptl->ptl_base = (struct mca_pml_base_ptl_t*)ptl_base;
} }
proc_pml->proc_ptl_first.ptl_base = ptl->ptl_base; proc_pml->proc_ptl_first.ptl_base = (mca_pml_base_ptl_t*)ptl->ptl_base;
proc_pml->proc_ptl_first.ptl_peer = ptl_peers[p]; proc_pml->proc_ptl_first.ptl_peer = ptl_peers[p];
proc_pml->proc_ptl_first.ptl = ptl; proc_pml->proc_ptl_first.ptl = ptl;
#if PML_UNIQ_ACCEPT_NEXT_PTL #if PML_UNIQ_ACCEPT_NEXT_PTL
proc_pml->proc_ptl_next.ptl_base = ptl->ptl_base; proc_pml->proc_ptl_next.ptl_base = (mca_pml_base_ptl_t*)ptl->ptl_base;
proc_pml->proc_ptl_next.ptl_peer = ptl_peers[p]; proc_pml->proc_ptl_next.ptl_peer = ptl_peers[p];
proc_pml->proc_ptl_next.ptl = ptl; proc_pml->proc_ptl_next.ptl = ptl;
#endif /* PML_UNIQ_ACCEPT_NEXT_PTL */ #endif /* PML_UNIQ_ACCEPT_NEXT_PTL */

2
ompi/mca/pml/uniq/pml_uniq_proc.h
Просмотреть файл

@ -42,7 +42,7 @@ extern "C" {
*/ */
struct mca_ptl_proc_t { struct mca_ptl_proc_t {
struct mca_ptl_base_peer_t* ptl_peer; /**< PTL addressing info */ struct mca_ptl_base_peer_t* ptl_peer; /**< PTL addressing info */
struct mca_pml_base_ptl_t* ptl_base; /**< PML specific PTL info */ struct mca_pml_uniq_ptl_t* ptl_base; /**< PML specific PTL info */
mca_ptl_base_module_t *ptl; /**< PTL module */ mca_ptl_base_module_t *ptl; /**< PTL module */
}; };
typedef struct mca_ptl_proc_t mca_ptl_proc_t; typedef struct mca_ptl_proc_t mca_ptl_proc_t;

6
ompi/mca/pml/uniq/pml_uniq_ptl.c
Просмотреть файл

@ -20,7 +20,7 @@
#include "pml_uniq_ptl.h" #include "pml_uniq_ptl.h"
static void mca_pml_uniq_ptl_construct(mca_pml_base_ptl_t* ptl) static void mca_pml_uniq_ptl_construct(mca_pml_uniq_ptl_t* ptl)
{ {
OBJ_CONSTRUCT(&ptl->ptl_cache, opal_list_t); OBJ_CONSTRUCT(&ptl->ptl_cache, opal_list_t);
OBJ_CONSTRUCT(&ptl->ptl_cache_lock, opal_mutex_t); OBJ_CONSTRUCT(&ptl->ptl_cache_lock, opal_mutex_t);
@ -29,14 +29,14 @@ static void mca_pml_uniq_ptl_construct(mca_pml_base_ptl_t* ptl)
ptl->ptl_cache_alloc = 0; ptl->ptl_cache_alloc = 0;
} }
static void mca_pml_uniq_ptl_destruct(mca_pml_base_ptl_t* ptl) static void mca_pml_uniq_ptl_destruct(mca_pml_uniq_ptl_t* ptl)
{ {
OBJ_DESTRUCT(&ptl->ptl_cache); OBJ_DESTRUCT(&ptl->ptl_cache);
OBJ_DESTRUCT(&ptl->ptl_cache_lock); OBJ_DESTRUCT(&ptl->ptl_cache_lock);
} }
OBJ_CLASS_INSTANCE( OBJ_CLASS_INSTANCE(
mca_pml_base_ptl_t, mca_pml_uniq_ptl_t,
opal_list_t, opal_list_t,
mca_pml_uniq_ptl_construct, mca_pml_uniq_ptl_construct,
mca_pml_uniq_ptl_destruct mca_pml_uniq_ptl_destruct

7
ompi/mca/pml/uniq/pml_uniq_ptl.h
Просмотреть файл

@ -27,16 +27,17 @@ extern "C" {
#endif #endif
struct mca_pml_base_ptl_t { struct mca_pml_uniq_ptl_t {
opal_list_t ptl_cache; /**< cache of send requests */ opal_list_t ptl_cache; /**< cache of send requests */
size_t ptl_cache_size; /**< maximum size of cache */ size_t ptl_cache_size; /**< maximum size of cache */
size_t ptl_cache_alloc; /**< current number of allocated items */ size_t ptl_cache_alloc; /**< current number of allocated items */
opal_mutex_t ptl_cache_lock; /**< lock for queue access */ opal_mutex_t ptl_cache_lock; /**< lock for queue access */
struct mca_ptl_base_module_t* ptl; /**< back pointer to ptl */ struct mca_ptl_base_module_t* ptl; /**< back pointer to ptl */
}; };
typedef struct mca_pml_base_ptl_t mca_pml_base_ptl_t; typedef struct mca_pml_uniq_ptl_t mca_pml_uniq_ptl_t;
typedef struct mca_pml_uniq_ptl_t mca_pml_base_ptl_t;
OBJ_CLASS_DECLARATION(mca_pml_base_ptl_t); OBJ_CLASS_DECLARATION(mca_pml_uniq_ptl_t);
#if defined(c_plusplus) || defined(__cplusplus) #if defined(c_plusplus) || defined(__cplusplus)
} }

4
ompi/mca/pml/uniq/pml_uniq_sendreq.h
Просмотреть файл

@ -44,7 +44,7 @@ OBJ_CLASS_DECLARATION(mca_pml_uniq_send_request_t);
{ \ { \
mca_pml_uniq_proc_t *proc = \ mca_pml_uniq_proc_t *proc = \
(mca_pml_uniq_proc_t*) mca_pml_uniq_proc_lookup_remote(comm,dst); \ (mca_pml_uniq_proc_t*) mca_pml_uniq_proc_lookup_remote(comm,dst); \
mca_pml_base_ptl_t* ptl_base; \ mca_pml_uniq_ptl_t* ptl_base; \
\ \
if(NULL == proc) { \ if(NULL == proc) { \
return OMPI_ERR_OUT_OF_RESOURCE; \ return OMPI_ERR_OUT_OF_RESOURCE; \
@ -122,7 +122,7 @@ OBJ_CLASS_DECLARATION(mca_pml_uniq_send_request_t);
#define MCA_PML_UNIQ_SEND_REQUEST_RETURN(sendreq) \ #define MCA_PML_UNIQ_SEND_REQUEST_RETURN(sendreq) \
{ \ { \
mca_ptl_base_module_t* ptl = (sendreq)->req_ptl; \ mca_ptl_base_module_t* ptl = (sendreq)->req_ptl; \
mca_pml_base_ptl_t* ptl_base = ptl->ptl_base; \ mca_pml_uniq_ptl_t* ptl_base = (mca_pml_uniq_ptl_t*)ptl->ptl_base; \
\ \
/* Let the base handle the reference counts */ \ /* Let the base handle the reference counts */ \
MCA_PML_BASE_SEND_REQUEST_FINI( &((sendreq)->req_send) ); \ MCA_PML_BASE_SEND_REQUEST_FINI( &((sendreq)->req_send) ); \