From 45fad1ddcca8b30a0000c804a541e2dbc119454c Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Wed, 3 Jul 2013 16:57:14 +0000
Subject: [PATCH] We really should be closing the event framework when told to
 do so.

cmr:v1.7.3,reviewer=jsquyres

This commit was SVN r28714.
---
 opal/mca/event/base/Makefile.am               |  2 +-
 opal/mca/event/base/event_base_close.c        | 25 -------------------
 .../{event_base_open.c => event_base_frame.c} | 10 +++++++-
 3 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 opal/mca/event/base/event_base_close.c
 rename opal/mca/event/base/{event_base_open.c => event_base_frame.c} (88%)

diff --git a/opal/mca/event/base/Makefile.am b/opal/mca/event/base/Makefile.am
index 4d0a5095f7..2705498e01 100644
--- a/opal/mca/event/base/Makefile.am
+++ b/opal/mca/event/base/Makefile.am
@@ -11,5 +11,5 @@ headers += \
         base/base.h
 
 libmca_event_la_SOURCES += \
-        base/event_base_open.c
+        base/event_base_frame.c
 
diff --git a/opal/mca/event/base/event_base_close.c b/opal/mca/event/base/event_base_close.c
deleted file mode 100644
index 4c0e9b2513..0000000000
--- a/opal/mca/event/base/event_base_close.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
- * $COPYRIGHT$
- * 
- * Additional copyrights may follow
- * 
- * $HEADER$
- */
-
-#include "opal_config.h"
-
-#include "opal/constants.h"
-#include "opal/mca/mca.h"
-#include "opal/mca/base/base.h"
-#include "opal/mca/event/event.h"
-#include "opal/mca/event/base/base.h"
-
-int opal_event_base_close(void)
-{
-    opal_event_base_inited--;
-
-    /* cleanup components even though they are statically opened */
-    return mca_base_framework_components_close (&opal_event_base_framework,
-						NULL);
-}
diff --git a/opal/mca/event/base/event_base_open.c b/opal/mca/event/base/event_base_frame.c
similarity index 88%
rename from opal/mca/event/base/event_base_open.c
rename to opal/mca/event/base/event_base_frame.c
index b7f14fd312..81eaf8828c 100644
--- a/opal/mca/event/base/event_base_open.c
+++ b/opal/mca/event/base/event_base_frame.c
@@ -46,11 +46,19 @@
  * and is only mentioned here for completeness.
  */
 static int opal_event_base_open(mca_base_open_flag_t flags);
+static int opal_event_base_close(void);
 
 /* Use default register and close function */
 MCA_BASE_FRAMEWORK_DECLARE(opal, event, NULL, NULL, opal_event_base_open,
-			   NULL, mca_event_base_static_components,
+			   opal_event_base_close, mca_event_base_static_components,
 			   0);
+
+static int opal_event_base_close(void)
+{
+    /* cleanup components even though they are statically opened */
+    return mca_base_framework_components_close (&opal_event_base_framework,
+						NULL);
+}
 			   
 /*
  * Globals