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

more code cleanup:

Просмотр исходного кода 
* change all the opal_output_verbose calls in the critical path to
    OPAL_OUTPUT_VERBOSE so that they are pre-processed out if debugging
    is not enabled
  * remove stub code

This commit was SVN r6564.
Этот коммит содержится в:
Brian Barrett 2005-07-20 15:02:56 +00:00
родитель 3ac83138c2
Коммит db4d993228
8 изменённых файлов: 64 добавлений и 90 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
ompi/mca/btl/portals/Makefile.am
Просмотреть файл

@ -48,7 +48,6 @@ portals_SOURCES = \
src/btl_portals_send.c \
src/btl_portals_recv.c \
src/btl_portals_rdma.c \
src/btl_portals_stubs.c \
src/btl_portals_endpoint.c
portals_nodist_SOURCES = \

16
ompi/mca/btl/portals/src/btl_portals.c
Просмотреть файл

@ -335,6 +335,22 @@ mca_btl_portals_prepare_src(struct mca_btl_base_module_t* btl,
}
mca_btl_base_descriptor_t*
mca_btl_portals_prepare_dst(struct mca_btl_base_module_t* btl_base,
struct mca_btl_base_endpoint_t* peer,
mca_mpool_base_registration_t* registration,
struct ompi_convertor_t* convertor,
size_t reserve,
size_t* size)
{
/* BWB - FIXME - Implement prepare_dst */
opal_output(mca_btl_portals_component.portals_output,
"Warning: call to unimplemented function prepare_dst");
return NULL;
}
int
mca_btl_portals_finalize(struct mca_btl_base_module_t *btl_base)
{

2
ompi/mca/btl/portals/src/btl_portals_component.c
Просмотреть файл

@ -369,7 +369,7 @@ mca_btl_portals_component_progress(void)
continue;
} else if (PTL_EQ_DROPPED == ret) {
opal_output_verbose(10, mca_btl_portals_component.portals_output,
"*** Event queue entries were dropped");
"*** Event queue entries were dropped ***");
}
switch (which) {

22
ompi/mca/btl/portals/src/btl_portals_rdma.c
Просмотреть файл

@ -29,3 +29,25 @@ mca_btl_portals_process_rdma(mca_btl_portals_module_t *module,
{
return OMPI_SUCCESS;
}
int
mca_btl_portals_put(struct mca_btl_base_module_t* btl_base,
struct mca_btl_base_endpoint_t* btl_peer,
struct mca_btl_base_descriptor_t* decriptor)
{
opal_output(mca_btl_portals_component.portals_output,
"Warning: call to unimplemented function put()");
return OMPI_ERR_NOT_IMPLEMENTED;
}
int
mca_btl_portals_get(struct mca_btl_base_module_t* btl_base,
struct mca_btl_base_endpoint_t* btl_peer,
struct mca_btl_base_descriptor_t* decriptor)
{
opal_output(mca_btl_portals_component.portals_output,
"Warning: call to unimplemented function get()");
return OMPI_ERR_NOT_IMPLEMENTED;
}

16
ompi/mca/btl/portals/src/btl_portals_recv.c
Просмотреть файл

@ -169,9 +169,9 @@ mca_btl_portals_process_recv(mca_btl_portals_module_t *btl,
switch (ev->type) {
case PTL_EVENT_PUT_START:
opal_output_verbose(90, mca_btl_portals_component.portals_output,
"recv: PTL_EVENT_PUT_START for tag %d, link %d",
tag, (int) ev->link);
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"recv: PTL_EVENT_PUT_START for tag %d, link %d",
tag, (int) ev->link));
if (ev->ni_fail_type != PTL_NI_OK) {
opal_output(mca_btl_portals_component.portals_output,
@ -181,9 +181,9 @@ mca_btl_portals_process_recv(mca_btl_portals_module_t *btl,
}
break;
case PTL_EVENT_PUT_END:
opal_output_verbose(90, mca_btl_portals_component.portals_output,
"recv: PTL_EVENT_PUT_END for tag %d, link %d",
tag, (int) ev->link);
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"recv: PTL_EVENT_PUT_END for tag %d, link %d",
tag, (int) ev->link));
if (ev->ni_fail_type != PTL_NI_OK) {
opal_output(mca_btl_portals_component.portals_output,
@ -193,8 +193,8 @@ mca_btl_portals_process_recv(mca_btl_portals_module_t *btl,
}
/* ok, we've got data */
opal_output_verbose(95, mca_btl_portals_component.portals_output,
"received data for tag %d\n", tag);
OPAL_OUTPUT_VERBOSE((95, mca_btl_portals_component.portals_output,
"received data for tag %d\n", tag));
/* it's a user, so we have to manually setup the segment */
MCA_BTL_PORTALS_FRAG_ALLOC_USER(btl, frag, ret);

28
ompi/mca/btl/portals/src/btl_portals_send.c
Просмотреть файл

@ -32,9 +32,9 @@ mca_btl_portals_process_send(mca_btl_portals_module_t *btl,
switch (ev->type) {
case PTL_EVENT_SEND_START:
opal_output_verbose(90, mca_btl_portals_component.portals_output,
"send: PTL_EVENT_SEND_START for 0x%x",
frag);
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"send: PTL_EVENT_SEND_START for 0x%x",
frag));
if (ev->ni_fail_type != PTL_NI_OK) {
opal_output(mca_btl_portals_component.portals_output,
@ -46,9 +46,9 @@ mca_btl_portals_process_send(mca_btl_portals_module_t *btl,
}
break;
case PTL_EVENT_SEND_END:
opal_output_verbose(90, mca_btl_portals_component.portals_output,
"send: PTL_EVENT_SEND_END for 0x%x",
frag);
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"send: PTL_EVENT_SEND_END for 0x%x",
frag));
if (ev->ni_fail_type != PTL_NI_OK) {
opal_output(mca_btl_portals_component.portals_output,
@ -64,9 +64,9 @@ mca_btl_portals_process_send(mca_btl_portals_module_t *btl,
on the other side. If mlength == 0, that means that we hit
the reject md and we need to try to retransmit */
opal_output_verbose(90, mca_btl_portals_component.portals_output,
"send: PTL_EVENT_ACK for 0x%x, Ox%x",
frag, frag->base.des_cbfunc);
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"send: PTL_EVENT_ACK for 0x%x, Ox%x",
frag, frag->base.des_cbfunc));
if (ev->ni_fail_type != PTL_NI_OK) {
opal_output(mca_btl_portals_component.portals_output,
"Failure to end send event\n");
@ -102,9 +102,9 @@ mca_btl_portals_process_send(mca_btl_portals_module_t *btl,
}
break;
default:
opal_output_verbose(90, mca_btl_portals_component.portals_output,
"send: unexpected event %d for 0x%x",
ev->type, frag);
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"send: unexpected event %d for 0x%x",
ev->type, frag));
break;
}
@ -133,9 +133,9 @@ mca_btl_portals_send(struct mca_btl_base_module_t* btl_base,
num_sends = OPAL_THREAD_ADD32(&btl->portals_outstanding_sends, 1);
/* BWB - implement check for too many pending messages */
opal_output_verbose(90, mca_btl_portals_component.portals_output,
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"send called for frag 0x%x, 0x%x",
frag, frag->base.des_cbfunc);
frag, frag->base.des_cbfunc));
if (num_sends >= btl->portals_max_outstanding_sends) {
opal_output(mca_btl_portals_component.portals_output,

6
ompi/mca/btl/portals/src/btl_portals_send.h
Просмотреть файл

@ -77,9 +77,9 @@ mca_btl_portals_progress_queued_sends(struct mca_btl_portals_module_t *btl)
btl->portals_max_outstanding_sends)) {
mca_btl_portals_frag_t *frag = (mca_btl_portals_frag_t*)
opal_list_remove_first(&(btl->portals_queued_sends));
opal_output_verbose(90, mca_btl_portals_component.portals_output,
"retransmit for frag 0x%x, 0x%x",
frag, frag->base.des_cbfunc);
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"retransmit for frag 0x%x, 0x%x",
frag, frag->base.des_cbfunc));
return mca_btl_portals_send(&btl->super,
frag->u.send_frag.endpoint,
&(frag->base),

63
ompi/mca/btl/portals/src/btl_portals_stubs.c
Просмотреть файл

@ -1,63 +0,0 @@
/*
* Copyright (c) 2004-2005 The Trustees of Indiana University.
* All rights reserved.
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
* All rights reserved.
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
*
* $HEADER$
*/
#include "ompi_config.h"
#include "btl_portals.h"
/* BWB - README - BWB - README - BWB - README - BWB - README - BWB
*
* These are stub functions that return error so that the
* initialization code can be developed and the whole thing will
* link. This file will disappear once all functions are
* implemented. Do not implement any functions in this file.
*
* BWB - README - BWB - README - BWB - README - BWB - README - BWB */
mca_btl_base_descriptor_t*
mca_btl_portals_prepare_dst(struct mca_btl_base_module_t* btl_base,
struct mca_btl_base_endpoint_t* peer,
mca_mpool_base_registration_t* registration,
struct ompi_convertor_t* convertor,
size_t reserve,
size_t* size)
{
printf("btl prepare dst\n");
return NULL;
}
int
mca_btl_portals_put(struct mca_btl_base_module_t* btl_base,
struct mca_btl_base_endpoint_t* btl_peer,
struct mca_btl_base_descriptor_t* decriptor)
{
printf("btl put\n");
return OMPI_ERR_NOT_IMPLEMENTED;
}
int
mca_btl_portals_get(struct mca_btl_base_module_t* btl_base,
struct mca_btl_base_endpoint_t* btl_peer,
struct mca_btl_base_descriptor_t* decriptor)
{
printf("btl get\n");
return OMPI_ERR_NOT_IMPLEMENTED;
}