diff --git a/debian/patches/Fix-spelling-error-of-mismatch.patch b/debian/patches/Fix-spelling-error-of-mismatch.patch new file mode 100644 index 0000000..9efb0d3 --- /dev/null +++ b/debian/patches/Fix-spelling-error-of-mismatch.patch @@ -0,0 +1,519 @@ +From 5400ae438c52cd7c21e1ce416e0670ebd2c74c17 Mon Sep 17 00:00:00 2001 +From: Benjamin Drung +Date: Wed, 11 Nov 2020 10:27:21 +0100 +Subject: Fix spelling error of mismatch + +Signed-off-by: Benjamin Drung +--- + ibdiag/src/ibdebug_if.tcl | 4 +- + ibdm/Clusters/topo2subnet | 2 +- + ibdm/doc/ibdmsh.pod | 2 +- + ibdm/ibdm/TopoMatch.cpp | 106 ++++++++++++------------ + ibdm/src/test_topo_match.cpp | 4 +- + ibis/tests/ibvs_test.tcl | 8 +- + ibmgtsim/tests/osmLidAssignment.sim.tcl | 2 +- + ibmgtsim/tests/osmStress.sim.tcl | 2 +- + 8 files changed, 65 insertions(+), 65 deletions(-) + +diff --git a/ibdiag/src/ibdebug_if.tcl b/ibdiag/src/ibdebug_if.tcl +index cdc389d..df626f1 100644 +--- a/ibdiag/src/ibdebug_if.tcl ++++ b/ibdiag/src/ibdebug_if.tcl +@@ -2014,7 +2014,7 @@ proc inform { msgCode args } { + set nodeName [lindex $args 0] + set inb [lindex $args 1] + set outb [lindex $args 2] +- append msgText "Missmatching In-Bound ($inb) and Out-Bound ($outb) PKey enforcement on switch $nodeName" ++ append msgText "Mismatching In-Bound ($inb) and Out-Bound ($outb) PKey enforcement on switch $nodeName" + } + "-W-ibdiagnet:PKeys.switch.missing.pkey" { + set name [lindex $args 0] +@@ -2054,7 +2054,7 @@ proc inform { msgCode args } { + foreach {gPKey pkey} $args {break} + set pk1 [format 0x%04x $gPKey] + set pk2 [format 0x%04x $pKey] +- append msgText "Missmatching Multicast Group PKey:$pk1 and MGID Pkey:$pk2" ++ append msgText "Mismatching Multicast Group PKey:$pk1 and MGID Pkey:$pk2" + } + "-W-ibdiagnet:ipoib.cantJoin" { + foreach {name rate gRate} $args {break} +diff --git a/ibdm/Clusters/topo2subnet b/ibdm/Clusters/topo2subnet +index f56048d..8fa31e3 100755 +--- a/ibdm/Clusters/topo2subnet ++++ b/ibdm/Clusters/topo2subnet +@@ -48,7 +48,7 @@ Description: + subnet.lst file (in local dir) to match the specified topology. + It 'invents' guids and lids sequentially. + +-TODO: Randomize missmatches ... ++TODO: Randomize mismatches ... + " + + ########################################################################### +diff --git a/ibdm/doc/ibdmsh.pod b/ibdm/doc/ibdmsh.pod +index 599a5ad..1386d5e 100644 +--- a/ibdm/doc/ibdmsh.pod ++++ b/ibdm/doc/ibdmsh.pod +@@ -594,7 +594,7 @@ Trace a path following the LFT updating the hops and node list variables + + =head2 Topology Matching Utilities + +-The following utilities matches two fabrics providing both missmatch messages and a unified fabric ++The following utilities matches two fabrics providing both mismatch messages and a unified fabric + + =over + +diff --git a/ibdm/ibdm/TopoMatch.cpp b/ibdm/ibdm/TopoMatch.cpp +index dd2bfc5..434bb3c 100644 +--- a/ibdm/ibdm/TopoMatch.cpp ++++ b/ibdm/ibdm/TopoMatch.cpp +@@ -44,7 +44,7 @@ spec = The fabric as specified in either a topology file or cables file. + + Through the matching algorithm: + 1. The specification fabric get guids annotations. +-2. Missmatches are being formatted into a text report. ++2. Mismatches are being formatted into a text report. + + After Matching a Merger can be run to create the merged fabric. + This fabric only includes the discovered nodes but uses the +@@ -105,7 +105,7 @@ TopoMatchPorts(IBPort *p_sPort, + } + if (p_sPort->num != p_dPort->num) { + if (doDiag) +- diag << "Port number missmatch found. The port:" << p_sPort->getName() ++ diag << "Port number mismatch found. The port:" << p_sPort->getName() + << " != discovered:" << p_dPort->num << endl; + return 0; + } +@@ -280,11 +280,11 @@ TopoQalifyNodesMatching(IBNode *p_sNode, IBNode *p_dNode) + if (numMissed <= maxMissed) + cout << "-V- Qualified Nodes:" << p_sNode->name + << " to:" << p_dNode->name << " with:" << numMissed +- << " missmatches!" <name + << " to:" << p_dNode->name << " due to:" << numMissed +- << " missmatches!\n" << tmpDiag.str() << endl; ++ << " mismatches!\n" << tmpDiag.str() << endl; + return numMissed <= maxMissed; + } + +@@ -367,16 +367,16 @@ TopoDoBFSAndMatch(IBNode *p_sNodeAnchor, // Starting node on the specification + continue; + + // do not rush into matching - double check all the nodes ports ... +- int anyMissmatch = 0; ++ int anyMismatch = 0; + if (p_node1->numPorts != p_node2->numPorts) + continue; +- for (unsigned int pn = 1; !anyMissmatch && (pn <= p_node1->numPorts); ++ for (unsigned int pn = 1; !anyMismatch && (pn <= p_node1->numPorts); + pn++) { + IBPort *p_dPort = p_node1->getPort(pn); + IBPort *p_sPort = p_node2->getPort(pn); + + if (! TopoMatchPorts(p_sPort, p_dPort, 1, diag)) { +- anyMissmatch++; ++ anyMismatch++; + if (FabricUtilsVerboseLevel & FABU_LOG_VERBOSE) + cout << "-V- Matched node:" << (*nI).first + << " by name - but some ports are different." << endl; +@@ -386,7 +386,7 @@ TopoDoBFSAndMatch(IBNode *p_sNodeAnchor, // Starting node on the specification + IBNode *p_dRemNode = p_dPort->p_remotePort->p_node; + IBNode *p_sRemNode = p_sPort->p_remotePort->p_node; + if (! TopoQalifyNodesMatching(p_sRemNode, p_dRemNode)) { +- anyMissmatch++; ++ anyMismatch++; + if (FabricUtilsVerboseLevel & FABU_LOG_VERBOSE) + cout << "-V- Disqualified start nodes match:" + << p_node1->name << " by rem nodes" << endl; +@@ -547,7 +547,7 @@ TopoBFSAndMatchFromPorts(IBPort *p_sPort, // Starting port on the specification + + + ////////////////////////////////////////////////////////////////////////////// +-// Second step in matching - refine missmatched nodes: ++// Second step in matching - refine mismatched nodes: + // Based on the previous matching - produce a set of all spec nodes + // that are connected to other matched spec nodes. + // Then go over all these nodes and produce a "best fit" match for them: +@@ -680,7 +680,7 @@ TopoMatchSpecNodesByAdjacentNode(IBFabric *p_sFabric) + + + ////////////////////////////////////////////////////////////////////////////// +-// Report missmatched nodes by examining entire system and looking for ++// Report mismatched nodes by examining entire system and looking for + // all system and then a single board (matching regexp). + // So the report will be optimized: + // If the entire system is missing - report only at this level +@@ -691,7 +691,7 @@ TopoReportMismatchedNode(IBNode *p_node, + int reportMissing, // 0 = reportExtra ... + stringstream &diag) + { +- int anyMissmatch = 0; ++ int anyMismatch = 0; + int MaxConnRep = 12; + // we assume if a previous check was done we would have + // never been called since the "reported" mark would have been set +@@ -789,7 +789,7 @@ TopoReportMismatchedNode(IBNode *p_node, + if (numRep == MaxConnRep) diag << " ..." << endl; + diag << endl; + } +- anyMissmatch++; ++ anyMismatch++; + + // also we do not need any more checks on this system + for (map_str_pnode::iterator nI = p_system->NodeByName.begin(); +@@ -805,7 +805,7 @@ TopoReportMismatchedNode(IBNode *p_node, + diag << "Extra System Board:" << nodeBoardName << endl; + diag << endl; + } +- anyMissmatch++; ++ anyMismatch++; + + for (list< IBNode *>::iterator nI = boardNodes.begin(); + nI != boardNodes.end(); nI++) { +@@ -860,26 +860,26 @@ TopoReportMismatchedNode(IBNode *p_node, + diag << " ..." << endl; + diag << endl; + } +- anyMissmatch++; ++ anyMismatch++; + + TopoMarkNodeAsReported(p_node); + } +- return(anyMissmatch); ++ return(anyMismatch); + } + + + // Given two matching nodes - report un-matching links. + // To avoid duplicated reporting: +-// * We only report missmatching links to matched nodes. ++// * We only report mismatching links to matched nodes. + // * We only report link to nodes with bigger pointer value +-// RETURN number of missmatches ++// RETURN number of mismatches + static int + TopoReportMatchedNodesUnMatchingLinks(IBNode *p_sNode, + IBNode *p_dNode, + stringstream &diag) + { +- int anyMissmatch = 0; +- // missmatch is when port numbers differ ++ int anyMismatch = 0; ++ // mismatch is when port numbers differ + // or the remote node is not the same. + IBPort *p_sPort, *p_dRemPort; + IBPort *p_dPort, *p_sRemPort; +@@ -924,7 +924,7 @@ TopoReportMatchedNodesUnMatchingLinks(IBNode *p_sNode, + << " to:" << p_actRemSNode->name << "/P" << p_dRemPort->num + << " instead of:" << p_sRemPort->getName() << endl; + } +- anyMissmatch++; ++ anyMismatch++; + } else { + // make sure same port remote number + if (p_dRemPort->num != p_sRemPort->num) { +@@ -943,7 +943,7 @@ TopoReportMatchedNodesUnMatchingLinks(IBNode *p_sNode, + << " to:" << p_actRemSNode->name << "/P" << p_dRemPort->num + << " instead of:" << p_sRemPort->getName() << endl; + } +- anyMissmatch++; ++ anyMismatch++; + } + } + // anyway make sure we got the width and speed. +@@ -951,13 +951,13 @@ TopoReportMatchedNodesUnMatchingLinks(IBNode *p_sNode, + diag << "Wrong link width on:" << p_sPort->getName() + << ". Expected:" << width2char(p_sPort->width) + << " got:" << width2char(p_dPort->width) << endl; +- anyMissmatch++; ++ anyMismatch++; + } + if (p_sPort->speed != p_dPort->speed) { + diag << "Wrong link speed on:" << p_sPort->getName() + << ". Expected:" << speed2char(p_sPort->speed) + << " got:" << speed2char(p_dPort->speed) << endl; +- anyMissmatch++; ++ anyMismatch++; + } + // done with the case both spec and dicsovered links exists + } else if (!p_dRemPort && p_sRemPort) { +@@ -987,7 +987,7 @@ TopoReportMatchedNodesUnMatchingLinks(IBNode *p_sNode, + << " to:" << p_sRemPort->getName() << endl; + } + } +- anyMissmatch++; ++ anyMismatch++; + } else if (p_dRemPort && !p_sRemPort) { + // Only a discovered link exists: + +@@ -1045,25 +1045,25 @@ TopoReportMatchedNodesUnMatchingLinks(IBNode *p_sNode, + diag << "Extra internal Link connecting:" << specPortName + << " to:" << portName << endl; + } +- anyMissmatch++; ++ anyMismatch++; + } + } +- if (anyMissmatch) ++ if (anyMismatch) + diag << endl; +- return(anyMissmatch); ++ return(anyMismatch); + } + + +-// Report Topology Missmatched and Build the Merged Fabric: ++// Report Topology Mismatched and Build the Merged Fabric: + static int +-TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the specification fabrric ++TopoReportMismatches(IBNode *p_sNodeAnchor, // Starting node on the specification fabrric + IBNode *p_dNodeAnchor, + stringstream &diag) + { + IBNode *p_sNode, *p_dNode; +- int anyMissmatchedSpecNodes = 0; +- int anyMissmatchedDiscNodes = 0; +- int anyMissmatchedLinks = 0; ++ int anyMismatchedSpecNodes = 0; ++ int anyMismatchedDiscNodes = 0; ++ int anyMismatchedLinks = 0; + + // since we do not want to report errors created by previous node failure + // to discover or match we will BFS from the start ports. +@@ -1082,7 +1082,7 @@ TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the + // we got in here only with matching nodes: + p_sNode = (IBNode *)p_dNode->appData1.ptr; + if (!p_sNode) { +- cerr << "How did we get in BFS with missmatching nodes!" << endl; ++ cerr << "How did we get in BFS with mismatching nodes!" << endl; + exit (1); + } + +@@ -1107,7 +1107,7 @@ TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the + // if the remote spec node is not marked matched: + if (!p_sRemPort->p_node->appData1.ptr) { + if (TopoReportMismatchedNode(p_sRemPort->p_node, 1, diag)) +- anyMissmatchedSpecNodes++; ++ anyMismatchedSpecNodes++; + } else { + // mark as visited. + TopoMarkNodeAsReported(p_sRemPort->p_node); +@@ -1121,7 +1121,7 @@ TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the + } // all ports + } // next nodes available... + +- if (anyMissmatchedSpecNodes) ++ if (anyMismatchedSpecNodes) + diag << endl; + + IBFabric *p_dFabric = p_dNodeAnchor->p_fabric; +@@ -1135,7 +1135,7 @@ TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the + diag << "Even starting nodes do not match! " + << "Expected:" << p_sNodeAnchor->name + << " but it is probably not connected correctly." << endl; +- anyMissmatchedDiscNodes++; ++ anyMismatchedDiscNodes++; + } + + // we track visited nodes in here by clearing their visited bits +@@ -1159,12 +1159,12 @@ TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the + + IBNode *p_node = p_dRemPort->p_node; + +- // we only care about missmatched discovered nodes ++ // we only care about mismatched discovered nodes + if (! p_node->appData1.ptr) { + // if not already visited. + if (! TopoIsNodeMarkedAsReported(p_node)) + if (TopoReportMismatchedNode(p_node, 0, diag)) +- anyMissmatchedDiscNodes++; ++ anyMismatchedDiscNodes++; + } else { + // if not already visited. + if (! TopoIsNodeMarkedAsReported(p_node)) +@@ -1184,26 +1184,26 @@ TopoReportMissmatches(IBNode *p_sNodeAnchor, // Starting node on the + TopoMarkNodeAsReported(p_dNode); + } // next nodes available... + +- if (anyMissmatchedDiscNodes) ++ if (anyMismatchedDiscNodes) + diag << endl; + +- // finaly we want to report any missmatched cables between matching nodes ++ // finaly we want to report any mismatched cables between matching nodes + for (map_str_pnode::iterator nI = p_dFabric->NodeByName.begin(); + nI != p_dFabric->NodeByName.end(); nI++) { + p_dNode = (*nI).second; + p_sNode = (IBNode *)p_dNode->appData1.ptr; + if ( p_sNode ) { +- // report any missmatched links on this node. ++ // report any mismatched links on this node. + if (TopoReportMatchedNodesUnMatchingLinks(p_sNode, p_dNode, diag)) +- anyMissmatchedLinks++; ++ anyMismatchedLinks++; + } + } + +- if (anyMissmatchedLinks) ++ if (anyMismatchedLinks) + diag << endl; +- return anyMissmatchedLinks + +- anyMissmatchedDiscNodes + +- anyMissmatchedSpecNodes; ++ return anyMismatchedLinks + ++ anyMismatchedDiscNodes + ++ anyMismatchedSpecNodes; + } + + +@@ -1303,7 +1303,7 @@ TopoMatchFabrics(IBFabric *p_sFabric, // The specification fabric + status = TopoBFSAndMatchFromNodes(p_sNode, p_dNode, tmpDiag); + } + if (status) { +- cout << "-W- Topology Matching First Phase Found Missmatches:\n" ++ cout << "-W- Topology Matching First Phase Found Mismatches:\n" + << tmpDiag.str() << endl; + } + +@@ -1311,7 +1311,7 @@ TopoMatchFabrics(IBFabric *p_sFabric, // The specification fabric + // and try to map the unmatched. + TopoMatchSpecNodesByAdjacentNode(p_sFabric); + +- if (TopoReportMissmatches(p_sNode, p_dNode, diag)) ++ if (TopoReportMismatches(p_sNode, p_dNode, diag)) + status = 1; + + Exit: +@@ -1461,7 +1461,7 @@ TopoCopyLinkToMergedFabric(IBFabric *p_mFabric, + } else { + /* + // The following error messages are actually not required at +- // all. If there is a missmatch on an internal node this will happen. ++ // all. If there is a mismatch on an internal node this will happen. + if (p_remPort->p_sysPort) { + cout << "-E- Linking:" << p_mPort->getName() << " to:" + << p_remPort->p_node->name +@@ -1798,7 +1798,7 @@ CheckMatchingCAPortsToMatchingSwPortNums(IBFabric *p_sFabric, IBFabric *p_dFabri + // try all ports and look for remote side switches + // if remote ports match collect all the switches reached + // now go over all reached switches and validate back all connections +-// to matched switches - report missmatches or report the new set ++// to matched switches - report mismatches or report the new set + // return the number of new matches found + static int + TopoMatchSwitches(IBFabric *p_sFabric, +@@ -2001,7 +2001,7 @@ TopoMatchSwitches(IBFabric *p_sFabric, + + + // go over entire fabric from edges and in and report +-// each missmatch - do not propogate inwards through missmatches ++// each mismatch - do not propogate inwards through mismatches + static int + BfsFromEdgReportingMatcStatus(IBFabric *p_sFabric, IBFabric *p_dFabric, + stringstream &s) +@@ -2077,7 +2077,7 @@ BfsFromEdgReportingMatcStatus(IBFabric *p_sFabric, IBFabric *p_dFabric, + p_sActRemNode->getPort(p_dPort->p_remotePort->num); + // so they must be same nodes... + if (p_sActRemNode != p_sRemNode) { +- badMsg << "-E- Missmatch: port:" << p_sPort->getName() ++ badMsg << "-E- Mismatch: port:" << p_sPort->getName() + << " should be connected to:" + << p_sPort->p_remotePort->getName() + << " but connects to:" << p_sActRemPort->getName() << endl; +@@ -2088,7 +2088,7 @@ BfsFromEdgReportingMatcStatus(IBFabric *p_sFabric, IBFabric *p_dFabric, + // now we know they both point to same switch - check the port + // connection and properties + if (p_sPort->p_remotePort->num != p_dPort->p_remotePort->num) { +- badMsg << "-E- Missmatch: port " << p_sPort->getName() ++ badMsg << "-E- Mismatch: port " << p_sPort->getName() + << " should be connected to:" + << p_sPort->p_remotePort->getName() + << " but connects to port: " +diff --git a/ibdm/src/test_topo_match.cpp b/ibdm/src/test_topo_match.cpp +index 5e546a7..867fa35 100644 +--- a/ibdm/src/test_topo_match.cpp ++++ b/ibdm/src/test_topo_match.cpp +@@ -64,9 +64,9 @@ show_help() { + << "\n" + << "Description:\n" + << "This tool compares a topology file and a discovered listing of" +- << "subnet.lst/ibdiagnet.lst and reports missmatches.\n" ++ << "subnet.lst/ibdiagnet.lst and reports mismatches.\n" + << "Two different algorithms provided:\n" +- << "Using the -e option is more suitible for MANY missmatches\n" ++ << "Using the -e option is more suitible for MANY mismatches\n" + << "it applies less heuristics and provide details about the match.\n" + << "Providing the -s, -p and -g starts a detailed heuristics that\n" + << "should be used when only small number of changes are expected.\n" +diff --git a/ibis/tests/ibvs_test.tcl b/ibis/tests/ibvs_test.tcl +index bf3c7e7..7a4d68c 100755 +--- a/ibis/tests/ibvs_test.tcl ++++ b/ibis/tests/ibvs_test.tcl +@@ -221,7 +221,7 @@ for {set i 0} {$i < $numLoops} {incr i} { + set prev [lindex [array get DATA$d $i] 1] + set this [assoc data$i $data] + if {$prev != $this} { +- puts "-E- Missmatch on set:$d data:$i $prev != $this" ++ puts "-E- Mismatch on set:$d data:$i $prev != $this" + incr anyError + } + } +@@ -242,7 +242,7 @@ for {set i 0} {$i < $numLoops} {incr i} { + set prev [lindex [array get DATA$d $i] 1] + set this [assoc data$i $data] + if {$prev != $this} { +- puts "-E- Missmatch on set:$d data:$i $prev != $this" ++ puts "-E- Mismatch on set:$d data:$i $prev != $this" + incr anyError + } + } +@@ -272,7 +272,7 @@ for {set i 0} {$i < $numLoops} {incr i} { + set prev [lindex $newWords $i] + set this [assoc data$i $data] + if {$prev != $this} { +- puts "-E- Missmatch read back of written data-set:$d data:$i $prev != $this" ++ puts "-E- Mismatch read back of written data-set:$d data:$i $prev != $this" + incr anyError + } + } +@@ -291,7 +291,7 @@ for {set i 0} {$i < $numLoops} {incr i} { + set prev [lindex $oldWords $i] + set this [assoc data$i $data] + if {$prev != $this} { +- puts "-E- Missmatch read back of reverted data-set:$d data:$i $prev != $this" ++ puts "-E- Mismatch read back of reverted data-set:$d data:$i $prev != $this" + incr anyError + } + } +diff --git a/ibmgtsim/tests/osmLidAssignment.sim.tcl b/ibmgtsim/tests/osmLidAssignment.sim.tcl +index a765aa3..0ff9d54 100644 +--- a/ibmgtsim/tests/osmLidAssignment.sim.tcl ++++ b/ibmgtsim/tests/osmLidAssignment.sim.tcl +@@ -698,7 +698,7 @@ proc checkLidValues {fabric lmc} { + } + } + if {$numErrs} { +- puts "-E- Got $numErrs missmatches in lid assignment out of $numPorts ports" ++ puts "-E- Got $numErrs mismatches in lid assignment out of $numPorts ports" + } else { + puts "-I- scanned $numPorts ports with no error" + } +diff --git a/ibmgtsim/tests/osmStress.sim.tcl b/ibmgtsim/tests/osmStress.sim.tcl +index 4d1a533..7b1b876 100755 +--- a/ibmgtsim/tests/osmStress.sim.tcl ++++ b/ibmgtsim/tests/osmStress.sim.tcl +@@ -546,7 +546,7 @@ proc checkLidValues {fabric lmc} { + } + } + if {$numErrs} { +- puts "-E- Got $numErrs missmatches in lid assignment out of $numPorts ports" ++ puts "-E- Got $numErrs mismatches in lid assignment out of $numPorts ports" + } else { + puts "-I- scanned $numPorts ports with no error" + } +-- +2.25.1 + diff --git a/debian/patches/Fix-spelling-error-of-tuple.patch b/debian/patches/Fix-spelling-error-of-tuple.patch new file mode 100644 index 0000000..a89eed3 --- /dev/null +++ b/debian/patches/Fix-spelling-error-of-tuple.patch @@ -0,0 +1,421 @@ +From 8bc14514d5dae672f92087fbd33d89d9e54aa13d Mon Sep 17 00:00:00 2001 +From: Benjamin Drung +Date: Wed, 11 Nov 2020 10:43:35 +0100 +Subject: Fix spelling error of tuple + +Signed-off-by: Benjamin Drung +--- + ibdm/ibdm/FatTree.cpp | 170 +++++++++++++++++++++--------------------- + 1 file changed, 85 insertions(+), 85 deletions(-) + +diff --git a/ibdm/ibdm/FatTree.cpp b/ibdm/ibdm/FatTree.cpp +index b61e5ca..678caff 100644 +--- a/ibdm/ibdm/FatTree.cpp ++++ b/ibdm/ibdm/FatTree.cpp +@@ -51,16 +51,16 @@ FatTree Utilities: + // highest value. + // + // The algorithm BFS from an arbitrary leaf switch. +-// It then allocates ID tupples to each switch ID[0..N]. ++// It then allocates ID tuples to each switch ID[0..N]. + // Only one digit of the ID is allowed to change when going from + // switch node to the other. + // + // We use the term "index" when we refer to +-// The digit indexed 0 ID[0] in the tupple is the rank number. ++// The digit indexed 0 ID[0] in the tuple is the rank number. + // Going down the tree the digit that might change is D[from->rank+1] + // Going up the tee the digit that might change is D[from->rank] + // +-// During the BFS each node is assigned a tupple the first time it is ++// During the BFS each node is assigned a tuple the first time it is + // visited. During the BFS we also collect the list of ports that connect to + // each value of the changing D. + // +@@ -69,8 +69,8 @@ FatTree Utilities: + // number of sub hierarchy indexes with the exact same number of ports + // + +-// for comparing tupples +-struct FatTreeTuppleLess : public binary_function { ++// for comparing tuples ++struct FatTreeTupleLess : public binary_function { + bool operator()(const vec_byte& x, const vec_byte& y) const { + if (x.size() > y.size()) return false; + if (y.size() > x.size()) return true; +@@ -166,15 +166,15 @@ bool FatTreeNode::goingDown(int lid) + return false; + } + +-typedef map< vec_byte, class FatTreeNode, FatTreeTuppleLess > map_tupple_ftnode; ++typedef map< vec_byte, class FatTreeNode, FatTreeTupleLess > map_tuple_ftnode; + + class FatTree { +- // the node tupple is built out of the following: ++ // the node tuple is built out of the following: + // d[0] = rank + // d[1..N-1] = ID digits + IBFabric *p_fabric; // The fabric we attach to +- map_pnode_vec_byte TuppleByNode; +- map_tupple_ftnode NodeByTupple; ++ map_pnode_vec_byte TupleByNode; ++ map_tuple_ftnode NodeByTuple; + vec_int LidByIdx; // store target HCA lid by its index + unsigned int N; // number of levels in the fabric + map_str_int IdxByName; +@@ -187,11 +187,11 @@ class FatTree { + // return NULL if this check is not met or no ranking available + IBNode *getLowestLevelSwitchNode(); + +- // get a free tupple given the reference one and the index to change: +- vec_byte getFreeTupple(vec_byte refTupple, unsigned int changeIdx); ++ // get a free tuple given the reference one and the index to change: ++ vec_byte getFreeTuple(vec_byte refTuple, unsigned int changeIdx); + +- // convert tupple to string +- string getTuppleStr(vec_byte tupple); ++ // convert tuple to string ++ string getTupleStr(vec_byte tuple); + + // simply dump out the FatTree data: + void dump(); +@@ -199,7 +199,7 @@ class FatTree { + // track a connection to remote switch + int trackConnection( + FatTreeNode *p_ftNode, +- vec_byte tupple, // the connected node tupple ++ vec_byte tuple, // the connected node tuple + unsigned int rank, // rank of the local node + unsigned int remRank, // rank of the remote node + unsigned int portNum, // the port number connecting to the remote node +@@ -249,9 +249,9 @@ public: + + FatTreeNode* FatTree::getFatTreeNodeByNode(IBNode *p_node) { + FatTreeNode* p_ftNode; +- vec_byte tupple(N, 0); +- tupple = TuppleByNode[p_node]; +- p_ftNode = &NodeByTupple[tupple]; ++ vec_byte tuple(N, 0); ++ tuple = TupleByNode[p_node]; ++ p_ftNode = &NodeByTuple[tuple]; + return p_ftNode; + } + +@@ -310,31 +310,31 @@ IBNode *FatTree::getLowestLevelSwitchNode() + return(p_leafSwitch); + } + +-// get a free tupple given the reference one and the index to change: ++// get a free tuple given the reference one and the index to change: + // also track the max digit allocated per index +-vec_byte FatTree::getFreeTupple(vec_byte refTupple, unsigned int changeIdx) ++vec_byte FatTree::getFreeTuple(vec_byte refTuple, unsigned int changeIdx) + { +- vec_byte res = refTupple; ++ vec_byte res = refTuple; + int rank = changeIdx - 1; + for (uint8_t i = 0; i < 255; i++) + { + res[changeIdx] = i; +- map_tupple_ftnode::const_iterator tI = NodeByTupple.find(res); +- if (tI == NodeByTupple.end()) ++ map_tuple_ftnode::const_iterator tI = NodeByTuple.find(res); ++ if (tI == NodeByTuple.end()) + return res; + } +- cout << "ABORT: fail to get free tupple! (in 255 indexies)" << endl; ++ cout << "ABORT: fail to get free tuple! (in 255 indexies)" << endl; + abort(); + } + +-string FatTree::getTuppleStr(vec_byte tupple) ++string FatTree::getTupleStr(vec_byte tuple) + { + char buf[128]; + buf[0] = '\0'; +- for (unsigned int i = 0; i < tupple.size(); i++) ++ for (unsigned int i = 0; i < tuple.size(); i++) + { + if (i) strcat(buf,"."); +- sprintf(buf, "%s%d", buf, tupple[i]); ++ sprintf(buf, "%s%d", buf, tuple[i]); + } + return(string(buf)); + } +@@ -343,11 +343,11 @@ string FatTree::getTuppleStr(vec_byte tupple) + // correct fat tree node childPorts and parentPorts + int FatTree::trackConnection( + FatTreeNode *p_ftNode, // the connected node +- vec_byte tupple, // the connected node tupple ++ vec_byte tuple, // the connected node tuple + unsigned int rank, // rank of the local node + unsigned int remRank, // rank of the remote node + unsigned int portNum, // the port number connecting to the remote node +- unsigned int remDigit // the digit of the tupple changing to the remote node ++ unsigned int remDigit // the digit of the tuple changing to the remote node + ) + { + if ( rank < remRank ) +@@ -394,8 +394,8 @@ FatTree::extractCoefficients() + int anyErr = 0; + + // go over all nodes +- for (map_tupple_ftnode::iterator tI = NodeByTupple.begin(); +- tI != NodeByTupple.end(); ++ for (map_tuple_ftnode::iterator tI = NodeByTuple.begin(); ++ tI != NodeByTuple.end(); + tI++) + { + FatTreeNode *p_ftNode = &((*tI).second); +@@ -454,11 +454,11 @@ FatTree::extractCoefficients() + + if (anyErr) return 1; + +- vec_byte firstLeafTupple(N, 0); +- firstLeafTupple[0] = N-1; ++ vec_byte firstLeafTuple(N, 0); ++ firstLeafTuple[0] = N-1; + maxHcasPerLeafSwitch = 0; +- for (map_tupple_ftnode::iterator tI = NodeByTupple.find(firstLeafTupple); +- tI != NodeByTupple.end(); ++ for (map_tuple_ftnode::iterator tI = NodeByTuple.find(firstLeafTuple); ++ tI != NodeByTuple.end(); + tI++) + { + FatTreeNode *p_ftNode = &((*tI).second); +@@ -506,24 +506,24 @@ FatTree::FatTree(IBFabric *p_f) + bfsQueue.push_back(p_node); + + // also we always allocate the address 0..0 with "rank" digits to the node: +- vec_byte tupple(N, 0); ++ vec_byte tuple(N, 0); + + // adjust the level: +- tupple[0] = p_node->rank; +- TuppleByNode[p_node] = tupple; +- NodeByTupple[tupple] = FatTreeNode(p_node); ++ tuple[0] = p_node->rank; ++ TupleByNode[p_node] = tuple; ++ NodeByTuple[tuple] = FatTreeNode(p_node); + if (FabricUtilsVerboseLevel & FABU_LOG_VERBOSE) +- cout << "-I- Assigning tupple:" << getTuppleStr(tupple) << " to:" ++ cout << "-I- Assigning tuple:" << getTupleStr(tuple) << " to:" + << p_node->name << endl; + + while (! bfsQueue.empty()) + { + p_node = bfsQueue.front(); + bfsQueue.pop_front(); +- // we must have a tupple stored - get it +- tupple = TuppleByNode[p_node]; ++ // we must have a tuple stored - get it ++ tuple = TupleByNode[p_node]; + // we also need to get the fat tree node... +- p_ftNode = &NodeByTupple[tupple]; ++ p_ftNode = &NodeByTuple[tuple]; + + // go over all the node ports + for (unsigned int pn = 1; pn <= p_node->numPorts; pn++) +@@ -543,7 +543,7 @@ FatTree::FatTree(IBFabric *p_f) + } + + // now try to see if this node has already a map: +- map_pnode_vec_byte::iterator tI = TuppleByNode.find(p_remNode); ++ map_pnode_vec_byte::iterator tI = TupleByNode.find(p_remNode); + + // we are allowed to change the digit based on the direction we go: + unsigned int changingDigitIdx; +@@ -563,28 +563,28 @@ FatTree::FatTree(IBFabric *p_f) + return; + } + +- // do we need to allocate a new tupple? +- if (tI == TuppleByNode.end()) ++ // do we need to allocate a new tuple? ++ if (tI == TupleByNode.end()) + { + +- // the node is new - so get a new tupple for it: +- vec_byte newTupple = tupple; ++ // the node is new - so get a new tuple for it: ++ vec_byte newTuple = tuple; + // change the level accordingly +- newTupple[0] = p_remNode->rank; ++ newTuple[0] = p_remNode->rank; + // obtain a free one +- newTupple = getFreeTupple(newTupple, changingDigitIdx); ++ newTuple = getFreeTuple(newTuple, changingDigitIdx); + +- // assign the new tupple and add to next steps: ++ // assign the new tuple and add to next steps: + if (FabricUtilsVerboseLevel & FABU_LOG_VERBOSE) +- cout << "-I- Assigning tupple:" << getTuppleStr(newTupple) ++ cout << "-I- Assigning tuple:" << getTupleStr(newTuple) + << " to:" << p_remNode->name << " changed idx:" +- << changingDigitIdx << " from:" << getTuppleStr(tupple) ++ << changingDigitIdx << " from:" << getTupleStr(tuple) + << endl; + +- TuppleByNode[p_remNode] = newTupple; +- NodeByTupple[newTupple] = FatTreeNode(p_remNode); ++ TupleByNode[p_remNode] = newTuple; ++ NodeByTuple[newTuple] = FatTreeNode(p_remNode); + +- unsigned int digit = newTupple[changingDigitIdx]; ++ unsigned int digit = newTuple[changingDigitIdx]; + + // track the connection + if (FabricUtilsVerboseLevel & FABU_LOG_VERBOSE) +@@ -592,25 +592,25 @@ FatTree::FatTree(IBFabric *p_f) + << p_remNode->name << " through port:" << pn + << " remDigit:" << digit << endl; + if (trackConnection( +- p_ftNode, tupple, p_node->rank, p_remNode->rank, pn, digit)) ++ p_ftNode, tuple, p_node->rank, p_remNode->rank, pn, digit)) + return; + + bfsQueue.push_back(p_remNode); + } + else + { +- // other side already has a tupple - so just track the connection +- vec_byte remTupple = (*tI).second; +- vec_byte mergedTupple = remTupple; ++ // other side already has a tuple - so just track the connection ++ vec_byte remTuple = (*tI).second; ++ vec_byte mergedTuple = remTuple; + +- unsigned int digit = remTupple[changingDigitIdx]; ++ unsigned int digit = remTuple[changingDigitIdx]; + + if (FabricUtilsVerboseLevel & FABU_LOG_VERBOSE) + cout << "-I- Connecting:" << p_node->name << " to:" + << p_remNode->name << " through port:" << pn + << " remDigit:" << digit << endl; + if (trackConnection( +- p_ftNode, tupple, p_node->rank, p_remNode->rank, pn, digit)) ++ p_ftNode, tuple, p_node->rank, p_remNode->rank, pn, digit)) + return; + } + +@@ -624,18 +624,18 @@ FatTree::FatTree(IBFabric *p_f) + // We need to decide what will be the K of the lowest switches level. + // It is possible that for all of them the number of HCAs is < num + // left ports thus we should probably use the lowest number of all +- vec_byte firstLeafTupple(N, 0); +- firstLeafTupple[0] = N-1; ++ vec_byte firstLeafTuple(N, 0); ++ firstLeafTuple[0] = N-1; + +- // now restart going over all leaf switches by their tupple order and ++ // now restart going over all leaf switches by their tuple order and + // allocate mapping + int hcaIdx = 0; +- for (map_tupple_ftnode::iterator tI = NodeByTupple.find(firstLeafTupple); +- tI != NodeByTupple.end(); ++ for (map_tuple_ftnode::iterator tI = NodeByTuple.find(firstLeafTuple); ++ tI != NodeByTuple.end(); + tI++) + { + // we collect HCAs connected to the leaf switch and set their childPort +- // starting at the index associated with the switch tupple. ++ // starting at the index associated with the switch tuple. + FatTreeNode *p_ftNode = &((*tI).second); + IBNode *p_node = p_ftNode->p_node; + unsigned int pIdx = 0; +@@ -917,10 +917,10 @@ int FatTree::route() + int lid; // the target LID we propagate for this time + + // go over all fat tree nodes of the lowest level +- vec_byte firstLeafTupple(N, 0); +- firstLeafTupple[0] = N-1; +- for (map_tupple_ftnode::iterator tI = NodeByTupple.find(firstLeafTupple); +- tI != NodeByTupple.end(); ++ vec_byte firstLeafTuple(N, 0); ++ firstLeafTuple[0] = N-1; ++ for (map_tuple_ftnode::iterator tI = NodeByTuple.find(firstLeafTuple); ++ tI != NodeByTuple.end(); + tI++) + { + +@@ -963,8 +963,8 @@ int FatTree::route() + } + + // now go over all switches and route to them +- for (map_tupple_ftnode::iterator tI = NodeByTupple.begin(); +- tI != NodeByTupple.end(); ++ for (map_tuple_ftnode::iterator tI = NodeByTuple.begin(); ++ tI != NodeByTuple.end(); + tI++) + { + +@@ -1051,9 +1051,9 @@ int FatTree::permRoute(vector src, vector dst) + int hcaIdx = 0; + int lid; // the target LID we propagate for this time + // extract radix +- vec_byte tmpLeafTupple(N,0); +- tmpLeafTupple[0] = N-1; +- FatTreeNode* p_ftN = &NodeByTupple[tmpLeafTupple]; ++ vec_byte tmpLeafTuple(N,0); ++ tmpLeafTuple[0] = N-1; ++ FatTreeNode* p_ftN = &NodeByTuple[tmpLeafTuple]; + int radix = 0; + for (int i = 0; i < p_ftN->parentPorts.size(); i++) + if(p_ftN->parentPorts[i].size()) +@@ -1078,10 +1078,10 @@ int FatTree::permRoute(vector src, vector dst) + + // build the LFTs + // go over all fat tree nodes of the lowest level +- vec_byte firstLeafTupple(N, 0); +- firstLeafTupple[0] = N-1; ++ vec_byte firstLeafTuple(N, 0); ++ firstLeafTuple[0] = N-1; + // First prepare downwards routing +- for (map_tupple_ftnode::iterator tI = NodeByTupple.find(firstLeafTupple); tI != NodeByTupple.end(); tI++) { ++ for (map_tuple_ftnode::iterator tI = NodeByTuple.find(firstLeafTuple); tI != NodeByTuple.end(); tI++) { + FatTreeNode *p_ftNode = &((*tI).second); + IBNode *p_node = p_ftNode->p_node; + // we need to track the number of ports to handle case of missing HCAs +@@ -1124,7 +1124,7 @@ int FatTree::permRoute(vector src, vector dst) + + // Now prepare upwards routing + hcaIdx = 0; +- for (map_tupple_ftnode::iterator tI = NodeByTupple.find(firstLeafTupple); tI != NodeByTupple.end(); tI++) { ++ for (map_tuple_ftnode::iterator tI = NodeByTuple.find(firstLeafTuple); tI != NodeByTuple.end(); tI++) { + FatTreeNode *p_ftNode = &((*tI).second); + IBNode *p_node = p_ftNode->p_node; + +@@ -1156,8 +1156,8 @@ int FatTree::permRoute(vector src, vector dst) + } + + // now go over all switches and route to them +- for (map_tupple_ftnode::iterator tI = NodeByTupple.begin(); +- tI != NodeByTupple.end(); ++ for (map_tuple_ftnode::iterator tI = NodeByTuple.begin(); ++ tI != NodeByTuple.end(); + tI++) + { + +@@ -1222,8 +1222,8 @@ void FatTree::dump() + { + unsigned int level, prevLevel = 2; + cout << "---------------------------------- FAT TREE DUMP -----------------------------" << endl; +- for (map_tupple_ftnode::const_iterator tI = NodeByTupple.begin(); +- tI != NodeByTupple.end(); ++ for (map_tuple_ftnode::const_iterator tI = NodeByTuple.begin(); ++ tI != NodeByTuple.end(); + tI++) + { + level = (*tI).first[0]; +@@ -1234,7 +1234,7 @@ void FatTree::dump() + } + + FatTreeNode const *p_ftNode = &((*tI).second); +- cout << " " << p_ftNode->p_node->name << " tupple:" << getTuppleStr((*tI).first) << endl; ++ cout << " " << p_ftNode->p_node->name << " tuple:" << getTupleStr((*tI).first) << endl; + for (unsigned int i = 0; i < p_ftNode->parentPorts.size(); i++) + { + if (p_ftNode->parentPorts[i].size()) +-- +2.25.1 + diff --git a/debian/patches/Fix-spelling-errors.patch b/debian/patches/Fix-spelling-errors.patch new file mode 100644 index 0000000..6ea8b7f --- /dev/null +++ b/debian/patches/Fix-spelling-errors.patch @@ -0,0 +1,639 @@ +From c1c77db7c3a3fc38c127509472c72bac68825634 Mon Sep 17 00:00:00 2001 +From: Benjamin Drung +Date: Wed, 11 Nov 2020 10:30:47 +0100 +Subject: Fix spelling errors + +lintian found some spelling errors. + +Signed-off-by: Benjamin Drung +--- + ibdiag/demo/sm-single-master.tcl | 2 +- + ibdiag/doc/ibdiagpath.pod | 2 +- + ibdiag/doc/ibdiagui.pod | 2 +- + ibdiag/src/ibdebug.tcl | 8 ++++---- + ibdiag/src/ibdebug_if.tcl | 6 +++--- + ibdiag/src/ibdiagui.tcl | 4 ++-- + ibdm/doc/ibdm-topo-file.pod | 2 +- + ibdm/doc/ibdmsh.pod | 10 +++++----- + ibdm/ibdm/CredLoops.cpp | 4 ++-- + ibdm/ibdm/Fabric.cpp | 16 ++++++++-------- + ibdm/ibdm/Fabric.h | 8 ++++---- + ibdm/ibdm/SubnMgt.cpp | 2 +- + ibdm/ibdm/TopoMatch.cpp | 2 +- + ibdm/ibdm/ibdm.i | 10 +++++----- + ibdm/src/ibsysapi.cpp | 10 +++++----- + ibdm/src/ibsysapi.h | 4 ++-- + ibis/doc/ibis.pod | 4 ++-- + ibis/tests/ibvs_test.tcl | 2 +- + ibmgtsim/README | 2 +- + ibmgtsim/tests/OsmTest.check.tcl | 2 +- + ibmgtsim/tests/README | 2 +- + ibmgtsim/tests/ibdiag-mcast.sim.tcl | 6 +++--- + ibmgtsim/tests/ibdiag-ucast.sim.tcl | 6 +++--- + ibmgtsim/tests/pkey.check.tcl | 2 +- + ibmgtsim/utils/RunSimTest | 2 +- + 25 files changed, 60 insertions(+), 60 deletions(-) + +diff --git a/ibdiag/demo/sm-single-master.tcl b/ibdiag/demo/sm-single-master.tcl +index 3dd5c65..dfd0fa4 100644 +--- a/ibdiag/demo/sm-single-master.tcl ++++ b/ibdiag/demo/sm-single-master.tcl +@@ -130,7 +130,7 @@ proc checker {simDir osmPath osmPortGuid} { + puts " -E- Found more then one master SM in the discover fabric\n" + puts " press Enter when done" + gets stdin +- puts " h. Make one of teh SMs sweep: kill -HUP %2." ++ puts " h. Make one of the SMs sweep: kill -HUP %2." + puts " Now one of the SMs gets to standby mode" + puts " i. Run ibdiagnet again to see the info about the SMs in /var/cache/ibutils/ibdiagnet.sm" + puts " " +diff --git a/ibdiag/doc/ibdiagpath.pod b/ibdiag/doc/ibdiagpath.pod +index 7f4a3f7..afc6317 100644 +--- a/ibdiag/doc/ibdiagpath.pod ++++ b/ibdiag/doc/ibdiagpath.pod +@@ -16,7 +16,7 @@ ibdiagpath traces a path between two end-points and provides information + regarding the nodes and ports traversed along the path. It utilizes device + specific health queries for the different devices along the traversed path. + The way ibdiagpath operates depends on the addressing mode used on the command +-line. If directed route adressing is used, the local node is the source node ++line. If directed route addressing is used, the local node is the source node + and the route to the destination port is known apriori. + On the other hand, if LID route (or by-name) addressing is imployed, + then the source and destination ports of a route are specified by their LIDs +diff --git a/ibdiag/doc/ibdiagui.pod b/ibdiag/doc/ibdiagui.pod +index 6c21394..da0c01c 100644 +--- a/ibdiag/doc/ibdiagui.pod ++++ b/ibdiag/doc/ibdiagui.pod +@@ -21,7 +21,7 @@ Its main features: + + =item 2. Hyperlink the ibdiagnet log to the graph objects + +-=item 3. Show each object properties and object type specific actions on a properties pannel. ++=item 3. Show each object properties and object type specific actions on a properties panel. + + =back + +diff --git a/ibdiag/src/ibdebug.tcl b/ibdiag/src/ibdebug.tcl +index 1527f9e..1e5d8ff 100644 +--- a/ibdiag/src/ibdebug.tcl ++++ b/ibdiag/src/ibdebug.tcl +@@ -5347,7 +5347,7 @@ proc writeCSVGeneralInfoFile {} { + $curr_hdr_key == "sw_minor" || + $curr_hdr_key == "sw_major" || + $curr_hdr_key == "fw_ini_ver"} { +- #depcrated keys ++ # deprecated keys + continue + } + lappend header_line $curr_hdr_key +@@ -5365,7 +5365,7 @@ proc writeCSVGeneralInfoFile {} { + $curr_hdr_key == "sw_minor" || + $curr_hdr_key == "sw_major" || + $curr_hdr_key == "fw_ini_ver"} { +- #depcrated keys ++ # deprecated keys + continue + } + lappend node_line [lindex $GENERAL_INFO($curr_node_guid.general_info_list) $i] +@@ -5439,7 +5439,7 @@ proc writePMFile {} { + ############################## + # NAME writeTopologyFileAndIBNLs + # SYNOPSIS writeTopologyFileAndIBNLs +-# FUNCTION Write out teh topoly fiel if requested ++# FUNCTION Write out the topology file if requested + # INPUTS NULL + # OUTPUT NULL + proc writeTopologyFileAndIBNLs {} { +@@ -5452,7 +5452,7 @@ proc writeTopologyFileAndIBNLs {} { + file mkdir $ibnlDir + } + +- # we might be teh only reason to get a topology ... ++ # we might be the only reason to get a topology ... + if {![info exists G(IBfabric:merged)] } { + set f [new_IBFabric] + if {[IBFabric_parseSubnetLinks $f $G(outfiles,.lst)]} { +diff --git a/ibdiag/src/ibdebug_if.tcl b/ibdiag/src/ibdebug_if.tcl +index df626f1..0e4ea16 100644 +--- a/ibdiag/src/ibdebug_if.tcl ++++ b/ibdiag/src/ibdebug_if.tcl +@@ -2678,7 +2678,7 @@ proc showHelpPage { args } { + regarding the nodes and ports traversed along the path. It utilizes device + specific health queries for the different devices along the traversed path. + The way ibdiagpath operates depends on the addressing mode used on the command +- line. If directed route adressing is used, the local node is the source node ++ line. If directed route addressing is used, the local node is the source node + and the route to the destination port is known apriori. + On the other hand, if LID route (or by-name) addressing is imployed, + then the source and destination ports of a route are specified by their LIDs +@@ -2799,10 +2799,10 @@ proc showHelpPage { args } { + "DESCRIPTION + ibdiagui is a GUI wrapper for ibdiagnet. + Its main features: +- 1. Display a graph of teh discovered fabric (with optional names annotattion) ++ 1. Display a graph of the discovered fabric (with optional names annotattion) + 2. Hyperlink the ibdiagnet log to the graph objects + 3. Show each object properties and object type specific actions +- on a properties pannel." ++ on a properties panel." + + # OPTIONS + # - : specific attribute field and value. Automatically sets the component mask bit. +diff --git a/ibdiag/src/ibdiagui.tcl b/ibdiag/src/ibdiagui.tcl +index ef9c23e..3b0c819 100644 +--- a/ibdiag/src/ibdiagui.tcl ++++ b/ibdiag/src/ibdiagui.tcl +@@ -753,7 +753,7 @@ proc drawFabric {fabric c} { + # fit $c + } + +-#assume there is a name:* tag in teh list return the name ++#assume there is a name:* tag in the list return the name + proc getNameTag {tags} { + set idx [lsearch -glob $tags name:*] + if {$idx < 0} { +@@ -1897,7 +1897,7 @@ proc LogObjSelect {log type w x y} { + } + } + +-# initialize the props guid such that we have a pannel ++# initialize the props guid such that we have a panel + # for each object type + proc initPropsGui {p} { + global PROPS O +diff --git a/ibdm/doc/ibdm-topo-file.pod b/ibdm/doc/ibdm-topo-file.pod +index 7deba46..cba8975 100644 +--- a/ibdm/doc/ibdm-topo-file.pod ++++ b/ibdm/doc/ibdm-topo-file.pod +@@ -66,7 +66,7 @@ A name of the remote system port. We use the numbers as printed on the front pan + + =head1 EXAMPLE + +-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 ++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 + + MTS2400 S-1 + P1 -> MT23108 H-1 P1 +diff --git a/ibdm/doc/ibdmsh.pod b/ibdm/doc/ibdmsh.pod +index 1386d5e..38a5134 100644 +--- a/ibdm/doc/ibdmsh.pod ++++ b/ibdm/doc/ibdmsh.pod +@@ -53,7 +53,7 @@ Log level: set to FABU_LOG* values + + =head1 IBDM Objects + +-This section decribes the various object types exposed by IBDM. ++This section describes the various object types exposed by IBDM. + + + IBDM exposes some of its internal objects. The objects identifiers returned by the various function calls are formatted according to the following rules: +@@ -150,7 +150,7 @@ Modify the guid of the port + + =item [ Member : returns new_string ] getName + +-Get the port name: A device port connected to system port (front pannel) returns the front pannel port name. ++Get the port name: A device port connected to system port (front panel) returns the front panel port name. + + =item [ Member : returns void ] connect p_otherPort ?width? ?speed? + +@@ -268,13 +268,13 @@ Dump out the min hop table of the node + + =head2 class IBSysPort + +-The IBSysPort class represents an IB plug on the system front or back pannels ++The IBSysPort class represents an IB plug on the system front or back panels + + =over + + =item [ Member data: returns string * ] -name + +-The front pannel name (silk) of the port ++The front panel name (silk) of the port + + =item [ Member data: returns IBSysPort * ] -p_remoteSysPort + +@@ -414,7 +414,7 @@ Create a new generic system - basically an empty container for nodes... + + =item [ Member : returns IBSystem * ] makeSystem name type + +-Create a new system - the type must have a registed factory. ++Create a new system - the type must have a registered factory. + + =item [ Member : returns IBSystem * ] getSystem name + +diff --git a/ibdm/ibdm/CredLoops.cpp b/ibdm/ibdm/CredLoops.cpp +index 1817260..732361b 100644 +--- a/ibdm/ibdm/CredLoops.cpp ++++ b/ibdm/ibdm/CredLoops.cpp +@@ -407,14 +407,14 @@ CrdLoopConnectMcastDepend(IBFabric* p_fabric) + IBPort *p_outPort = p_node->getPort(outPortNum); + if (! p_outPort) { + cout << "-E- Switch:" << p_node->name << " port:" << outPortNum +- << " is included in some MFT but is not connnected" << endl; ++ << " is included in some MFT but is not connected" << endl; + nErrs++; + continue; + } + IBPort *p_inPort = p_node->getPort(inPortNum); + if (! p_inPort) { + cout << "-E- Switch:" << p_node->name << " port:" << inPortNum +- << " is included in some MFT but is not connnected" << endl; ++ << " is included in some MFT but is not connected" << endl; + nErrs++; + continue; + } +diff --git a/ibdm/ibdm/Fabric.cpp b/ibdm/ibdm/Fabric.cpp +index 66f0090..0939b78 100644 +--- a/ibdm/ibdm/Fabric.cpp ++++ b/ibdm/ibdm/Fabric.cpp +@@ -197,7 +197,7 @@ int + IBPort::disconnect(int duringSysPortDisconnect) + { + if (!p_remotePort) { +- cout << "-W- Trying to disconenct non connected port." << endl; ++ cout << "-W- Trying to disconnect non-connected port." << endl; + return(1); + } + +@@ -214,7 +214,7 @@ IBPort::disconnect(int duringSysPortDisconnect) + cout << "-I- Disconnected port:" << getName() + << " from:" << p_remPort->getName() << endl; + +- // might need to treat the sys port too - but mark it duringPortDisconenct ++ // might need to treat the sys port too - but mark it duringPortDisconnect + if (p_sysPort && ! duringSysPortDisconnect) + return(p_sysPort->disconnect(1)); + +@@ -649,7 +649,7 @@ int + IBSysPort::disconnect(int duringPortDisconnect) + { + if (!p_remoteSysPort) { +- cout << "-W- Trying to disconenct non connected system port." << endl; ++ cout << "-W- Trying to disconnect non-connected system port." << endl; + return(1); + } + +@@ -667,7 +667,7 @@ IBSysPort::disconnect(int duringPortDisconnect) + cout << "-I- Disconnected system port:" << name + << " from:" << p_remSysPort->name << endl; + +- // might need to treat the port too - but mark it duringPortDisconenct ++ // might need to treat the port too - but mark it duringPortDisconnect + if (p_nodePort && ! duringPortDisconnect) return(p_nodePort->disconnect(1)); + return(0); + } +@@ -1106,7 +1106,7 @@ cfgStrToModifiers(string cfg, map_str_str &mods) + return(0); + } + +-// crate a new generic system - basically an empty contaner for nodes... ++// create a new generic system - basically an empty contaner for nodes... + IBSystem * + IBFabric::makeGenericSystem(string name) + { +@@ -1122,7 +1122,7 @@ IBFabric::makeGenericSystem(string name) + return p_sys; + } + +-// crate a new system - the type must have a predefined sysdef ++// create a new system - the type must have a predefined sysdef + IBSystem * + IBFabric::makeSystem(string name, string type, string cfg) + { +@@ -2277,7 +2277,7 @@ IBFabric::dumpTopology(const char *fileName, const char * ibnlDir) + cout << "-E- failed to open:" << fileName << " for writing." << endl; + return 1; + } +- sout << "# This topology file was automaticlly generated by IBDM" << endl; ++ sout << "# This topology file was automatically generated by IBDM" << endl; + + // we start with all systems at top level: + for (map_str_psys::iterator sI = SystemByName.begin(); +@@ -2335,7 +2335,7 @@ IBFabric::dumpNameMap(const char *fileName) + cout << "-E- failed to open:" << fileName << " for writing." << endl; + return 1; + } +- sout << "# This name map file was automaticlly generated by IBDM" << endl; ++ sout << "# This name map file was automatically generated by IBDM" << endl; + sout << "# NodeGUID PortLID NAME/SysImageGUID" << endl; + + // Go over all nodes of the fabric +diff --git a/ibdm/ibdm/Fabric.h b/ibdm/ibdm/Fabric.h +index d4e4e7d..386ba61 100644 +--- a/ibdm/ibdm/Fabric.h ++++ b/ibdm/ibdm/Fabric.h +@@ -426,11 +426,11 @@ class IBNode { + /////////////////////////////////////////////////////////////////////////////// + // + // System Port Class +-// The System Port is a front pannel entity. ++// The System Port is a front panel entity. + // + class IBSysPort { + public: +- string name; // The front pannel name of the port ++ string name; // The front panel name of the port + class IBSysPort *p_remoteSysPort; // If connected the other side sys port + class IBSystem *p_system; // System it benongs to + class IBPort *p_nodePort; // The node port it connects to. +@@ -564,10 +564,10 @@ public: + // return the list of node pointers matching the required type + list_pnode *getNodesByType(IBNodeType type); + +- // crate a new generic system - basically an empty contaner for nodes... ++ // create a new generic system - basically an empty contaner for nodes... + IBSystem *makeGenericSystem(string name); + +- // crate a new system - the type must have a pre-red SysDef ++ // create a new system - the type must have a pre-red SysDef + IBSystem *makeSystem(string name, string type, string cfg = ""); + + // get a system by name +diff --git a/ibdm/ibdm/SubnMgt.cpp b/ibdm/ibdm/SubnMgt.cpp +index 9de792c..106cfe5 100644 +--- a/ibdm/ibdm/SubnMgt.cpp ++++ b/ibdm/ibdm/SubnMgt.cpp +@@ -886,7 +886,7 @@ SubnMgtVerifyAllCaToCaRoutes(IBFabric *p_fabric) + // track the number of dlids actually routed through each switch port. + // to avoid memory scalability we do the path scanning with dest port + // in the external loop. So we only need to look on the aggregated +- // vectore per port at the end of all sources and sum up to teh final results ++ // vectore per port at the end of all sources and sum up to the final results + map_pnode_vec_int switchDLidsPerOutPort; + + cout << "-I- Verifying all CA to CA paths ... " << endl; +diff --git a/ibdm/ibdm/TopoMatch.cpp b/ibdm/ibdm/TopoMatch.cpp +index 434bb3c..fb82f83 100644 +--- a/ibdm/ibdm/TopoMatch.cpp ++++ b/ibdm/ibdm/TopoMatch.cpp +@@ -1993,7 +1993,7 @@ TopoMatchSwitches(IBFabric *p_sFabric, + } + } + if (numMatchedSws) { +- s << "-I- Successfuly matched " << numMatchedSws ++ s << "-I- Successfully matched " << numMatchedSws + << " more switches" << endl; + } + return(numMatchedSws); +diff --git a/ibdm/ibdm/ibdm.i b/ibdm/ibdm/ibdm.i +index e21b74a..822ff59 100644 +--- a/ibdm/ibdm/ibdm.i ++++ b/ibdm/ibdm/ibdm.i +@@ -899,7 +899,7 @@ int ibdmUseCoutLog(); + /* obtain log messages from internal log and clear it */ + + %section "IBDM Objects",pre +-/* This section decribes the various object types exposed by IBDM. */ ++/* This section describes the various object types exposed by IBDM. */ + %text %{ + + IBDM exposes some of its internal objects. The objects +@@ -1041,11 +1041,11 @@ class IBNode { + + // + // System Port Class +-// The System Port is a front pannel entity. ++// The System Port is a front panel entity. + // + class IBSysPort { + public: +- string name; // The front pannel name of the port ++ string name; // The front panel name of the port + IBSysPort *p_remoteSysPort; // If connected the other side sys port + IBSystem *p_system; // System it benongs to + IBPort *p_nodePort; // The node port it connects to. +@@ -1135,10 +1135,10 @@ class IBFabric { + // return the list of node pointers matching the required type + + IBSystem *makeGenericSystem (string name); +- // crate a new generic system - basically an empty contaner for nodes... ++ // create a new generic system - basically an empty contaner for nodes... + + IBSystem *makeSystem (string name, string type); +- // crate a new system - the type must have a registed factory. ++ // create a new system - the type must have a registered factory. + + IBSystem *getSystem(string name); + // Get system by name +diff --git a/ibdm/src/ibsysapi.cpp b/ibdm/src/ibsysapi.cpp +index d8ed319..6dc6a0f 100644 +--- a/ibdm/src/ibsysapi.cpp ++++ b/ibdm/src/ibsysapi.cpp +@@ -340,7 +340,7 @@ ibSysGetNodePortSysPort(char *nodeName, int portNum, + + if (!port->p_sysPort) { + if (ibSysVerbose & IBSYS_ERROR) { +- printf("Error: no front pannel port at node:%s port:%d\n", ++ printf("Error: no front panel port at node:%s port:%d\n", + nodeName, portNum); + } + *sysPortName = NULL; +@@ -356,7 +356,7 @@ ibSysGetNodePortSysPort(char *nodeName, int portNum, + } + + +-/* query node name and port given front pannel port name */ ++/* query node name and port given front panel port name */ + int + ibSysGetNodePortOnSysPort(char *sysPortName, + const char**nodeName, int *portNum) +@@ -370,7 +370,7 @@ ibSysGetNodePortOnSysPort(char *sysPortName, + + if (!sysPortName) { + if (ibSysVerbose & IBSYS_ERROR) { +- printf("Error: No front pannel port name provided\n"); ++ printf("Error: No front panel port name provided\n"); + } + return(1); + } +@@ -400,7 +400,7 @@ ibSysGetNodePortOnSysPort(char *sysPortName, + IBSysPort *sysPort = system->getSysPort(sysPortName); + if (!sysPort) { + if (ibSysVerbose & IBSYS_ERROR) { +- printf("Error: failed to find system front pannel port:%s\n", ++ printf("Error: failed to find system front panel port:%s\n", + sysPortName); + } + return(1); +@@ -408,7 +408,7 @@ ibSysGetNodePortOnSysPort(char *sysPortName, + + if (!sysPort->p_nodePort) { + if (ibSysVerbose & IBSYS_ERROR) { +- printf("Error: failed to find system front pannel port:%s node port?\n", ++ printf("Error: failed to find system front panel port:%s node port?\n", + sysPortName); + } + return(1); +diff --git a/ibdm/src/ibsysapi.h b/ibdm/src/ibsysapi.h +index 587c331..d7e48a1 100644 +--- a/ibdm/src/ibsysapi.h ++++ b/ibdm/src/ibsysapi.h +@@ -63,11 +63,11 @@ int ibSysGetDrPathsToNode(char *fromNode, char *toNode, + /* query all node names in the system */ + int ibSysGetNodes(int *numNodes, const char **nodeNames); + +-/* query name of front pannel port of a node port */ ++/* query name of front panel port of a node port */ + int ibSysGetNodePortSysPort(char *nodeName, int portNum, + const char **sysPortName); + +-/* query node name and port given front pannel port name */ ++/* query node name and port given front panel port name */ + int ibSysGetNodePortOnSysPort(char *sysPort, + const char**nodeName, int *portNum); + +diff --git a/ibis/doc/ibis.pod b/ibis/doc/ibis.pod +index 7102ca1..5659918 100644 +--- a/ibis/doc/ibis.pod ++++ b/ibis/doc/ibis.pod +@@ -144,7 +144,7 @@ Obtain the maximal number of parallel queries that can be sent + + =item [ returns int ] pmGetPortCounters lid port_select + +-Send a "PortCounters" query to teh given LID and port ++Send a "PortCounters" query to the given LID and port + + =item [ returns int ] pmGetPortCountersMulti num lid_list port_select_list + +@@ -1095,7 +1095,7 @@ Methods: + =head2 INFORM INFO RECORD + + +-The inform Info is built with heirarchy of objects. So several classes are defined. ++The inform Info is built with hierarchy of objects. So several classes are defined. + + ---- + +diff --git a/ibis/tests/ibvs_test.tcl b/ibis/tests/ibvs_test.tcl +index 7a4d68c..442898a 100755 +--- a/ibis/tests/ibvs_test.tcl ++++ b/ibis/tests/ibvs_test.tcl +@@ -58,7 +58,7 @@ vsI2cWriteMulti + + We perform the following flow for verification: + read1 - read some addresses from the EEPROM assuming fixed addresses +-read2 - repeat from teh other devices ++read2 - repeat from the other devices + read3 - do multi read and verify we got same result + read4 - try reading same multi read but this time with some garbadge lid too. + verify we still get what expect. +diff --git a/ibmgtsim/README b/ibmgtsim/README +index 1e13ab7..bd118d6 100644 +--- a/ibmgtsim/README ++++ b/ibmgtsim/README +@@ -46,7 +46,7 @@ HOWTO BUILD + NOTE: the pointer to the osm install path can be to any osm (not just the + one compiled with the simulator interface vendor layer. e.g. /usr) + +- --enable-maintainer-mode - will enable updating fo teh TCL API (by running ++ --enable-maintainer-mode - will enable updating of the TCL API (by running + swig) after modifications to any of the .i files. It also enables update + of the ibnl_parser.cc, ibnl_parser.h after changes to ibnl_parser.yy and + similarly updates to ibnl_scanner.cc after modification of ibnl_scanner.ll +diff --git a/ibmgtsim/tests/OsmTest.check.tcl b/ibmgtsim/tests/OsmTest.check.tcl +index 287d8e4..ea557ff 100644 +--- a/ibmgtsim/tests/OsmTest.check.tcl ++++ b/ibmgtsim/tests/OsmTest.check.tcl +@@ -71,6 +71,6 @@ proc checker {simDir osmPath osmPortGuid} { + return 1 + } + +- puts "-I- osmtest completed successfuly" ++ puts "-I- osmtest completed successfully" + return 0 + } +diff --git a/ibmgtsim/tests/README b/ibmgtsim/tests/README +index bfa7484..9d21f96 100644 +--- a/ibmgtsim/tests/README ++++ b/ibmgtsim/tests/README +@@ -20,7 +20,7 @@ ibdiag-drops.sim.tcl - set some bad links + ibdiag-dup-node-guid.sim.tcl - duplicate node guid + ibdiag-dup-port-guid.sim.tcl - duplicate port guid + ibdiag-lid.sim.tcl - post the SM run duplicate or zero some lids +-ibdiag-mcast.sim.tcl - post SM create 3 MGRPs join some ports, then disconenct some MFT routing ++ibdiag-mcast.sim.tcl - post SM create 3 MGRPs join some ports, then disconnect some MFT routing + ibdiag-ucast.sim.tcl - post SM delete some LFT entries + + +diff --git a/ibmgtsim/tests/ibdiag-mcast.sim.tcl b/ibmgtsim/tests/ibdiag-mcast.sim.tcl +index 6456749..8b2ec6c 100644 +--- a/ibmgtsim/tests/ibdiag-mcast.sim.tcl ++++ b/ibmgtsim/tests/ibdiag-mcast.sim.tcl +@@ -179,7 +179,7 @@ proc postSmSettings {fabric} { + puts "-E- $e" + puts $errorInfo + } +- set nDisconencted 0 ++ set nDisconnected 0 + + after 1000 + if {[catch { +@@ -187,14 +187,14 @@ if {[catch { + for {set i 0} {$i < 3} {incr i} { + # delete one entry + if {![removeMCastRouteEntry $fabric]} { +- incr nDisconencted ++ incr nDisconnected + } + } + } e]} { + puts $e + puts $errorInfo + } +- return "-I- Joined $nPorts Disconnected $nDisconencted" ++ return "-I- Joined $nPorts Disconnected $nDisconnected" + } + + # make sure ibdiagnet reported the bad links +diff --git a/ibmgtsim/tests/ibdiag-ucast.sim.tcl b/ibmgtsim/tests/ibdiag-ucast.sim.tcl +index f072d39..5c52ec6 100644 +--- a/ibmgtsim/tests/ibdiag-ucast.sim.tcl ++++ b/ibmgtsim/tests/ibdiag-ucast.sim.tcl +@@ -93,15 +93,15 @@ proc removeUCastRouteEntry {fabric} { + # setup post SM run changes: + proc postSmSettings {fabric} { + global errorInfo +- set nDisconencted 0 ++ set nDisconnected 0 + # now go and delete some switch MC entries... + for {set i 0} {$i < 3} {incr i} { + # delete one entry + if {![removeUCastRouteEntry $fabric]} { +- incr nDisconencted ++ incr nDisconnected + } + } +- return "-I- Disconnected $nDisconencted LFT Entries" ++ return "-I- Disconnected $nDisconnected LFT Entries" + } + + # make sure ibdiagnet reported the bad links +diff --git a/ibmgtsim/tests/pkey.check.tcl b/ibmgtsim/tests/pkey.check.tcl +index 2a262d2..687aa71 100644 +--- a/ibmgtsim/tests/pkey.check.tcl ++++ b/ibmgtsim/tests/pkey.check.tcl +@@ -363,7 +363,7 @@ proc checker {simDir osmPath osmPortGuid} { + puts "SIM: $res" + + if {$res == 0} { +- puts "-I- Pkey check flow completed successfuly" ++ puts "-I- Pkey check flow completed successfully" + } else { + puts "-E- Pkey check flow failed" + } +diff --git a/ibmgtsim/utils/RunSimTest b/ibmgtsim/utils/RunSimTest +index a79a82b..561f344 100755 +--- a/ibmgtsim/utils/RunSimTest ++++ b/ibmgtsim/utils/RunSimTest +@@ -342,7 +342,7 @@ proc checker {simDir osmPath osmPortGuid} { + puts $e + set exitCode 1 + } else { +- puts "-I- ibdmchk completed successfuly" ++ puts "-I- ibdmchk completed successfully" + set exitCode 0 + } + } +-- +2.25.1 + diff --git a/debian/patches/series b/debian/patches/series index 2ae4114..49ea641 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,6 @@ Fix-generating-man-pages-in-place.patch Always-update-man-pages-if-needed.patch ibdmsh-Correct-whatis-entry.patch +Fix-spelling-error-of-mismatch.patch +Fix-spelling-error-of-tuple.patch +Fix-spelling-errors.patch