Package list ibutils / 0e8dbf1
Refresh patches Mehdi Dogguy 3 years ago
5 changed file(s) with 193 addition(s) and 62 deletion(s). Raw diff Collapse all Expand all
66 accordingly.
77 * Run wrap-and-sort
88 * Import new upstream release
9 - Refresh patches
10 - Remove git-05a9d1a.patch and git-bd7e502.patch as they are included
11 in 1.5.7+0.2.gbd7e502.
912 * Bump Standards-Version to 4.1.3
1013 - Set Priority to optional, instead of (deprecated) extra
1114 * Set Section:libs for libibdm1
0 Description: Copy fix from main osm.m4 to avoid overwriting $with_osm_libs
1 Author: Roland Dreier <rbd@debian.org>
0 From: Roland Dreier <rbd@debian.org>
1 Date: Thu, 4 Jan 2018 19:21:25 +0100
2 Subject: Copy fix from main osm.m4 to avoid overwriting $with_osm_libs
23
4 ---
5 ibis/config/osm.m4 | 2 +-
6 ibmgtsim/config/osm.m4 | 2 +-
7 2 files changed, 2 insertions(+), 2 deletions(-)
8
9 diff --git a/ibis/config/osm.m4 b/ibis/config/osm.m4
10 index cc50fdf..cd2cabb 100644
311 --- a/ibis/config/osm.m4
412 +++ b/ibis/config/osm.m4
5 @@ -103,8 +103,8 @@
13 @@ -103,8 +103,8 @@ if test "x$libcheck" = "xtrue"; then
614 else
715 osm_lib_dir=lib
816 fi
1220
1321 dnl check what build we have gen1 or gen2
1422 if test -d $with_osm/include/infiniband; then
23 diff --git a/ibmgtsim/config/osm.m4 b/ibmgtsim/config/osm.m4
24 index cc50fdf..cd2cabb 100644
1525 --- a/ibmgtsim/config/osm.m4
1626 +++ b/ibmgtsim/config/osm.m4
17 @@ -103,8 +103,8 @@
27 @@ -103,8 +103,8 @@ if test "x$libcheck" = "xtrue"; then
1828 else
1929 osm_lib_dir=lib
2030 fi
0 Description: Fix gcc "-Werror=format-security" errors
1 Fix log calls to use format "%s" to output string buffers.
2 Author: Roland Dreier <rbd@debian.org>
0 From: Roland Dreier <rbd@debian.org>
1 Date: Thu, 4 Jan 2018 19:21:25 +0100
2 Subject: Fix gcc "-Werror=format-security" errors
33
4 --- a/ibis/src/ibis_wrap.c
5 +++ b/ibis/src/ibis_wrap.c
6 @@ -3186,7 +3186,7 @@
4 Fix log calls to use format "%s" to output string buffers.
5
6 ---
7 ibis/src/ibis.i | 2 +-
8 ibis/src/ibis_wrap.c | 2 +-
9 ibis/src/ibissh_wrap.cpp | 2 +-
10 3 files changed, 3 insertions(+), 3 deletions(-)
11
12 diff --git a/ibis/src/ibis.i b/ibis/src/ibis.i
13 index 28a0912..63335e5 100644
14 --- a/ibis/src/ibis.i
15 +++ b/ibis/src/ibis.i
16 @@ -362,7 +362,7 @@ ibisp_is_debug(void)
717 }
818
919 int ibis_puts( osm_log_level_t verbosity, char *msg) {
1222 return TCL_OK;
1323 }
1424
15 --- a/ibis/src/ibis.i
16 +++ b/ibis/src/ibis.i
17 @@ -362,7 +362,7 @@
25 diff --git a/ibis/src/ibis_wrap.c b/ibis/src/ibis_wrap.c
26 index ee97601..df814eb 100644
27 --- a/ibis/src/ibis_wrap.c
28 +++ b/ibis/src/ibis_wrap.c
29 @@ -3186,7 +3186,7 @@ typedef struct {
1830 }
1931
2032 int ibis_puts( osm_log_level_t verbosity, char *msg) {
2335 return TCL_OK;
2436 }
2537
38 diff --git a/ibis/src/ibissh_wrap.cpp b/ibis/src/ibissh_wrap.cpp
39 index 917904f..187e0f8 100644
2640 --- a/ibis/src/ibissh_wrap.cpp
2741 +++ b/ibis/src/ibissh_wrap.cpp
28 @@ -3186,7 +3186,7 @@
42 @@ -3186,7 +3186,7 @@ typedef struct {
2943 }
3044
3145 int ibis_puts( osm_log_level_t verbosity, char *msg) {
0 Description: Patch autotools files to avoid unecessary rpaths in executables
1 Author: Roland Dreier <rbd@debian.org>
0 From: Roland Dreier <rbd@debian.org>
1 Date: Thu, 4 Jan 2018 19:21:25 +0100
2 Subject: Patch autotools files to avoid unecessary rpaths in executables
23
4 ---
5 config/osm.m4 | 2 +-
6 ibdm/ibdm/Makefile.am | 4 ++--
7 ibis/config/osm.m4 | 2 +-
8 ibmgtsim/config/osm.m4 | 2 +-
9 ibmgtsim/src/Makefile.am | 3 +--
10 5 files changed, 6 insertions(+), 7 deletions(-)
11
12 diff --git a/config/osm.m4 b/config/osm.m4
13 index cd2cabb..47d41c6 100644
314 --- a/config/osm.m4
415 +++ b/config/osm.m4
5 @@ -114,7 +114,7 @@
16 @@ -114,7 +114,7 @@ if test "x$libcheck" = "xtrue"; then
617 fi
718 AC_MSG_NOTICE(OSM: build type $OSM_BUILD)
819
1122 dnl based on the with_osm dir and the libs available
1223 dnl we can try and decide what vendor was used:
1324 if test $OSM_BUILD = openib; then
14 --- a/ibis/config/osm.m4
15 +++ b/ibis/config/osm.m4
16 @@ -114,7 +114,7 @@
17 fi
18 AC_MSG_NOTICE(OSM: build type $OSM_BUILD)
19
20 - OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs"
21 + OSM_LDFLAGS="-L$with_osm_libs"
22 dnl based on the with_osm dir and the libs available
23 dnl we can try and decide what vendor was used:
24 if test $OSM_BUILD = openib; then
25 --- a/ibmgtsim/config/osm.m4
26 +++ b/ibmgtsim/config/osm.m4
27 @@ -114,7 +114,7 @@
28 fi
29 AC_MSG_NOTICE(OSM: build type $OSM_BUILD)
30
31 - OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs"
32 + OSM_LDFLAGS="-L$with_osm_libs"
33 dnl based on the with_osm dir and the libs available
34 dnl we can try and decide what vendor was used:
35 if test $OSM_BUILD = openib; then
25 diff --git a/ibdm/ibdm/Makefile.am b/ibdm/ibdm/Makefile.am
26 index aa39b69..13cea9a 100644
3627 --- a/ibdm/ibdm/Makefile.am
3728 +++ b/ibdm/ibdm/Makefile.am
38 @@ -80,12 +80,12 @@
29 @@ -80,12 +80,12 @@ libibdmcom_la_LDFLAGS = -version-info $(LIB_VER_TRIPLET)
3930
4031 libibdm_la_SOURCES = ibdm_wrap.cpp ibdm.i $(common_SOURCES)
4132 libibdm_la_LIBADD = $(TCL_LIBS)
5041 ibdmsh_DEPENDENCIES=$(lib_LTLIBRARIES)
5142
5243 $(srcdir)/Fabric.cpp: $(srcdir)/git_version.h
44 diff --git a/ibis/config/osm.m4 b/ibis/config/osm.m4
45 index cd2cabb..47d41c6 100644
46 --- a/ibis/config/osm.m4
47 +++ b/ibis/config/osm.m4
48 @@ -114,7 +114,7 @@ if test "x$libcheck" = "xtrue"; then
49 fi
50 AC_MSG_NOTICE(OSM: build type $OSM_BUILD)
51
52 - OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs"
53 + OSM_LDFLAGS="-L$with_osm_libs"
54 dnl based on the with_osm dir and the libs available
55 dnl we can try and decide what vendor was used:
56 if test $OSM_BUILD = openib; then
57 diff --git a/ibmgtsim/config/osm.m4 b/ibmgtsim/config/osm.m4
58 index cd2cabb..47d41c6 100644
59 --- a/ibmgtsim/config/osm.m4
60 +++ b/ibmgtsim/config/osm.m4
61 @@ -114,7 +114,7 @@ if test "x$libcheck" = "xtrue"; then
62 fi
63 AC_MSG_NOTICE(OSM: build type $OSM_BUILD)
64
65 - OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs"
66 + OSM_LDFLAGS="-L$with_osm_libs"
67 dnl based on the with_osm dir and the libs available
68 dnl we can try and decide what vendor was used:
69 if test $OSM_BUILD = openib; then
70 diff --git a/ibmgtsim/src/Makefile.am b/ibmgtsim/src/Makefile.am
71 index 525df73..072bde2 100644
5372 --- a/ibmgtsim/src/Makefile.am
5473 +++ b/ibmgtsim/src/Makefile.am
55 @@ -76,8 +76,7 @@
74 @@ -76,8 +76,7 @@ LDADD = $(IBDM_LIB) -lpthread
5675 ibmssh_SOURCES = sim.cpp server.cpp node.cpp dispatcher.cpp \
5776 ibmssh_wrap.cpp sma.cpp pma.cpp vsa.cpp randmgr.cpp
5877
0 From: Debian HPC Team <debian-hpc@lists.debian.org>
1 Date: Thu, 4 Jan 2018 19:21:25 +0100
2 Subject: do_not_use_tmp
3
4 ---
5 ibdiag/demo/sm-single-master.tcl | 2 +-
6 ibdiag/doc/ibdiag_release_notes.txt | 6 +++---
7 ibdiag/doc/ibdiagnet.pod | 4 ++--
8 ibdiag/doc/ibdiagnet.txt | 2 +-
9 ibdiag/doc/ibdiagpath.pod | 3 ++-
10 ibdiag/src/ibdebug_if.tcl | 2 +-
11 ibdiag/src/ibdiagui.tcl | 2 +-
12 ibdm/doc/ibdmchk.1 | 8 ++++----
13 ibdm/doc/ibdmchk.pod | 8 ++++----
14 ibdm/ibdm/LinkCover.cpp | 6 +++---
15 ibdm/ibdm/SubnMgt.cpp | 8 ++++----
16 ibdm/src/lst2ibnl | 8 ++++----
17 ibdm/src/osm_check.cpp | 28 ++++++++++++++--------------
18 ibis/src/ibis.i | 2 +-
19 ibis/src/ibis_wrap.c | 2 +-
20 ibis/src/ibissh_wrap.cpp | 2 +-
21 ibis/tests/ibcr_test.tcl | 2 +-
22 ibmgtsim/doc/IBMgtSim.1 | 2 +-
23 ibmgtsim/doc/IBMgtSim.pod | 2 +-
24 ibmgtsim/src/client.cpp | 2 +-
25 ibmgtsim/src/sim.cpp | 4 ++--
26 ibmgtsim/tests/FatTree.check.tcl | 2 +-
27 ibmgtsim/tests/FatTreeFails.check.tcl | 2 +-
28 ibmgtsim/tests/init.test.tcl | 8 ++++----
29 ibmgtsim/utils/IBMgtSim | 4 ++--
30 ibmgtsim/utils/RunSimTest | 2 +-
31 26 files changed, 62 insertions(+), 61 deletions(-)
32
33 diff --git a/ibdiag/demo/sm-single-master.tcl b/ibdiag/demo/sm-single-master.tcl
34 index 5b414c8..3dd5c65 100644
035 --- a/ibdiag/demo/sm-single-master.tcl
136 +++ b/ibdiag/demo/sm-single-master.tcl
2 @@ -132,7 +132,7 @@ proc checker {simDir osmPath osmPortGuid
37 @@ -132,7 +132,7 @@ proc checker {simDir osmPath osmPortGuid} {
338 gets stdin
439 puts " h. Make one of teh SMs sweep: kill -HUP %2."
540 puts " Now one of the SMs gets to standby mode"
843 puts " "
944 puts " press Enter when done"
1045 gets stdin
46 diff --git a/ibdiag/doc/ibdiag_release_notes.txt b/ibdiag/doc/ibdiag_release_notes.txt
47 index 7011631..6a11359 100644
1148 --- a/ibdiag/doc/ibdiag_release_notes.txt
1249 +++ b/ibdiag/doc/ibdiag_release_notes.txt
1350 @@ -61,7 +61,7 @@ Other changes:
3370
3471 Each report message includes:
3572 - Device Type
73 diff --git a/ibdiag/doc/ibdiagnet.pod b/ibdiag/doc/ibdiagnet.pod
74 index 0138f70..550c091 100644
3675 --- a/ibdiag/doc/ibdiagnet.pod
3776 +++ b/ibdiag/doc/ibdiagnet.pod
38 @@ -195,7 +195,7 @@ Specifies the local device's port num us
77 @@ -195,7 +195,7 @@ Specifies the local device's port num used to connect to the IB fabric
3978 =over
4079
4180 =item
4483
4584 =back
4685
47 @@ -260,7 +260,7 @@ Skip options (one or more can be specifi
86 @@ -260,7 +260,7 @@ Skip options (one or more can be specified) : dup_guids zero_guids pm logical_s
4887
4988 =item
5089 Write out the discovered topology into the given file. This flag is useful if you later want to check for changes from the current state of the fabric.
5392
5493 =back
5594
95 diff --git a/ibdiag/doc/ibdiagnet.txt b/ibdiag/doc/ibdiagnet.txt
96 index b8a054b..68c5449 100644
5697 --- a/ibdiag/doc/ibdiagnet.txt
5798 +++ b/ibdiag/doc/ibdiagnet.txt
5899 @@ -48,7 +48,7 @@ OPTIONS
64105
65106 -h|--help : Prints this help information
66107 -V|--version : Prints the version of the tool
108 diff --git a/ibdiag/doc/ibdiagpath.pod b/ibdiag/doc/ibdiagpath.pod
109 index b7cfece..7f4a3f7 100644
67110 --- a/ibdiag/doc/ibdiagpath.pod
68111 +++ b/ibdiag/doc/ibdiagpath.pod
69 @@ -135,7 +135,8 @@ Specifies the local device's port number
112 @@ -135,7 +135,8 @@ Specifies the local device's port number used to connect to the IB fabric
70113 =over
71114
72115 =item
76119
77120 =back
78121
122 diff --git a/ibdiag/src/ibdebug_if.tcl b/ibdiag/src/ibdebug_if.tcl
123 index f0586a1..cdc389d 100644
79124 --- a/ibdiag/src/ibdebug_if.tcl
80125 +++ b/ibdiag/src/ibdebug_if.tcl
81126 @@ -170,7 +170,7 @@ proc SetInfoArgv {} {
87132 -o,param "out-dir"
88133 -o,desc "Specifies the directory where the output files will be placed"
89134
135 diff --git a/ibdiag/src/ibdiagui.tcl b/ibdiag/src/ibdiagui.tcl
136 index 5470576..ef9c23e 100644
90137 --- a/ibdiag/src/ibdiagui.tcl
91138 +++ b/ibdiag/src/ibdiagui.tcl
92139 @@ -2141,7 +2141,7 @@ proc DiagNet {} {
98145 set r ""
99146 LogAppend "-I-Invoking ibdiagnet ...."
100147 # puts "-I- Invoking ibdiagnet ...."
148 diff --git a/ibdm/doc/ibdmchk.1 b/ibdm/doc/ibdmchk.1
149 index 7537473..b725702 100644
101150 --- a/ibdm/doc/ibdmchk.1
102151 +++ b/ibdm/doc/ibdmchk.1
103 @@ -186,7 +186,7 @@ Use enhanced routing algorithm when \s-1
152 @@ -186,7 +186,7 @@ Use enhanced routing algorithm when \s-1LMC\s0 > 0 and report the resulting path
104153 .IX Item "-r|--roots <roots file> A file with all the roots node names (one on each line)."
105154 .SH "VERIFICATION MODE DESCRIPTION"
106155 .IX Header "VERIFICATION MODE DESCRIPTION"
128177 .RE
129178 .IP "\-c|\-\-psl <file>"
130179 .IX Item "-c|--psl <file>"
180 diff --git a/ibdm/doc/ibdmchk.pod b/ibdm/doc/ibdmchk.pod
181 index dabfafa..ed85818 100644
131182 --- a/ibdm/doc/ibdmchk.pod
132183 +++ b/ibdm/doc/ibdmchk.pod
133 @@ -59,7 +59,7 @@ A file with all the roots node names (on
184 @@ -59,7 +59,7 @@ A file with all the roots node names (one on each line).
134185
135186 =head1 VERIFICATION MODE DESCRIPTION
136187
158209
159210 =item -c|--psl <file>
160211
212 diff --git a/ibdm/ibdm/LinkCover.cpp b/ibdm/ibdm/LinkCover.cpp
213 index 667e034..ed8cd40 100644
161214 --- a/ibdm/ibdm/LinkCover.cpp
162215 +++ b/ibdm/ibdm/LinkCover.cpp
163216 @@ -302,7 +302,7 @@ dumpLinearProgram(IBFabric *p_fabric,
169222
170223 // we need a doubel path - first collect all in ports and
171224 // dump out the target - maximize number of links covered
172 @@ -890,8 +890,8 @@ LinkCoverageAnalysis(IBFabric *p_fabric,
225 @@ -890,8 +890,8 @@ LinkCoverageAnalysis(IBFabric *p_fabric, list_pnode rootNodes)
173226 // iteration only.
174227 map_pnode_p_sint outPortUsedMap;
175228 cout << "-I- Generating non blocking full link coverage plan into:"
180233
181234 // initialize the data structures
182235 if (initFdbForwardPortLidTables(
236 diff --git a/ibdm/ibdm/SubnMgt.cpp b/ibdm/ibdm/SubnMgt.cpp
237 index 4fea002..9de792c 100644
183238 --- a/ibdm/ibdm/SubnMgt.cpp
184239 +++ b/ibdm/ibdm/SubnMgt.cpp
185 @@ -1104,7 +1104,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p
240 @@ -1104,7 +1104,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p_fabric)
186241 #if DO_CA_TO_CA_NUM_PATHS_HIST
187242 // report the link over subscription histogram and dump out the
188243 // num paths per switch out port
191246 linkUsage << "# NUM-PATHS PORT-NAME " << endl;
192247 vec_int linkSubscriptionHist(maxLinkSubscriptions + 1,0);
193248 for (map_pnode_vec_int::iterator nI = switchPathsPerOutPort.begin();
194 @@ -1127,7 +1127,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p
249 @@ -1127,7 +1127,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p_fabric)
195250 cout << "all the CA to CA paths. Ports driving CAs are ignored (as they must" << endl;
196251 cout << "have = Nca - 1). If the fabric is routed correctly the histogram" << endl;
197252 cout << "should be narrow for all ports on same level of the tree." << endl;
200255 cout << "NUM-PATHS NUM-SWITCH-PORTS" << endl;
201256 for (int b = 0; b <= maxLinkSubscriptions; b++)
202257 if (linkSubscriptionHist[b])
203 @@ -1136,7 +1136,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p
258 @@ -1136,7 +1136,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p_fabric)
204259 #endif
205260
206261 // now do the DLID per out port:
209264 portDlidsUsage << "# NUM-DLIDS PORT-NAME " << endl;
210265 vec_int dlidsSubscriptionHist(maxDlidPerOutPort + 1,0);
211266 for (map_pnode_vec_int::iterator nI = switchDLidsPerOutPort.begin();
212 @@ -1159,7 +1159,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p
267 @@ -1159,7 +1159,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p_fabric)
213268 cout << "all the CA to CA paths. Ports driving CAs are ignored (as they must" << endl;
214269 cout << "have = Nca - 1). If the fabric is routed correctly the histogram" << endl;
215270 cout << "should be narrow for all ports on same level of the tree." << endl;
218273 cout << "NUM-DLIDS NUM-SWITCH-PORTS" << endl;
219274 for (int b = 0; b <= maxDlidPerOutPort; b++)
220275 if (dlidsSubscriptionHist[b])
276 diff --git a/ibdm/src/lst2ibnl b/ibdm/src/lst2ibnl
277 index 4d5edc0..9acef6a 100755
221278 --- a/ibdm/src/lst2ibnl
222279 +++ b/ibdm/src/lst2ibnl
223280 @@ -70,8 +70,8 @@ DESCRIPTION
242299 4. Perform steps 1..3 by connecting the "host" to each one of the
243300 front panel ports and providing its name on the subsequent call to
244301 lst2ibnl
302 diff --git a/ibdm/src/osm_check.cpp b/ibdm/src/osm_check.cpp
303 index 22f52c2..c4475b6 100644
245304 --- a/ibdm/src/osm_check.cpp
246305 +++ b/ibdm/src/osm_check.cpp
247306 @@ -86,7 +86,7 @@ show_help() {
318377 rankFile << "-I- Node Ranking:" << endl;
319378 for(map_pnode_int::iterator nI = nodesRank.begin();
320379 nI != nodesRank.end(); nI++)
380 diff --git a/ibis/src/ibis.i b/ibis/src/ibis.i
381 index 63335e5..c970e1b 100644
321382 --- a/ibis/src/ibis.i
322383 +++ b/ibis/src/ibis.i
323384 @@ -564,7 +564,7 @@ extern char * ibisSourceVersion;
329390
330391
331392 /* we want all exists to cleanup */
393 diff --git a/ibis/src/ibis_wrap.c b/ibis/src/ibis_wrap.c
394 index df814eb..4f086f6 100644
332395 --- a/ibis/src/ibis_wrap.c
333396 +++ b/ibis/src/ibis_wrap.c
334 @@ -75067,7 +75067,7 @@ SWIGEXPORT(int,Ibis_Init)(Tcl_Interp *in
397 @@ -75067,7 +75067,7 @@ SWIGEXPORT(int,Ibis_Init)(Tcl_Interp *interp) {
335398 IbisOpts.m_key = 0;
336399 IbisOpts.v_key = 0;
337400 IbisOpts.log_flags = OSM_LOG_ERROR;
340403
341404
342405 /* we want all exists to cleanup */
406 diff --git a/ibis/src/ibissh_wrap.cpp b/ibis/src/ibissh_wrap.cpp
407 index 187e0f8..e569ff5 100644
343408 --- a/ibis/src/ibissh_wrap.cpp
344409 +++ b/ibis/src/ibissh_wrap.cpp
345 @@ -75129,7 +75129,7 @@ SWIGEXPORT(int,Ibis_Init)(Tcl_Interp *in
410 @@ -75129,7 +75129,7 @@ SWIGEXPORT(int,Ibis_Init)(Tcl_Interp *interp) {
346411 IbisOpts.m_key = 0;
347412 IbisOpts.v_key = 0;
348413 IbisOpts.log_flags = OSM_LOG_ERROR;
351416
352417
353418 /* we want all exists to cleanup */
419 diff --git a/ibis/tests/ibcr_test.tcl b/ibis/tests/ibcr_test.tcl
420 index 98fd6b2..593ef5b 100755
354421 --- a/ibis/tests/ibcr_test.tcl
355422 +++ b/ibis/tests/ibcr_test.tcl
356423 @@ -132,7 +132,7 @@ set badLid [lindex $argv 3]
362429 ibis_init
363430
364431 set availPorts [ibis_get_local_ports_info]
432 diff --git a/ibmgtsim/doc/IBMgtSim.1 b/ibmgtsim/doc/IBMgtSim.1
433 index e8ac646..626b956 100644
365434 --- a/ibmgtsim/doc/IBMgtSim.1
366435 +++ b/ibmgtsim/doc/IBMgtSim.1
367 @@ -158,7 +158,7 @@ A tcl file to be sourced after the fabri
436 @@ -158,7 +158,7 @@ A tcl file to be sourced after the fabric is setup.
368437 .RE
369438 .IP "\-l log-file"
370439 .IX Item "-l log-file"
373442 .RE
374443 .IP "\-p server-port"
375444 .IX Item "-p server-port"
445 diff --git a/ibmgtsim/doc/IBMgtSim.pod b/ibmgtsim/doc/IBMgtSim.pod
446 index f9b422f..ee3e2a8 100644
376447 --- a/ibmgtsim/doc/IBMgtSim.pod
377448 +++ b/ibmgtsim/doc/IBMgtSim.pod
378 @@ -30,7 +30,7 @@ A tcl file to be sourced after the fabri
449 @@ -30,7 +30,7 @@ A tcl file to be sourced after the fabric is setup.
379450
380451 =item -l log-file
381452
384455
385456 =item -p server-port
386457
458 diff --git a/ibmgtsim/src/client.cpp b/ibmgtsim/src/client.cpp
459 index 6c4ff6a..2a3d260 100644
387460 --- a/ibmgtsim/src/client.cpp
388461 +++ b/ibmgtsim/src/client.cpp
389 @@ -158,7 +158,7 @@ __ibms_get_sim_host_n_port(char *hostNam
462 @@ -158,7 +158,7 @@ __ibms_get_sim_host_n_port(char *hostName,
390463 if (getenv("IBMGTSIM_DIR"))
391464 simDir = getenv("IBMGTSIM_DIR");
392465 else
395468
396469 std::string serverFileName = simDir + "/ibmgtsim.server";
397470
471 diff --git a/ibmgtsim/src/sim.cpp b/ibmgtsim/src/sim.cpp
472 index 5444130..97dbd75 100644
398473 --- a/ibmgtsim/src/sim.cpp
399474 +++ b/ibmgtsim/src/sim.cpp
400475 @@ -50,8 +50,8 @@ const char *IBMgtSim::getSimulatorDir()
408483 }
409484 return getenv("IBMGTSIM_DIR");
410485 }
486 diff --git a/ibmgtsim/tests/FatTree.check.tcl b/ibmgtsim/tests/FatTree.check.tcl
487 index acb414b..7b41d56 100644
411488 --- a/ibmgtsim/tests/FatTree.check.tcl
412489 +++ b/ibmgtsim/tests/FatTree.check.tcl
413 @@ -44,7 +44,7 @@ proc runner {simDir osmPath osmPortGuid}
490 @@ -44,7 +44,7 @@ proc runner {simDir osmPath osmPortGuid} {
414491 puts "-I- Starting: $osmPath -R ftree -d2 -V -g $osmPortGuid ..."
415492 #set osmPid [exec $osmPath -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
416493 set osmPid [exec $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
419496
420497 # start a tracker on the log file and process:
421498 startOsmLogAnalyzer $osmLog
499 diff --git a/ibmgtsim/tests/FatTreeFails.check.tcl b/ibmgtsim/tests/FatTreeFails.check.tcl
500 index 3a0a997..0708060 100644
422501 --- a/ibmgtsim/tests/FatTreeFails.check.tcl
423502 +++ b/ibmgtsim/tests/FatTreeFails.check.tcl
424 @@ -44,7 +44,7 @@ proc runner {simDir osmPath osmPortGuid}
503 @@ -44,7 +44,7 @@ proc runner {simDir osmPath osmPortGuid} {
425504 puts "-I- Starting: $osmPath -R ftree -d2 -V -g $osmPortGuid ..."
426505 #set osmPid [exec $osmPath -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
427506 set osmPid [exec $osmPath -R ftree -f $osmLog -V -g $osmPortGuid > $osmStdOutLog &]
430509
431510 # start a tracker on the log file and process:
432511 startOsmLogAnalyzer $osmLog
512 diff --git a/ibmgtsim/tests/init.test.tcl b/ibmgtsim/tests/init.test.tcl
513 index 16892ae..1809502 100644
433514 --- a/ibmgtsim/tests/init.test.tcl
434515 +++ b/ibmgtsim/tests/init.test.tcl
435516 @@ -30,7 +30,7 @@
441522 MsgMgr setVerbLevel $MsgShowAll
442523 IBMgtSimulator init /home/eitan/SW/cvsroot/IBADM/ibdm/Clusters/RhinoBased512.topo 46517 5
443524 puts [IBMgtSimulator getFabric]
444 @@ -42,7 +42,7 @@ puts [IBMSNode_getPhyPortPMCounter simno
525 @@ -42,7 +42,7 @@ puts [IBMSNode_getPhyPortPMCounter simnode:1:SL2-4/spine2/U2 1 1]
445526 set mcm [madMcMemberRec]
446527 madMcMemberRec_send_set $mcm simnode:1:SL2-2/spine1/U2 1 1 0
447528
459540 MsgMgr setVerbLevel $MsgShowAll
460541 IBMgtSimulator init /usr/share/ibmgtsim/Gnu16NodeOsmTest.topo 46517 1
461542 set f [IBMgtSimulator getFabric]
462 @@ -72,7 +72,7 @@ foreach nodeNameNPtr [IBFabric_NodeByNam
543 @@ -72,7 +72,7 @@ foreach nodeNameNPtr [IBFabric_NodeByName_get $f] {
463544 activateNodePorts [lindex $nodeNameNPtr 1]
464545 }
465546
468549 MsgMgr setVerbLevel $MsgShowAll
469550 IBMgtSimulator init test.topo 46517 1
470551 set f [IBMgtSimulator getFabric]
552 diff --git a/ibmgtsim/utils/IBMgtSim b/ibmgtsim/utils/IBMgtSim
553 index 9d5846c..a32a3c3 100644
471554 --- a/ibmgtsim/utils/IBMgtSim
472555 +++ b/ibmgtsim/utils/IBMgtSim
473556 @@ -73,7 +73,7 @@ proc Help {} {
479562 -p server-port = set the port number the server attaches to (default 46517)
480563 -w num-threads = the number of threads processing the mads
481564 -V <module-verbosity-pair-list> = Provides a fine grain control over
482 @@ -375,7 +375,7 @@ proc getopt { argslist optstring optret
565 @@ -375,7 +375,7 @@ proc getopt { argslist optstring optret argret } {
483566 #
484567
485568 set moduleVerbosityList {top 0xA7}
488571 set numWorkerThreads 1
489572 set serverPortNum 46517
490573 set simulationFlowFile ""
574 diff --git a/ibmgtsim/utils/RunSimTest b/ibmgtsim/utils/RunSimTest
575 index d0cd829..a79a82b 100755
491576 --- a/ibmgtsim/utils/RunSimTest
492577 +++ b/ibmgtsim/utils/RunSimTest
493578 @@ -775,7 +775,7 @@ rmSeed $randomSeed