diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be carefull with the interaction of int with size_t

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@417 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
stasinos 2002-03-13 09:01:39 +00:00
parent 5253df47dc
commit 2913aeb54c
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
library/mpi/mpi.c
View File

@ -9,14 +9,14 @@
************************************************************************** **************************************************************************
* * * *
* File: mpi.c * * File: mpi.c *
* Last rev: $Date: 2002-03-12 20:03:55 $ * * Last rev: $Date: 2002-03-13 09:01:39 $ *
* mods: * * mods: *
* comments: Interface to an MPI library * * comments: Interface to an MPI library *
* * * *
*************************************************************************/ *************************************************************************/
#ifndef lint #ifndef lint
static char *rcsid = "$Header: /Users/vitor/Yap/yap-cvsbackup/library/mpi/mpi.c,v 1.6 2002-03-12 20:03:55 stasinos Exp $"; static char *rcsid = "$Header: /Users/vitor/Yap/yap-cvsbackup/library/mpi/mpi.c,v 1.7 2002-03-13 09:01:39 stasinos Exp $";
#endif #endif
#include "Yap.h" #include "Yap.h"
@ -56,9 +56,9 @@ static char **mpi_argv;
#define RECV_BUF_SIZE 4*1024 #define RECV_BUF_SIZE 4*1024
static size_t bufsize; static size_t bufsize, bufstrlen;
static char *buf; static char *buf;
static int bufptr, bufstrlen; static int bufptr;
static void static void
expand_buffer( int space ) expand_buffer( int space )
@ -70,6 +70,10 @@ expand_buffer( int space )
char *tmp; char *tmp;
#if 0
printf( "expanding by %d...", space );
#endif
tmp = malloc( bufsize + space ); tmp = malloc( bufsize + space );
if( tmp == NULL ) { if( tmp == NULL ) {
Error(SYSTEM_ERROR, TermNil, "out of memory" ); Error(SYSTEM_ERROR, TermNil, "out of memory" );
@ -89,6 +93,7 @@ expand_buffer( int space )
bufsize += space; bufsize += space;
#if 0 #if 0
printf("SUCCESS\n");
printf( "New bufsize: %d\n", bufsize ); printf( "New bufsize: %d\n", bufsize );
#endif #endif
} }
@ -408,22 +413,32 @@ p_mpi_bcast3() /* mpi_bcast( ?data, +root, +max_size ) */
#if 0 #if 0
if( (rank == root) && (max_size < bufstrlen) ) if( (rank == root) && (max_size < bufstrlen) )
/* issue a warning? explode? bcast s'thing unparsable? */ /* issue a warning? explode? bcast s'thing unparsable? */
printf( "MAYDAY: max_size == %d, bufstrlen == %d\n", max_size, bufstrlen );
return FALSE;
}
#endif #endif
printf( "%d: About to Bcast(): max_size == %d, bufstrlen == %d\n",
rank, max_size, bufstrlen );
/* adjust the buffer size, if necessary */ /* adjust the buffer size, if necessary */
if( max_size > bufsize ) { if( max_size > bufsize ) {
printf("expanding by %d\n", max_size-bufsize);
expand_buffer( max_size - bufsize ); expand_buffer( max_size - bufsize );
} }
retv = MPI_Bcast( buf, max_size, MPI_CHAR, root, MPI_COMM_WORLD ); retv = MPI_Bcast( buf, max_size, MPI_CHAR, root, MPI_COMM_WORLD );
if( retv != 0 ) return FALSE; if( retv != MPI_SUCCESS ) {
printf( "OOOPS! MPI_Bcast() returned %d.\n", retv );
return FALSE;
}
printf( "%d: I'm just after Bcast()ing. strlen(buf) == %d\n",
rank, strlen(buf) );
if( root == rank ) return TRUE; if( root == rank ) return TRUE;
else { else {
/* ARG1 must be unbound so that it can receive data */ /* ARG1 must be unbound so that it can receive data */
if( !IsVarTerm(t_data) ) { if( !IsVarTerm(t_data) ) {
Error(INSTANTIATION_ERROR, t_root, "mpi_bcast"); Error(INSTANTIATION_ERROR, t_data, "mpi_bcast");
return FALSE; return FALSE;
} }
@ -475,13 +490,9 @@ p_mpi_bcast2() /* mpi_bcast( ?data, +root ) */
retv = MPI_Bcast( &bufstrlen, sizeof bufstrlen, MPI_INT, root, MPI_COMM_WORLD ); retv = MPI_Bcast( &bufstrlen, sizeof bufstrlen, MPI_INT, root, MPI_COMM_WORLD );
if( retv != 0 ) return FALSE; if( retv != 0 ) return FALSE;
#if 1
printf("I am %d and I think the data is %d bytes long!\n", rank, bufstrlen);
#endif
/* adjust the buffer size, if necessary */ /* adjust the buffer size, if necessary */
if( bufstrlen-bufsize > 0 ) { if( bufstrlen > bufsize ) {
printf("expanding by %d\n", bufstrlen-bufsize); printf("expanding by %d\n", (bufstrlen-bufsize) );
expand_buffer( bufstrlen - bufsize ); expand_buffer( bufstrlen - bufsize );
} }
@ -493,7 +504,7 @@ p_mpi_bcast2() /* mpi_bcast( ?data, +root ) */
else { else {
/* ARG1 must be unbound so that it can receive data */ /* ARG1 must be unbound so that it can receive data */
if( !IsVarTerm(t_data) ) { if( !IsVarTerm(t_data) ) {
Error(INSTANTIATION_ERROR, t_root, "mpi_bcast"); Error(INSTANTIATION_ERROR, t_data, "mpi_bcast");
return FALSE; return FALSE;
} }