[openib-general] [PATCH] osm: Adding FatTree routing engine [1/2]

[Yevgeny Kliteynik]

Hi Hal

This patch (1/2) adds Fat Tree routing engine to OpenSM.

--
Yevgeny

Signed-off-by: Yevgeny Kliteynik <kliteyn at dev.mellanox.co.il>
---
 osm/opensm/Makefile.am  |    2 +-
 osm/opensm/main.c       |    3 ++-
 osm/opensm/osm_opensm.c |    2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osm/opensm/Makefile.am b/osm/opensm/Makefile.am
index b273eca..64b984b 100644
--- a/osm/opensm/Makefile.am
+++ b/osm/opensm/Makefile.am
@@ -87,7 +87,7 @@ opensm_SOURCES = main.c osm_console.c os
 		 osm_sw_info_rcv_ctrl.c osm_switch.c \
 		 osm_prtn.c osm_prtn_config.c osm_qos.c \
 		 osm_trap_rcv.c osm_trap_rcv_ctrl.c \
-		 osm_ucast_mgr.c osm_ucast_updn.c osm_ucast_file.c \
+		 osm_ucast_mgr.c osm_ucast_updn.c osm_ucast_file.c osm_ucast_ftree.c \
 		 osm_vl15intf.c osm_vl_arb_rcv.c \
 		 osm_vl_arb_rcv_ctrl.c st.c
 if OSMV_OPENIB
diff --git a/osm/opensm/main.c b/osm/opensm/main.c
index ca9a749..7b1c325 100644
--- a/osm/opensm/main.c
+++ b/osm/opensm/main.c
@@ -172,7 +172,8 @@ show_usage(void)
   printf( "-R\n"
           "--routing_engine <engine name>\n"
           "          This option chooses routing engine instead of Min Hop\n"
-          "          algorithm (default). Supported engines: updn, file\n\n");
+          "          algorithm (default).\n"
+          "          Supported engines: updn, file, ftree.\n\n");
   printf( "-M\n"
           "--lid_matrix_file <file name>\n"
           "          This option specifies the name of the lid matrix dump file\n"
diff --git a/osm/opensm/osm_opensm.c b/osm/opensm/osm_opensm.c
index 52ae75a..9cac636 100644
--- a/osm/opensm/osm_opensm.c
+++ b/osm/opensm/osm_opensm.c
@@ -74,6 +74,7 @@ struct routing_engine_module {
 
 extern int osm_ucast_updn_setup(osm_opensm_t *p_osm);
 extern int osm_ucast_file_setup(osm_opensm_t *p_osm);
+extern int osm_ucast_ftree_setup(osm_opensm_t *p_osm);
 
 static int osm_ucast_null_setup(osm_opensm_t *p_osm);
 
@@ -81,6 +82,7 @@ const static struct routing_engine_modul
 	{ "null", osm_ucast_null_setup },
 	{ "updn", osm_ucast_updn_setup },
 	{ "file", osm_ucast_file_setup },
+	{ "ftree", osm_ucast_ftree_setup },
 	{ NULL, NULL }
 };
 
-- 
1.4.4.1.GIT