1
1

Revert two files. Wrong changes were made due to a failed update.

This commit was SVN r27509.
Этот коммит содержится в:
Shiqing Fan 2012-10-27 02:57:22 +00:00
родитель 12c3c743de
Коммит 79e4a8ca38
2 изменённых файлов: 24 добавлений и 5 удалений

Просмотреть файл

@ -10,6 +10,9 @@
* 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 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -60,12 +63,17 @@ int MPI_Testall(int count, MPI_Request requests[], int *flag,
} }
} }
} }
if ((NULL == flag) || (0 > count)) { if ((NULL == flag) || (count < 0)) {
rc = MPI_ERR_ARG; rc = MPI_ERR_ARG;
} }
OMPI_ERRHANDLER_CHECK(rc, MPI_COMM_WORLD, rc, FUNC_NAME); OMPI_ERRHANDLER_CHECK(rc, MPI_COMM_WORLD, rc, FUNC_NAME);
} }
if (OPAL_UNLIKELY(0 == count)) {
*flag = true;
return MPI_SUCCESS;
}
OPAL_CR_ENTER_LIBRARY(); OPAL_CR_ENTER_LIBRARY();
if (OMPI_SUCCESS == ompi_request_test_all(count, requests, flag, if (OMPI_SUCCESS == ompi_request_test_all(count, requests, flag,

Просмотреть файл

@ -9,7 +9,10 @@
* 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-2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -37,7 +40,7 @@
static const char FUNC_NAME[] = "MPI_Testany"; static const char FUNC_NAME[] = "MPI_Testany";
int MPI_Testany(int count, MPI_Request requests[], int *index, int *completed, MPI_Status *status) int MPI_Testany(int count, MPI_Request requests[], int *indx, int *completed, MPI_Status *status)
{ {
MEMCHECKER( MEMCHECKER(
int j; int j;
@ -59,16 +62,24 @@ int MPI_Testany(int count, MPI_Request requests[], int *index, int *completed, M
} }
} }
} }
if ((NULL == index) || (NULL == completed) || (0 > count)) { if (((NULL == indx || NULL == completed) && count > 0) ||
count < 0) {
rc = MPI_ERR_ARG; rc = MPI_ERR_ARG;
} }
OMPI_ERRHANDLER_CHECK(rc, MPI_COMM_WORLD, rc, FUNC_NAME); OMPI_ERRHANDLER_CHECK(rc, MPI_COMM_WORLD, rc, FUNC_NAME);
} }
if (OPAL_UNLIKELY(0 == count)) {
*completed = true;
*indx = MPI_UNDEFINED;
*status = ompi_status_empty;
return MPI_SUCCESS;
}
OPAL_CR_ENTER_LIBRARY(); OPAL_CR_ENTER_LIBRARY();
if (OMPI_SUCCESS == ompi_request_test_any(count, requests, if (OMPI_SUCCESS == ompi_request_test_any(count, requests,
index, completed, status)) { indx, completed, status)) {
OPAL_CR_EXIT_LIBRARY(); OPAL_CR_EXIT_LIBRARY();
return MPI_SUCCESS; return MPI_SUCCESS;
} }