From 9299cd5cd7ad5877b84d23bf839da635283ec3fe Mon Sep 17 00:00:00 2001
From: Nathan Hjelm <hjelmn@lanl.gov>
Date: Thu, 19 Mar 2015 10:49:44 -0600
Subject: [PATCH] ompi/info: add support for getting info key value based on
 variable enumerator

This commit adds a function that will return an integer value for an
info key based on the value returned by a variable enumerator. This
feature should greatly simplify code using the info keys (osc for
example).

Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
---
 ompi/info/info.c | 31 +++++++++++++++++++++++++++++--
 ompi/info/info.h | 25 +++++++++++++++++++++++--
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/ompi/info/info.c b/ompi/info/info.c
index 4c9e0c7f4a..b44f3c76a9 100644
--- a/ompi/info/info.c
+++ b/ompi/info/info.c
@@ -12,8 +12,8 @@
  *                         All rights reserved.
  * Copyright (c) 2007-2015 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2009      Sun Microsystems, Inc.  All rights reserved.
- * Copyright (c) 2012-2013 Los Alamos National Security, LLC.
- *                         All rights reserved.
+ * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -326,6 +326,33 @@ int ompi_info_get (ompi_info_t *info, const char *key, int valuelen,
     return MPI_SUCCESS;
 }
 
+int ompi_info_get_value_enum (ompi_info_t *info, const char *key, int *value,
+                              int default_value, mca_base_var_enum_t *var_enum,
+                              int *flag)
+{
+    ompi_info_entry_t *search;
+    int ret;
+
+    *value = default_value;
+
+    OPAL_THREAD_LOCK(info->i_lock);
+    search = info_find_key (info, key);
+    if (NULL == search){
+        OPAL_THREAD_UNLOCK(info->i_lock);
+        *flag = 0;
+        return MPI_SUCCESS;
+    }
+
+    /* we found a mathing key. pass the string value to the enumerator and
+     * return */
+    *flag = 1;
+
+    ret = var_enum->value_from_string (var_enum, search->ie_value, value);
+    OPAL_THREAD_UNLOCK(info->i_lock);
+
+    return ret;
+}
+
 
 /*
  * Similar to ompi_info_get(), but cast the result into a boolean
diff --git a/ompi/info/info.h b/ompi/info/info.h
index 6616ac10f8..772d207349 100644
--- a/ompi/info/info.h
+++ b/ompi/info/info.h
@@ -12,8 +12,8 @@
  *                         All rights reserved.
  * Copyright (c) 2007-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2009      Sun Microsystems, Inc.  All rights reserved.
- * Copyright (c) 2012-2013 Los Alamos National Security, LLC.
- *                         All rights reserved.
+ * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -32,6 +32,7 @@
 #include "opal/class/opal_pointer_array.h"
 #include "opal/threads/mutex.h"
 
+#include "opal/mca/base/mca_base_var_enum.h"
 
 /**
  * \internal
@@ -202,6 +203,26 @@ int ompi_info_free (ompi_info_t **info);
 OMPI_DECLSPEC int ompi_info_get_bool (ompi_info_t *info, char *key, bool *value,
                                       int *flag);
 
+/**
+ *   Get a (key, value) pair from an 'MPI_Info' object and assign it
+ *   into an integer output based on the enumerator value.
+ *
+ *   @param info Pointer to ompi_info_t object
+ *   @param key null-terminated character string of the index key
+ *   @param value integer output value
+ *   @param default_value value to use if the string does not conform to the
+ *          values accepted by the enumerator
+ *   @param var_enum variable enumerator for the value
+ *   @param flag true (1) if 'key' defined on 'info', false (0) if not
+ *               (logical)
+ *
+ *   @retval MPI_SUCCESS
+ */
+
+OMPI_DECLSPEC int ompi_info_get_value_enum (ompi_info_t *info, const char *key,
+                                            int *value, int default_value,
+                                            mca_base_var_enum_t *var_enum, int *flag);
+
 /**
  *   Get a (key, value) pair from an 'MPI_Info' object
  *