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

moved several global variables to misc/GLOBALS

Browse Source
This commit is contained in:
Joao
2011-05-25 16:40:36 +01:00
parent 8170f6d3cb
commit 971ad94311
63 changed files with 1724 additions and 1329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/dialect/swi/fli/swi.c
View File

@@ -2741,9 +2741,9 @@ PL_query(int query)
{
switch(query) {
case PL_QUERY_ARGC:
return (intptr_t)Yap_argc;
return (intptr_t)GLOBAL_argc;
case PL_QUERY_ARGV:
return (intptr_t)Yap_argv;
return (intptr_t)GLOBAL_argv;
case PL_QUERY_USER_CPU:
return (intptr_t)Yap_cputime();
case PL_QUERY_VERSION:

11
library/lammpi/yap_mpi.c
View File

@@ -75,8 +75,7 @@ typedef struct broadcast_req BroadcastRequest;
* Auxiliary data
********************************************************************/
static int mpi_status;
extern char **Yap_argv;
extern int Yap_argc;
extern int GLOBAL_argc;
#define HASHSIZE 1777
static hashtable requests=NULL;
@@ -261,8 +260,8 @@ static int mpi_error(int errcode){
static int
mpi_init(void){
int thread_level;
// MPI_Init(&Yap_argc, &Yap_argv);
MPI_Init_thread(&Yap_argc, &Yap_argv,MPI_THREAD_SINGLE,&thread_level);
// MPI_Init(&GLOBAL_argc, &GLOBAL_argv);
MPI_Init_thread(&GLOBAL_argc, &GLOBAL_argv,MPI_THREAD_SINGLE,&thread_level);
#ifdef DEBUG
write_msg(__FUNCTION__,__FILE__,__LINE__,"Thread level: %d\n",thread_level);
#endif
@@ -300,11 +299,11 @@ rcv_msg_thread(char *handle_pred) {
static int
mpi_init_rcv_thread(void){
int thread_level;
// MPI_Init(&Yap_argc, &Yap_argv);
// MPI_Init(&GLOBAL_argc, &GLOBAL_argv);
pthread_t thread;
char *arg="handle_msg";
MPI_Init_thread(&Yap_argc, &Yap_argv,MPI_THREAD_SINGLE,&thread_level);
MPI_Init_thread(&GLOBAL_argc, &GLOBAL_argv,MPI_THREAD_SINGLE,&thread_level);
if(pthread_create(&thread,NULL,(void*)&rcv_msg_thread,arg)) {
return (FALSE);
}

14
library/mpi/mpi.c
View File

@@ -491,21 +491,21 @@ Yap_InitMPI(void)
{
int i,j;
mpi_argv = malloc( Yap_argc * sizeof(char *) );
mpi_argv[0] = strdup( Yap_argv[0] );
mpi_argv = malloc( GLOBAL_argc * sizeof(char *) );
mpi_argv[0] = strdup( GLOBAL_argv[0] );
bufsize = RECV_BUF_SIZE;
buf = malloc(bufsize * sizeof(char));
for( i=1; i<Yap_argc; ++i ) {
if( !strcmp(Yap_argv[i], "--") ) { ++i; break; }
for( i=1; i<GLOBAL_argc; ++i ) {
if( !strcmp(GLOBAL_argv[i], "--") ) { ++i; break; }
}
for( j=1; i<Yap_argc; ++i, ++j ) {
mpi_argv[j] = strdup( Yap_argv[i] );
for( j=1; i<GLOBAL_argc; ++i, ++j ) {
mpi_argv[j] = strdup( GLOBAL_argv[i] );
}
mpi_argc = j;
mpi_argv[0] = strdup( Yap_argv[0] );
mpi_argv[0] = strdup( GLOBAL_argv[0] );
Yap_InitCPred( "mpi_open", 3, p_mpi_open, SafePredFlag|SyncPredFlag );
Yap_InitCPred( "mpi_close", 0, p_mpi_close, SafePredFlag|SyncPredFlag );