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

* Revert r18067

Просмотр исходного кода 
* Add specific comments about why we're not setting MPI_ERROR here

This commit was SVN r18616.

The following SVN revision numbers were found above:
  r18067 --> open-mpi/ompi@58e31d767e
Этот коммит содержится в:
Jeff Squyres 2008-06-07 02:44:10 +00:00
родитель caac0e0182
Коммит c087b4cd4f
2 изменённых файлов: 12 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
ompi/request/req_test.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -58,7 +58,8 @@ int ompi_request_default_test( ompi_request_t ** rptr,
status->MPI_ERROR = old_error; status->MPI_ERROR = old_error;
} }
} else if (MPI_STATUS_IGNORE != status) { } else if (MPI_STATUS_IGNORE != status) {
/* See MPI-1.2, sec 3.2.5, p.22 */ /* Do *NOT* set a new value for status->MPI_ERROR here!
See MPI-1.1 doc, sec 3.2.5, p.22 */
int old_error = status->MPI_ERROR; int old_error = status->MPI_ERROR;
*status = request->req_status; *status = request->req_status;
status->MPI_ERROR = old_error; status->MPI_ERROR = old_error;
@ -125,13 +126,15 @@ int ompi_request_default_test_any(
if (OMPI_REQUEST_GEN == request->req_type) { if (OMPI_REQUEST_GEN == request->req_type) {
ompi_grequest_invoke_query(request, &request->req_status); ompi_grequest_invoke_query(request, &request->req_status);
if (MPI_STATUS_IGNORE != status) { if (MPI_STATUS_IGNORE != status) {
/* See MPI-1.2, sec 3.2.5, p.22 */ /* Do *NOT* set a new value for status->MPI_ERROR
here! See MPI-1.1 doc, sec 3.2.5, p.22 */
int old_error = status->MPI_ERROR; int old_error = status->MPI_ERROR;
*status = request->req_status; *status = request->req_status;
status->MPI_ERROR = old_error; status->MPI_ERROR = old_error;
} }
} else if (MPI_STATUS_IGNORE != status) { } else if (MPI_STATUS_IGNORE != status) {
/* See MPI-1.2, sec 3.2.5, p.22 */ /* Do *NOT* set a new value for status->MPI_ERROR
here! See MPI-1.1 doc, sec 3.2.5, p.22 */
int old_error = status->MPI_ERROR; int old_error = status->MPI_ERROR;
*status = request->req_status; *status = request->req_status;
status->MPI_ERROR = old_error; status->MPI_ERROR = old_error;

9
ompi/request/req_wait.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -47,10 +47,10 @@ int ompi_request_default_wait(
ompi_grequest_invoke_query(req, &req->req_status); ompi_grequest_invoke_query(req, &req->req_status);
} }
if( MPI_STATUS_IGNORE != status ) { if( MPI_STATUS_IGNORE != status ) {
/* See MPI-1.2, sec 3.2.5, p.22 */ /* Do *NOT* set status->MPI_ERROR here! See MPI-1.1 doc, sec
3.2.5, p.22 */
status->MPI_TAG = req->req_status.MPI_TAG; status->MPI_TAG = req->req_status.MPI_TAG;
status->MPI_SOURCE = req->req_status.MPI_SOURCE; status->MPI_SOURCE = req->req_status.MPI_SOURCE;
status->MPI_ERROR = req->req_status.MPI_ERROR;
status->_count = req->req_status._count; status->_count = req->req_status._count;
status->_cancelled = req->req_status._cancelled; status->_cancelled = req->req_status._cancelled;
} }
@ -174,7 +174,8 @@ finished:
rc = ompi_grequest_invoke_query(request, &request->req_status); rc = ompi_grequest_invoke_query(request, &request->req_status);
} }
if (MPI_STATUS_IGNORE != status) { if (MPI_STATUS_IGNORE != status) {
/* See MPI-1.2, sec 3.2.5, p.22 */ /* Do *NOT* set status->MPI_ERROR here! See MPI-1.1 doc,
sec 3.2.5, p.22 */
int old_error = status->MPI_ERROR; int old_error = status->MPI_ERROR;
*status = request->req_status; *status = request->req_status;
status->MPI_ERROR = old_error; status->MPI_ERROR = old_error;