X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6b188a3ca7fe91cf125a08229fb4fe51eee26e6d..4f377cfbcae89e70585c675eb978c7c8a33dd773:/src/smpi/smpi_f77.c

diff --git a/src/smpi/smpi_f77.c b/src/smpi/smpi_f77.c
index c467cc84f0..5aaf1dca45 100644
--- a/src/smpi/smpi_f77.c
+++ b/src/smpi/smpi_f77.c
@@ -14,6 +14,7 @@ extern int xargc;
 extern char** xargv;
 
 static xbt_dynar_t comm_lookup = NULL;
+static xbt_dynar_t group_lookup = NULL;
 static xbt_dict_t request_lookup = NULL;
 static xbt_dynar_t datatype_lookup = NULL;
 static xbt_dynar_t op_lookup = NULL;
@@ -25,6 +26,10 @@ static int new_comm(MPI_Comm comm) {
   return (int)xbt_dynar_length(comm_lookup) - 1;
 }
 
+static void free_comm(int comm) {
+  xbt_dynar_remove_at(comm_lookup, comm, NULL);
+}
+
 static MPI_Comm get_comm(int comm) {
   if(comm == -2) {
     return MPI_COMM_SELF;
@@ -34,6 +39,20 @@ static MPI_Comm get_comm(int comm) {
   return MPI_COMM_NULL;
 }
 
+static int new_group(MPI_Group group) {
+  xbt_dynar_push(group_lookup, &group);
+  return (int)xbt_dynar_length(group_lookup) - 1;
+}
+
+static MPI_Group get_group(int group) {
+  if(group == -2) {
+    return MPI_GROUP_EMPTY;
+  } else if(group_lookup && group >= 0 && group < (int)xbt_dynar_length(group_lookup)) {
+    return *(MPI_Group*)xbt_dynar_get_ptr(group_lookup, group);
+  }
+  return MPI_COMM_NULL;
+}
+
 static char* get_key(char* key, int id) {
   snprintf(key, KEY_SIZE, "%x", id);
   return key;
@@ -64,6 +83,10 @@ static MPI_Datatype get_datatype(int datatype) {
          : MPI_DATATYPE_NULL;
 }
 
+static void free_datatype(int datatype) {
+  xbt_dynar_remove_at(datatype_lookup, datatype, NULL);
+}
+
 static int new_op(MPI_Op op) {
   xbt_dynar_push(op_lookup, &op);
   return (int)xbt_dynar_length(op_lookup) - 1;
@@ -78,6 +101,7 @@ static MPI_Op get_op(int op) {
 void mpi_init__(int* ierr) {
    comm_lookup = xbt_dynar_new(sizeof(MPI_Comm), NULL);
    new_comm(MPI_COMM_WORLD);
+   group_lookup = xbt_dynar_new(sizeof(MPI_Group), NULL);
 
    request_lookup = xbt_dict_new_homogeneous(NULL);
 
@@ -101,6 +125,9 @@ void mpi_init__(int* ierr) {
    new_datatype(MPI_UINT16_T);
    new_datatype(MPI_UINT32_T);
    new_datatype(MPI_UINT64_T);
+   new_datatype(MPI_2FLOAT);
+   new_datatype(MPI_2DOUBLE);
+
 
    op_lookup = xbt_dynar_new(sizeof(MPI_Op), NULL);
    new_op(MPI_MAX);
@@ -148,6 +175,10 @@ double mpi_wtime__(void) {
    return MPI_Wtime();
 }
 
+double mpi_wtick__(void) {
+  return MPI_Wtick();
+}
+
 void mpi_comm_dup__(int* comm, int* newcomm, int* ierr) {
   MPI_Comm tmp;
 
@@ -157,6 +188,26 @@ void mpi_comm_dup__(int* comm, int* newcomm, int* ierr) {
   }
 }
 
+void mpi_comm_create__(int* comm, int* group, int* newcomm, int* ierr) {
+  MPI_Comm tmp;
+
+  *ierr = MPI_Comm_create(get_comm(*comm),get_group(*group), &tmp);
+  if(*ierr == MPI_SUCCESS) {
+    *newcomm = new_comm(tmp);
+  }
+}
+
+
+void mpi_comm_free__(int* comm, int* ierr) {
+  MPI_Comm tmp = get_comm(*comm);
+
+  *ierr = MPI_Comm_free(&tmp);
+
+  if(*ierr == MPI_SUCCESS) {
+    free_comm(*comm);
+  }
+}
+
 void mpi_comm_split__(int* comm, int* color, int* key, int* comm_out, int* ierr) {
   MPI_Comm tmp;
 
@@ -166,6 +217,29 @@ void mpi_comm_split__(int* comm, int* color, int* key, int* comm_out, int* ierr)
   }
 }
 
+void mpi_group_incl__(int* group, int* n, int* ranks, int* group_out, int* ierr) {
+  MPI_Group tmp;
+
+  *ierr = MPI_Group_incl(get_group(*group), *n, ranks, &tmp);
+  if(*ierr == MPI_SUCCESS) {
+    *group_out = new_group(tmp);
+  }
+}
+
+void mpi_comm_group__(int* comm, int* group_out,  int* ierr) {
+  MPI_Group tmp;
+
+  *ierr = MPI_Comm_group(get_comm(*comm), &tmp);
+  if(*ierr == MPI_SUCCESS) {
+    *group_out = new_group(tmp);
+  }
+}
+
+
+void mpi_initialized__(int* flag, int* ierr){
+  *ierr = MPI_Initialized(flag);
+}
+
 void mpi_send_init__(void *buf, int* count, int* datatype, int* dst, int* tag,
                      int* comm, int* request, int* ierr) {
   MPI_Request req;
@@ -188,12 +262,38 @@ void mpi_isend__(void *buf, int* count, int* datatype, int* dst,
   }
 }
 
+void mpi_irsend__(void *buf, int* count, int* datatype, int* dst,
+                 int* tag, int* comm, int* request, int* ierr) {
+  MPI_Request req;
+
+  *ierr = MPI_Irsend(buf, *count, get_datatype(*datatype), *dst, *tag,
+                    get_comm(*comm), &req);
+  if(*ierr == MPI_SUCCESS) {
+    *request = new_request(req);
+  }
+}
+
 void mpi_send__(void* buf, int* count, int* datatype, int* dst,
                 int* tag, int* comm, int* ierr) {
    *ierr = MPI_Send(buf, *count, get_datatype(*datatype), *dst, *tag,
                     get_comm(*comm));
 }
 
+void mpi_rsend__(void* buf, int* count, int* datatype, int* dst,
+                int* tag, int* comm, int* ierr) {
+   *ierr = MPI_Rsend(buf, *count, get_datatype(*datatype), *dst, *tag,
+                    get_comm(*comm));
+}
+
+void mpi_sendrecv__(void* sendbuf, int* sendcount, int* sendtype, int* dst,
+                int* sendtag, void *recvbuf, int* recvcount,
+                int* recvtype, int* src, int* recvtag,
+                int* comm, MPI_Status* status, int* ierr) {
+   *ierr = MPI_Sendrecv(sendbuf, *sendcount, get_datatype(*sendtype), *dst,
+       *sendtag, recvbuf, *recvcount,get_datatype(*recvtype), *src, *recvtag,
+       get_comm(*comm), status);
+}
+
 void mpi_recv_init__(void *buf, int* count, int* datatype, int* src, int* tag,
                      int* comm, int* request, int* ierr) {
   MPI_Request req;
@@ -290,6 +390,12 @@ void mpi_allreduce__(void* sendbuf, void* recvbuf, int* count, int* datatype,
                         get_op(*op), get_comm(*comm));
 }
 
+void mpi_reduce_scatter__(void* sendbuf, void* recvbuf, int* recvcounts, int* datatype,
+                     int* op, int* comm, int* ierr) {
+  *ierr = MPI_Reduce_scatter(sendbuf, recvbuf, recvcounts, get_datatype(*datatype),
+                        get_op(*op), get_comm(*comm));
+}
+
 void mpi_scatter__(void* sendbuf, int* sendcount, int* sendtype,
                    void* recvbuf, int* recvcount, int* recvtype, 
                    int* root, int* comm, int* ierr) {
@@ -297,6 +403,14 @@ void mpi_scatter__(void* sendbuf, int* sendcount, int* sendtype,
                       recvbuf, *recvcount, get_datatype(*recvtype), *root, get_comm(*comm));
 }
 
+
+void mpi_scatterv__(void* sendbuf, int* sendcounts, int* displs, int* sendtype,
+                   void* recvbuf, int* recvcount, int* recvtype,
+                   int* root, int* comm, int* ierr) {
+  *ierr = MPI_Scatterv(sendbuf, sendcounts, displs, get_datatype(*sendtype),
+                      recvbuf, *recvcount, get_datatype(*recvtype), *root, get_comm(*comm));
+}
+
 void mpi_gather__(void* sendbuf, int* sendcount, int* sendtype,
                   void* recvbuf, int* recvcount, int* recvtype,
                   int* root, int* comm, int* ierr) {
@@ -304,6 +418,13 @@ void mpi_gather__(void* sendbuf, int* sendcount, int* sendtype,
                      recvbuf, *recvcount, get_datatype(*recvtype), *root, get_comm(*comm));
 }
 
+void mpi_gatherv__(void* sendbuf, int* sendcount, int* sendtype,
+                  void* recvbuf, int* recvcounts, int* displs, int* recvtype,
+                  int* root, int* comm, int* ierr) {
+  *ierr = MPI_Gatherv(sendbuf, *sendcount, get_datatype(*sendtype),
+                     recvbuf, recvcounts, displs, get_datatype(*recvtype), *root, get_comm(*comm));
+}
+
 void mpi_allgather__(void* sendbuf, int* sendcount, int* sendtype,
                      void* recvbuf, int* recvcount, int* recvtype,
                      int* comm, int* ierr) {
@@ -311,6 +432,13 @@ void mpi_allgather__(void* sendbuf, int* sendcount, int* sendtype,
                         recvbuf, *recvcount, get_datatype(*recvtype), get_comm(*comm));
 }
 
+void mpi_allgatherv__(void* sendbuf, int* sendcount, int* sendtype,
+                     void* recvbuf, int* recvcounts,int* displs, int* recvtype,
+                     int* comm, int* ierr) {
+  *ierr = MPI_Allgatherv(sendbuf, *sendcount, get_datatype(*sendtype),
+                        recvbuf, recvcounts, displs, get_datatype(*recvtype), get_comm(*comm));
+}
+
 void mpi_scan__(void* sendbuf, void* recvbuf, int* count, int* datatype,
                 int* op, int* comm, int* ierr) {
   *ierr = MPI_Scan(sendbuf, recvbuf, *count, get_datatype(*datatype),
@@ -322,3 +450,134 @@ void mpi_alltoall__(void* sendbuf, int* sendcount, int* sendtype,
   *ierr = MPI_Alltoall(sendbuf, *sendcount, get_datatype(*sendtype),
                        recvbuf, *recvcount, get_datatype(*recvtype), get_comm(*comm));
 }
+
+void mpi_alltoallv__(void* sendbuf, int* sendcounts, int* senddisps, int* sendtype,
+                    void* recvbuf, int* recvcounts, int* recvdisps, int* recvtype, int* comm, int* ierr) {
+  *ierr = MPI_Alltoallv(sendbuf, sendcounts, senddisps, get_datatype(*sendtype),
+                       recvbuf, recvcounts, recvdisps, get_datatype(*recvtype), get_comm(*comm));
+}
+
+void mpi_test__ (int * request, int *flag, MPI_Status * status, int* ierr){
+  MPI_Request req = find_request(*request);
+  *ierr= MPI_Test(&req, flag, status);
+}
+
+
+void mpi_testall__ (int* count, int * requests,  int *flag, MPI_Status * statuses, int* ierr){
+  MPI_Request* reqs;
+  int i;
+  reqs = xbt_new(MPI_Request, *count);
+  for(i = 0; i < *count; i++) {
+    reqs[i] = find_request(requests[i]);
+  }
+  *ierr= MPI_Testall(*count, reqs, flag, statuses);
+}
+
+
+void mpi_get_processor_name__(char *name, int *resultlen, int* ierr){
+  *ierr = MPI_Get_processor_name(name, resultlen);
+}
+
+void mpi_get_count__(MPI_Status * status, int* datatype, int *count, int* ierr){
+  *ierr = MPI_Get_count(status, get_datatype(*datatype), count);
+}
+
+void mpi_attr_get__(int* comm, int* keyval, void* attr_value, int* flag, int* ierr ){
+  *ierr = MPI_Attr_get(get_comm(*comm), *keyval, attr_value, flag);
+}
+
+void mpi_type_extent__(int* datatype, MPI_Aint * extent, int* ierr){
+  *ierr= MPI_Type_extent(get_datatype(*datatype),  extent);
+}
+
+void mpi_type_commit__(int* datatype,  int* ierr){
+  MPI_Datatype tmp= get_datatype(*datatype);
+  *ierr= MPI_Type_commit(&tmp);
+}
+
+void mpi_type_vector__(int* count, int* blocklen, int* stride, int* old_type, int* newtype,  int* ierr){
+  MPI_Datatype tmp;
+  *ierr= MPI_Type_vector(*count, *blocklen, *stride, get_datatype(*old_type), &tmp);
+  if(*ierr == MPI_SUCCESS) {
+    *newtype = new_datatype(tmp);
+  }
+}
+
+void mpi_type_create_vector__(int* count, int* blocklen, int* stride, int* old_type, int* newtype,  int* ierr){
+  MPI_Datatype tmp;
+  *ierr= MPI_Type_vector(*count, *blocklen, *stride, get_datatype(*old_type), &tmp);
+  if(*ierr == MPI_SUCCESS) {
+    *newtype = new_datatype(tmp);
+  }
+}
+
+void mpi_type_hvector__(int* count, int* blocklen, MPI_Aint* stride, int* old_type, int* newtype,  int* ierr){
+  MPI_Datatype tmp;
+  *ierr= MPI_Type_hvector (*count, *blocklen, *stride, get_datatype(*old_type), &tmp);
+  if(*ierr == MPI_SUCCESS) {
+    *newtype = new_datatype(tmp);
+  }
+}
+
+void mpi_type_create_hvector__(int* count, int* blocklen, MPI_Aint* stride, int* old_type, int* newtype,  int* ierr){
+  MPI_Datatype tmp;
+  *ierr= MPI_Type_hvector(*count, *blocklen, *stride, get_datatype(*old_type), &tmp);
+  if(*ierr == MPI_SUCCESS) {
+    *newtype = new_datatype(tmp);
+  }
+}
+
+void mpi_type_free__(int* datatype, int* ierr){
+  MPI_Datatype tmp= get_datatype(*datatype);
+  *ierr= MPI_Type_free (&tmp);
+  if(*ierr == MPI_SUCCESS) {
+    free_datatype(*datatype);
+  }
+}
+
+void mpi_type_ub__(int* datatype, MPI_Aint * disp, int* ierr){
+  *ierr= MPI_Type_ub(get_datatype(*datatype), disp);
+}
+
+void mpi_type_lb__(int* datatype, MPI_Aint * extent, int* ierr){
+  *ierr= MPI_Type_extent(get_datatype(*datatype), extent);
+}
+
+void mpi_type_size__(int* datatype, int *size, int* ierr)
+{
+  *ierr = MPI_Type_size(get_datatype(*datatype), size);
+}
+
+void mpi_error_string__(int* errorcode, char* string, int* resultlen, int* ierr){
+  *ierr = MPI_Error_string(*errorcode, string, resultlen);
+}
+
+void mpi_win_fence__( int* assert,  int* win, int* ierr){
+  *ierr =  MPI_Win_fence(* assert, *(MPI_Win*)win);
+}
+
+void mpi_win_free__( int* win, int* ierr){
+  *ierr =  MPI_Win_free(  (MPI_Win*)win);
+}
+
+void mpi_win_create__( int *base, MPI_Aint* size, int* disp_unit, int* info, int* comm, int *win, int* ierr){
+  *ierr =  MPI_Win_create( (void*)base, *size, *disp_unit, *(MPI_Info*)info, get_comm(*comm),(MPI_Win*)win);
+}
+
+void mpi_info_create__( int *info, int* ierr){
+  *ierr =  MPI_Info_create( (MPI_Info *)info);
+}
+
+void mpi_info_set__( int *info, char *key, char *value, int* ierr){
+  *ierr =  MPI_Info_set( (MPI_Info *)info, key, value);
+}
+
+void mpi_info_free__(int* info, int* ierr){
+  *ierr =  MPI_Info_free((MPI_Info *) info);
+}
+
+void mpi_get__( int *origin_addr, int* origin_count, int* origin_datatype, int *target_rank,
+    MPI_Aint* target_disp, int *target_count, int* target_datatype, int* win, int* ierr){
+  *ierr =  MPI_Get( (void*)origin_addr,*origin_count, get_datatype(*origin_datatype),*target_rank,
+      *target_disp, *target_count,get_datatype(*target_datatype), *(MPI_Win *)win);
+}