Let's still pass the tests with mmalloc and MC in the library

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7703 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h
new file mode 100644 (file)
index 0000000..7009022
--- /dev/null
+++ b/src/include/mc/datatypes.h
@@ -0,0 +1,30 @@
+/*     $Id: datatypes.h 5497 2008-05-26 12:19:15Z cristianrosa $        */
+
+/* Copyright (c) 2008 Martin Quinson, Cristian Rosa.
+   All rights reserved.                                          */
+
+/* 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. */
+
+#ifndef MC_DATATYPE_H
+#define MC_DATATYPE_H
+#include "xbt/misc.h"
+#include "xbt/swag.h"
+#include "xbt/fifo.h"
+
+SG_BEGIN_DECL()
+
+/******************************* Transitions **********************************/
+typedef enum {
+  mc_isend,
+  mc_irecv,
+  mc_test,
+  mc_wait,
+  mc_waitany
+} mc_trans_type_t;
+
+typedef struct s_mc_transition *mc_transition_t;
+
+SG_END_DECL()
+
+#endif /* _MC_MC_H */

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
new file mode 100644 (file)
index 0000000..f14aef3
--- /dev/null
+++ b/src/include/mc/mc.h
@@ -0,0 +1,37 @@
+/*     $Id: simix.h 5497 2008-05-26 12:19:15Z cristianrosa $    */
+
+/* Copyright (c) 2008 Martin Quinson, Cristian Rosa.
+   All rights reserved.                                          */
+
+/* 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. */
+
+#ifndef _MC_MC_H
+#define _MC_MC_H
+
+#include "xbt/misc.h"
+#include "xbt/fifo.h"
+#include "xbt/dict.h"
+#include "xbt/function_types.h"
+#include "mc/datatypes.h"
+#include "simix/datatypes.h"
+
+SG_BEGIN_DECL()
+
+/********************************* Global *************************************/
+XBT_PUBLIC(void) MC_init(int);
+XBT_PUBLIC(void) MC_assert(int);
+XBT_PUBLIC(void) MC_modelcheck(int);
+
+/******************************* Transitions **********************************/
+XBT_PUBLIC(mc_transition_t) MC_create_transition(mc_trans_type_t, smx_process_t, smx_rdv_t, smx_comm_t);
+XBT_PUBLIC(void) MC_transition_set_comm(mc_transition_t, smx_comm_t);
+
+/********************************* Memory *************************************/
+XBT_PUBLIC(void) MC_memory_init(void);   /* Initialize the memory subsystem */
+XBT_PUBLIC(void) MC_memory_exit(void);   /* Finish the memory subsystem */
+
+
+SG_END_DECL()
+
+#endif                          /* _MC_MC_H */

diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c
index 7f9aa05..526d409 100644 (file)
--- a/src/mc/mc_memory.c
+++ b/src/mc/mc_memory.c
@@ -16,9 +16,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
                                "Logging specific to MC (memory)");
 
 /* Pointers to each of the heap regions to use */
-void *std_heap;
-void *raw_heap;
-void *actual_heap;
+void *std_heap=NULL;
+void *raw_heap=NULL;
+void *actual_heap=NULL;
 
 /* Pointers to the begining and end of the .data and .bss segment of libsimgrid */
 /* They are initialized once at memory_init */
@@ -58,7 +58,7 @@ void MC_memory_init()
       tmp = xbt_strdup(maps->regions[i].pathname);
       libname = basename(tmp);
  
-      if( strncmp("libsimgrid.so.2.0.0", libname, 18) == 0 && maps->regions[i].perms & MAP_WRITE){
+      if( strncmp("libsimgrid.so.2.0.0", libname, 18) == 0 && maps->regions[i].perms & MAP_WRITE){ //FIXME: do not hardcode
         libsimgrid_data_addr_start = maps->regions[i].start_addr;
         libsimgrid_data_size = (size_t)((char *)maps->regions[i+1].end_addr - (char *)maps->regions[i].start_addr);
         xbt_free(tmp);
@@ -110,7 +110,7 @@ void *realloc(void *p, size_t s)
     if (p)
       ret = mrealloc(actual_heap, p,s);
     else
-      ret = malloc(s);
+      ret = malloc(s); /* FIXME: shouldn't this be mmalloc? */
   } else {
     if (p) {
       free(p);
@@ -124,7 +124,7 @@ void *realloc(void *p, size_t s)
 void free(void *p)
 {
   DEBUG1("%p was freed",p);
-  xbt_assert(actual_heap != NULL);
+//  xbt_assert(actual_heap != NULL); FIXME: I had to comment this
   return mfree(actual_heap, p);
 }
 

diff --git a/src/mc/private.h b/src/mc/private.h
index 56a1002..6ecb3ce 100644 (file)
--- a/src/mc/private.h
+++ b/src/mc/private.h
@@ -16,7 +16,7 @@
 #include "xbt/setset.h"
 #include "xbt/config.h"
 #include "xbt/function_types.h"
-#include "mmalloc.h"
+#include "xbt/mmalloc.h"
 #include "../simix/private.h"
 
 /****************************** Snapshots ***********************************/

diff --git a/src/surf/surf.c b/src/surf/surf.c
index b33f395..35f7037 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -102,7 +102,7 @@ int __surf_is_absolute_file_path(const char *file_path)
 #endif
 }
 
-static double NOW = 0;
+double NOW = 0;
 
 xbt_dynar_t model_list = NULL;
 tmgr_history_t history = NULL;

diff --git a/src/xbt/mmalloc/mcalloc.c b/src/xbt/mmalloc/mcalloc.c
index a033bc0..6c26022 100644 (file)
--- a/src/xbt/mmalloc/mcalloc.c
+++ b/src/xbt/mmalloc/mcalloc.c
@@ -31,10 +31,9 @@ mcalloc (void *md, register size_t nmemb, register size_t size)
    on top of it, so that if we use the default sbrk() region we will not
    collide with another malloc package trying to do the same thing, if
    the application contains any "hidden" calls to malloc/realloc/free (such
-   as inside a system library). */
+   as inside a system library).
+   FIXME: disabled for now */
 
-void*
-calloc (size_t nmemb, size_t size)
-{
-  return (mcalloc ((void*) NULL, nmemb, size));
-}
+//void* calloc (size_t nmemb, size_t size) {
+//  return (mcalloc ((void*) NULL, nmemb, size));
+//}

diff --git a/src/xbt/mmalloc/mfree.c b/src/xbt/mmalloc/mfree.c
index 9d03561..b2bc649 100644 (file)
--- a/src/xbt/mmalloc/mfree.c
+++ b/src/xbt/mmalloc/mfree.c
@@ -226,10 +226,9 @@ void free(void* ptr);
    on top of it, so that if we use the default sbrk() region we will not
    collide with another malloc package trying to do the same thing, if
    the application contains any "hidden" calls to malloc/realloc/free (such
-   as inside a system library). */
+   as inside a system library).
+   FIXME: disabled for now */
 
-void
-free (void* ptr)
-{
-  mfree ((void*) NULL, ptr);
-}
+//void free (void* ptr) {
+//  mfree ((void*) NULL, ptr);
+//}

diff --git a/src/xbt/mmalloc/mmalloc.c b/src/xbt/mmalloc/mmalloc.c
index b0934ba..bf3b69d 100644 (file)
--- a/src/xbt/mmalloc/mmalloc.c
+++ b/src/xbt/mmalloc/mmalloc.c
@@ -307,12 +307,11 @@ mmalloc (md, size)
    on top of it, so that if we use the default sbrk() region we will not
    collide with another malloc package trying to do the same thing, if
    the application contains any "hidden" calls to malloc/realloc/free (such
-   as inside a system library). */
-
-void*
-malloc (size_t size)
-{
-  void* result;
-  result = mmalloc (NULL, size);
-  return (result);
-}
+   as inside a system library).
+   FIXME: disabled for now */
+
+//void* malloc (size_t size) {
+//  void* result;
+//  result = mmalloc (NULL, size);
+//  return (result);
+//}

diff --git a/src/xbt/mmalloc/mrealloc.c b/src/xbt/mmalloc/mrealloc.c
index 9ec3273..ccd837c 100644 (file)
--- a/src/xbt/mmalloc/mrealloc.c
+++ b/src/xbt/mmalloc/mrealloc.c
@@ -137,13 +137,12 @@ void *realloc (void *ptr, size_t size);
    on top of it, so that if we use the default sbrk() region we will not
    collide with another malloc package trying to do the same thing, if
    the application contains any "hidden" calls to malloc/realloc/free (such
-   as inside a system library). */
+   as inside a system library).
+   FIXME: disabled for now */
 
-void *
-realloc (void *ptr, size_t size)
-{
-  void* result;
+//void * realloc (void *ptr, size_t size) {
+//  void* result;
 
-  result = mrealloc (NULL, ptr, size);
-  return (result);
-}
+//  result = mrealloc (NULL, ptr, size);
+//  return (result);
+//}