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

Adapt to the new datatype engine and correct some minor bugs.

Просмотр исходного кода 
This commit was SVN r2753.
Этот коммит содержится в:
George Bosilca 2004-09-19 07:05:58 +00:00
родитель 3482ab96d6
Коммит eb5e5191fa
3 изменённых файлов: 91 добавлений и 82 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

84
src/mpi/c/pack.c
Просмотреть файл

@ -1,3 +1,5 @@
/* -*- Mode: C; c-basic-offset:4 ; -*- */
/* /*
* $HEADERS$ * $HEADERS$
*/ */
@ -25,51 +27,55 @@ static const char FUNC_NAME[] = "MPI_Pack";
int MPI_Pack(void *inbuf, int incount, MPI_Datatype datatype, int MPI_Pack(void *inbuf, int incount, MPI_Datatype datatype,
void *outbuf, int outsize, int *position, MPI_Comm comm) void *outbuf, int outsize, int *position, MPI_Comm comm)
{ {
int size, rc; int size, rc, freeAfter;
ompi_convertor_t *local_convertor; ompi_convertor_t *local_convertor;
struct iovec invec; struct iovec invec;
unsigned int max_data, iov_count;
if (MPI_PARAM_CHECK) { if (MPI_PARAM_CHECK) {
OMPI_ERR_INIT_FINALIZE(FUNC_NAME); OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
if (MPI_COMM_NULL == comm) { if (MPI_COMM_NULL == comm) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_COMM, FUNC_NAME); return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_COMM, FUNC_NAME);
} else if ((NULL == inbuf) || (NULL == outbuf) || (NULL == position)) { } else if ((NULL == inbuf) || (NULL == outbuf) || (NULL == position)) {
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_ARG, FUNC_NAME); return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_ARG, FUNC_NAME);
} else if (incount < 0) { } else if (incount < 0) {
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_COUNT, FUNC_NAME); return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_COUNT, FUNC_NAME);
} else if (outsize < 0) { } else if (outsize < 0) {
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_ARG, FUNC_NAME); return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_ARG, FUNC_NAME);
} else if (MPI_DATATYPE_NULL == datatype) { } else if (MPI_DATATYPE_NULL == datatype) {
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_TYPE, FUNC_NAME); return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_TYPE, FUNC_NAME);
}
} }
}
local_convertor = OBJ_NEW(ompi_convertor_t); local_convertor = OBJ_NEW(ompi_convertor_t);
ompi_convertor_init_for_send(local_convertor, 0, datatype, incount, ompi_convertor_init_for_send(local_convertor, 0, datatype, incount,
inbuf, *position); inbuf, 0, NULL /*never allocate memory*/);
/* Check for truncation */ /* Check for truncation */
ompi_convertor_get_packed_size(local_convertor, &size); ompi_convertor_get_packed_size(local_convertor, &size);
if (*position + size > outsize) { if (*position + size > outsize) {
OBJ_RELEASE(local_convertor);
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_TRUNCATE, FUNC_NAME);
}
/* Prepare the iovec with all informations */
invec.iov_base = (char*) outbuf + (*position);
invec.iov_len = outsize - (*position);
/* Do the actual packing */
rc = ompi_convertor_pack(local_convertor, &invec, 1);
*position += local_convertor->bConverted;
OBJ_RELEASE(local_convertor); OBJ_RELEASE(local_convertor);
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_TRUNCATE, FUNC_NAME);
}
/* All done. Note that the convertor returns 1 upon success, not /* Prepare the iovec with all informations */
OMPI_SUCCESS. */
invec.iov_base = (char*) outbuf + (*position);
invec.iov_len = outsize - (*position);
/* Do the actual packing */
iov_count = 1;
max_data = invec.iov_len;
rc = ompi_convertor_pack( local_convertor, &invec, &iov_count,
&max_data, &freeAfter );
*position += local_convertor->bConverted;
OBJ_RELEASE(local_convertor);
/* All done. Note that the convertor returns 1 upon success, not
OMPI_SUCCESS. */
OMPI_ERRHANDLER_RETURN((rc == 1) ? OMPI_SUCCESS : OMPI_ERROR, OMPI_ERRHANDLER_RETURN((rc == 1) ? OMPI_SUCCESS : OMPI_ERROR,
comm, MPI_ERR_UNKNOWN, FUNC_NAME); comm, MPI_ERR_UNKNOWN, FUNC_NAME);
} }

4
src/mpi/c/pack_size.c
Просмотреть файл

@ -40,8 +40,8 @@ int MPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm,
} }
local_convertor = OBJ_NEW(ompi_convertor_t); local_convertor = OBJ_NEW(ompi_convertor_t);
ompi_convertor_init_for_send(local_convertor, 0, datatype, ompi_convertor_init_for_send(local_convertor, 0, datatype, incount,
incount, NULL, 0); NULL, 0, NULL /* never allocate memory */);
ret = ompi_convertor_get_packed_size(local_convertor, size); ret = ompi_convertor_get_packed_size(local_convertor, size);
OBJ_RELEASE(local_convertor); OBJ_RELEASE(local_convertor);

85
src/mpi/c/unpack.c
Просмотреть файл

@ -26,56 +26,59 @@ int MPI_Unpack(void *inbuf, int insize, int *position,
void *outbuf, int outcount, MPI_Datatype datatype, void *outbuf, int outcount, MPI_Datatype datatype,
MPI_Comm comm) MPI_Comm comm)
{ {
int size, rc; int size, rc, freeAfter;
ompi_convertor_t *local_convertor; ompi_convertor_t *local_convertor;
struct iovec outvec; struct iovec outvec;
unsigned int max_data, iov_count;
if (MPI_PARAM_CHECK) { if (MPI_PARAM_CHECK) {
OMPI_ERR_INIT_FINALIZE(FUNC_NAME); OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
if (ompi_comm_invalid(comm)) { if (ompi_comm_invalid(comm)) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_COMM, return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_COMM,
FUNC_NAME); FUNC_NAME);
} }
if ((NULL == inbuf) || (NULL == outbuf) || (NULL == position)) { if ((NULL == inbuf) || (NULL == outbuf) || (NULL == position)) {
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_ARG, FUNC_NAME); return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_ARG, FUNC_NAME);
} }
if (outcount < 0) { if (outcount < 0) {
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_COUNT, FUNC_NAME); return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_COUNT, FUNC_NAME);
}
if (MPI_DATATYPE_NULL == datatype) {
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_TYPE, FUNC_NAME);
}
} }
local_convertor = OBJ_NEW(ompi_convertor_t); if (MPI_DATATYPE_NULL == datatype) {
ompi_convertor_init_for_recv(local_convertor, 0, datatype, outcount, return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_TYPE, FUNC_NAME);
outbuf, 0);
/* Check for truncation */
ompi_convertor_get_packed_size(local_convertor, &size);
if (*position + size > insize) {
OBJ_RELEASE(local_convertor);
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_TRUNCATE, FUNC_NAME);
} }
}
/* Prepare the iovec with all informations */ local_convertor = OBJ_NEW(ompi_convertor_t);
ompi_convertor_init_for_recv(local_convertor, 0, datatype, outcount,
outbuf, 0, NULL /* never allocate memory */);
/* Check for truncation */
outvec.iov_base = (char*) inbuf + (*position); ompi_convertor_get_packed_size(local_convertor, &size);
outvec.iov_len = insize - (*position); if (*position + size > insize) {
/* Do the actual unpacking */
rc = ompi_convertor_unpack(local_convertor, &outvec, 1);
*position += local_convertor->bConverted;
OBJ_RELEASE(local_convertor); OBJ_RELEASE(local_convertor);
return OMPI_ERRHANDLER_INVOKE(comm, MPI_ERR_TRUNCATE, FUNC_NAME);
}
/* All done. Note that the convertor returns 1 upon success, not /* Prepare the iovec with all informations */
OMPI_SUCCESS. */
OMPI_ERRHANDLER_RETURN((rc == 1) ? OMPI_SUCCESS : OMPI_ERROR, outvec.iov_base = (char*) inbuf + (*position);
comm, MPI_ERR_UNKNOWN, FUNC_NAME); outvec.iov_len = insize - (*position);
/* Do the actual unpacking */
iov_count = 1;
max_data = outvec.iov_len;
rc = ompi_convertor_unpack( local_convertor, &outvec, &iov_count,
&max_data, &freeAfter );
*position += local_convertor->bConverted;
OBJ_RELEASE(local_convertor);
/* All done. Note that the convertor returns 1 upon success, not
OMPI_SUCCESS. */
OMPI_ERRHANDLER_RETURN((rc == 1) ? OMPI_SUCCESS : OMPI_ERROR,
comm, MPI_ERR_UNKNOWN, FUNC_NAME);
} }