11e2d7886e
This commit makes it possible to set relative priorities for components. Before the addition of the patched component there was only one component that would run on any system but that is no longer the case. When determining which component to open each component's query function is called and the one that returns the highest priority is opened. The default priority of the patcher component is set slightly higher than the old ptmalloc2/ummunotify component. This commit fixes a long-standing break in the abstration of the memory components. ompi_mpi_init.c was referencing the linux malloc hook initilize function to ensure the hooks are initialized for libmpi.so. The abstraction break has been fixed by adding a memory base function that calls the open memory component's malloc hook init function if it has one. The code is not yet complete but is intended to support ptmalloc in 2.0.0. In that case the base function will always call the ptmalloc hook init if exists. Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
91 строка
2.5 KiB
C
91 строка
2.5 KiB
C
/*
|
|
* Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#ifndef OPAL_MEMORY_LINUX_H
|
|
#define OPAL_MEMORY_LINUX_H
|
|
|
|
#include "opal_config.h"
|
|
|
|
#include "opal/mca/memory/memory.h"
|
|
|
|
BEGIN_C_DECLS
|
|
|
|
/* Component structure */
|
|
|
|
typedef struct opal_memory_linux_component_t {
|
|
opal_memory_base_component_2_0_0_t super;
|
|
|
|
/* Component data */
|
|
int verbose_level;
|
|
int enable_ummunotify;
|
|
int enable_ptmalloc2;
|
|
|
|
#if MEMORY_LINUX_UMMUNOTIFY
|
|
/* Ummunotify-specific data */
|
|
int ummunotify_fd;
|
|
#endif
|
|
|
|
#if MEMORY_LINUX_MALLOC_ALIGN_ENABLED
|
|
int use_memalign;
|
|
size_t memalign_threshold;
|
|
#endif
|
|
|
|
#if MEMORY_LINUX_PTMALLOC2
|
|
/* Ptmalloc2-specific data. Note that these variables are all marked as volatile.
|
|
* This is needed because of what may be a buggy optimization in the GCC 4.9.2
|
|
* compilers and later. These variables are used in different code paths which the
|
|
* compiler is not aware of.
|
|
* Extra details located at these URLs:
|
|
* Open MPI User List: http://www.open-mpi.org/community/lists/users/2015/06/27039.php
|
|
* Bug Discussion: https://github.com/open-mpi/ompi/pull/625
|
|
* GCC Discussion: https://gcc.gnu.org/ml/gcc-bugs/2015-06/msg00757.html
|
|
*/
|
|
volatile bool free_invoked;
|
|
volatile bool malloc_invoked;
|
|
volatile bool realloc_invoked;
|
|
volatile bool memalign_invoked;
|
|
volatile bool munmap_invoked;
|
|
#endif
|
|
} opal_memory_linux_component_t;
|
|
|
|
/* memory_linux_component.c */
|
|
|
|
extern opal_memory_linux_component_t mca_memory_linux_component;
|
|
|
|
|
|
#if MEMORY_LINUX_UMMUNOTIFY
|
|
/* memory_linux_ummunotify.c */
|
|
int opal_memory_linux_ummunotify_open(void);
|
|
int opal_memory_linux_ummunotify_close(void);
|
|
#endif /* MEMORY_LINUX_UMMUNOTIFY */
|
|
|
|
#if MEMORY_LINUX_PTMALLOC2
|
|
/* memory_linux_ptmalloc2.c */
|
|
int opal_memory_linux_ptmalloc2_open(void);
|
|
int opal_memory_linux_ptmalloc2_close(void);
|
|
|
|
/* memory_linux_munmap.c */
|
|
OPAL_DECLSPEC int opal_memory_linux_free_ptmalloc2_munmap(void *start, size_t length, int from_alloc);
|
|
OPAL_DECLSPEC int munmap(void* addr, size_t len);
|
|
#endif /* !MEMORY_LINUX_PTMALLOC2 */
|
|
|
|
#if MEMORY_LINUX_HAVE_MALLOC_HOOK_SUPPORT
|
|
OPAL_DECLSPEC void opal_memory_linux_malloc_init_hook(void);
|
|
#endif /* MEMORY_LINUX_HAVE_MALLOC_HOOK_SUPPORT */
|
|
|
|
#if MEMORY_LINUX_MALLOC_ALIGN_ENABLED
|
|
OPAL_DECLSPEC void opal_memory_linux_malloc_set_alignment(int use_memalign, size_t memalign_threshold);
|
|
#endif /* MEMORY_LINUX_MALLOC_ALIGN_ENABLED */
|
|
|
|
extern bool opal_memory_linux_opened;
|
|
|
|
END_C_DECLS
|
|
|
|
#endif
|