Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLEANUP: remove unused ptmalloc283 #1936

Merged
merged 1 commit into from
Oct 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions config/m4/ucm.m4
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,11 @@ AS_IF([test "x$enable_symbol_override" == xyes],
AC_ARG_WITH([allocator],
[AC_HELP_STRING([--with-allocator=NAME],
[Build UCX with predefined memory allocator. The supported values are:
ptmalloc283, ptmalloc286. Default: ptmalloc286])],
ptmalloc286. Default: ptmalloc286])],
[],
[with_allocator=ptmalloc286])

case ${with_allocator} in
ptmalloc283)
AC_MSG_NOTICE(Memory allocator is ptmalloc-2.8.3 version)
AC_DEFINE([HAVE_UCM_PTMALLOC283], 1, [Use ptmalloc-2.8.3 version])
HAVE_UCM_PTMALLOC283=yes
;;
ptmalloc286)
AC_MSG_NOTICE(Memory allocator is ptmalloc-2.8.6 version)
AC_DEFINE([HAVE_UCM_PTMALLOC286], 1, [Use ptmalloc-2.8.6 version])
Expand All @@ -45,7 +40,6 @@ case ${with_allocator} in
;;
esac

AM_CONDITIONAL([HAVE_UCM_PTMALLOC283],[test "x$HAVE_UCM_PTMALLOC283" = "xyes"])
AM_CONDITIONAL([HAVE_UCM_PTMALLOC286],[test "x$HAVE_UCM_PTMALLOC286" = "xyes"])

AC_CHECK_FUNCS([malloc_get_state malloc_set_state],
Expand Down
1 change: 0 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ AS_IF([test "x$with_docs_only" == xyes],
AM_CONDITIONAL([HAVE_MPIRUN], [false])
AM_CONDITIONAL([HAVE_MPICC], [false])
AM_CONDITIONAL([HAVE_PROFILING], [false])
AM_CONDITIONAL([HAVE_UCM_PTMALLOC283], [false])
AM_CONDITIONAL([HAVE_UCM_PTMALLOC286], [false])
],
[
Expand Down
22 changes: 0 additions & 22 deletions src/ucm/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,6 @@ libucm_la_SOURCES = \
util/reloc.c \
util/sys.c

if HAVE_UCM_PTMALLOC283
libucm_la_CPPFLAGS += \
-I$(srcdir)/ptmalloc283/sysdeps/pthread \
-I$(srcdir)/ptmalloc283/sysdeps/generic \
-fno-strict-aliasing \
-DUSE_TSD_DATA_HACK \
-DUSE_LOCKS=1 \
-DONLY_MSPACES=0 \
-DMALLINFO_FIELD_TYPE=int

libucm_la_SOURCES += \
ptmalloc283/malloc.c

noinst_HEADERS += \
ptmalloc283/malloc-2.8.3.h \
ptmalloc283/sysdeps/generic/atomic.h \
ptmalloc283/sysdeps/generic/malloc-machine.h \
ptmalloc283/sysdeps/generic/thread-st.h \
ptmalloc283/sysdeps/pthread/malloc-machine.h \
ptmalloc283/sysdeps/pthread/thread-st.h
endif

if HAVE_UCM_PTMALLOC286
libucm_la_CPPFLAGS += \
-fno-strict-aliasing \
Expand Down
4 changes: 1 addition & 3 deletions src/ucm/malloc/allocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
#ifndef UCM_ALLOCATOR_H_
#define UCM_ALLOCATOR_H_

#if HAVE_UCM_PTMALLOC283
#include <ucm/ptmalloc283/malloc-2.8.3.h>
#elif HAVE_UCM_PTMALLOC286
#if HAVE_UCM_PTMALLOC286
#include <ucm/ptmalloc286/malloc-2.8.6.h>
#else
#error "No memory allocator is defined"
Expand Down
19 changes: 0 additions & 19 deletions src/ucm/ptmalloc283/COPYRIGHT

This file was deleted.

195 changes: 0 additions & 195 deletions src/ucm/ptmalloc283/README

This file was deleted.

Loading