X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a99bd94a2cedf8b455e78de53b19bebab8c034e..cf9a823f1cfd8b0098a039bff8ff6567e9beac91:/src/mc/mc_global.c

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 6c3b74252d..3b1367023b 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -4,18 +4,14 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <string.h>
+
 #include "mc_base.h"
 
 #ifndef _XBT_WIN32
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/time.h>
-#include <sys/mman.h>
-#include <libgen.h>
-
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
 #endif
 
 #include "simgrid/sg_config.h"
@@ -26,6 +22,8 @@
 #include "xbt/dict.h"
 
 #ifdef HAVE_MC
+#include <libunwind.h>
+
 #include "../xbt/mmalloc/mmprivate.h"
 #include "mc_object_info.h"
 #include "mc_comm_pattern.h"
@@ -35,12 +33,17 @@
 #include "mc_snapshot.h"
 #include "mc_liveness.h"
 #include "mc_private.h"
+#include "mc_unw.h"
 #endif
 #include "mc_record.h"
+#include "mc_protocol.h"
+#include "mc_client.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,
                                 "Logging specific to MC (global)");
 
+e_mc_mode_t mc_mode;
+
 double *mc_time = NULL;
 
 #ifdef HAVE_MC
@@ -59,14 +62,6 @@ xbt_fifo_t mc_stack = NULL;
 /* Liveness */
 xbt_automaton_t _mc_property_automaton = NULL;
 
-/* Variables */
-mc_object_info_t mc_libsimgrid_info = NULL;
-mc_object_info_t mc_binary_info = NULL;
-
-mc_object_info_t mc_object_infos[2] = { NULL, NULL };
-
-size_t mc_object_infos_size = 2;
-
 /* Dot output */
 FILE *dot_output = NULL;
 const char *colors[13];
@@ -104,47 +99,41 @@ static void MC_init_dot_output()
 
 }
 
-static void MC_init_debug_info(void)
-{
-  XBT_INFO("Get debug information ...");
-
-  memory_map_t maps = MC_get_memory_map();
-
-  /* Get local variables for state equality detection */
-  mc_binary_info = MC_find_object_info(maps, xbt_binary_name, 1);
-  mc_object_infos[0] = mc_binary_info;
-
-  mc_libsimgrid_info = MC_find_object_info(maps, libsimgrid_path, 0);
-  mc_object_infos[1] = mc_libsimgrid_info;
-
-  // Use information of the other objects:
-  MC_post_process_object_info(mc_binary_info);
-  MC_post_process_object_info(mc_libsimgrid_info);
-
-  MC_free_memory_map(maps);
-  XBT_INFO("Get debug information done !");
-}
-
-
 mc_model_checker_t mc_model_checker = NULL;
 
-mc_model_checker_t MC_model_checker_new()
+mc_model_checker_t MC_model_checker_new(pid_t pid, int socket)
 {
   mc_model_checker_t mc = xbt_new0(s_mc_model_checker_t, 1);
   mc->pages = mc_pages_store_new();
   mc->fd_clear_refs = -1;
   mc->fd_pagemap = -1;
+  MC_process_init(&mc->process, pid, socket);
   return mc;
 }
 
-void MC_model_checker_delete(mc_model_checker_t mc) {
+void MC_model_checker_delete(mc_model_checker_t mc)
+{
   mc_pages_store_delete(mc->pages);
   if(mc->record)
     xbt_dynar_free(&mc->record);
+  MC_process_clear(&mc->process);
 }
 
 void MC_init()
 {
+  MC_init_pid(getpid(), -1);
+}
+
+void MC_init_pid(pid_t pid, int socket)
+{
+  if (mc_mode == MC_MODE_NONE) {
+    if (getenv(MC_ENV_SOCKET_FD)) {
+      mc_mode = MC_MODE_CLIENT;
+    } else {
+      mc_mode = MC_MODE_STANDALONE;
+    }
+  }
+
   int raw_mem_set = (mmalloc_get_current_heap() == mc_heap);
 
   mc_time = xbt_new0(double, simix_process_maxpid);
@@ -154,7 +143,7 @@ void MC_init()
 
   MC_SET_MC_HEAP;
 
-  mc_model_checker = MC_model_checker_new();
+  mc_model_checker = MC_model_checker_new(pid, socket);
 
   mc_comp_times = xbt_new0(s_mc_comparison_times_t, 1);
 
@@ -162,9 +151,6 @@ void MC_init()
   mc_stats = xbt_new0(s_mc_stats_t, 1);
   mc_stats->state_size = 1;
 
-  MC_init_memory_map_info();
-  MC_init_debug_info();         /* FIXME : get debug information only if liveness verification or visited state reduction */
-
   if ((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0] != '\0'))
     MC_init_dot_output();
 
@@ -215,15 +201,26 @@ void MC_init()
     MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double));
 
     smx_process_t process;
-    xbt_swag_foreach(process, simix_global->process_list) {
-      MC_ignore_heap(&(process->process_hookup),
-                     sizeof(process->process_hookup));
-                     }
+    // FIXME, cross-process support (simix_global->process_list)
+
+    if (mc_mode == MC_MODE_STANDALONE || mc_mode == MC_MODE_CLIENT) {
+      xbt_swag_foreach(process, simix_global->process_list) {
+        MC_ignore_heap(&(process->process_hookup),
+                       sizeof(process->process_hookup));
+                       }
+    } else {
+      // TODO
+    }
   }
 
   if (raw_mem_set)
     MC_SET_MC_HEAP;
 
+  if (mc_mode == MC_MODE_CLIENT) {
+    // This will move somehwere else:
+    MC_client_handle_messages();
+  }
+
 }
 
 /*******************************  Core of MC *******************************/