- In an attempt for better compile times (i.e., less dependencies),

strip down cmd_line.h; remove necessity of including
  include/constants.h and util/argv.h.
- This means that a bunch of other files in the source tree that
  depended on those files having already been included needed to be
  updated to include the relevant file(s)
- In fixing these (^^), added both /* $HEADER$ */ and #include
  "ompi_config.h" in a few files that were missing them.
- change from ompi_cmd_line_create() / ompi_cmd_line_free() to
  OBJ_NEW() / OBJ_RELEASE()
- update mpirun2.cc to allow "-np"
- fix minor problem in mpirun2.cc where two command line params were
  accepting "-h"
- slightly revamped cmd_line.c to use the OBJ_NEW/OBJ_RELEASE
  interface.  Added new function ompi_cmd_line_make_opt3() that allows
  "single dash" parameters.
- Greatly expanded the ompi_cmd_line_t doxygen docs.
- The diff for ompi_cmd_line_t is artificially large because I also
  took the opprotunity to reformat to 4 space tabs.  Sorry.  :-\

This commit was SVN r2308.

src/mca/allocator/bucket/allocator_bucket_alloc.c

@@ -2,6 +2,7 @@
  * $HEADER$
  */
 
+#include "include/constants.h"
 #include "mca/allocator/bucket/allocator_bucket_alloc.h"
 /**
   * The define controls the size in bytes of the 1st bucket and hence every one

src/mca/llm/hostfile/src/llm_hostfile.c

@@ -6,6 +6,7 @@
 #include "ompi_config.h"
 #include "llm_hostfile.h"
 
+#include "include/constants.h"
 #include "mca/llm/llm.h"
 #include "mca/llm/base/base.h"
 

src/mca/llm/hostfile/src/llm_hostfile_component.c

@@ -6,6 +6,7 @@
 #include "ompi_config.h"
 #include "mca/llm/hostfile/llm-hostfile-version.h"
 #include "llm_hostfile.h"
+#include "include/constants.h"
 #include "util/os_path.h"
 #include "mca/llm/llm.h"
 #include "mca/llm/base/base.h"

src/mca/ns/base/ns_base_local_fns.c

@@ -12,6 +12,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 
+#include "include/constants.h"
 #include "util/output.h"
 #include "util/printf.h"
 #include "mca/mca.h"

src/mca/ns/base/ns_base_remote_fns.c

@@ -6,6 +6,7 @@
  */
 
 #include "ompi_config.h"
+#include "include/constants.h"
 #include "mca/mca.h"
 #include "util/pack.h"
 #include "mca/oob/base/base.h"

src/mca/oob/base/oob_base_init.c

@@ -9,6 +9,7 @@
 #include "runtime/runtime.h"
 #include "util/output.h"
 #include "util/proc_info.h"
+#include "util/argv.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"
 #include "mca/pcmclient/pcmclient.h"

src/mca/oob/base/oob_base_recv.c

@@ -1,3 +1,10 @@
+/*
+ * $HEADER$
+ */
+
+#include "ompi_config.h"
+
+#include "include/constants.h"
 #include "mca/oob/oob.h"
 #include "mca/oob/base/base.h"
 #include <netinet/in.h>

src/mca/oob/base/oob_base_recv_nb.c

@@ -1,3 +1,10 @@
+/*
+ * $HEADER$
+ */
+
+#include "ompi_config.h"
+
+#include "include/constants.h"
 #include "mca/oob/oob.h"
 #include "mca/oob/base/base.h"
 #include <string.h>

src/mca/oob/base/oob_base_send.c

@@ -1,3 +1,10 @@
+/*
+ * $HEADER$
+ */
+
+#include "ompi_config.h"
+
+#include "include/constants.h"
 #include "mca/oob/oob.h"
 #include "mca/oob/base/base.h"
 #include <string.h>

src/mca/oob/base/oob_base_send_nb.c

@@ -1,3 +1,10 @@
+/*
+ * $HEADER$
+ */
+
+#include "ompi_config.h"
+
+#include "include/constants.h"
 #include "mca/oob/oob.h"
 #include "mca/oob/base/base.h"
 #include <string.h>

src/mca/oob/cofs/src/oob_cofs.c

@@ -10,6 +10,7 @@
 #include "ompi_config.h"
 
 #include "include/types.h"
+#include "include/constants.h"
 #include "mca/oob/oob.h"
 #include "mca/oob/cofs/src/oob_cofs.h"
 #include "mca/ns/base/base.h"

src/mca/pcm/base/pcm_base_comm.c

@@ -6,6 +6,7 @@
 
 #include <string.h>
 
+#include "include/constants.h"
 #include "class/ompi_list.h"
 #include "mca/pcm/base/base.h"
 

src/mca/pcm/base/pcm_base_util.c

@@ -8,7 +8,9 @@
 
 #include <string.h>
 
+#include "include/constants.h"
 #include "class/ompi_list.h"
+#include "util/argv.h"
 #include "runtime/runtime_types.h"
 #include "mca/pcm/base/base.h"
 #include "mca/pcm/base/base.h"

src/mca/pcm/cofs/src/pcm_cofs.c

@@ -9,6 +9,7 @@
 #include "mca/pcm/pcm.h"
 #include "mca/pcm/cofs/src/pcm_cofs.h"
 #include "include/types.h"
+#include "include/constants.h"
 
 #include <stdio.h>
 #include <sys/types.h>

src/mca/pcm/rsh/src/pcm_rsh_kill.c

@@ -6,6 +6,7 @@
 
 #include "ompi_config.h"
 
+#include "include/constants.h"
 #include "mca/pcm/pcm.h"
 #include "mca/pcm/rsh/src/pcm_rsh.h"
 

src/mca/pcm/rsh/src/pcm_rsh_spawn.c

@@ -19,6 +19,7 @@
 #include <string.h>
 #include <errno.h>
 
+#include "include/constants.h"
 #include "mca/pcm/pcm.h"
 #include "mca/pcm/base/base.h"
 #include "mca/pcm/rsh/src/pcm_rsh.h"

src/mca/pcmclient/env/pcmclient_env.c

@@ -7,6 +7,7 @@
 #include "mca/pcmclient/pcmclient.h"
 #include "mca/pcmclient/env/pcmclient_env.h"
 #include "include/types.h"
+#include "include/constants.h"
 
 #include <stdio.h>
 #include <sys/types.h>

src/mca/pcmclient/rms/pcmclient_rms.c

@@ -7,6 +7,7 @@
 #include "mca/pcmclient/pcmclient.h"
 #include "mca/pcmclient/rms/pcmclient_rms.h"
 #include "include/types.h"
+#include "include/constants.h"
 
 #include <stdio.h>
 #include <sys/types.h>

src/mca/pcmclient/seed/pcmclient_seed.c

@@ -7,6 +7,7 @@
 #include "mca/pcmclient/pcmclient.h"
 #include "mca/pcmclient/seed/pcmclient_seed.h"
 #include "include/types.h"
+#include "include/constants.h"
 
 #include <stdio.h>
 #include <sys/types.h>

src/mca/pcmclient/singleton/pcmclient_singleton.c

@@ -7,6 +7,7 @@
 #include "mca/pcmclient/pcmclient.h"
 #include "mca/pcmclient/singleton/pcmclient_singleton.h"
 #include "include/types.h"
+#include "include/constants.h"
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -17,7 +18,7 @@ extern ompi_process_name_t *mca_pcmclient_singleton_procs;
 
 static
 int
-init_proclist()
+init_proclist(void)
 {
     if (NULL != mca_pcmclient_singleton_procs) return OMPI_SUCCESS;
 

src/mca/ptl/base/ptl_base_select.c

@@ -4,6 +4,7 @@
 
 #include "ompi_config.h"
 
+#include "util/argv.h"
 #include "runtime/runtime.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"

src/mca/topo/base/topo_base_comm_select.c

@@ -5,6 +5,7 @@
 #include "ompi_config.h"
 
 #include "class/ompi_list.h"
+#include "util/argv.h"
 #include "runtime/runtime.h"
 #include "mca/mca.h"
 #include "mca/base/base.h"

src/runtime/ompi_rte_llm.c

@@ -4,6 +4,7 @@
 
 #include "ompi_config.h"
 
+#include "include/constants.h"
 #include "runtime/runtime.h"
 #include "runtime/runtime_types.h"
 #include "mca/pcm/pcm.h"

src/runtime/ompi_rte_pcm.c

@@ -4,6 +4,7 @@
 
 #include "ompi_config.h"
 
+#include "include/constants.h"
 #include "runtime/runtime.h"
 #include "runtime/runtime_types.h"
 #include "mca/pcm/pcm.h"

src/tools/bootproxy/bootproxy.c

@@ -4,6 +4,7 @@
 
 #include "ompi_config.h"
 
+#include "include/constants.h"
 #include "runtime/runtime.h"
 #include "mca/pcm/base/base.h"
 
@@ -36,7 +37,7 @@ main(int argc, char *argv[])
     char *env_buf;
 
     ompi_init(argc, argv);
-    cmd_line = ompi_cmd_line_create();
+    cmd_line = OBJ_NEW(ompi_cmd_line_t);
     ompi_cmd_line_make_opt(cmd_line, '\0', "local_start_vpid", 1, 
                            "starting vpid to use when launching");
     ompi_cmd_line_make_opt(cmd_line, '\0', "global_start_vpid", 1, 

src/tools/mpirun/mpirun2.cc

@@ -46,7 +46,7 @@ main(int argc, char *argv[])
     /*
      * Intialize our Open MPI environment
      */
-    cmd_line = ompi_cmd_line_create();
+    cmd_line = OBJ_NEW(ompi_cmd_line_t);
 
     if (OMPI_SUCCESS != ompi_init(argc, argv)) {
         /* BWB show_help */
@@ -65,12 +65,12 @@ main(int argc, char *argv[])
 
     ompi_cmd_line_make_opt(cmd_line, 'h', "help", 0, 
                            "Show this help message");
-    ompi_cmd_line_make_opt(cmd_line, '\0', "np", 1,
-                           "Number of processes to start");
-    ompi_cmd_line_make_opt(cmd_line, 'h', "hostfile", 1,
+    ompi_cmd_line_make_opt3(cmd_line, 'n', "np", "np", 1,
+                            "Number of processes to start");
+    ompi_cmd_line_make_opt3(cmd_line, '\0', "hostfile", "hostfile", 1,
                            "Host description file");
 
-    if (OMPI_SUCCESS != ompi_cmd_line_parse(cmd_line, false, argc, argv) ||
+    if (OMPI_SUCCESS != ompi_cmd_line_parse(cmd_line, true, argc, argv) ||
         ompi_cmd_line_is_taken(cmd_line, "help") || 
         ompi_cmd_line_is_taken(cmd_line, "h")) {
         printf("...showing ompi_info help message...\n");
@@ -161,7 +161,7 @@ main(int argc, char *argv[])
      * Clean up
      */
     if (NULL != nodelist) ompi_rte_deallocate_resources(new_jobid, nodelist);
-    if (NULL != cmd_line) ompi_cmd_line_free(cmd_line);
+    if (NULL != cmd_line) OBJ_RELEASE(cmd_line);
     ompi_rte_finalize();
     mca_base_close();
     ompi_finalize();

src/tools/ompi_info/ompi_info.cc

@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
 
   // Initialize the argv parsing handle
 
-  cmd_line = ompi_cmd_line_create();
+  cmd_line = OBJ_NEW(ompi_cmd_line_t);
   if (NULL == cmd_line) {
     ret = errno;
 #if 0
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
   // All done
 
   ompi_info::close_components();
-  ompi_cmd_line_free(cmd_line);
+  OBJ_RELEASE(cmd_line);
   mca_base_close();
   ompi_finalize();
   return 0;

src/tools/ompid/ompid.c

@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
     }
 
     /* setup the rte command line arguments */
-    cmd_line = ompi_cmd_line_create();
+    cmd_line = OBJ_NEW(ompi_cmd_line_t);
     ompi_cmd_line_make_opt(cmd_line, 's', "seed", 0, 
 			   "Set the daemon seed to true.");
 
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
     /*
      * setup  mca command line arguments
      */
-    mca_cmd_line = ompi_cmd_line_create();
+    mca_cmd_line = OBJ_NEW(ompi_cmd_line_t);
     if (OMPI_SUCCESS != (ret = mca_base_cmd_line_setup(mca_cmd_line))) {
 	/* BWB show_help */
 	printf("show_help: mca_base_cmd_line_setup failed\n");
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
 	 * missing soemthing
 	 */
 	ompi_rte_finalize();
-	ompi_cmd_line_free(cmd_line);
+	OBJ_RELEASE(cmd_line);
 	mca_base_close();
 
 	return 1;
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
 
     /* Close services */
 
-    ompi_cmd_line_free(cmd_line);
+    OBJ_RELEASE(cmd_line);
     mca_base_close();
     ompi_finalize();
     return 0;

src/util/cmd_line.h

@@ -6,102 +6,171 @@
  * @file 
  *
  * General command line parsing facility for use throughout Open MPI.
+ *
+ * This scheme is inspired by the GNU getopt package.  Command line
+ * options are registered.  Each option can have up to three different
+ * matching tokens: a "short" name, a "single dash" name, and a "long"
+ * name.  Each option can also take 0 or more arguments.  Finally,
+ * each option can be repeated on the command line an arbitrary number
+ * of times.
+ *
+ * The "short" name can only be a single letter, and will be found
+ * after a single dash (e.g., "-a").  Multiple "short" names can be
+ * combined into a single command line argument (e.g., "-abc" can be
+ * equivalent to "-a -b -c").
+ *
+ * The "single dash" name is a multi-character name that only
+ * requires a single dash.  This only exists to provide backwards
+ * compatability for some well-known command line options in prior
+ * MPI implementations (e.g., "mpirun -np 3").  It should be used
+ * sparingly.
+ *
+ * The "long" name is a multi-character name that is found after a
+ * pair of dashes.  For example, "--some-option-name".  
+ *
+ * A command line option is a combination of 1 or more of a short
+ * name, single dash name, and a long name.  Any of the names may be
+ * used on the command line; they are treated as synonyms.  For
+ * example, say the following was used in for an executable named
+ * "foo":
+ *
+ * \code
+ * ompi_cmd_line_make_opt3(cmd, 'a', NULL, 'add', 1, "Add a user");
+ * \endcode
+ *
+ * In this case, the following command lines are exactly equivalent:
+ *
+ * \verbatim
+ * shell$ foo -a jsmith
+ * shell$ foo --add jsmith
+ * \endverbatim
+ *
+ * Note that this interface can also track multiple invocations of the
+ * same option.  For example, the following is both legal and able to
+ * be retrieved through this interface:
+ *
+ * \verbatim
+ * shell$ foo -a jsmith -add bjones
+ * \endverbatim
+ *
+ * The caller to this interface creates a command line handle
+ * (ompi_cmd_line_t) with OBJ_NEW() and then uses it to register the
+ * desired parameters via ompi_cmd_line_make_opt3() (or the deprecated
+ * ompi_cmd_line_make_opt()).  Once all the parameters have been
+ * registered, the user invokes ompi_cmd_line_parse() with the command
+ * line handle and the argv/argc pair to be parsed (typically the
+ * arguments from main()).  The parser will examine the argv and find
+ * registered options and parameters.  It will stop parsing when it
+ * runs into an recognized string token or the special "--" token.
+ *
+ * After the parse has occurred, various accessor functions can be
+ * used to determine which options were selected, what parameters were
+ * passed to them, etc.:
+ *
+ * - ompi_cmd_line_get_usage_msg() returns a string suitable for "help"
+ *   kinds of messages.
+ * - ompi_cmd_line_is_taken() returns a true or false indicating
+ *   whether a given command line option was found on the command
+ *   line.
+ * - ompi_cmd_line_get_argc() returns the number of tokens parsed on
+ *   the handle.
+ * - ompi_cmd_line_get_argv() returns any particular string from the
+ *   original argv.
+ * - ompi_cmd_line_get_ninsts() returns the number of times a
+ *   particular option was found on a command line.
+ * - ompi_cmd_line_get_param() returns the Nth parameter in the Mth
+ *   instance of a given parameter.
+ * - ompi_cmd_line_get_tail() returns an array of tokens not parsed
+ *   (i.e., if the parser ran into "--" or an unrecognized token).
  */
 
 #ifndef OMPI_CMD_LINE_H
 #define OMPI_CMD_LINE_H
 
 #include "ompi_config.h"
-#include "include/constants.h"
+
+#include "class/ompi_object.h"
 #include "class/ompi_list.h"
 #include "threads/mutex.h"
-#include "util/argv.h"
 
 /**
  * \internal
  *
- * Top-level descriptor.  This type is actually internal to the
- * cmd_line interface, but we can't have the top-level convenience
- * typedef without it.  You should not use the internal members of
- * this struct; please use the interface described in this file.
+ * Main top-level handle.  This interface should not be used by users!
  */
 struct ompi_cmd_line_t {
-  ompi_mutex_t lcl_mutex;
-  /**< Thread safety */
+    /** Make this an OBJ handle */
+    ompi_object_t super;
 
-  ompi_list_t lcl_options;
-  /**< List of cmd_line_option_t's, below */
+    /** Thread safety */
+    ompi_mutex_t lcl_mutex;
 
-  int lcl_argc;
-  /**< Duplicate of argc from ompi_cmd_line_parse() */
-  char **lcl_argv;
-  /**< Duplicate of argv from ompi_cmd_line_parse() */
+    /** List of cmd_line_option_t's (defined internally) */
+    ompi_list_t lcl_options;
 
-  ompi_list_t lcl_params;
-  /**< Parsed output; list of cmd_line_param_t's, below */
+    /** Duplicate of argc from ompi_cmd_line_parse() */
+    int lcl_argc;
+    /** Duplicate of argv from ompi_cmd_line_parse() */
+    char **lcl_argv;
 
-  int lcl_tail_argc;
-  /**< List of tail (unprocessed) arguments */
-  char **lcl_tail_argv;
-  /**< List of tail (unprocessed) arguments */
+    /** Parsed output; list of cmd_line_param_t's (defined internally) */
+    ompi_list_t lcl_params;
+    
+    /** List of tail (unprocessed) arguments */
+    int lcl_tail_argc;
+    /** List of tail (unprocessed) arguments */
+    char **lcl_tail_argv;
 };
 /**
- * Convenience typedef.
+ * \internal
+ *
+ * Convenience typedef
  */
 typedef struct ompi_cmd_line_t ompi_cmd_line_t;
 
 
+/**
+ * Top-level command line handle.
+ *
+ * This handle is used for accessing all command line functionality
+ * (i.e., all ompi_cmd_line*() functions).  Multiple handles can be
+ * created and simultaneously processed; each handle is independant
+ * from others.
+ *
+ * The ompi_cmd_line_t handles are [simplisticly] thread safe;
+ * processing is guaranteed to be mutually exclusive if multiple
+ * threads invoke functions on the same handle at the same time --
+ * access will be serialized in an unspecified order.
+ *
+ * Once finished, handles should be released with OBJ_RELEASE().  The
+ * destructor for ompi_cmd_line_t handles will free all memory
+ * associated with the handle.
+ */
+OBJ_CLASS_DECLARATION(ompi_cmd_line_t);
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
   /**
-   * Create a OMPI command line handle.
+   * Create a command line option.
    *
-   * @retval NULL Upon failure.
-   * @retval cmd A pointer to an empty command line handle upon success.
-   *
-   * This is the first function invoked to start command line parsing.
-   * It creates an independant handle that is used in all other
-   * ompi_cmd_line*() functions.  Multiple handles can be created and
-   * simultaneously processed; each handle is independant from others.
-   *
-   * The ompi_cmd_line_t handles are [simplisticly] thread safe;
-   * processing is guaranteed to be mutually exclusive if multiple
-   * threads invoke functions on the same handle at the same time --
-   * access will be serialized in an unspecified order.
-   *
-   * It is necessary to call ompi_cmd_line_free() with the handle
-   * returned from this function in order to free all memory associated
-   * with it.
+   * This function is an older [deprecated] form of
+   * ompi_cmd_line_make_opt3().  It is exactly equivalent to
+   * ompi_cmd_line_make_opt3(cmd, short_name, NULL, long_name,
+   * num_params, desc).
    */
-  ompi_cmd_line_t *ompi_cmd_line_create(void);
-
-  /*
-   * Free a (ompi_cmd_line_t*) that was initially allocated via
-   * ompi_cmd_line_create().
-   *
-   * @param cmd The OMPI command line handle to free.
-   *
-   * This function frees a OMPI command line handle and all its
-   * associated memory.  This function can be called with any non-NULL
-   * pointer that was returned from ompi_cmd_line_create().  Once called,
-   * the handle is no longer valid.
-   *
-   * Access into this function is not thread safe.  Since, by
-   * definition, calling this function will destroy the handle, it does
-   * not make sense to try to have thread A invoke a different
-   * ompi_cmd_line*() function and thread B invoke ompi_cmd_line_free() --
-   * even if the calls are serialized, there's a race condition where
-   * thread A may try to use a now-invalid handle.
-   */
-  void ompi_cmd_line_free(ompi_cmd_line_t *cmd);
+  int ompi_cmd_line_make_opt(ompi_cmd_line_t *cmd, char short_name, 
+                            const char *long_name, int num_params, 
+                            const char *desc);
 
   /**
    * Create a command line option.
    *
    * @param cmd OMPI command line handle.
    * @param short_name "Short" name of the command line option.
+   * @param sd_name "Single dash" name of the command line option.
    * @param long_name "Long" name of the command line option.
    * @param num_params How many parameters this option takes.
    * @param dest Short string description of this option.
@@ -113,19 +182,20 @@ extern "C" {
    * Adds a command line option to the list of options that a a OMPI
    * command line handle will accept.  The short_name may take the
    * special value '\0' to not have a short name.  Likewise, the
-   * long_name may take the special value NULL to not have a long name.
-   * However, either the long or the short name must take valid value.
+   * sd_name and long_name may take the special value NULL to not have
+   * a single dash or long name, respectively.  However, one of the
+   * three must have a name.
    *
    * num_params indicates how many parameters this option takes.  It
    * must be greater than or equal to 0.
    *
    * Finally, desc is a short string description of this option.  It is
    * used to generate the output from ompi_cmd_line_get_usage_msg().
+   *
    */
-  int ompi_cmd_line_make_opt(ompi_cmd_line_t *cmd, char short_name, 
-                            const char *long_name, int num_params, 
-                            const char *desc);
-
+  int ompi_cmd_line_make_opt3(ompi_cmd_line_t *cmd, char short_name, 
+                              const char *sd_name, const char *long_name, 
+                              int num_params, const char *desc);
   /**
    * Parse a command line according to a pre-built OMPI command line
    * handle.
@@ -214,6 +284,39 @@ extern "C" {
    * Otherwise, it will return false.
    */
   bool ompi_cmd_line_is_taken(ompi_cmd_line_t *cmd, const char *opt);
+
+  /**
+   * Return the number of arguments parsed on a OMPI command line handle.
+   *
+   * @param cmd A pointer to the OMPI command line handle.
+   *
+   * @retval OMPI_ERROR If cmd is NULL.
+   * @retval argc Number of arguments previously added to the handle.
+   *
+   * Arguments are added to the handle via the ompi_cmd_line_parse()
+   * function.
+   */
+  int ompi_cmd_line_get_argc(ompi_cmd_line_t *cmd);
+
+  /**
+   * Return a string argument parsed on a OMPI command line handle.
+   *
+   * @param cmd A pointer to the OMPI command line handle.
+   * @param index The nth argument from the command line (0 is
+   * argv[0], etc.).
+   *
+   * @retval NULL If cmd is NULL or index is invalid
+   * @retval argument String of original argv[index]
+   *
+   * This function returns a single token from the arguments parsed
+   * on this handle.  Arguments are added bia the
+   * ompi_cmd_line_parse() function.
+   *
+   * What is returned is a pointer to the actual string that is on
+   * the handle; it should not be modified or freed.
+   */
+  char *ompi_cmd_line_get_argv(ompi_cmd_line_t *cmd, int index);
+
   /**
    * Return the number of instances of an option found during parsing.
    *
@@ -265,90 +368,39 @@ extern "C" {
    */
   char *ompi_cmd_line_get_param(ompi_cmd_line_t *cmd, const char *opt, 
                                int instance_num, int param_num);
+
+  /**
+   * Return the entire "tail" of unprocessed argv from a OMPI
+   * command line handle.
+   *
+   * @param cmd A pointer to the OMPI command line handle.
+   * @param tailc Pointer to the output length of the null-terminated
+   * tail argv array.
+   * @param tailv Pointer to the output null-terminated argv of all
+   * unprocessed arguments from the command line.
+   *
+   * @retval OMPI_ERROR If cmd is NULL or otherwise invalid.
+   * @retval OMPI_SUCCESS Upon success.
+   *
+   * The "tail" is all the arguments on the command line that were
+   * not processed for some reason.  Reasons for not processing
+   * arguments include:
+   *
+   * \sa The argument was not recognized
+   * \sa The argument "--" was seen, and therefore all arguments
+   * following it were not processed
+   *
+   * The output tailc parameter will be filled in with the integer
+   * length of the null-terminated tailv array (length including the
+   * final NULL entry).  The output tailv parameter will be a copy
+   * of the tail parameters, and must be freed (likely with a call
+   * to ompi_argv_free()) by the caller.
+   */
+  int ompi_cmd_line_get_tail(ompi_cmd_line_t *cmd, int *tailc, 
+                             char ***tailv);
 #ifdef __cplusplus
 }
 #endif
 
 
-/**
- * Return the number of arguments parsed on a OMPI command line handle.
- *
- * @param cmd A pointer to the OMPI command line handle.
- *
- * @retval OMPI_ERROR If cmd is NULL.
- * @retval argc Number of arguments previously added to the handle.
- *
- * Arguments are added to the handle via the ompi_cmd_line_parse()
- * function.
- */
-static inline int ompi_cmd_line_get_argc(ompi_cmd_line_t *cmd)
-{
-  return (NULL != cmd) ? cmd->lcl_argc : OMPI_ERROR;
-}
-
-
-/**
- * Return a string argument parsed on a OMPI command line handle.
- *
- * @param cmd A pointer to the OMPI command line handle.
- * @param index The nth argument from the command line (0 is argv[0], etc.).
- *
- * @retval NULL If cmd is NULL or index is invalid
- * @retval argument String of original argv[index]
- *
- * This function returns a single token from the arguments parsed on
- * this handle.  Arguments are added bia the ompi_cmd_line_parse()
- * function.
- *
- * What is returned is a pointer to the actual string that is on the
- * handle; it should not be modified or freed.
- */
-static inline char *ompi_cmd_line_get_argv(ompi_cmd_line_t *cmd, int index)
-{
-  return (NULL == cmd) ? NULL :
-    (index >= cmd->lcl_argc || index < 0) ? NULL : cmd->lcl_argv[index];
-}
-
-
-/**
- * Return the entire "tail" of unprocessed argv from a OMPI command
- * line handle.
- *
- * @param cmd A pointer to the OMPI command line handle.
- * @param tailc Pointer to the output length of the null-terminated
- * tail argv array.
- * @param tailv Pointer to the output null-terminated argv of all
- * unprocessed arguments from the command line.
- *
- * @retval OMPI_ERROR If cmd is NULL or otherwise invalid.
- * @retval OMPI_SUCCESS Upon success.
- *
- * The "tail" is all the arguments on the command line that were not
- * processed for some reason.  Reasons for not processing arguments
- * include:
- *
- * \sa The argument was not recognized
- * \sa The argument "--" was seen, and therefore all arguments
- * following it were not processed
- *
- * The output tailc parameter will be filled in with the integer
- * length of the null-terminated tailv array (length including the
- * final NULL entry).  The output tailv parameter will be a copy of
- * the tail parameters, and must be freed (likely with a call to
- * ompi_argv_free()) by the caller.
- */
-static inline int ompi_cmd_line_get_tail(ompi_cmd_line_t *cmd, int *tailc, 
-                                        char ***tailv)
-{
-  if (NULL != cmd) {
-    ompi_mutex_lock(&cmd->lcl_mutex);
-    *tailc = cmd->lcl_tail_argc;
-    *tailv = ompi_argv_copy(cmd->lcl_tail_argv);
-    ompi_mutex_unlock(&cmd->lcl_mutex);
-    return OMPI_SUCCESS;
-  } else {
-    return OMPI_ERROR;
-  }
-}
-
 #endif /* OMPI_CMD_LINE_H */

src/util/common_cmd_line.c

@@ -3,14 +3,11 @@
  */
 
 #include "ompi_config.h"
+
+#include "include/constants.h"
 #include "util/common_cmd_line.h"
 
 
-/*
- * Private variables
- */
-static bool setup = false;
-
 /*
  * The global variable that everyone accesses
  */
@@ -22,30 +19,26 @@ ompi_cmd_line_t *ompi_common_cmd_line = NULL;
  */
 int ompi_common_cmd_line_init(int argc, char **argv)
 {
-  if (!setup) {
-    ompi_common_cmd_line = ompi_cmd_line_create();
+    if (NULL == ompi_common_cmd_line) {
+        ompi_common_cmd_line = OBJ_NEW(ompi_cmd_line_t);
 
-    /* Setup the options that are allowable */
+        /* Setup the options that are allowable */
+        
+        ompi_cmd_line_make_opt(ompi_common_cmd_line, 'v', "version", 0,
+                               "Show version of Open MPI and this program");
 
-    ompi_cmd_line_make_opt(ompi_common_cmd_line, 'v', "version", 0,
-			   "Show version of Open MPI and this program");
+        ompi_cmd_line_make_opt(ompi_common_cmd_line, 'h', "help", 0,
+                               "Show help for this function");
 
-    ompi_cmd_line_make_opt(ompi_common_cmd_line, 'h', "help", 0,
-			   "Show help for this function");
+        /* Parse the command line */
 
-
-    /* Parse the command line */
-
-    if (OMPI_SUCCESS != ompi_cmd_line_parse(ompi_common_cmd_line, true, argc, argv)) {
-	return OMPI_ERROR;
+        if (OMPI_SUCCESS != 
+            ompi_cmd_line_parse(ompi_common_cmd_line, true, argc, argv)) {
+            return OMPI_ERROR;
+        }
     }
 
-    /* Done */
-
-    setup = true;
-  }
-
-  return OMPI_SUCCESS;
+    return OMPI_SUCCESS;
 }
 
 
@@ -54,10 +47,9 @@ int ompi_common_cmd_line_init(int argc, char **argv)
  */
 int ompi_common_cmd_line_finalize(void)
 {
-  if (setup) {
-    ompi_cmd_line_free(ompi_common_cmd_line);
-    setup = false;
-  }
+    if (NULL != ompi_common_cmd_line) {
+        OBJ_RELEASE(ompi_common_cmd_line);
+    }
 
-  return OMPI_SUCCESS;
+    return OMPI_SUCCESS;
 }