From a73cac07e55e84343652a31d5c77747b50e49f20 Mon Sep 17 00:00:00 2001 From: Joshua Ladd Date: Thu, 5 Dec 2013 19:37:44 +0000 Subject: [PATCH] Resolves oshmem_info segfault on OSX. This fixes trac:3904. Refs trac:3763 This commit was SVN r29809. The following Trac tickets were found above: Ticket 3763 --> https://svn.open-mpi.org/trac/ompi/ticket/3763 Ticket 3904 --> https://svn.open-mpi.org/trac/ompi/ticket/3904 --- oshmem/mca/memheap/base/memheap_base_static.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oshmem/mca/memheap/base/memheap_base_static.c b/oshmem/mca/memheap/base/memheap_base_static.c index 08049b0e64..8d458ff362 100644 --- a/oshmem/mca/memheap/base/memheap_base_static.c +++ b/oshmem/mca/memheap/base/memheap_base_static.c @@ -92,6 +92,8 @@ static int _check_perms(struct map_segment_desc *seg) static int _check_address(struct map_segment_desc *seg) { + /* FIXME Linux specific code */ +#ifdef __linux__ extern unsigned _end; void* data_end = &_end; @@ -110,6 +112,7 @@ static int _check_address(struct map_segment_desc *seg) data_end, seg->start); return OSHMEM_ERROR; } +#endif return OSHMEM_SUCCESS; } @@ -163,7 +166,7 @@ static int _load_segments(void) struct map_segment_desc seg; memheap_context.n_segments = 0; - + /* FIXME!!! Linux specific code */ fp = fopen("/proc/self/maps", "r"); if (NULL == fp) { MEMHEAP_ERROR("Failed to open /proc/self/maps");