ofi: Cruft Cleanup in common code

Remove cruft from common_ofi, including unnecessary includes,
declarations, and OPAL_DECLSPEC annotations on function
definitions (they are only needed on declarations).

Also move one function back into the C_DECLS block and
properly OPAL_DECLSPEC the function.

Signed-off-by: Brian Barrett <bbarrett@amazon.com>

Author: bwbarrett

opal/mca/common/ofi/common_ofi.c

@@ -15,23 +15,30 @@
  * $HEADER$
  */
 
+
+#include "opal_config.h"
+
 #include <errno.h>
 #include <unistd.h>
+#include <rdma/fabric.h>
+#if OPAL_OFI_IMPORT_MONITOR_SUPPORT
+#include <rdma/fi_ext.h>
+#endif
 
-#include "opal_config.h"
 #include "common_ofi.h"
 #include "opal/constants.h"
 #include "opal/mca/base/mca_base_framework.h"
 #include "opal/mca/base/mca_base_var.h"
 #include "opal/mca/hwloc/base/base.h"
+#include "opal/mca/memory/base/base.h"
 #include "opal/mca/pmix/base/base.h"
 #include "opal/util/argv.h"
 #include "opal/util/show_help.h"
 
-OPAL_DECLSPEC opal_common_ofi_module_t opal_common_ofi = {.prov_include = NULL,
-                                                          .prov_exclude = NULL,
-                                                          .registered = 0,
-                                                          .verbose = 0};
+opal_common_ofi_module_t opal_common_ofi = {.prov_include = NULL,
+                                            .prov_exclude = NULL,
+                                            .registered = 0,
+                                            .verbose = 0};
 
 static const char default_prov_exclude_list[] = "shm,sockets,tcp,udp,rstream,usnic";
 static opal_mutex_t opal_common_ofi_mutex = OPAL_MUTEX_STATIC_INIT;
@@ -75,15 +82,15 @@ static struct fi_ops_mem_monitor opal_common_ofi_export_ops = {
     .valid = opal_common_ofi_monitor_valid,
 };
 
-OPAL_DECLSPEC void opal_common_ofi_mem_release_cb(void *buf, size_t length,
-                                                  void *cbdata, bool from_alloc)
+static void opal_common_ofi_mem_release_cb(void *buf, size_t length,
+                                           void *cbdata, bool from_alloc)
 {
     opal_common_ofi_monitor->import_ops->notify(opal_common_ofi_monitor,
                                                 buf, length);
 }
 #endif /* OPAL_OFI_IMPORT_MONITOR_SUPPORT */
 
-OPAL_DECLSPEC int opal_common_ofi_init(void)
+int opal_common_ofi_init(void)
 {
     int ret;
 
@@ -135,7 +142,7 @@ OPAL_DECLSPEC int opal_common_ofi_init(void)
 #endif
 }
 
-OPAL_DECLSPEC int opal_common_ofi_fini(void)
+int opal_common_ofi_fini(void)
 {
     if (opal_common_ofi_initialized && !--opal_common_ofi_init_ref_cnt) {
 #if OPAL_OFI_IMPORT_MONITOR_SUPPORT
@@ -150,7 +157,7 @@ OPAL_DECLSPEC int opal_common_ofi_fini(void)
     return OPAL_SUCCESS;
 }
 
-OPAL_DECLSPEC int opal_common_ofi_is_in_list(char **list, char *item)
+int opal_common_ofi_is_in_list(char **list, char *item)
 {
     int i = 0;
 
@@ -169,7 +176,7 @@ OPAL_DECLSPEC int opal_common_ofi_is_in_list(char **list, char *item)
     return 0;
 }
 
-OPAL_DECLSPEC int opal_common_ofi_register_mca_variables(const mca_base_component_t *component)
+int opal_common_ofi_register_mca_variables(const mca_base_component_t *component)
 {
     static int include_index;
     static int exclude_index;
@@ -253,7 +260,7 @@ OPAL_DECLSPEC int opal_common_ofi_register_mca_variables(const mca_base_componen
     return OPAL_SUCCESS;
 }
 
-OPAL_DECLSPEC void opal_common_ofi_mca_register(void)
+void opal_common_ofi_mca_register(void)
 {
     opal_common_ofi.registered++;
     if (opal_common_ofi.registered > 1) {
@@ -265,7 +272,7 @@ OPAL_DECLSPEC void opal_common_ofi_mca_register(void)
     opal_output_set_verbosity(opal_common_ofi.output, opal_common_ofi.verbose);
 }
 
-OPAL_DECLSPEC void opal_common_ofi_mca_deregister(void)
+void opal_common_ofi_mca_deregister(void)
 {
     /* unregister only on last deregister */
     opal_common_ofi.registered--;

opal/mca/common/ofi/common_ofi.h

@@ -18,15 +18,8 @@
 #ifndef OPAL_MCA_COMMON_OFI_H
 #define OPAL_MCA_COMMON_OFI_H
 
-#include "opal_config.h"
-#include "opal/mca/base/mca_base_framework.h"
-#include "opal/mca/base/mca_base_var.h"
 #include "opal/util/proc.h"
 #include "opal/memoryhooks/memory.h"
-#include <rdma/fabric.h>
-#if OPAL_OFI_IMPORT_MONITOR_SUPPORT
-#include <rdma/fi_ext.h>
-#endif
 
 BEGIN_C_DECLS
 
@@ -39,7 +32,6 @@ typedef struct opal_common_ofi_module {
 } opal_common_ofi_module_t;
 
 extern opal_common_ofi_module_t opal_common_ofi;
-extern mca_base_framework_t opal_memory_base_framework;
 
 OPAL_DECLSPEC int opal_common_ofi_register_mca_variables(const mca_base_component_t *component);
 OPAL_DECLSPEC void opal_common_ofi_mca_register(void);
@@ -61,24 +53,6 @@ OPAL_DECLSPEC void opal_common_ofi_mca_deregister(void);
  */
 OPAL_DECLSPEC int opal_common_ofi_is_in_list(char **list, char *item);
 
-#if OPAL_OFI_IMPORT_MONITOR_SUPPORT
-/*
- * @param buf (IN)         Pointer to the start of the allocation
- * @param length (IN)      Length of the allocation
- * @param cbdata (IN)      Data passed to memory hooks when callback
- *                         was registered
- * @param from_alloc (IN)  True if the callback is caused by a call to the
- *                         general allocation routines (malloc, calloc, free,
- *                         etc.) or directly from the user (mmap, munmap, etc.)
- *
- * Callback function triggered when memory is about to be freed.
- * is about to be freed.  The callback will be triggered according to
- * the note in opal_mem_hooks_register_release().
- *
- */
-OPAL_DECLSPEC void opal_common_ofi_mem_release_cb(void *buf, size_t length, void *cbdata, bool from_alloc);
-#endif /* OPAL_OFI_IMPORT_MONITOR_SUPPORT */
-
 /*
  * Initializes common objects for libfabric
  */
@@ -89,9 +63,9 @@ OPAL_DECLSPEC int opal_common_ofi_init(void);
  */
 OPAL_DECLSPEC int opal_common_ofi_fini(void);
 
-END_C_DECLS
+OPAL_DECLSPEC struct fi_info *opal_mca_common_ofi_select_provider(struct fi_info *provider_list,
+                                                                  opal_process_info_t *process_info);
 
-struct fi_info *opal_mca_common_ofi_select_provider(struct fi_info *provider_list,
-                                                    opal_process_info_t *process_info);
+END_C_DECLS
 
 #endif /* OPAL_MCA_COMMON_OFI_H */