1
1

Fix a few issues reported by Terry Dontje:

1. ompi/mca/btl/udapl/btl_udapl_proc.c should be including
btl_udapl_endpoint.h for mca_btl_udapl_proc_insert function.

2. btl_udapl_endpoint.c it looks like you are using
&endpoint->endpoint_lock when you should use &ep->endpoint_lock in a
OPAL_THREAD_LOCK call.

3. btl_udapl_frag.h has a couple opal_list_item_t's that should be
ompi_free_list_item_t in the _FRAG_ALLOC_{EAGER,MAX} macros.

This commit was SVN r10442.
Этот коммит содержится в:
Andrew Friedley 2006-06-20 17:13:44 +00:00
родитель 03cc22842c
Коммит 365c81d6e9
3 изменённых файлов: 10 добавлений и 7 удалений

Просмотреть файл

@ -324,7 +324,7 @@ int mca_btl_udapl_endpoint_finish_connect(struct mca_btl_udapl_module_t* btl,
!memcmp(param.remote_ia_address_ptr,
&ep->endpoint_addr.addr, sizeof(DAT_SOCK_ADDR))) {
OPAL_THREAD_LOCK(&endpoint->endpoint_lock);
OPAL_THREAD_LOCK(&ep->endpoint_lock);
if(MCA_BTL_UDAPL_CONN_EAGER == ep->endpoint_state) {
ep->endpoint_eager = endpoint;
rc = mca_btl_udapl_endpoint_finish_eager(ep);

Просмотреть файл

@ -77,7 +77,7 @@ OBJ_CLASS_DECLARATION(mca_btl_udapl_frag_user_t);
#define MCA_BTL_UDAPL_FRAG_ALLOC_EAGER(btl, frag, rc) \
{ \
\
opal_list_item_t *item; \
ompi_free_list_item_t *item; \
OMPI_FREE_LIST_WAIT(&((mca_btl_udapl_module_t*)btl)->udapl_frag_eager, item, rc); \
frag = (mca_btl_udapl_frag_t*) item; \
}
@ -85,13 +85,13 @@ OBJ_CLASS_DECLARATION(mca_btl_udapl_frag_user_t);
#define MCA_BTL_UDAPL_FRAG_RETURN_EAGER(btl, frag) \
{ \
OMPI_FREE_LIST_RETURN(&((mca_btl_udapl_module_t*)btl)->udapl_frag_eager, \
(opal_list_item_t*)(frag)); \
(ompi_free_list_item_t*)(frag)); \
}
#define MCA_BTL_UDAPL_FRAG_ALLOC_MAX(btl, frag, rc) \
{ \
\
opal_list_item_t *item; \
ompi_free_list_item_t *item; \
OMPI_FREE_LIST_WAIT(&((mca_btl_udapl_module_t*)btl)->udapl_frag_max, item, rc); \
frag = (mca_btl_udapl_frag_t*) item; \
}
@ -99,13 +99,13 @@ OBJ_CLASS_DECLARATION(mca_btl_udapl_frag_user_t);
#define MCA_BTL_UDAPL_FRAG_RETURN_MAX(btl, frag) \
{ \
OMPI_FREE_LIST_RETURN(&((mca_btl_udapl_module_t*)btl)->udapl_frag_max, \
(opal_list_item_t*)(frag)); \
(ompi_free_list_item_t*)(frag)); \
}
#define MCA_BTL_UDAPL_FRAG_ALLOC_USER(btl, frag, rc) \
{ \
opal_list_item_t *item; \
ompi_free_list_item_t *item; \
OMPI_FREE_LIST_WAIT(&((mca_btl_udapl_module_t*)btl)->udapl_frag_user, item, rc); \
frag = (mca_btl_udapl_frag_t*) item; \
}
@ -113,7 +113,7 @@ OBJ_CLASS_DECLARATION(mca_btl_udapl_frag_user_t);
#define MCA_BTL_UDAPL_FRAG_RETURN_USER(btl, frag) \
{ \
OMPI_FREE_LIST_RETURN(&((mca_btl_udapl_module_t*)btl)->udapl_frag_user, \
(opal_list_item_t*)(frag)); \
(ompi_free_list_item_t*)(frag)); \
}

Просмотреть файл

@ -9,6 +9,8 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006 Sandia National Laboratories. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -22,6 +24,7 @@
#include "ompi/mca/pml/base/pml_base_module_exchange.h"
#include "btl_udapl.h"
#include "btl_udapl_endpoint.h"
#include "btl_udapl_proc.h"
static void mca_btl_udapl_proc_construct(mca_btl_udapl_proc_t* proc);