01e8fc5f91
Move the req_mtl structure back to the end of each of the structures in the CM PML. The req_mtl structure is cast into a mtl_*_request_structure for each MTL, which is larger than the req_mtl itself. The cast will cause the *_request to overwrite parts of the heavy requests if the req_mtl isn't the *LAST* thing on each structure (hence the comment). This was moved as an optimization at some point, which caused buffer sends to fail... Refs trac:669 This commit was SVN r12873. The following SVN revision numbers were found above: r12871 --> open-mpi/ompi@597598b712 The following Trac tickets were found above: Ticket 669 --> https://svn.open-mpi.org/trac/ompi/ticket/669
74 строки
1.8 KiB
C
74 строки
1.8 KiB
C
/*
|
|
* Copyright (c) 2004-2006 The Regents of the University of California.
|
|
* All rights reserved.
|
|
* Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "ompi_config.h"
|
|
|
|
#include "ompi/request/request.h"
|
|
#include "ompi/mca/pml/base/pml_base_request.h"
|
|
|
|
#include "pml_cm.h"
|
|
#include "pml_cm_sendreq.h"
|
|
#include "pml_cm_recvreq.h"
|
|
|
|
int
|
|
mca_pml_cm_cancel(struct ompi_request_t *ompi_req, int flag)
|
|
{
|
|
int ret;
|
|
mca_pml_cm_request_t *base_request =
|
|
(mca_pml_cm_request_t*) ompi_req;
|
|
mca_mtl_request_t *mtl_req = NULL;
|
|
|
|
switch (base_request->req_pml_type) {
|
|
case MCA_PML_CM_REQUEST_SEND_HEAVY:
|
|
{
|
|
mca_pml_cm_hvy_send_request_t *request =
|
|
(mca_pml_cm_hvy_send_request_t*) base_request;
|
|
mtl_req = &request->req_mtl;
|
|
}
|
|
break;
|
|
|
|
case MCA_PML_CM_REQUEST_SEND_THIN:
|
|
{
|
|
mca_pml_cm_thin_send_request_t *request =
|
|
(mca_pml_cm_thin_send_request_t*) base_request;
|
|
mtl_req = &request->req_mtl;
|
|
}
|
|
break;
|
|
|
|
case MCA_PML_CM_REQUEST_RECV_HEAVY:
|
|
{
|
|
mca_pml_cm_hvy_recv_request_t *request =
|
|
(mca_pml_cm_hvy_recv_request_t*) base_request;
|
|
mtl_req = &request->req_mtl;
|
|
}
|
|
break;
|
|
|
|
case MCA_PML_CM_REQUEST_RECV_THIN:
|
|
{
|
|
mca_pml_cm_thin_recv_request_t *request =
|
|
(mca_pml_cm_thin_recv_request_t*) base_request;
|
|
mtl_req = &request->req_mtl;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
abort();
|
|
|
|
ret = OMPI_ERROR;
|
|
}
|
|
|
|
ret = OMPI_MTL_CALL(cancel(ompi_mtl,
|
|
mtl_req,
|
|
flag));
|
|
|
|
return ret;
|
|
}
|