From 5e75cb2495bcb6d1446bfa7e70d6a2c3f72cfc6b Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Thu, 28 Jul 2005 19:28:04 +0000 Subject: [PATCH] * properly set unlink thresholds - START/END combined are 1 event This commit was SVN r6662. --- ompi/mca/btl/portals/src/btl_portals.c | 2 +- ompi/mca/btl/portals/src/btl_portals_send.c | 7 ------- ompi/mca/btl/portals/src/btl_portals_send.h | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ompi/mca/btl/portals/src/btl_portals.c b/ompi/mca/btl/portals/src/btl_portals.c index 7c7e6c9bb5..5df782ee62 100644 --- a/ompi/mca/btl/portals/src/btl_portals.c +++ b/ompi/mca/btl/portals/src/btl_portals.c @@ -410,7 +410,7 @@ mca_btl_portals_prepare_dst(struct mca_btl_base_module_t* btl_base, later :) */ md.start = frag->segment.seg_addr.pval; md.length = frag->segment.seg_len; - md.threshold = 2; /* unlink after START / END */ + md.threshold = 1; /* unlink after START / END */ md.max_size = 0; md.options = PTL_MD_OP_PUT | PTL_MD_OP_GET; md.user_ptr = frag; /* keep a pointer to ourselves */ diff --git a/ompi/mca/btl/portals/src/btl_portals_send.c b/ompi/mca/btl/portals/src/btl_portals_send.c index b5f02647b4..ec87f9c6c8 100644 --- a/ompi/mca/btl/portals/src/btl_portals_send.c +++ b/ompi/mca/btl/portals/src/btl_portals_send.c @@ -38,8 +38,6 @@ mca_btl_portals_process_send(mca_btl_portals_module_t *btl, "send: PTL_EVENT_SEND_START for 0x%x", frag)); - opal_output_verbose(10, mca_btl_portals_component.portals_output, - "start threshold: %d", ev->md.threshold); if (ev->ni_fail_type != PTL_NI_OK) { opal_output(mca_btl_portals_component.portals_output, "Failure to start send event\n"); @@ -55,8 +53,6 @@ mca_btl_portals_process_send(mca_btl_portals_module_t *btl, OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "send: PTL_EVENT_SEND_END for 0x%x", frag)); - opal_output_verbose(10, mca_btl_portals_component.portals_output, - "end threshold: %d", ev->md.threshold); if (ev->ni_fail_type != PTL_NI_OK) { opal_output(mca_btl_portals_component.portals_output, @@ -105,9 +101,6 @@ mca_btl_portals_process_send(mca_btl_portals_module_t *btl, &frag->base, OMPI_SUCCESS); - opal_output_verbose(10, mca_btl_portals_component.portals_output, - "ack threshold: %d", ev->md.threshold); - /* see if we can send someone else */ mca_btl_portals_progress_queued_sends(btl); } diff --git a/ompi/mca/btl/portals/src/btl_portals_send.h b/ompi/mca/btl/portals/src/btl_portals_send.h index 57a10675e3..396ece7190 100644 --- a/ompi/mca/btl/portals/src/btl_portals_send.h +++ b/ompi/mca/btl/portals/src/btl_portals_send.h @@ -33,7 +33,7 @@ mca_btl_portals_send_frag(mca_btl_portals_frag_t *frag) /* setup the send */ md.start = frag->segment.seg_addr.pval; md.length = frag->segment.seg_len; - md.threshold = 3; /* unlink after start, end, ack */ + md.threshold = 2; /* unlink after start, end, ack */ md.max_size = 0; md.options = 0; /* BWB - can we optimize? */ md.user_ptr = frag; /* keep a pointer to ourselves */