From 25b516ae83b61b738ee275e8a677eee087d72a58 Mon Sep 17 00:00:00 2001 From: Tim Woodall Date: Thu, 9 Sep 2004 21:50:18 +0000 Subject: [PATCH] chech if send request was cached This commit was SVN r2573. --- src/mca/ptl/tcp/src/ptl_tcp.c | 2 +- src/mca/ptl/tcp/src/ptl_tcp_component.c | 2 -- src/mca/ptl/tcp/src/ptl_tcp_sendfrag.h | 4 +++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mca/ptl/tcp/src/ptl_tcp.c b/src/mca/ptl/tcp/src/ptl_tcp.c index 62c6054f1f..3012053937 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp.c +++ b/src/mca/ptl/tcp/src/ptl_tcp.c @@ -208,7 +208,7 @@ int mca_ptl_tcp_send( { mca_ptl_tcp_send_frag_t* sendfrag; int rc; - if (offset == 0) { + if (offset == 0 && sendreq->req_cached) { sendfrag = &((mca_ptl_tcp_send_request_t*)sendreq)->req_frag; } else { ompi_list_item_t* item; diff --git a/src/mca/ptl/tcp/src/ptl_tcp_component.c b/src/mca/ptl/tcp/src/ptl_tcp_component.c index 3e7db0d6bc..7a785a163a 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_component.c +++ b/src/mca/ptl/tcp/src/ptl_tcp_component.c @@ -381,8 +381,6 @@ mca_ptl_base_module_t** mca_ptl_tcp_component_init(int *num_ptl_modules, bool *have_hidden_threads) { mca_ptl_base_module_t **ptls; - int rc; - *num_ptl_modules = 0; *allow_multi_user_threads = true; *have_hidden_threads = OMPI_HAVE_THREADS; diff --git a/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.h b/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.h index 95b97acc2b..a96fde8fa1 100644 --- a/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.h +++ b/src/mca/ptl/tcp/src/ptl_tcp_sendfrag.h @@ -95,8 +95,10 @@ static inline void mca_ptl_tcp_send_frag_progress(mca_ptl_tcp_send_frag_t* frag) /* the first fragment is allocated with the request, * all others need to be returned to free list */ - if(frag->frag_send.frag_base.frag_header.hdr_frag.hdr_frag_offset != 0) + if(request->req_cached == false || + frag->frag_send.frag_base.frag_header.hdr_frag.hdr_frag_offset != 0) { mca_ptl_tcp_send_frag_return(frag->frag_send.frag_base.frag_owner, frag); + } } } }