[ofa-general] PATCH [1/3] osm: adding root and compute node guid files options for fat-tree

[Yevgeny Kliteynik]

Hi Hal,

Added two options:
  ftree_root_guid_file - file that contains list of root guids for fat-tree routing
  ftree_cn_guid_file - file that contains list of compute node guidsfor fat-tree routing

For now, these options are exposed via options file only.

Signed-off-by: Yevgeny Kliteynik <kliteyn at dev.mellanox.co.il>
---
 opensm/include/opensm/osm_subnet.h |   10 ++++++++++
 opensm/opensm/osm_subnet.c         |   22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/opensm/include/opensm/osm_subnet.h b/opensm/include/opensm/osm_subnet.h
index c62128b..46d90d6 100644
--- a/opensm/include/opensm/osm_subnet.h
+++ b/opensm/include/opensm/osm_subnet.h
@@ -279,6 +279,8 @@ typedef struct _osm_subn_opt
   char *                   lid_matrix_dump_file;
   char *                   ucast_dump_file;
   char *                   updn_guid_file;
+  char *                   ftree_root_guid_file;
+  char *                   ftree_cn_guid_file;
   char *                   sa_db_file;
   boolean_t                exit_on_fatal;
   boolean_t                honor_guid2lid_file;
@@ -455,6 +457,14 @@ typedef struct _osm_subn_opt
 *	updn_guid_file
 *		Pointer to name of the UPDN guid file given by User
 *
+*	ftree_root_guid_file
+*		Name of the file that contains list of root guids that
+*		will be used by fat-tree routing (provided by User)
+*
+*	ftree_cn_guid_file
+*		Name of the file that contains list of compute node guids that
+*		will be used by fat-tree routing (provided by User)
+*
 *	sa_db_file
 *		Name of the SA database file.
 *
diff --git a/opensm/opensm/osm_subnet.c b/opensm/opensm/osm_subnet.c
index 736f49a..a39ada6 100644
--- a/opensm/opensm/osm_subnet.c
+++ b/opensm/opensm/osm_subnet.c
@@ -501,6 +501,8 @@ osm_subn_set_default_opt(
   p_opt->lid_matrix_dump_file = NULL;
   p_opt->ucast_dump_file = NULL;
   p_opt->updn_guid_file = NULL;
+  p_opt->ftree_root_guid_file = NULL;
+  p_opt->ftree_cn_guid_file = NULL;
   p_opt->sa_db_file = NULL;
   p_opt->exit_on_fatal = TRUE;
   p_opt->enable_quirks = FALSE;
@@ -1326,6 +1328,14 @@ osm_subn_parse_conf_file(
         "updn_guid_file",
         p_key, p_val, &p_opts->updn_guid_file);
 
+      __osm_subn_opts_unpack_charp( 
+        "updn_guid_file",
+        p_key, p_val, &p_opts->ftree_root_guid_file);
+
+      __osm_subn_opts_unpack_charp( 
+        "updn_guid_file",
+        p_key, p_val, &p_opts->ftree_cn_guid_file);
+
       __osm_subn_opts_unpack_charp(
         "sa_db_file",
         p_key, p_val, &p_opts->sa_db_file);
@@ -1554,6 +1564,18 @@ osm_subn_write_conf_file(
              "# One guid in each line\n"
              "updn_guid_file %s\n\n",
              p_opts->updn_guid_file);
+  if (p_opts->ftree_root_guid_file)
+    fprintf( opts_file,
+             "# The file holding the fat-tree root node guids\n"
+             "# One guid in each line\n"
+             "ftree_root_guid_file %s\n\n",
+             p_opts->ftree_root_guid_file);
+  if (p_opts->ftree_cn_guid_file)
+    fprintf( opts_file,
+             "# The file holding the fat-tree compute node guids\n"
+             "# One guid in each line\n"
+             "ftree_cn_guid_file %s\n\n",
+             p_opts->ftree_cn_guid_file);
   if (p_opts->sa_db_file)
     fprintf( opts_file,
              "# SA database file name\n"
-- 
1.5.1.4