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

Minimal possible change to allow static-linking of ompi:

Просмотр исходного кода 
otherwise the mca_pml_base_ptl_t-Class is doubly defined, due
to the close similarity to teg.

This commit was SVN r6747.
Этот коммит содержится в:
Rainer Keller 2005-08-05 13:57:06 +00:00
родитель 6faa46348f
Коммит 9dc4aa583e
4 изменённых файлов: 8 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -294,7 +294,7 @@ 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_base_ptl_uniq_t* ptl_base = OBJ_NEW(mca_pml_base_ptl_uniq_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 = ptl_base;

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

@ -19,7 +19,7 @@
#include "pml_uniq_ptl.h" #include "pml_uniq_ptl.h"
static void mca_pml_base_ptl_construct(mca_pml_base_ptl_t* ptl) static void mca_pml_base_ptl_construct(mca_pml_base_ptl_uniq_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);
@ -28,14 +28,14 @@ static void mca_pml_base_ptl_construct(mca_pml_base_ptl_t* ptl)
ptl->ptl_cache_alloc = 0; ptl->ptl_cache_alloc = 0;
} }
static void mca_pml_base_ptl_destruct(mca_pml_base_ptl_t* ptl) static void mca_pml_base_ptl_destruct(mca_pml_base_ptl_uniq_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_base_ptl_uniq_t,
opal_list_t, opal_list_t,
mca_pml_base_ptl_construct, mca_pml_base_ptl_construct,
mca_pml_base_ptl_destruct mca_pml_base_ptl_destruct

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

@ -32,9 +32,9 @@ struct mca_pml_base_ptl_t {
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_base_ptl_t mca_pml_base_ptl_uniq_t;
OBJ_CLASS_DECLARATION(mca_pml_base_ptl_t); OBJ_CLASS_DECLARATION(mca_pml_base_ptl_uniq_t);
#if defined(c_plusplus) || defined(__cplusplus) #if defined(c_plusplus) || defined(__cplusplus)
} }

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

@ -41,7 +41,7 @@ OBJ_CLASS_DECLARATION(mca_pml_uniq_send_request_t);
rc) \ rc) \
{ \ { \
mca_pml_proc_t *proc = mca_pml_uniq_proc_lookup_remote(comm,dst); \ mca_pml_proc_t *proc = mca_pml_uniq_proc_lookup_remote(comm,dst); \
mca_pml_base_ptl_t* ptl_base; \ mca_pml_base_ptl_uniq_t* ptl_base; \
\ \
if(NULL == proc) { \ if(NULL == proc) { \
return OMPI_ERR_OUT_OF_RESOURCE; \ return OMPI_ERR_OUT_OF_RESOURCE; \
@ -119,7 +119,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_base_ptl_uniq_t* ptl_base = 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) ); \