From bd4bad869bf5ee5c5638c87c1b6d5ca8dc354973 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Thu, 22 Jan 2004 00:38:29 +0000
Subject: [PATCH] Contiuned development of laminfo; open and close pcm modules
 (good testbed for MCA base, especially w.r.t. module management)

This commit was SVN r525.
---
 src/tools/laminfo/laminfo.cc |  4 +++-
 src/tools/laminfo/modules.cc | 11 +++++------
 src/tools/laminfo/version.cc |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/tools/laminfo/laminfo.cc b/src/tools/laminfo/laminfo.cc
index 5792ea79c7..876403a97a 100644
--- a/src/tools/laminfo/laminfo.cc
+++ b/src/tools/laminfo/laminfo.cc
@@ -332,8 +332,8 @@ int main(int argc, char *argv[])
     laminfo::show_path(path_prefix, LAM_PREFIX);
     laminfo::do_arch(cmd_line);
     laminfo::do_config(false);
-#if 0
     laminfo::open_modules();
+#if 0
     laminfo::show_boot_version(mca_boot_modules, type_all, ver_full, 
                                ver_module);
     laminfo::show_coll_version(mca_coll_modules, type_all, ver_full, 
@@ -349,5 +349,7 @@ int main(int argc, char *argv[])
 
   laminfo::close_modules();
   lam_cmd_line_free(cmd_line);
+  mca_base_close();
+  lam_finalize();
   return 0;
 }
diff --git a/src/tools/laminfo/modules.cc b/src/tools/laminfo/modules.cc
index aeea9b1b25..977b785ef9 100644
--- a/src/tools/laminfo/modules.cc
+++ b/src/tools/laminfo/modules.cc
@@ -11,6 +11,7 @@
 #include <string.h>
 
 #include "mca/lam/base/base.h"
+#include "mca/lam/pcm/pcm.h"
 #include "tools/laminfo/laminfo.h"
 
 using namespace std;
@@ -52,7 +53,7 @@ void laminfo::open_modules()
   // not by value.
 
   for (i = 0; i < mca_types.size(); ++i) {
-    env = "LAM_MPI_mca_" + mca_types[i];
+    env = "LAM_MPI_MCA_" + mca_types[i];
     if (NULL != getenv(env.c_str())) {
       env += "=";
       target = strdup(env.c_str());
@@ -64,11 +65,8 @@ void laminfo::open_modules()
 
   mca_base_open();
 
-#if 0
-  // pcm module opening not implemented yet
-  mca_pcm_open();
-  module_map("pcm") = mca_pcm_base_module_list;
-#endif
+  mca_pcm_base_open();
+  module_map["pcm"] = &mca_pcm_base_modules_available;
 
 #if 0
   // oob module opening not implemented yet
@@ -127,6 +125,7 @@ void laminfo::open_modules()
 void laminfo::close_modules()
 {
   if (opened_modules) {
+    mca_pcm_base_close();
 #if 0
     mca_crmpi_base_close();
     mca_coll_base_close();
diff --git a/src/tools/laminfo/version.cc b/src/tools/laminfo/version.cc
index 2d022f0876..5f5a5b882b 100644
--- a/src/tools/laminfo/version.cc
+++ b/src/tools/laminfo/version.cc
@@ -150,7 +150,7 @@ static void show_module_version(const string& type_name,
 
   modules = module_map[type_name];
   for (item = lam_list_get_first(modules);
-       lam_list_get_last(modules) != item;
+       lam_list_get_end(modules) != item;
        item = lam_list_get_next(item)) {
     module = (mca_base_module_t *) item;
     if (want_all_modules || module->mca_module_name == module_name) {