Compil smpi on win32.

[simgrid.git] / src / smpi / smpi_global.c

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 4560524..95d4457 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -15,8 +15,6 @@
 #include "simix/smx_private.h"
 
 
-XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories");
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi,
                                 "Logging specific to SMPI (kernel)");
 
@@ -29,6 +27,7 @@ typedef struct s_smpi_process_data {
   xbt_os_timer_t timer;
   double simulated;
   MPI_Comm comm_self;
+  void *data; /* user data */
 } s_smpi_process_data_t;
 
 static smpi_process_data_t *process_data = NULL;
@@ -67,7 +66,7 @@ void smpi_process_init(int *argc, char ***argv)
     (*argc)--;
     data->argc = argc;
     data->argv = argv;
-    SIMIX_rdv_set_receiver(data->mailbox_small, proc);// set the process attached to the mailbox
+    simcall_rdv_set_receiver(data->mailbox_small, proc);// set the process attached to the mailbox
     XBT_DEBUG("<%d> New process in the game: %p", index, proc);
   }
 }
@@ -96,6 +95,7 @@ int smpi_process_argc(void) {
   return data->argc ? *(data->argc) - 1 : 0;
 }
 
+#ifdef SMPI_F2C
 int smpi_process_getarg(integer* index, char* dst, ftnlen len) {
   smpi_process_data_t data = smpi_process_data();
   char* arg;
@@ -114,13 +114,14 @@ int smpi_process_getarg(integer* index, char* dst, ftnlen len) {
   }
   return 0;
 }
+#endif
 
 int smpi_global_size(void) {
    char* value = getenv("SMPI_GLOBAL_SIZE");
 
    if(!value) {
-      fprintf(stderr, "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n");
-      abort();
+     fprintf(stderr, "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n");
+     xbt_abort();
    }
    return atoi(value);
 }
@@ -135,6 +136,17 @@ smpi_process_data_t smpi_process_remote_data(int index)
   return process_data[index];
 }
 
+void smpi_process_set_user_data(void *data)
+{
+  smpi_process_data_t process_data = smpi_process_data();
+  process_data->data = data;
+}
+
+void* smpi_process_get_user_data(){
+  smpi_process_data_t process_data = smpi_process_data();
+  return process_data->data;
+}
+
 int smpi_process_count(void)
 {
   return process_count;
@@ -203,13 +215,27 @@ void print_request(const char *message, MPI_Request request) {
          request->src, request->dst, request->tag, request->flags);
 }
 
+static void SMPI_comm_copy_buffer_callback(smx_action_t comm, void* buff, size_t buff_size)
+{
+  XBT_DEBUG("Copy the data over");
+  memcpy(comm->comm.dst_buff, buff, buff_size);
+  if (comm->comm.detached) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the original buffer available to the application ASAP
+    xbt_free(buff);
+    //It seems that the request is used after the call there this should
+    //be free somewhereelse  but where???
+    //xbt_free(comm->comm.src_data);// inside SMPI the request is keep
+    //inside the user data and should be free 
+    comm->comm.src_buff = NULL;
+  }
+}
+
 void smpi_global_init(void)
 {
   int i;
   MPI_Group group;
   char name[MAILBOX_NAME_MAXLEN];
 
-  SIMIX_comm_set_copy_data_callback(&smpi_comm_copy_data_callback);
+  SIMIX_comm_set_copy_data_callback(&SMPI_comm_copy_buffer_callback);
   process_count = SIMIX_process_count();
   process_data = xbt_new(smpi_process_data_t, process_count);
   for (i = 0; i < process_count; i++) {
@@ -264,6 +290,23 @@ int __attribute__((weak)) main(int argc, char** argv) {
    return MAIN__();
 }
 
+#ifdef WIN32
+#include <windows.h>
+
+int __attribute__((weak)) smpi_simulated_main(int argc, char** argv) {
+  xbt_die("Should not be in this smpi_simulated_main");
+  return 1;
+}
+
+/* TODO FOR WIN32 */
+/* Dummy prototype to make gcc happy */
+int APIENTRY WinMain(HINSTANCE hInst,HINSTANCE hInst2,LPSTR lpstr01,int nCmdShow)
+{
+       return MAIN__();
+}
+
+#endif
+
 int MAIN__(void)
 {
   srand(SMPI_RAND_SEED);
@@ -274,7 +317,8 @@ int MAIN__(void)
   }
 
   /* Connect log categories.  See xbt/log.c */
-  XBT_LOG_CONNECT(smpi);
+  XBT_LOG_CONNECT(smpi);  /* Keep this line as soon as possible in this function: xbt_log_appender_file.c depends on it
+                             DO NOT connect this in XBT or so, or it will be useless to xbt_log_appender_file.c */
   XBT_LOG_CONNECT(smpi_base);
   XBT_LOG_CONNECT(smpi_bench);
   XBT_LOG_CONNECT(smpi_coll);
@@ -307,7 +351,7 @@ int MAIN__(void)
   fflush(stdout);
   fflush(stderr);
 
-  if (MC_IS_ENABLED)
+  if (MC_is_active())
     MC_modelcheck();
   else
     SIMIX_run();
@@ -321,6 +365,5 @@ int MAIN__(void)
   TRACE_end();
 #endif
 
-  SIMIX_clean();
   return 0;
 }