diff --git a/opal/class/Makefile.am b/opal/class/Makefile.am index 8f3ac12b19..5b9776f004 100644 --- a/opal/class/Makefile.am +++ b/opal/class/Makefile.am @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2014 Los Alamos National Security, LLC. All rights +# Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights # reserved. # $COPYRIGHT$ # @@ -38,8 +38,7 @@ headers += \ class/opal_pointer_array.h \ class/opal_value_array.h \ class/opal_ring_buffer.h \ - class/opal_rb_tree.h \ - class/ompi_free_list.h + class/opal_rb_tree.h lib@OPAL_LIB_PREFIX@open_pal_la_SOURCES += \ class/opal_bitmap.c \ @@ -55,5 +54,4 @@ lib@OPAL_LIB_PREFIX@open_pal_la_SOURCES += \ class/opal_pointer_array.c \ class/opal_value_array.c \ class/opal_ring_buffer.c \ - class/opal_rb_tree.c \ - class/ompi_free_list.c + class/opal_rb_tree.c diff --git a/opal/class/ompi_free_list.c b/opal/class/ompi_free_list.c deleted file mode 100644 index af863b3aba..0000000000 --- a/opal/class/ompi_free_list.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ -/* - * Copyright (c) 2014 Los Alamos National Security, LLC. All rights - * reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "opal/class/ompi_free_list.h" - -OBJ_CLASS_INSTANCE(ompi_free_list_t, opal_free_list_t, NULL, NULL); diff --git a/opal/class/ompi_free_list.h b/opal/class/ompi_free_list.h deleted file mode 100644 index e195715b07..0000000000 --- a/opal/class/ompi_free_list.h +++ /dev/null @@ -1,128 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2013 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * University of Stuttgart. All rights reserved. - * Copyright (c) 2004-2005 The Regents of the University of California. - * All rights reserved. - * Copyright (c) 2010 IBM Corporation. All rights reserved. - * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2014 Los Alamos National Security, LLC. All rights - * reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#ifndef OMPI_FREE_LIST_H -#define OMPI_FREE_LIST_H - -#include "opal_free_list.h" - -#define ompi_free_list_item_t opal_free_list_item_t - -typedef void (*ompi_free_list_item_init_fn_t) (ompi_free_list_item_t*, void* ctx); - -struct ompi_free_list_t { - opal_free_list_t super; - ompi_free_list_item_init_fn_t item_init; - void *ctx; -}; -typedef struct ompi_free_list_t ompi_free_list_t; -OPAL_DECLSPEC OBJ_CLASS_DECLARATION(ompi_free_list_t); - -#define OMPI_FREE_LIST_GET_MT(fl, item) \ - opal_free_list_get (&(fl)->super, &(item)) - -#define OMPI_FREE_LIST_WAIT_MT(fl, item) \ - opal_free_list_wait (&(fl)->super, &(item)) - -#define OMPI_FREE_LIST_RETURN_MT(fl, item) \ - opal_free_list_return (&(fl)->super, item) - -static inline int ompi_free_list_item_init_compat (ompi_free_list_item_t *item, - void *ctx) -{ - ompi_free_list_t *free_list = (ompi_free_list_t *) ctx; - - free_list->item_init (item, free_list->ctx); - return OPAL_SUCCESS; -} - - -static inline int __opal_attribute_deprecated__ -ompi_free_list_init_ex_new (ompi_free_list_t *free_list, size_t frag_size, - size_t frag_alignment, opal_class_t* frag_class, - size_t payload_buffer_size, size_t payload_buffer_alignment, - int num_elements_to_alloc, int max_elements_to_alloc, - int num_elements_per_alloc, struct mca_mpool_base_module_t *mpool, - ompi_free_list_item_init_fn_t item_init, void *ctx) -{ - free_list->item_init = item_init; - free_list->ctx = ctx; - - return opal_free_list_init (&free_list->super, frag_size, frag_alignment, - frag_class, payload_buffer_size, payload_buffer_alignment, - num_elements_to_alloc, max_elements_to_alloc, - num_elements_per_alloc, mpool, 0, NULL, - ompi_free_list_item_init_compat, - (void *) free_list); -} - -static inline int __opal_attribute_deprecated__ -ompi_free_list_init_new (ompi_free_list_t *free_list, size_t frag_size, - size_t frag_alignment, opal_class_t* frag_class, - size_t payload_buffer_size, size_t payload_buffer_alignment, - int num_elements_to_alloc,int max_elements_to_alloc, - int num_elements_per_alloc, struct mca_mpool_base_module_t* mpool) -{ - return opal_free_list_init (&free_list->super, frag_size, frag_alignment, - frag_class, payload_buffer_size, - payload_buffer_alignment, num_elements_to_alloc, - max_elements_to_alloc, num_elements_per_alloc, - mpool, 0, NULL, NULL, NULL); -} - -static inline int __opal_attribute_deprecated__ -ompi_free_list_init_ex (ompi_free_list_t *free_list, size_t element_size, - size_t alignment, opal_class_t* element_class, - int num_elements_to_alloc, int max_elements_to_alloc, - int num_elements_per_alloc, struct mca_mpool_base_module_t *mpool, - ompi_free_list_item_init_fn_t item_init, void *ctx) -{ - return ompi_free_list_init_ex_new (free_list, element_size, alignment, - element_class, 0, 0, num_elements_to_alloc, - max_elements_to_alloc, num_elements_per_alloc, - mpool, item_init, ctx); -} - -static inline int __opal_attribute_deprecated__ -ompi_free_list_init (ompi_free_list_t *free_list, size_t element_size, - opal_class_t* element_class, int num_elements_to_alloc, - int max_elements_to_alloc, int num_elements_per_alloc, - struct mca_mpool_base_module_t* mpool) -{ - return opal_free_list_init (&free_list->super, element_size, opal_cache_line_size, - element_class, 0, 0, num_elements_to_alloc, - max_elements_to_alloc, num_elements_per_alloc, - mpool, 0, NULL, NULL, NULL); -} - -/* Grow the free list to be *at least* size elements. This function - will not shrink the list if it is already larger than size and may - grow it past size if necessary (it will grow in - num_elements_per_alloc chunks) */ -static inline int __opal_attribute_deprecated__ -ompi_free_list_resize_mt(ompi_free_list_t *flist, size_t size) -{ - return opal_free_list_resize_mt (&flist->super, size); -} - -#endif