Codebase list ibutils / 4938c3a
Fix spelling mistakes (found by lintian) Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com> Benjamin Drung 2 years ago
4 changed file(s) with 1582 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
+519
-0
debian/patches/Fix-spelling-error-of-mismatch.patch less more
0 From 5400ae438c52cd7c21e1ce416e0670ebd2c74c17 Mon Sep 17 00:00:00 2001
1 From: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2 Date: Wed, 11 Nov 2020 10:27:21 +0100
3 Subject: Fix spelling error of mismatch
4
5 Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
6 ---
7 ibdiag/src/ibdebug_if.tcl | 4 +-
8 ibdm/Clusters/topo2subnet | 2 +-
9 ibdm/doc/ibdmsh.pod | 2 +-
10 ibdm/ibdm/TopoMatch.cpp | 106 ++++++++++++------------
11 ibdm/src/test_topo_match.cpp | 4 +-
12 ibis/tests/ibvs_test.tcl | 8 +-
13 ibmgtsim/tests/osmLidAssignment.sim.tcl | 2 +-
14 ibmgtsim/tests/osmStress.sim.tcl | 2 +-
15 8 files changed, 65 insertions(+), 65 deletions(-)
16
17 diff --git a/ibdiag/src/ibdebug_if.tcl b/ibdiag/src/ibdebug_if.tcl
18 index cdc389d..df626f1 100644
19 --- a/ibdiag/src/ibdebug_if.tcl
20 +++ b/ibdiag/src/ibdebug_if.tcl
21 @@ -2014,7 +2014,7 @@ proc inform { msgCode args } {
22 set nodeName [lindex $args 0]
23 set inb [lindex $args 1]
24 set outb [lindex $args 2]
25 - append msgText "Missmatching In-Bound ($inb) and Out-Bound ($outb) PKey enforcement on switch $nodeName"
26 + append msgText "Mismatching In-Bound ($inb) and Out-Bound ($outb) PKey enforcement on switch $nodeName"
27 }
28 "-W-ibdiagnet:PKeys.switch.missing.pkey" {
29 set name [lindex $args 0]
30 @@ -2054,7 +2054,7 @@ proc inform { msgCode args } {
31 foreach {gPKey pkey} $args {break}
32 set pk1 [format 0x%04x $gPKey]
33 set pk2 [format 0x%04x $pKey]
34 - append msgText "Missmatching Multicast Group PKey:$pk1 and MGID Pkey:$pk2"
35 + append msgText "Mismatching Multicast Group PKey:$pk1 and MGID Pkey:$pk2"
36 }
37 "-W-ibdiagnet:ipoib.cantJoin" {
38 foreach {name rate gRate} $args {break}
39 diff --git a/ibdm/Clusters/topo2subnet b/ibdm/Clusters/topo2subnet
40 index f56048d..8fa31e3 100755
41 --- a/ibdm/Clusters/topo2subnet
42 +++ b/ibdm/Clusters/topo2subnet
43 @@ -48,7 +48,7 @@ Description:
44 subnet.lst file (in local dir) to match the specified topology.
45 It 'invents' guids and lids sequentially.
46
47 -TODO: Randomize missmatches ...
48 +TODO: Randomize mismatches ...
49 "
50
51 ###########################################################################
52 diff --git a/ibdm/doc/ibdmsh.pod b/ibdm/doc/ibdmsh.pod
53 index 599a5ad..1386d5e 100644
54 --- a/ibdm/doc/ibdmsh.pod
55 +++ b/ibdm/doc/ibdmsh.pod
56 @@ -594,7 +594,7 @@ Trace a path following the LFT updating the hops and node list variables
57
58 =head2 Topology Matching Utilities
59
60 -The following utilities matches two fabrics providing both missmatch messages and a unified fabric
61 +The following utilities matches two fabrics providing both mismatch messages and a unified fabric
62
63 =over
64
65 diff --git a/ibdm/ibdm/TopoMatch.cpp b/ibdm/ibdm/TopoMatch.cpp
66 index dd2bfc5..434bb3c 100644
67 --- a/ibdm/ibdm/TopoMatch.cpp
68 +++ b/ibdm/ibdm/TopoMatch.cpp
69 @@ -44,7 +44,7 @@ spec = The fabric as specified in either a topology file or cables file.
70
71 Through the matching algorithm:
72 1. The specification fabric get guids annotations.
73 -2. Missmatches are being formatted into a text report.
74 +2. Mismatches are being formatted into a text report.
75
76 After Matching a Merger can be run to create the merged fabric.
77 This fabric only includes the discovered nodes but uses the
78 @@ -105,7 +105,7 @@ TopoMatchPorts(IBPort *p_sPort,
79 }
80 if (p_sPort->num != p_dPort->num) {
81 if (doDiag)
82 - diag << "Port number missmatch found. The port:" << p_sPort->getName()
83 + diag << "Port number mismatch found. The port:" << p_sPort->getName()
84 << " != discovered:" << p_dPort->num << endl;
85 return 0;
86 }
87 @@ -280,11 +280,11 @@ TopoQalifyNodesMatching(IBNode *p_sNode, IBNode *p_dNode)
88 if (numMissed <= maxMissed)
89 cout << "-V- Qualified Nodes:" << p_sNode->name
90 << " to:" << p_dNode->name << " with:" << numMissed
91 - << " missmatches!" <<endl;
92 + << " mismatches!" <<endl;
93 else
94 cout << "-V- Disqualified Nodes:" << p_sNode->name
95 << " to:" << p_dNode->name << " due to:" << numMissed
96 - << " missmatches!\n" << tmpDiag.str() << endl;
97 + << " mismatches!\n" << tmpDiag.str() << endl;
98 return numMissed <= maxMissed;
99 }
100
101 @@ -367,16 +367,16 @@ TopoDoBFSAndMatch(IBNode *p_sNodeAnchor, // Starting node on the specification
102 continue;
103
104 // do not rush into matching - double check all the nodes ports ...
105 - int anyMissmatch = 0;
106 + int anyMismatch = 0;
107 if (p_node1->numPorts != p_node2->numPorts)
108 continue;
109 - for (unsigned int pn = 1; !anyMissmatch && (pn <= p_node1->numPorts);
110 + for (unsigned int pn = 1; !anyMismatch && (pn <= p_node1->numPorts);
111 pn++) {
112 IBPort *p_dPort = p_node1->getPort(pn);
113 IBPort *p_sPort = p_node2->getPort(pn);
114
115 if (! TopoMatchPorts(p_sPort, p_dPort, 1, diag)) {
116 - anyMissmatch++;
117 + anyMismatch++;
118 if (FabricUtilsVerboseLevel & FABU_LOG_VERBOSE)
119 cout << "-V- Matched node:" << (*nI).first
120 << " by name - but some ports are different." << endl;
121 @@ -386,7 +386,7 @@ TopoDoBFSAndMatch(IBNode *p_sNodeAnchor, // Starting node on the specification
122 IBNode *p_dRemNode = p_dPort->p_remotePort->p_node;
123 IBNode *p_sRemNode = p_sPort->p_remotePort->p_node;
124 if (! TopoQalifyNodesMatching(p_sRemNode, p_dRemNode)) {
125 - anyMissmatch++;
126 + anyMismatch++;
127 if (FabricUtilsVerboseLevel & FABU_LOG_VERBOSE)
128 cout << "-V- Disqualified start nodes match:"
129 << p_node1->name << " by rem nodes" << endl;
130 @@ -547,7 +547,7 @@ TopoBFSAndMatchFromPorts(IBPort *p_sPort, // Starting port on the specification
131
132
133 //////////////////////////////////////////////////////////////////////////////
134 -// Second step in matching - refine missmatched nodes:
135 +// Second step in matching - refine mismatched nodes:
136 // Based on the previous matching - produce a set of all spec nodes
137 // that are connected to other matched spec nodes.
138 // Then go over all these nodes and produce a "best fit" match for them:
139 @@ -680,7 +680,7 @@ TopoMatchSpecNodesByAdjacentNode(IBFabric *p_sFabric)
140
141
142 //////////////////////////////////////////////////////////////////////////////
143 -// Report missmatched nodes by examining entire system and looking for
144 +// Report mismatched nodes by examining entire system and looking for
145 // all system and then a single board (matching regexp).
146 // So the report will be optimized:
147 // If the entire system is missing - report only at this level
148 @@ -691,7 +691,7 @@ TopoReportMismatchedNode(IBNode *p_node,
149 int reportMissing, // 0 = reportExtra ...
150 stringstream &diag)
151 {
152 - int anyMissmatch = 0;
153 + int anyMismatch = 0;
154 int MaxConnRep = 12;
155 // we assume if a previous check was done we would have
156 // never been called since the "reported" mark would have been set
157 @@ -789,7 +789,7 @@ TopoReportMismatchedNode(IBNode *p_node,
158 if (numRep == MaxConnRep) diag << " ..." << endl;
159 diag << endl;
160 }
161 - anyMissmatch++;
162 + anyMismatch++;
163
164 // also we do not need any more checks on this system
165 for (map_str_pnode::iterator nI = p_system->NodeByName.begin();
166 @@ -805,7 +805,7 @@ TopoReportMismatchedNode(IBNode *p_node,
167 diag << "Extra System Board:" << nodeBoardName << endl;
168 diag << endl;
169 }
170 - anyMissmatch++;
171 + anyMismatch++;
172
173 for (list< IBNode *>::iterator nI = boardNodes.begin();
174 nI != boardNodes.end(); nI++) {
175 @@ -860,26 +860,26 @@ TopoReportMismatchedNode(IBNode *p_node,
176 diag << " ..." << endl;
177 diag << endl;
178 }
179 - anyMissmatch++;
180 + anyMismatch++;
181
182 TopoMarkNodeAsReported(p_node);
183 }
184 - return(anyMissmatch);
185 + return(anyMismatch);
186 }
187
188
189 // Given two matching nodes - report un-matching links.
190 // To avoid duplicated reporting:
191 -// * We only report missmatching links to matched nodes.
192 +// * We only report mismatching links to matched nodes.
193 // * We only report link to nodes with bigger pointer value
194 -// RETURN number of missmatches
195 +// RETURN number of mismatches
196 static int
197 TopoReportMatchedNodesUnMatchingLinks(IBNode *p_sNode,
198 IBNode *p_dNode,
199 stringstream &diag)
200 {
201 - int anyMissmatch = 0;
202 - // missmatch is when port numbers differ
203 + int anyMismatch = 0;
204 + // mismatch is when port numbers differ
205 // or the remote node is not the same.
206 IBPort *p_sPort, *p_dRemPort;
207 IBPort *p_dPort, *p_sRemPort;
208 @@ -924,7 +924,7 @@ TopoReportMatchedNodesUnMatchingLinks(IBNode *p_sNode,
209 << " to:" << p_actRemSNode->name << "/P" << p_dRemPort->num
210 << " instead of:" << p_sRemPort->getName() << endl;
211 }
212 - anyMissmatch++;
213 + anyMismatch++;
214 } else {
215 // make sure same port remote number
216 if (p_dRemPort->num != p_sRemPort->num) {
217 @@ -943,7 +943,7 @@ TopoReportMatchedNodesUnMatchingLinks(IBNode *p_sNode,
218 << " to:" << p_actRemSNode->name << "/P" << p_dRemPort->num
219 << " instead of:" << p_sRemPort->getName() << endl;
220 }
221 - anyMissmatch++;
222 + anyMismatch++;
223 }
224 }
225 // anyway make sure we got the width and speed.
226 @@ -951,13 +951,13 @@ TopoReportMatchedNodesUnMatchingLinks(IBNode *p_sNode,
227 diag << "Wrong link width on:" << p_sPort->getName()
228 << ". Expected:" << width2char(p_sPort->width)
229 << " got:" << width2char(p_dPort->width) << endl;
230 - anyMissmatch++;
231 + anyMismatch++;
232 }
233 if (p_sPort->speed != p_dPort->speed) {
234 diag << "Wrong link speed on:" << p_sPort->getName()
235 << ". Expected:" << speed2char(p_sPort->speed)
236 << " got:" << speed2char(p_dPort->speed) << endl;
237 - anyMissmatch++;
238 + anyMismatch++;
239 }
240 // done with the case both spec and dicsovered links exists
241 } else if (!p_dRemPort && p_sRemPort) {
242 @@ -987,7 +987,7 @@ TopoReportMatchedNodesUnMatchingLinks(IBNode *p_sNode,
243 << " to:" << p_sRemPort->getName() << endl;
244 }
245 }
246 - anyMissmatch++;
247 + anyMismatch++;
248 } else if (p_dRemPort && !p_sRemPort) {
249 // Only a discovered link exists:
250
251 @@ -1045,25 +1045,25 @@ TopoReportMatchedNodesUnMatchingLinks(IBNode *p_sNode,
252 diag << "Extra internal Link connecting:" << specPortName
253 << " to:" << portName << endl;
254 }
255 - anyMissmatch++;
256 + anyMismatch++;
257 }
258 }
259 - if (anyMissmatch)
260 + if (anyMismatch)
261 diag << endl;
262 - return(anyMissmatch);
263 + return(anyMismatch);
264 }
265
266
267 -// Report Topology Missmatched and Build the Merged Fabric:
268 +// Report Topology Mismatched and Build the Merged Fabric:
269 static int
270 -TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the specification fabrric
271 +TopoReportMismatches(IBNode *p_sNodeAnchor, // Starting node on the specification fabrric
272 IBNode *p_dNodeAnchor,
273 stringstream &diag)
274 {
275 IBNode *p_sNode, *p_dNode;
276 - int anyMissmatchedSpecNodes = 0;
277 - int anyMissmatchedDiscNodes = 0;
278 - int anyMissmatchedLinks = 0;
279 + int anyMismatchedSpecNodes = 0;
280 + int anyMismatchedDiscNodes = 0;
281 + int anyMismatchedLinks = 0;
282
283 // since we do not want to report errors created by previous node failure
284 // to discover or match we will BFS from the start ports.
285 @@ -1082,7 +1082,7 @@ TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the
286 // we got in here only with matching nodes:
287 p_sNode = (IBNode *)p_dNode->appData1.ptr;
288 if (!p_sNode) {
289 - cerr << "How did we get in BFS with missmatching nodes!" << endl;
290 + cerr << "How did we get in BFS with mismatching nodes!" << endl;
291 exit (1);
292 }
293
294 @@ -1107,7 +1107,7 @@ TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the
295 // if the remote spec node is not marked matched:
296 if (!p_sRemPort->p_node->appData1.ptr) {
297 if (TopoReportMismatchedNode(p_sRemPort->p_node, 1, diag))
298 - anyMissmatchedSpecNodes++;
299 + anyMismatchedSpecNodes++;
300 } else {
301 // mark as visited.
302 TopoMarkNodeAsReported(p_sRemPort->p_node);
303 @@ -1121,7 +1121,7 @@ TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the
304 } // all ports
305 } // next nodes available...
306
307 - if (anyMissmatchedSpecNodes)
308 + if (anyMismatchedSpecNodes)
309 diag << endl;
310
311 IBFabric *p_dFabric = p_dNodeAnchor->p_fabric;
312 @@ -1135,7 +1135,7 @@ TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the
313 diag << "Even starting nodes do not match! "
314 << "Expected:" << p_sNodeAnchor->name
315 << " but it is probably not connected correctly." << endl;
316 - anyMissmatchedDiscNodes++;
317 + anyMismatchedDiscNodes++;
318 }
319
320 // we track visited nodes in here by clearing their visited bits
321 @@ -1159,12 +1159,12 @@ TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the
322
323 IBNode *p_node = p_dRemPort->p_node;
324
325 - // we only care about missmatched discovered nodes
326 + // we only care about mismatched discovered nodes
327 if (! p_node->appData1.ptr) {
328 // if not already visited.
329 if (! TopoIsNodeMarkedAsReported(p_node))
330 if (TopoReportMismatchedNode(p_node, 0, diag))
331 - anyMissmatchedDiscNodes++;
332 + anyMismatchedDiscNodes++;
333 } else {
334 // if not already visited.
335 if (! TopoIsNodeMarkedAsReported(p_node))
336 @@ -1184,26 +1184,26 @@ TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the
337 TopoMarkNodeAsReported(p_dNode);
338 } // next nodes available...
339
340 - if (anyMissmatchedDiscNodes)
341 + if (anyMismatchedDiscNodes)
342 diag << endl;
343
344 - // finaly we want to report any missmatched cables between matching nodes
345 + // finaly we want to report any mismatched cables between matching nodes
346 for (map_str_pnode::iterator nI = p_dFabric->NodeByName.begin();
347 nI != p_dFabric->NodeByName.end(); nI++) {
348 p_dNode = (*nI).second;
349 p_sNode = (IBNode *)p_dNode->appData1.ptr;
350 if ( p_sNode ) {
351 - // report any missmatched links on this node.
352 + // report any mismatched links on this node.
353 if (TopoReportMatchedNodesUnMatchingLinks(p_sNode, p_dNode, diag))
354 - anyMissmatchedLinks++;
355 + anyMismatchedLinks++;
356 }
357 }
358
359 - if (anyMissmatchedLinks)
360 + if (anyMismatchedLinks)
361 diag << endl;
362 - return anyMissmatchedLinks +
363 - anyMissmatchedDiscNodes +
364 - anyMissmatchedSpecNodes;
365 + return anyMismatchedLinks +
366 + anyMismatchedDiscNodes +
367 + anyMismatchedSpecNodes;
368 }
369
370
371 @@ -1303,7 +1303,7 @@ TopoMatchFabrics(IBFabric *p_sFabric, // The specification fabric
372 status = TopoBFSAndMatchFromNodes(p_sNode, p_dNode, tmpDiag);
373 }
374 if (status) {
375 - cout << "-W- Topology Matching First Phase Found Missmatches:\n"
376 + cout << "-W- Topology Matching First Phase Found Mismatches:\n"
377 << tmpDiag.str() << endl;
378 }
379
380 @@ -1311,7 +1311,7 @@ TopoMatchFabrics(IBFabric *p_sFabric, // The specification fabric
381 // and try to map the unmatched.
382 TopoMatchSpecNodesByAdjacentNode(p_sFabric);
383
384 - if (TopoReportMissmatches(p_sNode, p_dNode, diag))
385 + if (TopoReportMismatches(p_sNode, p_dNode, diag))
386 status = 1;
387
388 Exit:
389 @@ -1461,7 +1461,7 @@ TopoCopyLinkToMergedFabric(IBFabric *p_mFabric,
390 } else {
391 /*
392 // The following error messages are actually not required at
393 - // all. If there is a missmatch on an internal node this will happen.
394 + // all. If there is a mismatch on an internal node this will happen.
395 if (p_remPort->p_sysPort) {
396 cout << "-E- Linking:" << p_mPort->getName() << " to:"
397 << p_remPort->p_node->name
398 @@ -1798,7 +1798,7 @@ CheckMatchingCAPortsToMatchingSwPortNums(IBFabric *p_sFabric, IBFabric *p_dFabri
399 // try all ports and look for remote side switches
400 // if remote ports match collect all the switches reached
401 // now go over all reached switches and validate back all connections
402 -// to matched switches - report missmatches or report the new set
403 +// to matched switches - report mismatches or report the new set
404 // return the number of new matches found
405 static int
406 TopoMatchSwitches(IBFabric *p_sFabric,
407 @@ -2001,7 +2001,7 @@ TopoMatchSwitches(IBFabric *p_sFabric,
408
409
410 // go over entire fabric from edges and in and report
411 -// each missmatch - do not propogate inwards through missmatches
412 +// each mismatch - do not propogate inwards through mismatches
413 static int
414 BfsFromEdgReportingMatcStatus(IBFabric *p_sFabric, IBFabric *p_dFabric,
415 stringstream &s)
416 @@ -2077,7 +2077,7 @@ BfsFromEdgReportingMatcStatus(IBFabric *p_sFabric, IBFabric *p_dFabric,
417 p_sActRemNode->getPort(p_dPort->p_remotePort->num);
418 // so they must be same nodes...
419 if (p_sActRemNode != p_sRemNode) {
420 - badMsg << "-E- Missmatch: port:" << p_sPort->getName()
421 + badMsg << "-E- Mismatch: port:" << p_sPort->getName()
422 << " should be connected to:"
423 << p_sPort->p_remotePort->getName()
424 << " but connects to:" << p_sActRemPort->getName() << endl;
425 @@ -2088,7 +2088,7 @@ BfsFromEdgReportingMatcStatus(IBFabric *p_sFabric, IBFabric *p_dFabric,
426 // now we know they both point to same switch - check the port
427 // connection and properties
428 if (p_sPort->p_remotePort->num != p_dPort->p_remotePort->num) {
429 - badMsg << "-E- Missmatch: port " << p_sPort->getName()
430 + badMsg << "-E- Mismatch: port " << p_sPort->getName()
431 << " should be connected to:"
432 << p_sPort->p_remotePort->getName()
433 << " but connects to port: "
434 diff --git a/ibdm/src/test_topo_match.cpp b/ibdm/src/test_topo_match.cpp
435 index 5e546a7..867fa35 100644
436 --- a/ibdm/src/test_topo_match.cpp
437 +++ b/ibdm/src/test_topo_match.cpp
438 @@ -64,9 +64,9 @@ show_help() {
439 << "\n"
440 << "Description:\n"
441 << "This tool compares a topology file and a discovered listing of"
442 - << "subnet.lst/ibdiagnet.lst and reports missmatches.\n"
443 + << "subnet.lst/ibdiagnet.lst and reports mismatches.\n"
444 << "Two different algorithms provided:\n"
445 - << "Using the -e option is more suitible for MANY missmatches\n"
446 + << "Using the -e option is more suitible for MANY mismatches\n"
447 << "it applies less heuristics and provide details about the match.\n"
448 << "Providing the -s, -p and -g starts a detailed heuristics that\n"
449 << "should be used when only small number of changes are expected.\n"
450 diff --git a/ibis/tests/ibvs_test.tcl b/ibis/tests/ibvs_test.tcl
451 index bf3c7e7..7a4d68c 100755
452 --- a/ibis/tests/ibvs_test.tcl
453 +++ b/ibis/tests/ibvs_test.tcl
454 @@ -221,7 +221,7 @@ for {set i 0} {$i < $numLoops} {incr i} {
455 set prev [lindex [array get DATA$d $i] 1]
456 set this [assoc data$i $data]
457 if {$prev != $this} {
458 - puts "-E- Missmatch on set:$d data:$i $prev != $this"
459 + puts "-E- Mismatch on set:$d data:$i $prev != $this"
460 incr anyError
461 }
462 }
463 @@ -242,7 +242,7 @@ for {set i 0} {$i < $numLoops} {incr i} {
464 set prev [lindex [array get DATA$d $i] 1]
465 set this [assoc data$i $data]
466 if {$prev != $this} {
467 - puts "-E- Missmatch on set:$d data:$i $prev != $this"
468 + puts "-E- Mismatch on set:$d data:$i $prev != $this"
469 incr anyError
470 }
471 }
472 @@ -272,7 +272,7 @@ for {set i 0} {$i < $numLoops} {incr i} {
473 set prev [lindex $newWords $i]
474 set this [assoc data$i $data]
475 if {$prev != $this} {
476 - puts "-E- Missmatch read back of written data-set:$d data:$i $prev != $this"
477 + puts "-E- Mismatch read back of written data-set:$d data:$i $prev != $this"
478 incr anyError
479 }
480 }
481 @@ -291,7 +291,7 @@ for {set i 0} {$i < $numLoops} {incr i} {
482 set prev [lindex $oldWords $i]
483 set this [assoc data$i $data]
484 if {$prev != $this} {
485 - puts "-E- Missmatch read back of reverted data-set:$d data:$i $prev != $this"
486 + puts "-E- Mismatch read back of reverted data-set:$d data:$i $prev != $this"
487 incr anyError
488 }
489 }
490 diff --git a/ibmgtsim/tests/osmLidAssignment.sim.tcl b/ibmgtsim/tests/osmLidAssignment.sim.tcl
491 index a765aa3..0ff9d54 100644
492 --- a/ibmgtsim/tests/osmLidAssignment.sim.tcl
493 +++ b/ibmgtsim/tests/osmLidAssignment.sim.tcl
494 @@ -698,7 +698,7 @@ proc checkLidValues {fabric lmc} {
495 }
496 }
497 if {$numErrs} {
498 - puts "-E- Got $numErrs missmatches in lid assignment out of $numPorts ports"
499 + puts "-E- Got $numErrs mismatches in lid assignment out of $numPorts ports"
500 } else {
501 puts "-I- scanned $numPorts ports with no error"
502 }
503 diff --git a/ibmgtsim/tests/osmStress.sim.tcl b/ibmgtsim/tests/osmStress.sim.tcl
504 index 4d1a533..7b1b876 100755
505 --- a/ibmgtsim/tests/osmStress.sim.tcl
506 +++ b/ibmgtsim/tests/osmStress.sim.tcl
507 @@ -546,7 +546,7 @@ proc checkLidValues {fabric lmc} {
508 }
509 }
510 if {$numErrs} {
511 - puts "-E- Got $numErrs missmatches in lid assignment out of $numPorts ports"
512 + puts "-E- Got $numErrs mismatches in lid assignment out of $numPorts ports"
513 } else {
514 puts "-I- scanned $numPorts ports with no error"
515 }
516 --
517 2.25.1
518
+421
-0
debian/patches/Fix-spelling-error-of-tuple.patch less more
0 From 8bc14514d5dae672f92087fbd33d89d9e54aa13d Mon Sep 17 00:00:00 2001
1 From: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2 Date: Wed, 11 Nov 2020 10:43:35 +0100
3 Subject: Fix spelling error of tuple
4
5 Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
6 ---
7 ibdm/ibdm/FatTree.cpp | 170 +++++++++++++++++++++---------------------
8 1 file changed, 85 insertions(+), 85 deletions(-)
9
10 diff --git a/ibdm/ibdm/FatTree.cpp b/ibdm/ibdm/FatTree.cpp
11 index b61e5ca..678caff 100644
12 --- a/ibdm/ibdm/FatTree.cpp
13 +++ b/ibdm/ibdm/FatTree.cpp
14 @@ -51,16 +51,16 @@ FatTree Utilities:
15 // highest value.
16 //
17 // The algorithm BFS from an arbitrary leaf switch.
18 -// It then allocates ID tupples to each switch ID[0..N].
19 +// It then allocates ID tuples to each switch ID[0..N].
20 // Only one digit of the ID is allowed to change when going from
21 // switch node to the other.
22 //
23 // We use the term "index" when we refer to
24 -// The digit indexed 0 ID[0] in the tupple is the rank number.
25 +// The digit indexed 0 ID[0] in the tuple is the rank number.
26 // Going down the tree the digit that might change is D[from->rank+1]
27 // Going up the tee the digit that might change is D[from->rank]
28 //
29 -// During the BFS each node is assigned a tupple the first time it is
30 +// During the BFS each node is assigned a tuple the first time it is
31 // visited. During the BFS we also collect the list of ports that connect to
32 // each value of the changing D.
33 //
34 @@ -69,8 +69,8 @@ FatTree Utilities:
35 // number of sub hierarchy indexes with the exact same number of ports
36 //
37
38 -// for comparing tupples
39 -struct FatTreeTuppleLess : public binary_function <vec_byte, vec_byte, bool> {
40 +// for comparing tuples
41 +struct FatTreeTupleLess : public binary_function <vec_byte, vec_byte, bool> {
42 bool operator()(const vec_byte& x, const vec_byte& y) const {
43 if (x.size() > y.size()) return false;
44 if (y.size() > x.size()) return true;
45 @@ -166,15 +166,15 @@ bool FatTreeNode::goingDown(int lid)
46 return false;
47 }
48
49 -typedef map< vec_byte, class FatTreeNode, FatTreeTuppleLess > map_tupple_ftnode;
50 +typedef map< vec_byte, class FatTreeNode, FatTreeTupleLess > map_tuple_ftnode;
51
52 class FatTree {
53 - // the node tupple is built out of the following:
54 + // the node tuple is built out of the following:
55 // d[0] = rank
56 // d[1..N-1] = ID digits
57 IBFabric *p_fabric; // The fabric we attach to
58 - map_pnode_vec_byte TuppleByNode;
59 - map_tupple_ftnode NodeByTupple;
60 + map_pnode_vec_byte TupleByNode;
61 + map_tuple_ftnode NodeByTuple;
62 vec_int LidByIdx; // store target HCA lid by its index
63 unsigned int N; // number of levels in the fabric
64 map_str_int IdxByName;
65 @@ -187,11 +187,11 @@ class FatTree {
66 // return NULL if this check is not met or no ranking available
67 IBNode *getLowestLevelSwitchNode();
68
69 - // get a free tupple given the reference one and the index to change:
70 - vec_byte getFreeTupple(vec_byte refTupple, unsigned int changeIdx);
71 + // get a free tuple given the reference one and the index to change:
72 + vec_byte getFreeTuple(vec_byte refTuple, unsigned int changeIdx);
73
74 - // convert tupple to string
75 - string getTuppleStr(vec_byte tupple);
76 + // convert tuple to string
77 + string getTupleStr(vec_byte tuple);
78
79 // simply dump out the FatTree data:
80 void dump();
81 @@ -199,7 +199,7 @@ class FatTree {
82 // track a connection to remote switch
83 int trackConnection(
84 FatTreeNode *p_ftNode,
85 - vec_byte tupple, // the connected node tupple
86 + vec_byte tuple, // the connected node tuple
87 unsigned int rank, // rank of the local node
88 unsigned int remRank, // rank of the remote node
89 unsigned int portNum, // the port number connecting to the remote node
90 @@ -249,9 +249,9 @@ public:
91
92 FatTreeNode* FatTree::getFatTreeNodeByNode(IBNode *p_node) {
93 FatTreeNode* p_ftNode;
94 - vec_byte tupple(N, 0);
95 - tupple = TuppleByNode[p_node];
96 - p_ftNode = &NodeByTupple[tupple];
97 + vec_byte tuple(N, 0);
98 + tuple = TupleByNode[p_node];
99 + p_ftNode = &NodeByTuple[tuple];
100 return p_ftNode;
101 }
102
103 @@ -310,31 +310,31 @@ IBNode *FatTree::getLowestLevelSwitchNode()
104 return(p_leafSwitch);
105 }
106
107 -// get a free tupple given the reference one and the index to change:
108 +// get a free tuple given the reference one and the index to change:
109 // also track the max digit allocated per index
110 -vec_byte FatTree::getFreeTupple(vec_byte refTupple, unsigned int changeIdx)
111 +vec_byte FatTree::getFreeTuple(vec_byte refTuple, unsigned int changeIdx)
112 {
113 - vec_byte res = refTupple;
114 + vec_byte res = refTuple;
115 int rank = changeIdx - 1;
116 for (uint8_t i = 0; i < 255; i++)
117 {
118 res[changeIdx] = i;
119 - map_tupple_ftnode::const_iterator tI = NodeByTupple.find(res);
120 - if (tI == NodeByTupple.end())
121 + map_tuple_ftnode::const_iterator tI = NodeByTuple.find(res);
122 + if (tI == NodeByTuple.end())
123 return res;
124 }
125 - cout << "ABORT: fail to get free tupple! (in 255 indexies)" << endl;
126 + cout << "ABORT: fail to get free tuple! (in 255 indexies)" << endl;
127 abort();
128 }
129
130 -string FatTree::getTuppleStr(vec_byte tupple)
131 +string FatTree::getTupleStr(vec_byte tuple)
132 {
133 char buf[128];
134 buf[0] = '\0';
135 - for (unsigned int i = 0; i < tupple.size(); i++)
136 + for (unsigned int i = 0; i < tuple.size(); i++)
137 {
138 if (i) strcat(buf,".");
139 - sprintf(buf, "%s%d", buf, tupple[i]);
140 + sprintf(buf, "%s%d", buf, tuple[i]);
141 }
142 return(string(buf));
143 }
144 @@ -343,11 +343,11 @@ string FatTree::getTuppleStr(vec_byte tupple)
145 // correct fat tree node childPorts and parentPorts
146 int FatTree::trackConnection(
147 FatTreeNode *p_ftNode, // the connected node
148 - vec_byte tupple, // the connected node tupple
149 + vec_byte tuple, // the connected node tuple
150 unsigned int rank, // rank of the local node
151 unsigned int remRank, // rank of the remote node
152 unsigned int portNum, // the port number connecting to the remote node
153 - unsigned int remDigit // the digit of the tupple changing to the remote node
154 + unsigned int remDigit // the digit of the tuple changing to the remote node
155 )
156 {
157 if ( rank < remRank )
158 @@ -394,8 +394,8 @@ FatTree::extractCoefficients()
159 int anyErr = 0;
160
161 // go over all nodes
162 - for (map_tupple_ftnode::iterator tI = NodeByTupple.begin();
163 - tI != NodeByTupple.end();
164 + for (map_tuple_ftnode::iterator tI = NodeByTuple.begin();
165 + tI != NodeByTuple.end();
166 tI++)
167 {
168 FatTreeNode *p_ftNode = &((*tI).second);
169 @@ -454,11 +454,11 @@ FatTree::extractCoefficients()
170
171 if (anyErr) return 1;
172
173 - vec_byte firstLeafTupple(N, 0);
174 - firstLeafTupple[0] = N-1;
175 + vec_byte firstLeafTuple(N, 0);
176 + firstLeafTuple[0] = N-1;
177 maxHcasPerLeafSwitch = 0;
178 - for (map_tupple_ftnode::iterator tI = NodeByTupple.find(firstLeafTupple);
179 - tI != NodeByTupple.end();
180 + for (map_tuple_ftnode::iterator tI = NodeByTuple.find(firstLeafTuple);
181 + tI != NodeByTuple.end();
182 tI++)
183 {
184 FatTreeNode *p_ftNode = &((*tI).second);
185 @@ -506,24 +506,24 @@ FatTree::FatTree(IBFabric *p_f)
186 bfsQueue.push_back(p_node);
187
188 // also we always allocate the address 0..0 with "rank" digits to the node:
189 - vec_byte tupple(N, 0);
190 + vec_byte tuple(N, 0);
191
192 // adjust the level:
193 - tupple[0] = p_node->rank;
194 - TuppleByNode[p_node] = tupple;
195 - NodeByTupple[tupple] = FatTreeNode(p_node);
196 + tuple[0] = p_node->rank;
197 + TupleByNode[p_node] = tuple;
198 + NodeByTuple[tuple] = FatTreeNode(p_node);
199 if (FabricUtilsVerboseLevel & FABU_LOG_VERBOSE)
200 - cout << "-I- Assigning tupple:" << getTuppleStr(tupple) << " to:"
201 + cout << "-I- Assigning tuple:" << getTupleStr(tuple) << " to:"
202 << p_node->name << endl;
203
204 while (! bfsQueue.empty())
205 {
206 p_node = bfsQueue.front();
207 bfsQueue.pop_front();
208 - // we must have a tupple stored - get it
209 - tupple = TuppleByNode[p_node];
210 + // we must have a tuple stored - get it
211 + tuple = TupleByNode[p_node];
212 // we also need to get the fat tree node...
213 - p_ftNode = &NodeByTupple[tupple];
214 + p_ftNode = &NodeByTuple[tuple];
215
216 // go over all the node ports
217 for (unsigned int pn = 1; pn <= p_node->numPorts; pn++)
218 @@ -543,7 +543,7 @@ FatTree::FatTree(IBFabric *p_f)
219 }
220
221 // now try to see if this node has already a map:
222 - map_pnode_vec_byte::iterator tI = TuppleByNode.find(p_remNode);
223 + map_pnode_vec_byte::iterator tI = TupleByNode.find(p_remNode);
224
225 // we are allowed to change the digit based on the direction we go:
226 unsigned int changingDigitIdx;
227 @@ -563,28 +563,28 @@ FatTree::FatTree(IBFabric *p_f)
228 return;
229 }
230
231 - // do we need to allocate a new tupple?
232 - if (tI == TuppleByNode.end())
233 + // do we need to allocate a new tuple?
234 + if (tI == TupleByNode.end())
235 {
236
237 - // the node is new - so get a new tupple for it:
238 - vec_byte newTupple = tupple;
239 + // the node is new - so get a new tuple for it:
240 + vec_byte newTuple = tuple;
241 // change the level accordingly
242 - newTupple[0] = p_remNode->rank;
243 + newTuple[0] = p_remNode->rank;
244 // obtain a free one
245 - newTupple = getFreeTupple(newTupple, changingDigitIdx);
246 + newTuple = getFreeTuple(newTuple, changingDigitIdx);
247
248 - // assign the new tupple and add to next steps:
249 + // assign the new tuple and add to next steps:
250 if (FabricUtilsVerboseLevel & FABU_LOG_VERBOSE)
251 - cout << "-I- Assigning tupple:" << getTuppleStr(newTupple)
252 + cout << "-I- Assigning tuple:" << getTupleStr(newTuple)
253 << " to:" << p_remNode->name << " changed idx:"
254 - << changingDigitIdx << " from:" << getTuppleStr(tupple)
255 + << changingDigitIdx << " from:" << getTupleStr(tuple)
256 << endl;
257
258 - TuppleByNode[p_remNode] = newTupple;
259 - NodeByTupple[newTupple] = FatTreeNode(p_remNode);
260 + TupleByNode[p_remNode] = newTuple;
261 + NodeByTuple[newTuple] = FatTreeNode(p_remNode);
262
263 - unsigned int digit = newTupple[changingDigitIdx];
264 + unsigned int digit = newTuple[changingDigitIdx];
265
266 // track the connection
267 if (FabricUtilsVerboseLevel & FABU_LOG_VERBOSE)
268 @@ -592,25 +592,25 @@ FatTree::FatTree(IBFabric *p_f)
269 << p_remNode->name << " through port:" << pn
270 << " remDigit:" << digit << endl;
271 if (trackConnection(
272 - p_ftNode, tupple, p_node->rank, p_remNode->rank, pn, digit))
273 + p_ftNode, tuple, p_node->rank, p_remNode->rank, pn, digit))
274 return;
275
276 bfsQueue.push_back(p_remNode);
277 }
278 else
279 {
280 - // other side already has a tupple - so just track the connection
281 - vec_byte remTupple = (*tI).second;
282 - vec_byte mergedTupple = remTupple;
283 + // other side already has a tuple - so just track the connection
284 + vec_byte remTuple = (*tI).second;
285 + vec_byte mergedTuple = remTuple;
286
287 - unsigned int digit = remTupple[changingDigitIdx];
288 + unsigned int digit = remTuple[changingDigitIdx];
289
290 if (FabricUtilsVerboseLevel & FABU_LOG_VERBOSE)
291 cout << "-I- Connecting:" << p_node->name << " to:"
292 << p_remNode->name << " through port:" << pn
293 << " remDigit:" << digit << endl;
294 if (trackConnection(
295 - p_ftNode, tupple, p_node->rank, p_remNode->rank, pn, digit))
296 + p_ftNode, tuple, p_node->rank, p_remNode->rank, pn, digit))
297 return;
298 }
299
300 @@ -624,18 +624,18 @@ FatTree::FatTree(IBFabric *p_f)
301 // We need to decide what will be the K of the lowest switches level.
302 // It is possible that for all of them the number of HCAs is < num
303 // left ports thus we should probably use the lowest number of all
304 - vec_byte firstLeafTupple(N, 0);
305 - firstLeafTupple[0] = N-1;
306 + vec_byte firstLeafTuple(N, 0);
307 + firstLeafTuple[0] = N-1;
308
309 - // now restart going over all leaf switches by their tupple order and
310 + // now restart going over all leaf switches by their tuple order and
311 // allocate mapping
312 int hcaIdx = 0;
313 - for (map_tupple_ftnode::iterator tI = NodeByTupple.find(firstLeafTupple);
314 - tI != NodeByTupple.end();
315 + for (map_tuple_ftnode::iterator tI = NodeByTuple.find(firstLeafTuple);
316 + tI != NodeByTuple.end();
317 tI++)
318 {
319 // we collect HCAs connected to the leaf switch and set their childPort
320 - // starting at the index associated with the switch tupple.
321 + // starting at the index associated with the switch tuple.
322 FatTreeNode *p_ftNode = &((*tI).second);
323 IBNode *p_node = p_ftNode->p_node;
324 unsigned int pIdx = 0;
325 @@ -917,10 +917,10 @@ int FatTree::route()
326 int lid; // the target LID we propagate for this time
327
328 // go over all fat tree nodes of the lowest level
329 - vec_byte firstLeafTupple(N, 0);
330 - firstLeafTupple[0] = N-1;
331 - for (map_tupple_ftnode::iterator tI = NodeByTupple.find(firstLeafTupple);
332 - tI != NodeByTupple.end();
333 + vec_byte firstLeafTuple(N, 0);
334 + firstLeafTuple[0] = N-1;
335 + for (map_tuple_ftnode::iterator tI = NodeByTuple.find(firstLeafTuple);
336 + tI != NodeByTuple.end();
337 tI++)
338 {
339
340 @@ -963,8 +963,8 @@ int FatTree::route()
341 }
342
343 // now go over all switches and route to them
344 - for (map_tupple_ftnode::iterator tI = NodeByTupple.begin();
345 - tI != NodeByTupple.end();
346 + for (map_tuple_ftnode::iterator tI = NodeByTuple.begin();
347 + tI != NodeByTuple.end();
348 tI++)
349 {
350
351 @@ -1051,9 +1051,9 @@ int FatTree::permRoute(vector<string> src, vector<string> dst)
352 int hcaIdx = 0;
353 int lid; // the target LID we propagate for this time
354 // extract radix
355 - vec_byte tmpLeafTupple(N,0);
356 - tmpLeafTupple[0] = N-1;
357 - FatTreeNode* p_ftN = &NodeByTupple[tmpLeafTupple];
358 + vec_byte tmpLeafTuple(N,0);
359 + tmpLeafTuple[0] = N-1;
360 + FatTreeNode* p_ftN = &NodeByTuple[tmpLeafTuple];
361 int radix = 0;
362 for (int i = 0; i < p_ftN->parentPorts.size(); i++)
363 if(p_ftN->parentPorts[i].size())
364 @@ -1078,10 +1078,10 @@ int FatTree::permRoute(vector<string> src, vector<string> dst)
365
366 // build the LFTs
367 // go over all fat tree nodes of the lowest level
368 - vec_byte firstLeafTupple(N, 0);
369 - firstLeafTupple[0] = N-1;
370 + vec_byte firstLeafTuple(N, 0);
371 + firstLeafTuple[0] = N-1;
372 // First prepare downwards routing
373 - for (map_tupple_ftnode::iterator tI = NodeByTupple.find(firstLeafTupple); tI != NodeByTupple.end(); tI++) {
374 + for (map_tuple_ftnode::iterator tI = NodeByTuple.find(firstLeafTuple); tI != NodeByTuple.end(); tI++) {
375 FatTreeNode *p_ftNode = &((*tI).second);
376 IBNode *p_node = p_ftNode->p_node;
377 // we need to track the number of ports to handle case of missing HCAs
378 @@ -1124,7 +1124,7 @@ int FatTree::permRoute(vector<string> src, vector<string> dst)
379
380 // Now prepare upwards routing
381 hcaIdx = 0;
382 - for (map_tupple_ftnode::iterator tI = NodeByTupple.find(firstLeafTupple); tI != NodeByTupple.end(); tI++) {
383 + for (map_tuple_ftnode::iterator tI = NodeByTuple.find(firstLeafTuple); tI != NodeByTuple.end(); tI++) {
384 FatTreeNode *p_ftNode = &((*tI).second);
385 IBNode *p_node = p_ftNode->p_node;
386
387 @@ -1156,8 +1156,8 @@ int FatTree::permRoute(vector<string> src, vector<string> dst)
388 }
389
390 // now go over all switches and route to them
391 - for (map_tupple_ftnode::iterator tI = NodeByTupple.begin();
392 - tI != NodeByTupple.end();
393 + for (map_tuple_ftnode::iterator tI = NodeByTuple.begin();
394 + tI != NodeByTuple.end();
395 tI++)
396 {
397
398 @@ -1222,8 +1222,8 @@ void FatTree::dump()
399 {
400 unsigned int level, prevLevel = 2;
401 cout << "---------------------------------- FAT TREE DUMP -----------------------------" << endl;
402 - for (map_tupple_ftnode::const_iterator tI = NodeByTupple.begin();
403 - tI != NodeByTupple.end();
404 + for (map_tuple_ftnode::const_iterator tI = NodeByTuple.begin();
405 + tI != NodeByTuple.end();
406 tI++)
407 {
408 level = (*tI).first[0];
409 @@ -1234,7 +1234,7 @@ void FatTree::dump()
410 }
411
412 FatTreeNode const *p_ftNode = &((*tI).second);
413 - cout << " " << p_ftNode->p_node->name << " tupple:" << getTuppleStr((*tI).first) << endl;
414 + cout << " " << p_ftNode->p_node->name << " tuple:" << getTupleStr((*tI).first) << endl;
415 for (unsigned int i = 0; i < p_ftNode->parentPorts.size(); i++)
416 {
417 if (p_ftNode->parentPorts[i].size())
418 --
419 2.25.1
420
+639
-0
debian/patches/Fix-spelling-errors.patch less more
0 From c1c77db7c3a3fc38c127509472c72bac68825634 Mon Sep 17 00:00:00 2001
1 From: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2 Date: Wed, 11 Nov 2020 10:30:47 +0100
3 Subject: Fix spelling errors
4
5 lintian found some spelling errors.
6
7 Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
8 ---
9 ibdiag/demo/sm-single-master.tcl | 2 +-
10 ibdiag/doc/ibdiagpath.pod | 2 +-
11 ibdiag/doc/ibdiagui.pod | 2 +-
12 ibdiag/src/ibdebug.tcl | 8 ++++----
13 ibdiag/src/ibdebug_if.tcl | 6 +++---
14 ibdiag/src/ibdiagui.tcl | 4 ++--
15 ibdm/doc/ibdm-topo-file.pod | 2 +-
16 ibdm/doc/ibdmsh.pod | 10 +++++-----
17 ibdm/ibdm/CredLoops.cpp | 4 ++--
18 ibdm/ibdm/Fabric.cpp | 16 ++++++++--------
19 ibdm/ibdm/Fabric.h | 8 ++++----
20 ibdm/ibdm/SubnMgt.cpp | 2 +-
21 ibdm/ibdm/TopoMatch.cpp | 2 +-
22 ibdm/ibdm/ibdm.i | 10 +++++-----
23 ibdm/src/ibsysapi.cpp | 10 +++++-----
24 ibdm/src/ibsysapi.h | 4 ++--
25 ibis/doc/ibis.pod | 4 ++--
26 ibis/tests/ibvs_test.tcl | 2 +-
27 ibmgtsim/README | 2 +-
28 ibmgtsim/tests/OsmTest.check.tcl | 2 +-
29 ibmgtsim/tests/README | 2 +-
30 ibmgtsim/tests/ibdiag-mcast.sim.tcl | 6 +++---
31 ibmgtsim/tests/ibdiag-ucast.sim.tcl | 6 +++---
32 ibmgtsim/tests/pkey.check.tcl | 2 +-
33 ibmgtsim/utils/RunSimTest | 2 +-
34 25 files changed, 60 insertions(+), 60 deletions(-)
35
36 diff --git a/ibdiag/demo/sm-single-master.tcl b/ibdiag/demo/sm-single-master.tcl
37 index 3dd5c65..dfd0fa4 100644
38 --- a/ibdiag/demo/sm-single-master.tcl
39 +++ b/ibdiag/demo/sm-single-master.tcl
40 @@ -130,7 +130,7 @@ proc checker {simDir osmPath osmPortGuid} {
41 puts " -E- Found more then one master SM in the discover fabric\n"
42 puts " press Enter when done"
43 gets stdin
44 - puts " h. Make one of teh SMs sweep: kill -HUP %2."
45 + puts " h. Make one of the SMs sweep: kill -HUP %2."
46 puts " Now one of the SMs gets to standby mode"
47 puts " i. Run ibdiagnet again to see the info about the SMs in /var/cache/ibutils/ibdiagnet.sm"
48 puts " "
49 diff --git a/ibdiag/doc/ibdiagpath.pod b/ibdiag/doc/ibdiagpath.pod
50 index 7f4a3f7..afc6317 100644
51 --- a/ibdiag/doc/ibdiagpath.pod
52 +++ b/ibdiag/doc/ibdiagpath.pod
53 @@ -16,7 +16,7 @@ ibdiagpath traces a path between two end-points and provides information
54 regarding the nodes and ports traversed along the path. It utilizes device
55 specific health queries for the different devices along the traversed path.
56 The way ibdiagpath operates depends on the addressing mode used on the command
57 -line. If directed route adressing is used, the local node is the source node
58 +line. If directed route addressing is used, the local node is the source node
59 and the route to the destination port is known apriori.
60 On the other hand, if LID route (or by-name) addressing is imployed,
61 then the source and destination ports of a route are specified by their LIDs
62 diff --git a/ibdiag/doc/ibdiagui.pod b/ibdiag/doc/ibdiagui.pod
63 index 6c21394..da0c01c 100644
64 --- a/ibdiag/doc/ibdiagui.pod
65 +++ b/ibdiag/doc/ibdiagui.pod
66 @@ -21,7 +21,7 @@ Its main features:
67
68 =item 2. Hyperlink the ibdiagnet log to the graph objects
69
70 -=item 3. Show each object properties and object type specific actions on a properties pannel.
71 +=item 3. Show each object properties and object type specific actions on a properties panel.
72
73 =back
74
75 diff --git a/ibdiag/src/ibdebug.tcl b/ibdiag/src/ibdebug.tcl
76 index 1527f9e..1e5d8ff 100644
77 --- a/ibdiag/src/ibdebug.tcl
78 +++ b/ibdiag/src/ibdebug.tcl
79 @@ -5347,7 +5347,7 @@ proc writeCSVGeneralInfoFile {} {
80 $curr_hdr_key == "sw_minor" ||
81 $curr_hdr_key == "sw_major" ||
82 $curr_hdr_key == "fw_ini_ver"} {
83 - #depcrated keys
84 + # deprecated keys
85 continue
86 }
87 lappend header_line $curr_hdr_key
88 @@ -5365,7 +5365,7 @@ proc writeCSVGeneralInfoFile {} {
89 $curr_hdr_key == "sw_minor" ||
90 $curr_hdr_key == "sw_major" ||
91 $curr_hdr_key == "fw_ini_ver"} {
92 - #depcrated keys
93 + # deprecated keys
94 continue
95 }
96 lappend node_line [lindex $GENERAL_INFO($curr_node_guid.general_info_list) $i]
97 @@ -5439,7 +5439,7 @@ proc writePMFile {} {
98 ##############################
99 # NAME writeTopologyFileAndIBNLs
100 # SYNOPSIS writeTopologyFileAndIBNLs
101 -# FUNCTION Write out teh topoly fiel if requested
102 +# FUNCTION Write out the topology file if requested
103 # INPUTS NULL
104 # OUTPUT NULL
105 proc writeTopologyFileAndIBNLs {} {
106 @@ -5452,7 +5452,7 @@ proc writeTopologyFileAndIBNLs {} {
107 file mkdir $ibnlDir
108 }
109
110 - # we might be teh only reason to get a topology ...
111 + # we might be the only reason to get a topology ...
112 if {![info exists G(IBfabric:merged)] } {
113 set f [new_IBFabric]
114 if {[IBFabric_parseSubnetLinks $f $G(outfiles,.lst)]} {
115 diff --git a/ibdiag/src/ibdebug_if.tcl b/ibdiag/src/ibdebug_if.tcl
116 index df626f1..0e4ea16 100644
117 --- a/ibdiag/src/ibdebug_if.tcl
118 +++ b/ibdiag/src/ibdebug_if.tcl
119 @@ -2678,7 +2678,7 @@ proc showHelpPage { args } {
120 regarding the nodes and ports traversed along the path. It utilizes device
121 specific health queries for the different devices along the traversed path.
122 The way ibdiagpath operates depends on the addressing mode used on the command
123 - line. If directed route adressing is used, the local node is the source node
124 + line. If directed route addressing is used, the local node is the source node
125 and the route to the destination port is known apriori.
126 On the other hand, if LID route (or by-name) addressing is imployed,
127 then the source and destination ports of a route are specified by their LIDs
128 @@ -2799,10 +2799,10 @@ proc showHelpPage { args } {
129 "DESCRIPTION
130 ibdiagui is a GUI wrapper for ibdiagnet.
131 Its main features:
132 - 1. Display a graph of teh discovered fabric (with optional names annotattion)
133 + 1. Display a graph of the discovered fabric (with optional names annotattion)
134 2. Hyperlink the ibdiagnet log to the graph objects
135 3. Show each object properties and object type specific actions
136 - on a properties pannel."
137 + on a properties panel."
138
139 # OPTIONS
140 # -<field-i> <val-i>: specific attribute field and value. Automatically sets the component mask bit.
141 diff --git a/ibdiag/src/ibdiagui.tcl b/ibdiag/src/ibdiagui.tcl
142 index ef9c23e..3b0c819 100644
143 --- a/ibdiag/src/ibdiagui.tcl
144 +++ b/ibdiag/src/ibdiagui.tcl
145 @@ -753,7 +753,7 @@ proc drawFabric {fabric c} {
146 # fit $c
147 }
148
149 -#assume there is a name:* tag in teh list return the name
150 +#assume there is a name:* tag in the list return the name
151 proc getNameTag {tags} {
152 set idx [lsearch -glob $tags name:*]
153 if {$idx < 0} {
154 @@ -1897,7 +1897,7 @@ proc LogObjSelect {log type w x y} {
155 }
156 }
157
158 -# initialize the props guid such that we have a pannel
159 +# initialize the props guid such that we have a panel
160 # for each object type
161 proc initPropsGui {p} {
162 global PROPS O
163 diff --git a/ibdm/doc/ibdm-topo-file.pod b/ibdm/doc/ibdm-topo-file.pod
164 index 7deba46..cba8975 100644
165 --- a/ibdm/doc/ibdm-topo-file.pod
166 +++ b/ibdm/doc/ibdm-topo-file.pod
167 @@ -66,7 +66,7 @@ A name of the remote system port. We use the numbers as printed on the front pan
168
169 =head1 EXAMPLE
170
171 -The following is a topology file for a simple cluster with one 24 port switch and two HCAs. The firts HCA named H-1 and connect to the fabric with its two ports. The second HCA named H-2. The switch is of type MTS2400 and is named S-1
172 +The following is a topology file for a simple cluster with one 24 port switch and two HCAs. The first HCA named H-1 and connect to the fabric with its two ports. The second HCA named H-2. The switch is of type MTS2400 and is named S-1
173
174 MTS2400 S-1
175 P1 -> MT23108 H-1 P1
176 diff --git a/ibdm/doc/ibdmsh.pod b/ibdm/doc/ibdmsh.pod
177 index 1386d5e..38a5134 100644
178 --- a/ibdm/doc/ibdmsh.pod
179 +++ b/ibdm/doc/ibdmsh.pod
180 @@ -53,7 +53,7 @@ Log level: set to FABU_LOG* values
181
182 =head1 IBDM Objects
183
184 -This section decribes the various object types exposed by IBDM.
185 +This section describes the various object types exposed by IBDM.
186
187
188 IBDM exposes some of its internal objects. The objects identifiers returned by the various function calls are formatted according to the following rules:
189 @@ -150,7 +150,7 @@ Modify the guid of the port
190
191 =item [ Member : returns new_string ] getName
192
193 -Get the port name: A device port connected to system port (front pannel) returns the front pannel port name.
194 +Get the port name: A device port connected to system port (front panel) returns the front panel port name.
195
196 =item [ Member : returns void ] connect p_otherPort ?width? ?speed?
197
198 @@ -268,13 +268,13 @@ Dump out the min hop table of the node
199
200 =head2 class IBSysPort
201
202 -The IBSysPort class represents an IB plug on the system front or back pannels
203 +The IBSysPort class represents an IB plug on the system front or back panels
204
205 =over
206
207 =item [ Member data: returns string * ] -name
208
209 -The front pannel name (silk) of the port
210 +The front panel name (silk) of the port
211
212 =item [ Member data: returns IBSysPort * ] -p_remoteSysPort
213
214 @@ -414,7 +414,7 @@ Create a new generic system - basically an empty container for nodes...
215
216 =item [ Member : returns IBSystem * ] makeSystem name type
217
218 -Create a new system - the type must have a registed factory.
219 +Create a new system - the type must have a registered factory.
220
221 =item [ Member : returns IBSystem * ] getSystem name
222
223 diff --git a/ibdm/ibdm/CredLoops.cpp b/ibdm/ibdm/CredLoops.cpp
224 index 1817260..732361b 100644
225 --- a/ibdm/ibdm/CredLoops.cpp
226 +++ b/ibdm/ibdm/CredLoops.cpp
227 @@ -407,14 +407,14 @@ CrdLoopConnectMcastDepend(IBFabric* p_fabric)
228 IBPort *p_outPort = p_node->getPort(outPortNum);
229 if (! p_outPort) {
230 cout << "-E- Switch:" << p_node->name << " port:" << outPortNum
231 - << " is included in some MFT but is not connnected" << endl;
232 + << " is included in some MFT but is not connected" << endl;
233 nErrs++;
234 continue;
235 }
236 IBPort *p_inPort = p_node->getPort(inPortNum);
237 if (! p_inPort) {
238 cout << "-E- Switch:" << p_node->name << " port:" << inPortNum
239 - << " is included in some MFT but is not connnected" << endl;
240 + << " is included in some MFT but is not connected" << endl;
241 nErrs++;
242 continue;
243 }
244 diff --git a/ibdm/ibdm/Fabric.cpp b/ibdm/ibdm/Fabric.cpp
245 index 66f0090..0939b78 100644
246 --- a/ibdm/ibdm/Fabric.cpp
247 +++ b/ibdm/ibdm/Fabric.cpp
248 @@ -197,7 +197,7 @@ int
249 IBPort::disconnect(int duringSysPortDisconnect)
250 {
251 if (!p_remotePort) {
252 - cout << "-W- Trying to disconenct non connected port." << endl;
253 + cout << "-W- Trying to disconnect non-connected port." << endl;
254 return(1);
255 }
256
257 @@ -214,7 +214,7 @@ IBPort::disconnect(int duringSysPortDisconnect)
258 cout << "-I- Disconnected port:" << getName()
259 << " from:" << p_remPort->getName() << endl;
260
261 - // might need to treat the sys port too - but mark it duringPortDisconenct
262 + // might need to treat the sys port too - but mark it duringPortDisconnect
263 if (p_sysPort && ! duringSysPortDisconnect)
264 return(p_sysPort->disconnect(1));
265
266 @@ -649,7 +649,7 @@ int
267 IBSysPort::disconnect(int duringPortDisconnect)
268 {
269 if (!p_remoteSysPort) {
270 - cout << "-W- Trying to disconenct non connected system port." << endl;
271 + cout << "-W- Trying to disconnect non-connected system port." << endl;
272 return(1);
273 }
274
275 @@ -667,7 +667,7 @@ IBSysPort::disconnect(int duringPortDisconnect)
276 cout << "-I- Disconnected system port:" << name
277 << " from:" << p_remSysPort->name << endl;
278
279 - // might need to treat the port too - but mark it duringPortDisconenct
280 + // might need to treat the port too - but mark it duringPortDisconnect
281 if (p_nodePort && ! duringPortDisconnect) return(p_nodePort->disconnect(1));
282 return(0);
283 }
284 @@ -1106,7 +1106,7 @@ cfgStrToModifiers(string cfg, map_str_str &mods)
285 return(0);
286 }
287
288 -// crate a new generic system - basically an empty contaner for nodes...
289 +// create a new generic system - basically an empty contaner for nodes...
290 IBSystem *
291 IBFabric::makeGenericSystem(string name)
292 {
293 @@ -1122,7 +1122,7 @@ IBFabric::makeGenericSystem(string name)
294 return p_sys;
295 }
296
297 -// crate a new system - the type must have a predefined sysdef
298 +// create a new system - the type must have a predefined sysdef
299 IBSystem *
300 IBFabric::makeSystem(string name, string type, string cfg)
301 {
302 @@ -2277,7 +2277,7 @@ IBFabric::dumpTopology(const char *fileName, const char * ibnlDir)
303 cout << "-E- failed to open:" << fileName << " for writing." << endl;
304 return 1;
305 }
306 - sout << "# This topology file was automaticlly generated by IBDM" << endl;
307 + sout << "# This topology file was automatically generated by IBDM" << endl;
308
309 // we start with all systems at top level:
310 for (map_str_psys::iterator sI = SystemByName.begin();
311 @@ -2335,7 +2335,7 @@ IBFabric::dumpNameMap(const char *fileName)
312 cout << "-E- failed to open:" << fileName << " for writing." << endl;
313 return 1;
314 }
315 - sout << "# This name map file was automaticlly generated by IBDM" << endl;
316 + sout << "# This name map file was automatically generated by IBDM" << endl;
317 sout << "# NodeGUID PortLID NAME/SysImageGUID" << endl;
318
319 // Go over all nodes of the fabric
320 diff --git a/ibdm/ibdm/Fabric.h b/ibdm/ibdm/Fabric.h
321 index d4e4e7d..386ba61 100644
322 --- a/ibdm/ibdm/Fabric.h
323 +++ b/ibdm/ibdm/Fabric.h
324 @@ -426,11 +426,11 @@ class IBNode {
325 ///////////////////////////////////////////////////////////////////////////////
326 //
327 // System Port Class
328 -// The System Port is a front pannel entity.
329 +// The System Port is a front panel entity.
330 //
331 class IBSysPort {
332 public:
333 - string name; // The front pannel name of the port
334 + string name; // The front panel name of the port
335 class IBSysPort *p_remoteSysPort; // If connected the other side sys port
336 class IBSystem *p_system; // System it benongs to
337 class IBPort *p_nodePort; // The node port it connects to.
338 @@ -564,10 +564,10 @@ public:
339 // return the list of node pointers matching the required type
340 list_pnode *getNodesByType(IBNodeType type);
341
342 - // crate a new generic system - basically an empty contaner for nodes...
343 + // create a new generic system - basically an empty contaner for nodes...
344 IBSystem *makeGenericSystem(string name);
345
346 - // crate a new system - the type must have a pre-red SysDef
347 + // create a new system - the type must have a pre-red SysDef
348 IBSystem *makeSystem(string name, string type, string cfg = "");
349
350 // get a system by name
351 diff --git a/ibdm/ibdm/SubnMgt.cpp b/ibdm/ibdm/SubnMgt.cpp
352 index 9de792c..106cfe5 100644
353 --- a/ibdm/ibdm/SubnMgt.cpp
354 +++ b/ibdm/ibdm/SubnMgt.cpp
355 @@ -886,7 +886,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p_fabric)
356 // track the number of dlids actually routed through each switch port.
357 // to avoid memory scalability we do the path scanning with dest port
358 // in the external loop. So we only need to look on the aggregated
359 - // vectore per port at the end of all sources and sum up to teh final results
360 + // vectore per port at the end of all sources and sum up to the final results
361 map_pnode_vec_int switchDLidsPerOutPort;
362
363 cout << "-I- Verifying all CA to CA paths ... " << endl;
364 diff --git a/ibdm/ibdm/TopoMatch.cpp b/ibdm/ibdm/TopoMatch.cpp
365 index 434bb3c..fb82f83 100644
366 --- a/ibdm/ibdm/TopoMatch.cpp
367 +++ b/ibdm/ibdm/TopoMatch.cpp
368 @@ -1993,7 +1993,7 @@ TopoMatchSwitches(IBFabric *p_sFabric,
369 }
370 }
371 if (numMatchedSws) {
372 - s << "-I- Successfuly matched " << numMatchedSws
373 + s << "-I- Successfully matched " << numMatchedSws
374 << " more switches" << endl;
375 }
376 return(numMatchedSws);
377 diff --git a/ibdm/ibdm/ibdm.i b/ibdm/ibdm/ibdm.i
378 index e21b74a..822ff59 100644
379 --- a/ibdm/ibdm/ibdm.i
380 +++ b/ibdm/ibdm/ibdm.i
381 @@ -899,7 +899,7 @@ int ibdmUseCoutLog();
382 /* obtain log messages from internal log and clear it */
383
384 %section "IBDM Objects",pre
385 -/* This section decribes the various object types exposed by IBDM. */
386 +/* This section describes the various object types exposed by IBDM. */
387 %text %{
388
389 IBDM exposes some of its internal objects. The objects
390 @@ -1041,11 +1041,11 @@ class IBNode {
391
392 //
393 // System Port Class
394 -// The System Port is a front pannel entity.
395 +// The System Port is a front panel entity.
396 //
397 class IBSysPort {
398 public:
399 - string name; // The front pannel name of the port
400 + string name; // The front panel name of the port
401 IBSysPort *p_remoteSysPort; // If connected the other side sys port
402 IBSystem *p_system; // System it benongs to
403 IBPort *p_nodePort; // The node port it connects to.
404 @@ -1135,10 +1135,10 @@ class IBFabric {
405 // return the list of node pointers matching the required type
406
407 IBSystem *makeGenericSystem (string name);
408 - // crate a new generic system - basically an empty contaner for nodes...
409 + // create a new generic system - basically an empty contaner for nodes...
410
411 IBSystem *makeSystem (string name, string type);
412 - // crate a new system - the type must have a registed factory.
413 + // create a new system - the type must have a registered factory.
414
415 IBSystem *getSystem(string name);
416 // Get system by name
417 diff --git a/ibdm/src/ibsysapi.cpp b/ibdm/src/ibsysapi.cpp
418 index d8ed319..6dc6a0f 100644
419 --- a/ibdm/src/ibsysapi.cpp
420 +++ b/ibdm/src/ibsysapi.cpp
421 @@ -340,7 +340,7 @@ ibSysGetNodePortSysPort(char *nodeName, int portNum,
422
423 if (!port->p_sysPort) {
424 if (ibSysVerbose & IBSYS_ERROR) {
425 - printf("Error: no front pannel port at node:%s port:%d\n",
426 + printf("Error: no front panel port at node:%s port:%d\n",
427 nodeName, portNum);
428 }
429 *sysPortName = NULL;
430 @@ -356,7 +356,7 @@ ibSysGetNodePortSysPort(char *nodeName, int portNum,
431 }
432
433
434 -/* query node name and port given front pannel port name */
435 +/* query node name and port given front panel port name */
436 int
437 ibSysGetNodePortOnSysPort(char *sysPortName,
438 const char**nodeName, int *portNum)
439 @@ -370,7 +370,7 @@ ibSysGetNodePortOnSysPort(char *sysPortName,
440
441 if (!sysPortName) {
442 if (ibSysVerbose & IBSYS_ERROR) {
443 - printf("Error: No front pannel port name provided\n");
444 + printf("Error: No front panel port name provided\n");
445 }
446 return(1);
447 }
448 @@ -400,7 +400,7 @@ ibSysGetNodePortOnSysPort(char *sysPortName,
449 IBSysPort *sysPort = system->getSysPort(sysPortName);
450 if (!sysPort) {
451 if (ibSysVerbose & IBSYS_ERROR) {
452 - printf("Error: failed to find system front pannel port:%s\n",
453 + printf("Error: failed to find system front panel port:%s\n",
454 sysPortName);
455 }
456 return(1);
457 @@ -408,7 +408,7 @@ ibSysGetNodePortOnSysPort(char *sysPortName,
458
459 if (!sysPort->p_nodePort) {
460 if (ibSysVerbose & IBSYS_ERROR) {
461 - printf("Error: failed to find system front pannel port:%s node port?\n",
462 + printf("Error: failed to find system front panel port:%s node port?\n",
463 sysPortName);
464 }
465 return(1);
466 diff --git a/ibdm/src/ibsysapi.h b/ibdm/src/ibsysapi.h
467 index 587c331..d7e48a1 100644
468 --- a/ibdm/src/ibsysapi.h
469 +++ b/ibdm/src/ibsysapi.h
470 @@ -63,11 +63,11 @@ int ibSysGetDrPathsToNode(char *fromNode, char *toNode,
471 /* query all node names in the system */
472 int ibSysGetNodes(int *numNodes, const char **nodeNames);
473
474 -/* query name of front pannel port of a node port */
475 +/* query name of front panel port of a node port */
476 int ibSysGetNodePortSysPort(char *nodeName, int portNum,
477 const char **sysPortName);
478
479 -/* query node name and port given front pannel port name */
480 +/* query node name and port given front panel port name */
481 int ibSysGetNodePortOnSysPort(char *sysPort,
482 const char**nodeName, int *portNum);
483
484 diff --git a/ibis/doc/ibis.pod b/ibis/doc/ibis.pod
485 index 7102ca1..5659918 100644
486 --- a/ibis/doc/ibis.pod
487 +++ b/ibis/doc/ibis.pod
488 @@ -144,7 +144,7 @@ Obtain the maximal number of parallel queries that can be sent
489
490 =item [ returns int ] pmGetPortCounters lid port_select
491
492 -Send a "PortCounters" query to teh given LID and port
493 +Send a "PortCounters" query to the given LID and port
494
495 =item [ returns int ] pmGetPortCountersMulti num lid_list port_select_list
496
497 @@ -1095,7 +1095,7 @@ Methods:
498 =head2 INFORM INFO RECORD
499
500
501 -The inform Info is built with heirarchy of objects. So several classes are defined.
502 +The inform Info is built with hierarchy of objects. So several classes are defined.
503
504 ----
505
506 diff --git a/ibis/tests/ibvs_test.tcl b/ibis/tests/ibvs_test.tcl
507 index 7a4d68c..442898a 100755
508 --- a/ibis/tests/ibvs_test.tcl
509 +++ b/ibis/tests/ibvs_test.tcl
510 @@ -58,7 +58,7 @@ vsI2cWriteMulti
511
512 We perform the following flow for verification:
513 read1 - read some addresses from the EEPROM assuming fixed addresses
514 -read2 - repeat from teh other devices
515 +read2 - repeat from the other devices
516 read3 - do multi read and verify we got same result
517 read4 - try reading same multi read but this time with some garbadge lid too.
518 verify we still get what expect.
519 diff --git a/ibmgtsim/README b/ibmgtsim/README
520 index 1e13ab7..bd118d6 100644
521 --- a/ibmgtsim/README
522 +++ b/ibmgtsim/README
523 @@ -46,7 +46,7 @@ HOWTO BUILD
524 NOTE: the pointer to the osm install path can be to any osm (not just the
525 one compiled with the simulator interface vendor layer. e.g. /usr)
526
527 - --enable-maintainer-mode - will enable updating fo teh TCL API (by running
528 + --enable-maintainer-mode - will enable updating of the TCL API (by running
529 swig) after modifications to any of the .i files. It also enables update
530 of the ibnl_parser.cc, ibnl_parser.h after changes to ibnl_parser.yy and
531 similarly updates to ibnl_scanner.cc after modification of ibnl_scanner.ll
532 diff --git a/ibmgtsim/tests/OsmTest.check.tcl b/ibmgtsim/tests/OsmTest.check.tcl
533 index 287d8e4..ea557ff 100644
534 --- a/ibmgtsim/tests/OsmTest.check.tcl
535 +++ b/ibmgtsim/tests/OsmTest.check.tcl
536 @@ -71,6 +71,6 @@ proc checker {simDir osmPath osmPortGuid} {
537 return 1
538 }
539
540 - puts "-I- osmtest completed successfuly"
541 + puts "-I- osmtest completed successfully"
542 return 0
543 }
544 diff --git a/ibmgtsim/tests/README b/ibmgtsim/tests/README
545 index bfa7484..9d21f96 100644
546 --- a/ibmgtsim/tests/README
547 +++ b/ibmgtsim/tests/README
548 @@ -20,7 +20,7 @@ ibdiag-drops.sim.tcl - set some bad links
549 ibdiag-dup-node-guid.sim.tcl - duplicate node guid
550 ibdiag-dup-port-guid.sim.tcl - duplicate port guid
551 ibdiag-lid.sim.tcl - post the SM run duplicate or zero some lids
552 -ibdiag-mcast.sim.tcl - post SM create 3 MGRPs join some ports, then disconenct some MFT routing
553 +ibdiag-mcast.sim.tcl - post SM create 3 MGRPs join some ports, then disconnect some MFT routing
554 ibdiag-ucast.sim.tcl - post SM delete some LFT entries
555
556
557 diff --git a/ibmgtsim/tests/ibdiag-mcast.sim.tcl b/ibmgtsim/tests/ibdiag-mcast.sim.tcl
558 index 6456749..8b2ec6c 100644
559 --- a/ibmgtsim/tests/ibdiag-mcast.sim.tcl
560 +++ b/ibmgtsim/tests/ibdiag-mcast.sim.tcl
561 @@ -179,7 +179,7 @@ proc postSmSettings {fabric} {
562 puts "-E- $e"
563 puts $errorInfo
564 }
565 - set nDisconencted 0
566 + set nDisconnected 0
567
568 after 1000
569 if {[catch {
570 @@ -187,14 +187,14 @@ if {[catch {
571 for {set i 0} {$i < 3} {incr i} {
572 # delete one entry
573 if {![removeMCastRouteEntry $fabric]} {
574 - incr nDisconencted
575 + incr nDisconnected
576 }
577 }
578 } e]} {
579 puts $e
580 puts $errorInfo
581 }
582 - return "-I- Joined $nPorts Disconnected $nDisconencted"
583 + return "-I- Joined $nPorts Disconnected $nDisconnected"
584 }
585
586 # make sure ibdiagnet reported the bad links
587 diff --git a/ibmgtsim/tests/ibdiag-ucast.sim.tcl b/ibmgtsim/tests/ibdiag-ucast.sim.tcl
588 index f072d39..5c52ec6 100644
589 --- a/ibmgtsim/tests/ibdiag-ucast.sim.tcl
590 +++ b/ibmgtsim/tests/ibdiag-ucast.sim.tcl
591 @@ -93,15 +93,15 @@ proc removeUCastRouteEntry {fabric} {
592 # setup post SM run changes:
593 proc postSmSettings {fabric} {
594 global errorInfo
595 - set nDisconencted 0
596 + set nDisconnected 0
597 # now go and delete some switch MC entries...
598 for {set i 0} {$i < 3} {incr i} {
599 # delete one entry
600 if {![removeUCastRouteEntry $fabric]} {
601 - incr nDisconencted
602 + incr nDisconnected
603 }
604 }
605 - return "-I- Disconnected $nDisconencted LFT Entries"
606 + return "-I- Disconnected $nDisconnected LFT Entries"
607 }
608
609 # make sure ibdiagnet reported the bad links
610 diff --git a/ibmgtsim/tests/pkey.check.tcl b/ibmgtsim/tests/pkey.check.tcl
611 index 2a262d2..687aa71 100644
612 --- a/ibmgtsim/tests/pkey.check.tcl
613 +++ b/ibmgtsim/tests/pkey.check.tcl
614 @@ -363,7 +363,7 @@ proc checker {simDir osmPath osmPortGuid} {
615 puts "SIM: $res"
616
617 if {$res == 0} {
618 - puts "-I- Pkey check flow completed successfuly"
619 + puts "-I- Pkey check flow completed successfully"
620 } else {
621 puts "-E- Pkey check flow failed"
622 }
623 diff --git a/ibmgtsim/utils/RunSimTest b/ibmgtsim/utils/RunSimTest
624 index a79a82b..561f344 100755
625 --- a/ibmgtsim/utils/RunSimTest
626 +++ b/ibmgtsim/utils/RunSimTest
627 @@ -342,7 +342,7 @@ proc checker {simDir osmPath osmPortGuid} {
628 puts $e
629 set exitCode 1
630 } else {
631 - puts "-I- ibdmchk completed successfuly"
632 + puts "-I- ibdmchk completed successfully"
633 set exitCode 0
634 }
635 }
636 --
637 2.25.1
638
+3
-0
debian/patches/series less more
88 Fix-generating-man-pages-in-place.patch
99 Always-update-man-pages-if-needed.patch
1010 ibdmsh-Correct-whatis-entry.patch
11 Fix-spelling-error-of-mismatch.patch
12 Fix-spelling-error-of-tuple.patch
13 Fix-spelling-errors.patch