From dd5087bf582bba0879fa352bdc0ddcbf06d943d2 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Wed, 4 May 2016 17:44:07 +0200
Subject: erts: Add macro HAVE_ERTS_MMAP

and make erts_mmap unavailable at compile time
if not supported.
---
 erts/emulator/sys/common/erl_mmap.c | 13 +++++++++----
 erts/emulator/sys/common/erl_mmap.h | 15 +++++++++++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'erts/emulator/sys')

diff --git a/erts/emulator/sys/common/erl_mmap.c b/erts/emulator/sys/common/erl_mmap.c
index bf675cf1ab..53009a1481 100644
--- a/erts/emulator/sys/common/erl_mmap.c
+++ b/erts/emulator/sys/common/erl_mmap.c
@@ -28,6 +28,8 @@
 #include "erl_mmap.h"
 #include <stddef.h>
 
+#if HAVE_ERTS_MMAP
+
 /* #define ERTS_MMAP_OP_RINGBUF_SZ 100 */
 
 #if defined(DEBUG) || 0
@@ -2513,9 +2515,13 @@ Eterm erts_mmap_info_options(ErtsMemMapper* mm,
     return res;
 }
 
+#endif /* HAVE_ERTS_MMAP */
 
-Eterm erts_mmap_debug_info(ErtsMemMapper* mm, Process* p)
+Eterm erts_mmap_debug_info(Process* p)
 {
+#if HAVE_ERTS_MMAP
+    ErtsMemMapper* mm = &erts_dflt_mmapper;
+
     if (mm->supercarrier) {
         ERTS_DECL_AM(sabot);
         ERTS_DECL_AM(satop);
@@ -2553,9 +2559,8 @@ Eterm erts_mmap_debug_info(ErtsMemMapper* mm, Process* p)
         HRelease(p, hp_end, hp);
         return list;
     }
-    else {
-        return am_undefined;
-    }
+#endif
+    return am_undefined;
 }
 
 
diff --git a/erts/emulator/sys/common/erl_mmap.h b/erts/emulator/sys/common/erl_mmap.h
index 3790f2c94e..7ac61a82c1 100644
--- a/erts/emulator/sys/common/erl_mmap.h
+++ b/erts/emulator/sys/common/erl_mmap.h
@@ -50,6 +50,13 @@
 #  define ERTS_HAVE_OS_MMAP 1
 #endif
 
+#ifdef ERTS_HAVE_GENUINE_OS_MMAP
+#  define HAVE_ERTS_MMAP 1
+#else
+#  define HAVE_ERTS_MMAP 0
+#endif
+
+
 extern UWord erts_page_inv_mask;
 
 typedef struct {
@@ -107,6 +114,10 @@ typedef struct {
 #define ERTS_PAGEALIGNED_SIZE \
     (ERTS_INV_PAGEALIGNED_MASK + 1)
 
+struct process;
+Eterm erts_mmap_debug_info(struct process*);
+
+#if HAVE_ERTS_MMAP
 
 typedef struct ErtsMemMapper_ ErtsMemMapper;
 
@@ -130,8 +141,6 @@ Eterm erts_mmap_info(ErtsMemMapper*, int *print_to_p, void *print_to_arg,
 Eterm erts_mmap_info_options(ErtsMemMapper*,
                              char *prefix, int *print_to_p, void *print_to_arg,
                              Uint **hpp, Uint *szp);
-struct process;
-Eterm erts_mmap_debug_info(ErtsMemMapper*, struct process*);
 
 
 #ifdef ERTS_WANT_MEM_MAPPERS
@@ -157,4 +166,6 @@ void hard_dbg_remove_mseg(void* seg, UWord sz);
 #  define HARD_DBG_REMOVE_MSEG(SEG,SZ)
 #endif
 
+#endif /* HAVE_ERTS_MMAP */
+
 #endif /* ERL_MMAP_H__ */
-- 
cgit v1.2.3