1
1

Add one arguement to the memory allocation function.

This commit was SVN r6022.
Этот коммит содержится в:
George Bosilca 2005-06-09 22:26:22 +00:00
родитель f11ec2560a
Коммит 700ec8f999
2 изменённых файлов: 5 добавлений и 5 удалений

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

@ -82,7 +82,7 @@ static inline void mca_ptl_tcp_recv_frag_init(mca_ptl_tcp_recv_frag_t* frag, str
bool mca_ptl_tcp_recv_frag_send_ack(mca_ptl_tcp_recv_frag_t* frag);
extern void* mca_ptl_tcp_memalloc( size_t* length );
extern void* mca_ptl_tcp_memalloc( size_t* length, void* data );
static inline void mca_ptl_tcp_recv_frag_matched(
mca_ptl_tcp_recv_frag_t* frag,
@ -97,7 +97,7 @@ static inline void mca_ptl_tcp_recv_frag_matched(
ompi_convertor_clone( &(request->req_recv.req_convertor),
&(frag->frag_recv.frag_base.frag_convertor), 1 );
ompi_convertor_personalize( &frag->frag_recv.frag_base.frag_convertor, 0,
&frag_offset, mca_ptl_tcp_memalloc );
&frag_offset, mca_ptl_tcp_memalloc, NULL );
/* non-contiguous - allocate buffer for receive */
if( 1 == ompi_convertor_need_buffers( &frag->frag_recv.frag_base.frag_convertor ) ) {
frag->frag_recv.frag_base.frag_addr = malloc(frag_length);
@ -157,7 +157,7 @@ static inline void mca_ptl_tcp_recv_frag_progress(mca_ptl_tcp_recv_frag_t* frag)
ompi_convertor_clone( &(request->req_recv.req_convertor),
&(frag->frag_recv.frag_base.frag_convertor), 1 );
ompi_convertor_personalize( &(frag->frag_recv.frag_base.frag_convertor),
0, &offset, mca_ptl_tcp_memalloc );
0, &offset, mca_ptl_tcp_memalloc, NULL );
iov.iov_base = (ompi_iov_base_ptr_t)frag->frag_recv.frag_base.frag_addr;
iov.iov_len = frag->frag_recv.frag_base.frag_size;

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

@ -63,7 +63,7 @@ static void mca_ptl_tcp_send_frag_destruct(mca_ptl_tcp_send_frag_t* frag)
extern mca_ptl_tcp_component_t mca_ptl_tcp_component;
void* mca_ptl_tcp_memalloc( size_t* length )
void* mca_ptl_tcp_memalloc( size_t* length, void* data )
{
if( (*length) > mca_ptl_tcp_component.tcp_frag_size )
*length = mca_ptl_tcp_component.tcp_frag_size;
@ -96,7 +96,7 @@ int mca_ptl_tcp_send_frag_init(
convertor = &sendfrag->frag_convertor;
ompi_convertor_clone( &sendreq->req_send.req_convertor, convertor, 1 );
ompi_convertor_personalize( convertor, 0, &offset, mca_ptl_tcp_memalloc );
ompi_convertor_personalize( convertor, 0, &offset, mca_ptl_tcp_memalloc, NULL );
/* if data is contigous convertor will return an offset
* into users buffer - otherwise will return an allocated buffer
* that holds the packed data