Remove the need of pthread_mutex in mmalloc, to allow its use with sthread

[simgrid.git] / src / include / xbt / mmalloc.h

diff --git a/src/include/xbt/mmalloc.h b/src/include/xbt/mmalloc.h
index 3323594..bdff2c1 100644 (file)
--- a/src/include/xbt/mmalloc.h
+++ b/src/include/xbt/mmalloc.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2022. The SimGrid Team. 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. */
@@ -11,12 +11,17 @@
 
 #include "src/internal_config.h"
 
+/** Environment variable name used to pass the communication socket.
+ *
+ * It is set by `simgrid-mc` to enable MC support in the children processes.
+ *
+ * It is placed in this file so that it's visible from mmalloc and MC without sharing anythin of xbt in mmalloc
+ */
+#define MC_ENV_SOCKET_FD "SIMGRID_MC_SOCKET_FD"
+
 #include <stdio.h>     /* for NULL */
 #include <sys/types.h> /* for size_t */
 
-#include "xbt/dict.h"
-#include "xbt/dynar.h"
-
 SG_BEGIN_DECL
 
 /* Datatype representing a separate heap. The whole point of the mmalloc module is to allow several such heaps in the
@@ -45,13 +50,14 @@ XBT_PUBLIC void mfree(xbt_mheap_t md, void* ptr);
 
 XBT_PUBLIC xbt_mheap_t xbt_mheap_new(void* baseaddr, int options);
 
-XBT_PUBLIC void xbt_mheap_destroy_no_free(xbt_mheap_t md);
-
 XBT_PUBLIC void* xbt_mheap_destroy(xbt_mheap_t md);
 
 /* To get the heap used when using the legacy version malloc/free/realloc and such */
 xbt_mheap_t mmalloc_get_current_heap(void);
 
+/* Returns true if we are using the internal mmalloc, and false if we are using the libc's malloc */
+XBT_PUBLIC int malloc_use_mmalloc(void);
+
 #endif
 SG_END_DECL