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

Start the cleanup process. I try to remove all useless operations from the critical path.

Просмотр исходного кода 
Start of the pool of memory that will be used for unexpected messages (just the framework at this moment).

This commit was SVN r3867.
Этот коммит содержится в:
George Bosilca 2004-12-22 00:14:31 +00:00
родитель 92e94f5921
Коммит 4acb2b853c
5 изменённых файлов: 199 добавлений и 195 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
src/mca/ptl/gm/src/ptl_gm.c
Просмотреть файл

@ -411,7 +411,7 @@ mca_ptl_gm_matched( mca_ptl_base_module_t * ptl,
/* Now update the status of the fragment */ /* Now update the status of the fragment */
if( ((mca_ptl_gm_recv_frag_t*)frag)->have_allocated_buffer == true ) { if( ((mca_ptl_gm_recv_frag_t*)frag)->have_allocated_buffer == true ) {
free( ((mca_ptl_gm_recv_frag_t*)frag)->frag_recv.frag_base.frag_addr); gm_release_local_buffer( ((mca_ptl_gm_recv_frag_t*)frag)->frag_recv.frag_base.frag_addr );
((mca_ptl_gm_recv_frag_t*)frag)->have_allocated_buffer = false; ((mca_ptl_gm_recv_frag_t*)frag)->have_allocated_buffer = false;
} }

83
src/mca/ptl/gm/src/ptl_gm.h
Просмотреть файл

@ -37,10 +37,10 @@
extern "C" { extern "C" {
#endif #endif
/** /**
* GM PTL component * GM PTL component
*/ */
struct mca_ptl_gm_component_t { struct mca_ptl_gm_component_t {
mca_ptl_base_component_1_0_0_t super; /**< base PTL module */ mca_ptl_base_component_1_0_0_t super; /**< base PTL module */
struct mca_ptl_gm_module_t **gm_ptl_modules; /**< array of available PTL modules */ struct mca_ptl_gm_module_t **gm_ptl_modules; /**< array of available PTL modules */
size_t gm_num_ptl_modules; /**< number of ptls actually used */ size_t gm_num_ptl_modules; /**< number of ptls actually used */
@ -62,15 +62,15 @@ struct mca_ptl_gm_component_t {
ompi_list_t gm_send_req; ompi_list_t gm_send_req;
ompi_mutex_t gm_lock; /**< lock for accessing module state */ ompi_mutex_t gm_lock; /**< lock for accessing module state */
}; };
typedef struct mca_ptl_gm_component_t mca_ptl_gm_component_t; typedef struct mca_ptl_gm_component_t mca_ptl_gm_component_t;
extern mca_ptl_gm_component_t mca_ptl_gm_component; extern mca_ptl_gm_component_t mca_ptl_gm_component;
/** /**
* GM PTL Interface * GM PTL Interface
*/ */
struct mca_ptl_gm_module_t { struct mca_ptl_gm_module_t {
mca_ptl_base_module_t super; /**< base PTL module interface */ mca_ptl_base_module_t super; /**< base PTL module interface */
struct gm_port *gm_port; struct gm_port *gm_port;
unsigned int local_id; unsigned int local_id;
@ -97,67 +97,67 @@ struct mca_ptl_gm_module_t {
size_t ptl_bytes_sent; size_t ptl_bytes_sent;
size_t ptl_bytes_recv; size_t ptl_bytes_recv;
#endif #endif
}; };
typedef struct mca_ptl_gm_module_t mca_ptl_gm_module_t; typedef struct mca_ptl_gm_module_t mca_ptl_gm_module_t;
extern mca_ptl_gm_module_t mca_ptl_gm_module; extern mca_ptl_gm_module_t mca_ptl_gm_module;
/** /**
* Register GM module parameters with the MCA framework * Register GM module parameters with the MCA framework
*/ */
extern int mca_ptl_gm_component_open (void); extern int mca_ptl_gm_component_open (void);
/** /**
* Any final cleanup before being unloaded. * Any final cleanup before being unloaded.
*/ */
extern int mca_ptl_gm_component_close (void); extern int mca_ptl_gm_component_close (void);
/** /**
* GM module initialization. * GM module initialization.
* *
* @param num_ptls (OUT) Number of PTLs returned in PTL array. * @param num_ptls (OUT) Number of PTLs returned in PTL array.
* @param allow_multi_user_threads (OUT) Flag indicating wether PTL supports user threads (TRUE) * @param allow_multi_user_threads (OUT) Flag indicating wether PTL supports user threads (TRUE)
* @param have_hidden_threads (OUT) Flag indicating wether PTL uses threads (TRUE) * @param have_hidden_threads (OUT) Flag indicating wether PTL uses threads (TRUE)
*/ */
extern mca_ptl_base_module_t **mca_ptl_gm_component_init (int *num_ptl_modules, extern mca_ptl_base_module_t **mca_ptl_gm_component_init (int *num_ptl_modules,
bool * allow_multi_user_threads, bool * allow_multi_user_threads,
bool * have_hidden_threads); bool * have_hidden_threads);
/** /**
* GM module control. * GM module control.
*/ */
extern int mca_ptl_gm_component_control (int param, void *value, size_t size); extern int mca_ptl_gm_component_control (int param, void *value, size_t size);
/** /**
* GM module progress. * GM module progress.
*/ */
extern int mca_ptl_gm_component_progress (mca_ptl_tstamp_t tstamp); extern int mca_ptl_gm_component_progress (mca_ptl_tstamp_t tstamp);
/** /**
* GM send * GM send
*/ */
extern int mca_ptl_gm_send( struct mca_ptl_base_module_t *ptl, extern int mca_ptl_gm_send( struct mca_ptl_base_module_t *ptl,
struct mca_ptl_base_peer_t *ptl_peer, struct mca_ptl_base_peer_t *ptl_peer,
struct mca_pml_base_send_request_t *sendreq, struct mca_pml_base_send_request_t *sendreq,
size_t offset, size_t size, int flags); size_t offset, size_t size, int flags);
/** /**
* GM put * GM put
*/ */
extern int mca_ptl_gm_put( struct mca_ptl_base_module_t *ptl, extern int mca_ptl_gm_put( struct mca_ptl_base_module_t *ptl,
struct mca_ptl_base_peer_t *ptl_peer, struct mca_ptl_base_peer_t *ptl_peer,
struct mca_pml_base_send_request_t *sendreq, struct mca_pml_base_send_request_t *sendreq,
size_t offset, size_t size, int flags); size_t offset, size_t size, int flags);
/** /**
* GM get * GM get
*/ */
extern int mca_ptl_gm_get (struct mca_ptl_base_module_t *ptl, extern int mca_ptl_gm_get (struct mca_ptl_base_module_t *ptl,
struct mca_ptl_base_peer_t *ptl_peer, struct mca_ptl_base_peer_t *ptl_peer,
struct mca_pml_base_recv_request_t *sendreq, struct mca_pml_base_recv_request_t *sendreq,
size_t offset, size_t size, int flags); size_t offset, size_t size, int flags);
/** /**
* PML->PTL notification of change in the process list. * PML->PTL notification of change in the process list.
* *
* @param ptl (IN) * @param ptl (IN)
@ -168,13 +168,13 @@ extern int mca_ptl_gm_get (struct mca_ptl_base_module_t *ptl,
* @return OMPI_SUCCESS or error status on failure. * @return OMPI_SUCCESS or error status on failure.
* *
*/ */
extern int mca_ptl_gm_add_procs (struct mca_ptl_base_module_t *ptl, extern int mca_ptl_gm_add_procs (struct mca_ptl_base_module_t *ptl,
size_t nprocs, size_t nprocs,
struct ompi_proc_t **procs, struct ompi_proc_t **procs,
struct mca_ptl_base_peer_t **peers, struct mca_ptl_base_peer_t **peers,
struct ompi_bitmap_t * reachable); struct ompi_bitmap_t * reachable);
/** /**
* PML->PTL notification of change in the process list. * PML->PTL notification of change in the process list.
* *
* @param ptl (IN) PTL instance * @param ptl (IN) PTL instance
@ -184,12 +184,12 @@ extern int mca_ptl_gm_add_procs (struct mca_ptl_base_module_t *ptl,
* @return Status indicating if cleanup was successful * @return Status indicating if cleanup was successful
* *
*/ */
extern int mca_ptl_gm_del_procs( struct mca_ptl_base_module_t *ptl, extern int mca_ptl_gm_del_procs( struct mca_ptl_base_module_t *ptl,
size_t nprocs, size_t nprocs,
struct ompi_proc_t **procs, struct ompi_proc_t **procs,
struct mca_ptl_base_peer_t **peers ); struct mca_ptl_base_peer_t **peers );
/** /**
* PML->PTL Allocate a send request from the PTL modules free list. * PML->PTL Allocate a send request from the PTL modules free list.
* *
* @param ptl (IN) PTL instance * @param ptl (IN) PTL instance
@ -197,29 +197,36 @@ extern int mca_ptl_gm_del_procs( struct mca_ptl_base_module_t *ptl,
* @return Status indicating if allocation was successful. * @return Status indicating if allocation was successful.
* *
*/ */
extern int mca_ptl_gm_request_init( struct mca_ptl_base_module_t* ptl, extern int mca_ptl_gm_request_init( struct mca_ptl_base_module_t* ptl,
struct mca_pml_base_send_request_t* req); struct mca_pml_base_send_request_t* req);
/** /**
* *
*/ */
extern void mca_ptl_gm_request_fini( struct mca_ptl_base_module_t *ptl, extern void mca_ptl_gm_request_fini( struct mca_ptl_base_module_t *ptl,
struct mca_pml_base_send_request_t* req); struct mca_pml_base_send_request_t* req);
/** /**
* PML->PTL Notification that a receive fragment has been matched. * PML->PTL Notification that a receive fragment has been matched.
* *
* @param ptl (IN) PTL instance * @param ptl (IN) PTL instance
* @param recv_frag (IN) Receive fragment * @param recv_frag (IN) Receive fragment
* *
*/ */
extern void mca_ptl_gm_matched (struct mca_ptl_base_module_t *ptl, extern void mca_ptl_gm_matched (struct mca_ptl_base_module_t *ptl,
struct mca_ptl_base_recv_frag_t *frag); struct mca_ptl_base_recv_frag_t *frag);
/** /**
* *
*/ */
extern int mca_ptl_gm_finalize (struct mca_ptl_base_module_t *ptl); extern int mca_ptl_gm_finalize (struct mca_ptl_base_module_t *ptl);
/**
* Internally allocate memory for the unexpected messages. We will manage a list
* of such buffers in order to avoid too many memory allocations.
*/
extern char* gm_get_local_buffer( void );
extern void gm_release_local_buffer( char* ptr );
#if defined(c_plusplus) || defined(__cplusplus) #if defined(c_plusplus) || defined(__cplusplus)
} }

10
src/mca/ptl/gm/src/ptl_gm_component.c
Просмотреть файл

@ -480,7 +480,6 @@ mca_ptl_gm_component_init (int *num_ptl_modules,
memcpy (ptls, mca_ptl_gm_component.gm_ptl_modules, memcpy (ptls, mca_ptl_gm_component.gm_ptl_modules,
mca_ptl_gm_component.gm_num_ptl_modules * sizeof(mca_ptl_gm_module_t *)); mca_ptl_gm_component.gm_num_ptl_modules * sizeof(mca_ptl_gm_module_t *));
*num_ptl_modules = mca_ptl_gm_component.gm_num_ptl_modules; *num_ptl_modules = mca_ptl_gm_component.gm_num_ptl_modules;
return ptls; return ptls;
} }
@ -494,6 +493,15 @@ mca_ptl_gm_component_control (int param, void *value, size_t size)
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
char* gm_get_local_buffer( void )
{
return malloc( sizeof(char) * GM_BUF_SIZE );
}
void gm_release_local_buffer( char* ptr )
{
free(ptr);
}
/* /*
* GM module progress. * GM module progress.

48
src/mca/ptl/gm/src/ptl_gm_priv.c
Просмотреть файл

@ -105,9 +105,9 @@ int mca_ptl_gm_peer_send_continue( mca_ptl_gm_peer_t *ptl_peer,
item = (ompi_list_item_t*)fragment->send_buf; item = (ompi_list_item_t*)fragment->send_buf;
if( (*size) <= mca_ptl_gm_component.gm_max_eager_size ) { /* small protocol */ if( (*size) <= mca_ptl_gm_component.gm_max_eager_size ) { /* small protocol */
size_t max_data, remaining_bytes = fragment->send_frag.frag_base.frag_size; size_t remaining_bytes = fragment->send_frag.frag_base.frag_size;
int freeAfter; int32_t freeAfter;
unsigned int in_size; uint32_t max_data, in_size;
struct iovec iov; struct iovec iov;
ompi_convertor_t *convertor = &(fragment->send_frag.frag_base.frag_convertor); ompi_convertor_t *convertor = &(fragment->send_frag.frag_base.frag_convertor);
@ -298,7 +298,6 @@ int mca_ptl_gm_peer_send( mca_ptl_gm_peer_t *ptl_peer,
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
void put_callback(struct gm_port *port,void * context, gm_status_t status) void put_callback(struct gm_port *port,void * context, gm_status_t status)
{ {
mca_ptl_gm_module_t *ptl; mca_ptl_gm_module_t *ptl;
@ -454,13 +453,9 @@ mca_ptl_gm_recv_frag_match( struct mca_ptl_gm_module_t *ptl,
/* allocate a receive fragment */ /* allocate a receive fragment */
recv_frag = mca_ptl_gm_alloc_recv_frag( (struct mca_ptl_base_module_t*)ptl ); recv_frag = mca_ptl_gm_alloc_recv_frag( (struct mca_ptl_base_module_t*)ptl );
/*recv_frag->frag_recv.frag_base.frag_peer = NULL;
recv_frag->frag_recv.frag_base.frag_owner = (struct mca_ptl_base_module_t*)ptl;
recv_frag->frag_recv.frag_base.frag_peer = NULL;
recv_frag->frag_recv.frag_request = NULL; recv_frag->frag_recv.frag_request = NULL;
recv_frag->frag_recv.frag_is_buffered = false; */
recv_frag->frag_recv.frag_base.frag_header.hdr_rndv = hdr->hdr_rndv;
if( MCA_PTL_HDR_TYPE_MATCH == hdr->hdr_rndv.hdr_match.hdr_common.hdr_type ) { if( MCA_PTL_HDR_TYPE_MATCH == hdr->hdr_rndv.hdr_match.hdr_common.hdr_type ) {
recv_frag->frag_recv.frag_base.frag_addr = recv_frag->frag_recv.frag_base.frag_addr =
(char *) hdr + sizeof(mca_ptl_base_match_header_t); (char *) hdr + sizeof(mca_ptl_base_match_header_t);
@ -472,27 +467,34 @@ mca_ptl_gm_recv_frag_match( struct mca_ptl_gm_module_t *ptl,
recv_frag->frag_recv.frag_base.frag_size = hdr->hdr_rndv.hdr_frag_length; recv_frag->frag_recv.frag_base.frag_size = hdr->hdr_rndv.hdr_frag_length;
} }
recv_frag->matched = false; recv_frag->frag_recv.frag_is_buffered = false;
recv_frag->have_allocated_buffer = false; recv_frag->have_allocated_buffer = false;
recv_frag->frag_ack_pending = false; recv_frag->frag_offset = 0; /* initial fragment */
recv_frag->frag_progressed = 0;
recv_frag->frag_offset = 0; /* initial frgment */
recv_frag->frag_bytes_processed = 0;
recv_frag->frag_recv.frag_base.frag_header.hdr_rndv = hdr->hdr_rndv;
matched = ptl->super.ptl_match( &(ptl->super), matched = ptl->super.ptl_match( &(ptl->super),
&(recv_frag->frag_recv), &(recv_frag->frag_recv),
&(recv_frag->frag_recv.frag_base.frag_header.hdr_match) ); &(recv_frag->frag_recv.frag_base.frag_header.hdr_match) );
if( !matched ) { if( !matched ) {
size_t length = recv_frag->frag_recv.frag_base.frag_size; size_t length = recv_frag->frag_recv.frag_base.frag_size;
/* get some memory and copy the data inside. We can then release the receive buffer */ /* get some memory and copy the data inside. We can then release the receive buffer */
if( 0 != length ) { if( 0 != length ) {
char* ptr = (char*)malloc( sizeof(char) * length ); char* ptr = (char*)gm_get_local_buffer();
if (NULL == ptr) {
ompi_output(0, "[%s:%d] error in allocating memory \n", __FILE__, __LINE__);
}
recv_frag->have_allocated_buffer = true; recv_frag->have_allocated_buffer = true;
memcpy( ptr, recv_frag->frag_recv.frag_base.frag_addr, length ); memcpy( ptr, recv_frag->frag_recv.frag_base.frag_addr, length );
recv_frag->frag_recv.frag_base.frag_addr = ptr; recv_frag->frag_recv.frag_base.frag_addr = ptr;
} else { } else {
recv_frag->frag_recv.frag_base.frag_addr = NULL; recv_frag->frag_recv.frag_base.frag_addr = NULL;
} }
recv_frag->matched = false;
recv_frag->frag_ack_pending = false;
recv_frag->frag_progressed = 0;
recv_frag->frag_bytes_processed = 0;
return recv_frag; return recv_frag;
} }
return NULL; return NULL;
@ -592,7 +594,6 @@ mca_ptl_gm_recv_frag_frag( struct mca_ptl_gm_module_t *ptl,
recv_frag = NULL; recv_frag = NULL;
} else { /* large message => we have to create a receive fragment */ } else { /* large message => we have to create a receive fragment */
recv_frag = mca_ptl_gm_alloc_recv_frag( (struct mca_ptl_base_module_t*)ptl ); recv_frag = mca_ptl_gm_alloc_recv_frag( (struct mca_ptl_base_module_t*)ptl );
recv_frag->frag_recv.frag_base.frag_owner = (struct mca_ptl_base_module_t*)ptl;
recv_frag->frag_recv.frag_request = request; recv_frag->frag_recv.frag_request = request;
recv_frag->frag_recv.frag_base.frag_header.hdr_frag = hdr->hdr_frag; recv_frag->frag_recv.frag_base.frag_header.hdr_frag = hdr->hdr_frag;
recv_frag->frag_recv.frag_base.frag_peer = recv_frag->frag_recv.frag_base.frag_peer =
@ -745,19 +746,6 @@ int mca_ptl_gm_analyze_recv_event( struct mca_ptl_gm_module_t* ptl, gm_recv_even
case GM_HIGH_PEER_RECV_EVENT: case GM_HIGH_PEER_RECV_EVENT:
mesg = gm_ntohp(event->recv.buffer); mesg = gm_ntohp(event->recv.buffer);
frag = ptl_gm_handle_recv( ptl, event ); frag = ptl_gm_handle_recv( ptl, event );
if( (frag != NULL) && !(frag->matched) ) {
/* allocate temporary buffer: temporary until the fragment will be finally matched */
char* buffer = malloc( GM_BUF_SIZE );
if (NULL == buffer) {
ompi_output(0, "[%s:%d] error in allocating memory \n", __FILE__, __LINE__);
}
/* copy the data from the registered buffer to the newly allocated one */
memcpy( buffer, mesg, gm_ntohl(event->recv.length) );
/* associate the buffer with the unexpected fragment */
frag->frag_recv.frag_base.frag_addr = (void *)buffer;
/* mark the fragment as having pending buffers */
frag->have_allocated_buffer = true;
}
gm_provide_receive_buffer( ptl->gm_port, mesg, GM_SIZE, GM_LOW_PRIORITY ); gm_provide_receive_buffer( ptl->gm_port, mesg, GM_SIZE, GM_LOW_PRIORITY );
break; break;
case GM_NO_RECV_EVENT: case GM_NO_RECV_EVENT:

7
src/mca/ptl/gm/src/ptl_gm_sendfrag.c
Просмотреть файл

@ -90,7 +90,6 @@ mca_ptl_gm_alloc_send_frag( struct mca_ptl_gm_module_t *ptl,
return sendfrag; return sendfrag;
} }
int mca_ptl_gm_send_frag_done( mca_ptl_gm_send_frag_t * frag, int mca_ptl_gm_send_frag_done( mca_ptl_gm_send_frag_t * frag,
mca_pml_base_send_request_t * req ) mca_pml_base_send_request_t * req )
{ {
@ -141,7 +140,6 @@ int mca_ptl_gm_send_ack_init( struct mca_ptl_gm_send_frag_t* ack,
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
int mca_ptl_gm_put_frag_init( struct mca_ptl_gm_send_frag_t* putfrag, int mca_ptl_gm_put_frag_init( struct mca_ptl_gm_send_frag_t* putfrag,
struct mca_ptl_gm_peer_t* ptl_peer, struct mca_ptl_gm_peer_t* ptl_peer,
struct mca_ptl_gm_module_t* gm_ptl, struct mca_ptl_gm_module_t* gm_ptl,
@ -203,10 +201,13 @@ mca_ptl_gm_alloc_recv_frag( struct mca_ptl_base_module_t *ptl )
{ {
int rc; int rc;
ompi_list_item_t* item; ompi_list_item_t* item;
mca_ptl_gm_recv_frag_t* frag;
OMPI_FREE_LIST_GET( &(((mca_ptl_gm_module_t *)ptl)->gm_recv_frags_free), item, rc ); OMPI_FREE_LIST_GET( &(((mca_ptl_gm_module_t *)ptl)->gm_recv_frags_free), item, rc );
return (mca_ptl_gm_recv_frag_t *)item; frag = (mca_ptl_gm_recv_frag_t*)item;
frag->frag_recv.frag_base.frag_owner = (struct mca_ptl_base_module_t*)ptl;
return frag;
} }