more cleanup of broken svn commit
This commit was SVN r1280.
Этот коммит содержится в:
родитель
1491d25583
Коммит
d1706ed2d0
@ -16,8 +16,8 @@
|
||||
|
||||
struct mca_mpool_base_selected_module_t {
|
||||
ompi_list_item_t super;
|
||||
mca_mpool_base_module_t *pbsm_module;
|
||||
mca_mpool_t *pbsm_actions;
|
||||
mca_mpool_base_module_t *mbsm_module;
|
||||
mca_mpool_t *mbsm_actions;
|
||||
};
|
||||
typedef struct mca_mpool_base_selected_module_t mca_mpool_base_selected_module_t;
|
||||
|
||||
|
@ -29,7 +29,7 @@ int mca_mpool_base_close(void)
|
||||
anyway? This module is going away, so errors don't matter
|
||||
anymore) */
|
||||
|
||||
sm->pbsm_actions->mpool_finalize(sm->pbsm_actions);
|
||||
sm->mbsm_actions->mpool_finalize(sm->mbsm_actions);
|
||||
free(sm);
|
||||
}
|
||||
|
||||
|
@ -1,67 +0,0 @@
|
||||
/**
|
||||
* $HEADER$
|
||||
*/
|
||||
/**
|
||||
* @file
|
||||
*/
|
||||
#ifndef MCA_MEM_H
|
||||
#define MCA_MEM_H
|
||||
#include "mca/mca.h"
|
||||
|
||||
|
||||
/**
|
||||
* allocate function typedef
|
||||
*/
|
||||
typedef void*(*mca_mem_alloc_fn_t)(size_t);
|
||||
|
||||
/**
|
||||
* allocate align function typedef
|
||||
*/
|
||||
typedef void*(*mca_mem_alloc_align_fn_t)(size_t, size_t);
|
||||
|
||||
/**
|
||||
* free function typedef
|
||||
*/
|
||||
typedef void(*mca_mem_free_fn_t)(void *);
|
||||
|
||||
/**
|
||||
* register memory
|
||||
*/
|
||||
typedef void(*mca_mem_register_fn_t)(void *, size_t);
|
||||
|
||||
/**
|
||||
* deregister memory
|
||||
*/
|
||||
typedef void(*mca_mem_deregister_fn_t)(void *);
|
||||
|
||||
typedef int (*mca_mem_base_finalize_fn_t)(
|
||||
struct mca_mem_t* mem
|
||||
);
|
||||
|
||||
struct mca_mem_t {
|
||||
/* interface functions */
|
||||
mca_mem_alloc_fn_t mem_alloc;
|
||||
mca_mem_alloc_align_fn_t mem_alloc_align;
|
||||
mca_mem_free_fn_t mem_free;
|
||||
mca_mem_register_fn_t mem_register;
|
||||
mca_mem_deregister_fn_t mem_deregister;
|
||||
mca_mem_base_finalize_fn_t mem_finalize;
|
||||
};
|
||||
typedef struct mca_mem_t mca_mem_t;
|
||||
|
||||
/**
|
||||
* module initialization function
|
||||
*/
|
||||
typedef struct mca_mem_t* (*mca_mem_base_module_init_fn_t)(
|
||||
bool *allow_multi_user_threads
|
||||
);
|
||||
|
||||
struct mca_mem_base_module_1_0_0_t {
|
||||
mca_base_module_t mem_version;
|
||||
mca_base_module_data_1_0_0_t mem_data;
|
||||
mca_mem_base_module_init_fn_t mem_init;
|
||||
};
|
||||
typedef struct mca_mem_base_module_1_0_0_t mca_mem_base_module_t;
|
||||
|
||||
#endif /* MCA_MEM_H */
|
||||
|
@ -17,7 +17,7 @@ ompi_bitmap_SOURCES = ompi_bitmap.c
|
||||
ompi_bitmap_LDADD = \
|
||||
$(top_builddir)/src/class/ompi_bitmap.lo \
|
||||
$(top_builddir)/src/class/ompi_object.lo \
|
||||
$(top_builddir)/src/mem/malloc.lo \
|
||||
$(top_builddir)/src/util/malloc.lo \
|
||||
$(top_builddir)/src/util/output.lo \
|
||||
$(top_builddir)/src/threads/mutex.lo \
|
||||
$(top_builddir)/src/threads/mutex_pthread.lo \
|
||||
@ -29,7 +29,7 @@ ompi_list_SOURCES = ompi_list.c
|
||||
ompi_list_LDADD = \
|
||||
$(top_builddir)/src/class/ompi_list.lo \
|
||||
$(top_builddir)/src/class/ompi_object.lo \
|
||||
$(top_builddir)/src/mem/malloc.lo \
|
||||
$(top_builddir)/src/util/malloc.lo \
|
||||
$(top_builddir)/src/util/output.lo \
|
||||
$(top_builddir)/src/threads/mutex.lo \
|
||||
$(top_builddir)/src/threads/mutex_pthread.lo \
|
||||
@ -42,7 +42,7 @@ ompi_hash_table_LDADD = \
|
||||
$(top_builddir)/src/class/ompi_hash_table.lo \
|
||||
$(top_builddir)/src/class/ompi_list.lo \
|
||||
$(top_builddir)/src/class/ompi_object.lo \
|
||||
$(top_builddir)/src/mem/malloc.lo \
|
||||
$(top_builddir)/src/util/malloc.lo \
|
||||
$(top_builddir)/src/util/output.lo \
|
||||
$(top_builddir)/src/threads/mutex.lo \
|
||||
$(top_builddir)/src/threads/mutex_pthread.lo \
|
||||
@ -54,7 +54,7 @@ ompi_pointer_array_SOURCES = ompi_pointer_array.c
|
||||
ompi_pointer_array_LDADD = \
|
||||
$(top_builddir)/src/class/ompi_pointer_array.lo \
|
||||
$(top_builddir)/src/class/ompi_object.lo \
|
||||
$(top_builddir)/src/mem/malloc.lo \
|
||||
$(top_builddir)/src/util/malloc.lo \
|
||||
$(top_builddir)/src/util/output.lo \
|
||||
$(top_builddir)/src/threads/mutex.lo \
|
||||
$(top_builddir)/src/threads/mutex_pthread.lo \
|
||||
@ -67,7 +67,7 @@ ompi_value_array_SOURCES = ompi_value_array.c
|
||||
ompi_value_array_LDADD = \
|
||||
$(top_builddir)/src/class/ompi_value_array.lo \
|
||||
$(top_builddir)/src/class/ompi_object.lo \
|
||||
$(top_builddir)/src/mem/malloc.lo \
|
||||
$(top_builddir)/src/util/malloc.lo \
|
||||
$(top_builddir)/src/util/output.lo \
|
||||
$(top_builddir)/src/threads/mutex.lo \
|
||||
$(top_builddir)/src/threads/mutex_pthread.lo \
|
||||
|
@ -15,7 +15,7 @@ ompi_thread_SOURCES = ompi_thread.c
|
||||
ompi_thread_LDADD = \
|
||||
$(top_builddir)/src/threads/thread.lo \
|
||||
$(top_builddir)/src/class/ompi_object.lo \
|
||||
$(top_builddir)/src/mem/malloc.lo \
|
||||
$(top_builddir)/src/util/malloc.lo \
|
||||
$(top_builddir)/src/util/output.lo \
|
||||
$(top_builddir)/src/threads/mutex.lo \
|
||||
$(top_builddir)/src/threads/mutex_pthread.lo \
|
||||
@ -38,7 +38,7 @@ ompi_condition_LDADD = \
|
||||
$(top_builddir)/src/threads/thread.lo \
|
||||
$(top_builddir)/src/class/ompi_object.lo \
|
||||
$(top_builddir)/src/runtime/ompi_progress.lo \
|
||||
$(top_builddir)/src/mem/malloc.lo \
|
||||
$(top_builddir)/src/util/malloc.lo \
|
||||
$(top_builddir)/src/util/output.lo \
|
||||
$(top_builddir)/src/event/libevent.la \
|
||||
$(top_builddir)/test/support/libsupport.la
|
||||
|
@ -15,7 +15,7 @@ noinst_PROGRAMS = \
|
||||
ompi_argv_SOURCES = ompi_argv.c
|
||||
ompi_argv_LDADD = \
|
||||
$(top_builddir)/src/class/ompi_object.lo \
|
||||
$(top_builddir)/src/mem/malloc.lo \
|
||||
$(top_builddir)/src/util/malloc.lo \
|
||||
$(top_builddir)/src/util/output.lo \
|
||||
$(top_builddir)/src/util/argv.lo \
|
||||
$(top_builddir)/src/util/strncpy.lo \
|
||||
@ -30,7 +30,7 @@ ompi_os_path_SOURCES = ompi_os_path.c
|
||||
ompi_os_path_LDADD = \
|
||||
$(top_builddir)/src/util/sys_info.lo \
|
||||
$(top_builddir)/src/class/ompi_object.lo \
|
||||
$(top_builddir)/src/mem/malloc.lo \
|
||||
$(top_builddir)/src/util/malloc.lo \
|
||||
$(top_builddir)/src/util/output.lo \
|
||||
$(top_builddir)/src/util/argv.lo \
|
||||
$(top_builddir)/src/util/strncpy.lo \
|
||||
@ -47,7 +47,7 @@ ompi_sys_info_SOURCES = ompi_sys_info.c
|
||||
ompi_sys_info_LDADD = \
|
||||
$(top_builddir)/src/util/sys_info.lo \
|
||||
$(top_builddir)/src/class/ompi_object.lo \
|
||||
$(top_builddir)/src/mem/malloc.lo \
|
||||
$(top_builddir)/src/util/malloc.lo \
|
||||
$(top_builddir)/src/util/output.lo \
|
||||
$(top_builddir)/src/util/argv.lo \
|
||||
$(top_builddir)/src/util/strncpy.lo \
|
||||
@ -62,7 +62,7 @@ ompi_os_create_dirpath_SOURCES = ompi_os_create_dirpath.c
|
||||
ompi_os_create_dirpath_LDADD = \
|
||||
$(top_builddir)/src/util/sys_info.lo \
|
||||
$(top_builddir)/src/class/ompi_object.lo \
|
||||
$(top_builddir)/src/mem/malloc.lo \
|
||||
$(top_builddir)/src/util/malloc.lo \
|
||||
$(top_builddir)/src/util/output.lo \
|
||||
$(top_builddir)/src/util/argv.lo \
|
||||
$(top_builddir)/src/util/strncpy.lo \
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user