[Pkg-ofed-commits] r426 - in /branches/ofed-1.4.2/ibutils/trunk: ./ debian/ ibdi...
gmpc-guest at alioth.debian.org
gmpc-guest at alioth.debian.org
Fri Aug 7 15:16:47 UTC 2009
Author: gmpc-guest
Date: Fri Aug 7 15:16:47 2009
New Revision: 426
URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=426
Log:
OFED 1.4.2 release
Added:
branches/ofed-1.4.2/ibutils/trunk/ibdiag/doc/ibutils_release_notes_ofed_1_4_1.txt
- copied unchanged from r425, branches/ofed-1.4.2/ibutils/branches/upstream/current/ibdiag/doc/ibutils_release_notes_ofed_1_4_1.txt
branches/ofed-1.4.2/ibutils/trunk/ibdm/ibnl/IS4_NATIVE.ibnl
- copied unchanged from r425, branches/ofed-1.4.2/ibutils/branches/upstream/current/ibdm/ibnl/IS4_NATIVE.ibnl
Modified:
branches/ofed-1.4.2/ibutils/trunk/debian/changelog
branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/partition.check.tcl
branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/qos.check.tcl
branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/sm-lids.check.tcl
branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/Makefile.am
branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/Makefile.in
branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdebug.tcl
branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdebug_if.tcl
branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagnet.in
branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagpath.in
branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagui.in
branches/ofed-1.4.2/ibutils/trunk/ibdm/ibdm/CredLoops.cpp
branches/ofed-1.4.2/ibutils/trunk/ibis/doc/ibis_wrap.html
branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.c
branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.h
branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.i
branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibis_wrap.c
branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibissh_wrap.cpp
branches/ofed-1.4.2/ibutils/trunk/ibmgtsim/src/ibmssh_wrap.cpp
branches/ofed-1.4.2/ibutils/trunk/ibutils.spec
Modified: branches/ofed-1.4.2/ibutils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/debian/changelog?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/debian/changelog (original)
+++ branches/ofed-1.4.2/ibutils/trunk/debian/changelog Fri Aug 7 15:16:47 2009
@@ -1,3 +1,9 @@
+ibutils (1.2-OFED-1.4.2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Guy Coates <gmpc at sanger.ac.uk> Fri, 07 Aug 2009 16:16:02 +0100
+
ibutils (1.2-1) unstable; urgency=low
* Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>
Modified: branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/partition.check.tcl
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/partition.check.tcl?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/partition.check.tcl (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/partition.check.tcl Fri Aug 7 15:16:47 2009
@@ -135,39 +135,45 @@
return 1
}
- # make sure /proc is updated ...
- puts $simCtrlSock "updateProcFSForNode \$fabric $simDir H-1/U1 H-1/U1 1"
- set res [gets $simCtrlSock]
- puts "SIM: Updated H-1 proc file:$res"
+# make sure /proc is updated ...
+ puts $simCtrlSock "updateProcFSForNode \$fabric $simDir H-1/U1 H-1/U1 1"
+ set res [gets $simCtrlSock]
+ puts "SIM: Updated H-1 proc file:$res"
- puts "---------------------------------------------------------------------"
- puts " OpemSM brought up the network"
- puts $simCtrlSock "dumpPKeyTables \$fabric"
- puts "SIM:[gets $simCtrlSock]"
- puts "---------------------------------------------------------------------"
- puts " Listing of 3 Nodes of each group:"
- getFirstHostOfEachGroup
- puts "---------------------------------------------------------------------"
- puts " Drop some pkeys from switch ports"
- foreach g {1 2 3} {
+ puts "---------------------------------------------------------------------"
+ puts " OpemSM brought up the network"
+ puts $simCtrlSock "dumpPKeyTables \$fabric"
+ puts "SIM:[gets $simCtrlSock]"
+ puts "---------------------------------------------------------------------"
+ puts " Listing of 3 Nodes of each group:"
+ getFirstHostOfEachGroup
+ puts "---------------------------------------------------------------------"
+ puts " Drop some pkeys from switch ports"
+ foreach g {1 2 3} {
set hostNode "[lindex $GROUP_HOSTS($g) 2]/U1"
puts $simCtrlSock "removeGroupPKeyAccrosForHcaPort \$fabric $hostNode 1 $g"
set res [gets $simCtrlSock]
if {[regexp {^ERR} $res]} {
puts "$res"
- return 1
+ return 1
}
puts "$res"
}
puts "---------------------------------------------------------------------"
- puts " SUBNET READY FOR DIAGNOSTICS"
- puts " press ^C when done"
- puts " "
- puts "cd $simDir"
- puts "setenv IBMGTSIM_DIR $simDir"
- puts "setenv OSM_CACHE_DIR $simDir"
- puts "setenv OSM_TMP_DIR $simDir"
- puts " press Enter when done"
- gets stdin
- return 0
+ puts " SUBNET READY FOR DIAGNOSTICS"
+ puts " press ^C when done"
+ puts " "
+ puts "cd $simDir"
+ puts "setenv IBMGTSIM_DIR $simDir"
+ puts "setenv OSM_CACHE_DIR $simDir"
+ puts "setenv OSM_TMP_DIR $simDir"
+ puts "---------------------------------------------------------------------"
+ puts ""
+ puts "1) try: ibdiagnet -o $simDir -t network.topo"
+ puts "2) try: ibdiagpath -t network.topo -n H-9,H-1"
+ puts " press Enter when done"
+
+ puts " press Enter when done"
+ gets stdin
+ return 0
}
Modified: branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/qos.check.tcl
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/qos.check.tcl?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/qos.check.tcl (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/qos.check.tcl Fri Aug 7 15:16:47 2009
@@ -4,39 +4,39 @@
# by default we set all switches to have
# VL = SL % 8
# VLArb High = VLArb Low = 0.1,1.1,2.1,3.1,4.1,5.1,6.1,7.1
- set f [open $simDir/opensm.opts w]
+ set f [open $simDir/opensm.conf w]
puts $f {
# Disable QoS setup
no_qos FALSE
# QoS default options
-qos_max_vls 8
-qos_high_limit 3
-qos_vlarb_high 0:1,1:1,2:1,3:1,4:1,5:1,6:1,7:1
-qos_vlarb_low 0:1,1:1,2:1,3:1,4:1,5:1,6:1,7:1
-qos_sl2vl 0,1,2,3,4,5,6,7,0,1,2,3,4,5,6,7
+#qos_max_vls 8
+#qos_high_limit 3
+#qos_vlarb_high 0:1,1:1,2:1,3:1,4:1,5:1,6:1,7:1
+#qos_vlarb_low 0:1,1:1,2:1,3:1,4:1,5:1,6:1,7:1
+#qos_sl2vl 0,1,2,3,4,5,6,7,0,1,2,3,4,5,6,7
# QoS CA options
qos_ca_max_vls 8
qos_ca_high_limit 4
qos_ca_vlarb_high 0:1,1:1,2:1,3:1,4:1,5:1,6:1,7:1
-qos_ca_vlarb_low 0:1,1:1,2:1,3:1,4:1,5:1,6:1,7:1
-qos_ca_sl2vl 0,1,2,3,4,5,6,7,0,1,2,3,4,5,6,7
+qos_ca_vlarb_low 0:1,1:1,2:1,3:1,4:1,5:1,6:1,7:1
+qos_ca_sl2vl 0,1,2,3,4,5,6,7,0,1,2,3,4,5,6,7
# QoS Switch Port 0 options
qos_sw0_max_vls 8
qos_sw0_high_limit 5
qos_sw0_vlarb_high 0:1,1:1,2:1,3:1,4:1,5:1,6:1,7:1
qos_sw0_vlarb_low 0:1,1:1,2:1,3:1,4:1,5:1,6:1,7:1
-qos_sw0_sl2vl 0,1,2,3,4,5,6,7,0,1,2,3,4,5,6,7
+qos_sw0_sl2vl 0,1,2,3,4,5,6,7,0,1,2,3,4,5,6,7
# QoS Switch external ports options
qos_swe_max_vls 8
qos_swe_high_limit 6
qos_swe_vlarb_high 0:1,1:1,2:1,3:1,4:1,5:1,6:1,7:1
qos_swe_vlarb_low 0:1,1:1,2:1,3:1,4:1,5:1,6:1,7:1
-qos_swe_sl2vl 0,1,2,3,4,5,6,7,0,1,2,3,4,5,6,7
+qos_swe_sl2vl 0,1,2,3,4,5,6,7,0,1,2,3,4,5,6,7
}
close $f
@@ -65,7 +65,7 @@
puts "---------------------------------------------------------------------"
puts " Starting the SM\n"
set valgrind "/usr/bin/valgrind --tool=memcheck"
- set osmCmd "$osmPath -D 0x43 -d2 -t 4000 -f $osmLog -g $osmPortGuid"
+ set osmCmd "$osmPath -F $simDir/opensm.conf -Q -D 0x43 -d2 -t 4000 -f $osmLog -g $osmPortGuid"
puts "-I- Starting: $osmCmd"
set osmPid [eval "exec $osmCmd > $osmStdOutLog &"]
Modified: branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/sm-lids.check.tcl
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/sm-lids.check.tcl?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/sm-lids.check.tcl (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibdiag/demo/sm-lids.check.tcl Fri Aug 7 15:16:47 2009
@@ -48,6 +48,8 @@
puts " OpemSM brought up the network"
puts " Randomizing some LIDs ... "
+global osmPid
+exec kill $osmPid
# randomize lid errors:
puts $simCtrlSock "setLidAssignmentErrors \$fabric $lmc"
puts "SIM: [gets $simCtrlSock]"
Modified: branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/Makefile.am?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/Makefile.am (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/Makefile.am Fri Aug 7 15:16:47 2009
@@ -64,18 +64,21 @@
ibdiagnet: ibdiagnet.in
sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \
-e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \
+ -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \
-e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagnet.in > ibdiagnet
ibdiagpath: ibdiagpath.in
sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \
- -e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \
- -e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagpath.in > ibdiagpath
+ -e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \
+ -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \
+ -e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagpath.in > ibdiagpath
ibdiagui: ibdiagui.in
sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \
-e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \
-e 's=%with_tk_lib%='$(with_tk_lib)'=' \
-e 's=%with_graphviz_lib%='$(with_graphviz_lib)'=' \
+ -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \
-e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagui.in > ibdiagui
clean:
Modified: branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/Makefile.in?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/Makefile.in (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/Makefile.in Fri Aug 7 15:16:47 2009
@@ -350,18 +350,21 @@
ibdiagnet: ibdiagnet.in
sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \
-e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \
+ -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \
-e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagnet.in > ibdiagnet
ibdiagpath: ibdiagpath.in
sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \
- -e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \
- -e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagpath.in > ibdiagpath
+ -e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \
+ -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \
+ -e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagpath.in > ibdiagpath
ibdiagui: ibdiagui.in
sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \
-e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \
-e 's=%with_tk_lib%='$(with_tk_lib)'=' \
-e 's=%with_graphviz_lib%='$(with_graphviz_lib)'=' \
+ -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \
-e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagui.in > ibdiagui
clean:
Modified: branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdebug.tcl
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdebug.tcl?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdebug.tcl (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdebug.tcl Fri Aug 7 15:16:47 2009
@@ -377,8 +377,6 @@
set count_device 1
set ibisInfo $_ibisInfo
set toolName $G(var:tool.name)
- set bool_oldIBIS 0
- set bool_oldOSM 0
## Pre Settings - Step1.1: Set vars by G(argv:*)
set bool_smp $G(argv:symmetric.multi.processing)
@@ -391,32 +389,6 @@
set argv_devIdx $G(argv:dev.idx)
}
-
- ### SetPortNDevice - IBIS and OSM
- ## IBIS and OSM - Step1.0: Determine version of osm and ibis
- if {[llength [lindex $ibisInfo 0]] < 4} {
- set bool_oldIBIS 1
- inform "-W-loading:old.ibis.version"
- } else {
- foreach ibisEntry $ibisInfo {
- scan $ibisEntry {%s %s %s %s} portGuid portLid portState portNum
- if {($portNum != 1) && ($portNum != 2)} {
- set bool_oldOSM 1
- break;
- }
- }
- }
-
- ## IBIS and OSM - Step1.1: Handle old osm version: ignore PN entries in ibisInfo
- if {$bool_oldOSM} {
- inform "-W-loading:old.osm.version"
- set tmp_ibisInfo ""
- foreach ibisEntry $ibisInfo {
- lappend tmp_ibisInfo [lrange $ibisEntry 0 2]
- }
- set ibisInfo $tmp_ibisInfo
- }
-
## IBIS and OSM - Step1.2: Handle Gen2 (or higher): ignore the default port
if {[llength $ibisInfo] > 1} {
if {[lsearch -start 1 $ibisInfo [lindex $ibisInfo 0]]!= -1} {
@@ -425,17 +397,7 @@
}
- ### SetPortNDevice - Set PORT_HCA according to $ibisInfo
- ## Set PORT_HCA - Case1.0: Old ibis/osm => assume only one HCA present on the local host
- if {$bool_oldOSM || $bool_oldIBIS } {
- for {set portNumIndx 0} {$portNumIndx < [llength $ibisInfo]} {incr portNumIndx} {
- set listEntry [lindex $ibisInfo $portNumIndx]
- scan $listEntry {%s %s %s} portGuid portLid portState
- set PORT_HCA($count_device.[expr 1 + $portNumIndx]:portGuid) $portGuid
- set PORT_HCA($count_device.[expr 1 + $portNumIndx]:portLid) $portLid
- set PORT_HCA($count_device.[expr 1 + $portNumIndx]:portState) $portState
- }
- } else {
+ ### SetPortNDevice - Set PORT_HCA according to $ibisInfo
set prev_portNum 0
for {set portNumIndx 0} {$portNumIndx < [llength $ibisInfo]} {incr portNumIndx} {
set listEntry [lindex $ibisInfo $portNumIndx]
@@ -448,7 +410,6 @@
set PORT_HCA($count_device.$portNum:portLid) $portLid
set PORT_HCA($count_device.$portNum:portState) $portState
}
- }
### SetPortNDevice - Port and Dev set according to specified/unspecified device index and port number
@@ -3087,7 +3048,7 @@
continue
}
foreach pkey $pkeyTable {
- if {$pkey != 0} {
+ if {[regexp {^0x[0-9a-fA-F]$} $pkey]} {
lappend pkeys $pkey
}
}
Modified: branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdebug_if.tcl
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdebug_if.tcl?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdebug_if.tcl (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdebug_if.tcl Fri Aug 7 15:16:47 2009
@@ -2057,6 +2057,16 @@
append msgText "Writing file $G(outfiles,.pkey)"
append msgText " (a dump of the partitions in the IB fabric and their members)"
}
+ "-V-outfiles:.sm" {
+ PutsIn80Chars " "
+ append msgText "Writing file $G(outfiles,.sm)"
+ append msgText " (a dump of SMs in the fabric)"
+ }
+ "-V-outfiles:.mcgs" {
+ PutsIn80Chars " "
+ append msgText "Writing file $G(outfiles,.mcgs)"
+ append msgText " (a dump of the Multicast groups in the fabric)"
+ }
"-I-ibping:results" {
set pktFailures $msgF(failures)
Modified: branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagnet.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagnet.in?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagnet.in (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagnet.in Fri Aug 7 15:16:47 2009
@@ -1,7 +1,7 @@
#!/bin/sh -f
export TCLLIBPATH="%with_ibdm_lib% %ibdiag_libdir%"; \
-export PATH="%with_ibis%":$PATH; \
+export PATH="%with_ibis%":"%with_ibis_bindir%":$PATH; \
exec ibis "$@" <<EOF
set argv0 ibdiagnet
Modified: branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagpath.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagpath.in?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagpath.in (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagpath.in Fri Aug 7 15:16:47 2009
@@ -1,6 +1,7 @@
#!/bin/sh -f
+
export TCLLIBPATH="%with_ibdm_lib% %ibdiag_libdir%"; \
-export PATH="%with_ibis%":$PATH; \
+export PATH="%with_ibis%":"%with_ibis_bindir%":$PATH; \
exec ibis "$@" <<EOF
set argv0 ibdiagpath
Modified: branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagui.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagui.in?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagui.in (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibdiag/src/ibdiagui.in Fri Aug 7 15:16:47 2009
@@ -2,7 +2,7 @@
export TCLLIBPATH="%with_ibdm_lib% %ibdiag_libdir% %with_tk_lib% %with_graphviz_lib%"; \
export TK_LIBRARY="%with_tk_lib%"; \
-export PATH="%with_ibis%":$PATH; \
+export PATH="%with_ibis%":"%with_ibis_bindir%":$PATH; \
exec ibis "$@" <<EOF
set argv0 ibdiagui
Modified: branches/ofed-1.4.2/ibutils/trunk/ibdm/ibdm/CredLoops.cpp
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibdm/ibdm/CredLoops.cpp?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibdm/ibdm/CredLoops.cpp (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibdm/ibdm/CredLoops.cpp Fri Aug 7 15:16:47 2009
@@ -279,30 +279,6 @@
return 0;
}
-// Cleanup the data model
-int
-CrdLoopCleanup(IBFabric *p_fabric) {
- unsigned int lidStep = 1 << p_fabric->lmc;
-
- // go over all ports in the fabric
- for (int i = p_fabric->minLid; i <= p_fabric->maxLid; i += lidStep) {
- IBPort *p_Port = p_fabric->PortByLid[i];
- if (!p_Port) continue;
- IBNode *p_node = p_Port->p_node;
- int nL;
- if (p_node->type == IB_CA_NODE)
- nL = p_fabric->getNumSLs();
- else
- nL = p_fabric->getNumVLs();
- // Go over all node's ports
- for (int k=0;k<p_node->Ports.size();k++) {
- IBPort* p_Port = p_node->Ports[k];
- for (int j=0;j<nL;j++)
- delete p_Port->channels[j];
- }
- }
-}
-
//////////////////////////////////////////////////////////////////////////////
// Top Level Subroutine:
@@ -328,9 +304,6 @@
else
cout << endl << "-E- credit loops in routing"<<endl;
- // cleanup:
- CrdLoopCleanup(p_fabric);
-
return res;
}
Modified: branches/ofed-1.4.2/ibutils/trunk/ibis/doc/ibis_wrap.html
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibis/doc/ibis_wrap.html?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibis/doc/ibis_wrap.html (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibis/doc/ibis_wrap.html Fri Aug 7 15:16:47 2009
@@ -3370,12 +3370,7 @@
<P><TT><B>-protect_bit
</B></TT>
-<BLOCKQUOTE><PRE>[ Member data: returns uint8_t * ]
-</PRE></BLOCKQUOTE>
-
-<P><TT><B>-resv
-</B></TT>
-<BLOCKQUOTE><PRE>[ Member data: returns uint8_t * ]
+<BLOCKQUOTE><PRE>[ Member data: returns ib_net16_t * ]
</PRE></BLOCKQUOTE>
<P><TT><B>-lease_period
@@ -3410,19 +3405,9 @@
<BLOCKQUOTE><PRE>[ Member data: returns ib_net16_t * ]
</PRE></BLOCKQUOTE>
-<P><TT><B>-resv0_sl
-</B></TT>
-<BLOCKQUOTE><PRE>[ Member data: returns uint8_t * ]
-</PRE></BLOCKQUOTE>
-
-<P><TT><B>-resv1
-</B></TT>
-<BLOCKQUOTE><PRE>[ Member data: returns uint8_t * ]
-</PRE></BLOCKQUOTE>
-
-<P><TT><B>-resv2
-</B></TT>
-<BLOCKQUOTE><PRE>[ Member data: returns ib_net16_t * ]
+<P><TT><B>-sl
+</B></TT>
+<BLOCKQUOTE><PRE>[ Member data: returns ib_net32_t * ]
</PRE></BLOCKQUOTE>
<P><TT><B>-time_stamp
@@ -3434,7 +3419,7 @@
<H3>10.6. class ib_cong_log_event_ca_t</H3></A>
<PRE>[ created from struct ib_cong_log_event_ca_t ]
</PRE>
-<P><TT><B>-resv0_local_qp
+<P><TT><B>-local_qp_resv0
</B></TT>
<BLOCKQUOTE><PRE>[ Member data: returns ib_net32_t * ]
</PRE></BLOCKQUOTE>
@@ -3559,7 +3544,7 @@
<BLOCKQUOTE><PRE>[ Member data: returns uint8_array_t * ]
</PRE></BLOCKQUOTE>
-<P><TT><B>-threshold
+<P><TT><B>-threshold_resv
</B></TT>
<BLOCKQUOTE><PRE>[ Member data: returns uint8_t * ]
</PRE></BLOCKQUOTE>
@@ -3569,14 +3554,9 @@
<BLOCKQUOTE><PRE>[ Member data: returns uint8_t * ]
</PRE></BLOCKQUOTE>
-<P><TT><B>-cs_threshold
-</B></TT>
-<BLOCKQUOTE><PRE>[ Member data: returns uint8_t * ]
-</PRE></BLOCKQUOTE>
-
-<P><TT><B>-resv0
-</B></TT>
-<BLOCKQUOTE><PRE>[ Member data: returns uint8_t * ]
+<P><TT><B>-cs_threshold_resv
+</B></TT>
+<BLOCKQUOTE><PRE>[ Member data: returns ib_net16_t * ]
</PRE></BLOCKQUOTE>
<P><TT><B>-cs_return_delay
@@ -3673,12 +3653,7 @@
</PRE>
<P><TT><B>-port_control
</B></TT>
-<BLOCKQUOTE><PRE>[ Member data: returns uint8_t * ]
-</PRE></BLOCKQUOTE>
-
-<P><TT><B>-resv0
-</B></TT>
-<BLOCKQUOTE><PRE>[ Member data: returns uint8_t * ]
+<BLOCKQUOTE><PRE>[ Member data: returns ib_net16_t * ]
</PRE></BLOCKQUOTE>
<P><TT><B>-control_map
Modified: branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.c?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.c (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.c Fri Aug 7 15:16:47 2009
@@ -296,6 +296,41 @@
OSM_LOG_EXIT(&(IbisObj.log));
} /* __ibcc_prep_cc_mad() */
+static void
+__ibcc_dump_raw_mad(
+ ib_cc_mad_t * p_cc_mad)
+{
+ int mad_size = (int)sizeof(ib_cc_mad_t);
+ uint8_t * p_raw_mad = (uint8_t*)p_cc_mad;
+ int i;
+ int last_data_idx; // last non-zero byte of the MAD
+
+ for (i = (mad_size-1); i > 0; i -= 1)
+ if (p_raw_mad[i] != 0)
+ break;
+ last_data_idx = i;
+
+ for (i = 0; i < mad_size; i += 4) {
+ if (i == 0)
+ printf(" Header |---------------------------|\n");
+ else if (i == 24)
+ printf(" V key |---------------------------|\n");
+ else if (i == 32)
+ printf(" RESV0 |---------------------------|\n");
+ else if (i == 64)
+ printf(" Data |---------------------------|\n");
+ else if (i == 192)
+ printf(" RESV1 |---------------------------|\n");
+
+ if (i <= last_data_idx)
+ printf(" [%03d..%03d] %02x %02x %02x %02x\n",
+ i+3,i,
+ //p_raw_mad[i+3], p_raw_mad[i+2], p_raw_mad[i+1], p_raw_mad[i+0]);
+ p_raw_mad[i+0], p_raw_mad[i+1], p_raw_mad[i+2], p_raw_mad[i+3]);
+ }
+ printf(" end |---------------------------|\n");
+}
+
/**********************************************************************
**********************************************************************/
@@ -315,6 +350,7 @@
osm_madw_t *p_madw;
ib_cc_mad_t response_mad;
ib_api_status_t status;
+ int debug_mode = 0;
OSM_LOG_ENTER(&(IbisObj.log));
@@ -337,6 +373,12 @@
cc_mgt_data,
cc_mgt_data_size,
&p_madw);
+ if (debug_mode == 1)
+ {
+ /* print mad */
+ printf("\n\n>>> Sending MAD:\n\n" );
+ __ibcc_dump_raw_mad((ib_cc_mad_t *)(p_madw->p_mad));
+ }
/* send and wait */
status = ibis_gsi_send_sync_mad_batch(
@@ -351,6 +393,12 @@
status = IB_TIMEOUT;
if (status == IB_SUCCESS) {
+ if (debug_mode == 1)
+ {
+ /* print mad */
+ printf("\n\nResponse MAD:\n\n" );
+ __ibcc_dump_raw_mad((ib_cc_mad_t *)&response_mad);
+ }
if (cc_log_data)
memcpy(cc_log_data,
Modified: branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.h?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.h (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.h Fri Aug 7 15:16:47 2009
@@ -737,9 +737,9 @@
ib_net32_t control_map;
uint8_t victim_mask[32];
uint8_t credit_mask[32];
- uint8_t threshold;
+ uint8_t threshold_resv;
uint8_t packet_size;
- ib_net16_t cs_threshold;
+ ib_net16_t cs_threshold_resv;
ib_net16_t cs_return_delay;
ib_net16_t marking_rate;
} PACK_SUFFIX ib_sw_cong_setting_t;
Modified: branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.i
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.i?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.i (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibcc.i Fri Aug 7 15:16:47 2009
@@ -790,9 +790,9 @@
ib_net32_t control_map;
uint8_array_t victim_mask[32];
uint8_array_t credit_mask[32];
- uint8_t threshold;
+ uint8_t threshold_resv;
uint8_t packet_size;
- ib_net16_t cs_threshold;
+ ib_net16_t cs_threshold_resv;
ib_net16_t cs_return_delay;
ib_net16_t marking_rate;
} ccSWCongestionSetting;
Modified: branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibis_wrap.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibis_wrap.c?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibis_wrap.c (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibis_wrap.c Fri Aug 7 15:16:47 2009
@@ -67221,8 +67221,8 @@
}
return TCL_OK;
}
-#define _ib_sw_cong_setting_threshold_set(_swigobj,_swigval) (_swigobj->threshold = *(_swigval),_swigval)
-static int _wrap_ccSWCongestionSetting_threshold_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+#define _ib_sw_cong_setting_threshold_resv_set(_swigobj,_swigval) (_swigobj->threshold_resv = *(_swigval),_swigval)
+static int _wrap_ccSWCongestionSetting_threshold_resv_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
uint8_t * _result;
ccSWCongestionSetting * _arg0;
@@ -67234,11 +67234,11 @@
clientData = clientData; objv = objv;
tcl_result = Tcl_GetObjResult(interp);
if ((objc < 3) || (objc > 3)) {
- Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_threshold_set { ccSWCongestionSetting * } { uint8_t * } ",-1);
+ Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_threshold_resv_set { ccSWCongestionSetting * } { uint8_t * } ",-1);
return TCL_ERROR;
}
if ((rettype = SWIG_GetPointerObj(interp,objv[1],(void **) &_arg0,"_ccSWCongestionSetting_p"))) {
- Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_threshold_set. Expected _ccSWCongestionSetting_p, received ", -1);
+ Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_threshold_resv_set. Expected _ccSWCongestionSetting_p, received ", -1);
Tcl_AppendToObj(tcl_result, rettype, -1);
return TCL_ERROR;
}
@@ -67265,7 +67265,7 @@
}
ibis_tcl_error = 0;
- _result = (uint8_t *)_ib_sw_cong_setting_threshold_set(_arg0,_arg1);
+ _result = (uint8_t *)_ib_sw_cong_setting_threshold_resv_set(_arg0,_arg1);
;
if (ibis_tcl_error) {
Tcl_SetStringObj(Tcl_GetObjResult(interp), ibis_tcl_error_msg, -1);
@@ -67279,8 +67279,8 @@
}
return TCL_OK;
}
-#define _ib_sw_cong_setting_threshold_get(_swigobj) (&_swigobj->threshold)
-static int _wrap_ccSWCongestionSetting_threshold_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+#define _ib_sw_cong_setting_threshold_resv_get(_swigobj) (&_swigobj->threshold_resv)
+static int _wrap_ccSWCongestionSetting_threshold_resv_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
uint8_t * _result;
ccSWCongestionSetting * _arg0;
@@ -67290,34 +67290,34 @@
clientData = clientData; objv = objv;
tcl_result = Tcl_GetObjResult(interp);
if ((objc < 2) || (objc > 2)) {
- Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_threshold_get { ccSWCongestionSetting * } ",-1);
+ Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_threshold_resv_get { ccSWCongestionSetting * } ",-1);
return TCL_ERROR;
}
if ((rettype = SWIG_GetPointerObj(interp,objv[1],(void **) &_arg0,"_ccSWCongestionSetting_p"))) {
- Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_threshold_get. Expected _ccSWCongestionSetting_p, received ", -1);
- Tcl_AppendToObj(tcl_result, rettype, -1);
- return TCL_ERROR;
- }
-{
- /* we can check if IBIS was initialized here */
- if (!IbisObj.initialized)
- {
- Tcl_SetStringObj(
- Tcl_GetObjResult(interp),
- "ibis was not yet initialized. please use ibis_init and then ibis_set_port before.", -1);
- return TCL_ERROR;
- }
-
- if (! IbisObj.port_guid)
- {
- Tcl_SetStringObj(
- Tcl_GetObjResult(interp),
- " ibis was not yet initialized. please use ibis_set_port before.", -1);
- return TCL_ERROR;
- }
-
- ibis_tcl_error = 0;
- _result = (uint8_t *)_ib_sw_cong_setting_threshold_get(_arg0);
+ Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_threshold_resv_get. Expected _ccSWCongestionSetting_p, received ", -1);
+ Tcl_AppendToObj(tcl_result, rettype, -1);
+ return TCL_ERROR;
+ }
+{
+ /* we can check if IBIS was initialized here */
+ if (!IbisObj.initialized)
+ {
+ Tcl_SetStringObj(
+ Tcl_GetObjResult(interp),
+ "ibis was not yet initialized. please use ibis_init and then ibis_set_port before.", -1);
+ return TCL_ERROR;
+ }
+
+ if (! IbisObj.port_guid)
+ {
+ Tcl_SetStringObj(
+ Tcl_GetObjResult(interp),
+ " ibis was not yet initialized. please use ibis_set_port before.", -1);
+ return TCL_ERROR;
+ }
+
+ ibis_tcl_error = 0;
+ _result = (uint8_t *)_ib_sw_cong_setting_threshold_resv_get(_arg0);
;
if (ibis_tcl_error) {
Tcl_SetStringObj(Tcl_GetObjResult(interp), ibis_tcl_error_msg, -1);
@@ -67441,8 +67441,8 @@
}
return TCL_OK;
}
-#define _ib_sw_cong_setting_cs_threshold_set(_swigobj,_swigval) (_swigobj->cs_threshold = *(_swigval),_swigval)
-static int _wrap_ccSWCongestionSetting_cs_threshold_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+#define _ib_sw_cong_setting_cs_threshold_resv_set(_swigobj,_swigval) (_swigobj->cs_threshold_resv = *(_swigval),_swigval)
+static int _wrap_ccSWCongestionSetting_cs_threshold_resv_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
ib_net16_t * _result;
ccSWCongestionSetting * _arg0;
@@ -67454,11 +67454,11 @@
clientData = clientData; objv = objv;
tcl_result = Tcl_GetObjResult(interp);
if ((objc < 3) || (objc > 3)) {
- Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_cs_threshold_set { ccSWCongestionSetting * } { ib_net16_t * } ",-1);
+ Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_cs_threshold_resv_set { ccSWCongestionSetting * } { ib_net16_t * } ",-1);
return TCL_ERROR;
}
if ((rettype = SWIG_GetPointerObj(interp,objv[1],(void **) &_arg0,"_ccSWCongestionSetting_p"))) {
- Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_cs_threshold_set. Expected _ccSWCongestionSetting_p, received ", -1);
+ Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_cs_threshold_resv_set. Expected _ccSWCongestionSetting_p, received ", -1);
Tcl_AppendToObj(tcl_result, rettype, -1);
return TCL_ERROR;
}
@@ -67485,7 +67485,7 @@
}
ibis_tcl_error = 0;
- _result = (ib_net16_t *)_ib_sw_cong_setting_cs_threshold_set(_arg0,_arg1);
+ _result = (ib_net16_t *)_ib_sw_cong_setting_cs_threshold_resv_set(_arg0,_arg1);
;
if (ibis_tcl_error) {
Tcl_SetStringObj(Tcl_GetObjResult(interp), ibis_tcl_error_msg, -1);
@@ -67499,8 +67499,8 @@
}
return TCL_OK;
}
-#define _ib_sw_cong_setting_cs_threshold_get(_swigobj) (&_swigobj->cs_threshold)
-static int _wrap_ccSWCongestionSetting_cs_threshold_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+#define _ib_sw_cong_setting_cs_threshold_resv_get(_swigobj) (&_swigobj->cs_threshold_resv)
+static int _wrap_ccSWCongestionSetting_cs_threshold_resv_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
ib_net16_t * _result;
ccSWCongestionSetting * _arg0;
@@ -67510,34 +67510,34 @@
clientData = clientData; objv = objv;
tcl_result = Tcl_GetObjResult(interp);
if ((objc < 2) || (objc > 2)) {
- Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_cs_threshold_get { ccSWCongestionSetting * } ",-1);
+ Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_cs_threshold_resv_get { ccSWCongestionSetting * } ",-1);
return TCL_ERROR;
}
if ((rettype = SWIG_GetPointerObj(interp,objv[1],(void **) &_arg0,"_ccSWCongestionSetting_p"))) {
- Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_cs_threshold_get. Expected _ccSWCongestionSetting_p, received ", -1);
- Tcl_AppendToObj(tcl_result, rettype, -1);
- return TCL_ERROR;
- }
-{
- /* we can check if IBIS was initialized here */
- if (!IbisObj.initialized)
- {
- Tcl_SetStringObj(
- Tcl_GetObjResult(interp),
- "ibis was not yet initialized. please use ibis_init and then ibis_set_port before.", -1);
- return TCL_ERROR;
- }
-
- if (! IbisObj.port_guid)
- {
- Tcl_SetStringObj(
- Tcl_GetObjResult(interp),
- " ibis was not yet initialized. please use ibis_set_port before.", -1);
- return TCL_ERROR;
- }
-
- ibis_tcl_error = 0;
- _result = (ib_net16_t *)_ib_sw_cong_setting_cs_threshold_get(_arg0);
+ Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_cs_threshold_resv_get. Expected _ccSWCongestionSetting_p, received ", -1);
+ Tcl_AppendToObj(tcl_result, rettype, -1);
+ return TCL_ERROR;
+ }
+{
+ /* we can check if IBIS was initialized here */
+ if (!IbisObj.initialized)
+ {
+ Tcl_SetStringObj(
+ Tcl_GetObjResult(interp),
+ "ibis was not yet initialized. please use ibis_init and then ibis_set_port before.", -1);
+ return TCL_ERROR;
+ }
+
+ if (! IbisObj.port_guid)
+ {
+ Tcl_SetStringObj(
+ Tcl_GetObjResult(interp),
+ " ibis was not yet initialized. please use ibis_set_port before.", -1);
+ return TCL_ERROR;
+ }
+
+ ibis_tcl_error = 0;
+ _result = (ib_net16_t *)_ib_sw_cong_setting_cs_threshold_resv_get(_arg0);
;
if (ibis_tcl_error) {
Tcl_SetStringObj(Tcl_GetObjResult(interp), ibis_tcl_error_msg, -1);
@@ -67941,12 +67941,12 @@
cmd = _wrap_ccSWCongestionSetting_victim_mask_set;
} else if (strcmp(_str,"-credit_mask") == 0) {
cmd = _wrap_ccSWCongestionSetting_credit_mask_set;
- } else if (strcmp(_str,"-threshold") == 0) {
- cmd = _wrap_ccSWCongestionSetting_threshold_set;
+ } else if (strcmp(_str,"-threshold_resv") == 0) {
+ cmd = _wrap_ccSWCongestionSetting_threshold_resv_set;
} else if (strcmp(_str,"-packet_size") == 0) {
cmd = _wrap_ccSWCongestionSetting_packet_size_set;
- } else if (strcmp(_str,"-cs_threshold") == 0) {
- cmd = _wrap_ccSWCongestionSetting_cs_threshold_set;
+ } else if (strcmp(_str,"-cs_threshold_resv") == 0) {
+ cmd = _wrap_ccSWCongestionSetting_cs_threshold_resv_set;
} else if (strcmp(_str,"-cs_return_delay") == 0) {
cmd = _wrap_ccSWCongestionSetting_cs_return_delay_set;
} else if (strcmp(_str,"-marking_rate") == 0) {
@@ -67960,13 +67960,13 @@
if (rcode == TCL_ERROR) return rcode;
cmd = 0;
} else {
- Tcl_SetStringObj(tcl_result,"Invalid configure option. Must be { -control_map -victim_mask -credit_mask -threshold -packet_size -cs_threshold -cs_return_delay -marking_rate }",-1);
+ Tcl_SetStringObj(tcl_result,"Invalid configure option. Must be { -control_map -victim_mask -credit_mask -threshold_resv -packet_size -cs_threshold_resv -cs_return_delay -marking_rate }",-1);
return TCL_ERROR;
}
i+=2;
}
if ((i < objc) || (i == 2)) {
- Tcl_SetStringObj(tcl_result,"{ -control_map -victim_mask -credit_mask -threshold -packet_size -cs_threshold -cs_return_delay -marking_rate }",-1);
+ Tcl_SetStringObj(tcl_result,"{ -control_map -victim_mask -credit_mask -threshold_resv -packet_size -cs_threshold_resv -cs_return_delay -marking_rate }",-1);
return TCL_ERROR;
}
return TCL_OK;
@@ -67980,12 +67980,12 @@
cmd = _wrap_ccSWCongestionSetting_victim_mask_get;
} else if (strcmp(_str,"-credit_mask") == 0) {
cmd = _wrap_ccSWCongestionSetting_credit_mask_get;
- } else if (strcmp(_str,"-threshold") == 0) {
- cmd = _wrap_ccSWCongestionSetting_threshold_get;
+ } else if (strcmp(_str,"-threshold_resv") == 0) {
+ cmd = _wrap_ccSWCongestionSetting_threshold_resv_get;
} else if (strcmp(_str,"-packet_size") == 0) {
cmd = _wrap_ccSWCongestionSetting_packet_size_get;
- } else if (strcmp(_str,"-cs_threshold") == 0) {
- cmd = _wrap_ccSWCongestionSetting_cs_threshold_get;
+ } else if (strcmp(_str,"-cs_threshold_resv") == 0) {
+ cmd = _wrap_ccSWCongestionSetting_cs_threshold_resv_get;
} else if (strcmp(_str,"-cs_return_delay") == 0) {
cmd = _wrap_ccSWCongestionSetting_cs_return_delay_get;
} else if (strcmp(_str,"-marking_rate") == 0) {
@@ -68002,11 +68002,11 @@
objv[2] = oldarg;
return rcode;
} else {
- Tcl_SetStringObj(tcl_result,"Invalid cget option. Must be { -this -control_map -victim_mask -credit_mask -threshold -packet_size -cs_threshold -cs_return_delay -marking_rate }",-1);
+ Tcl_SetStringObj(tcl_result,"Invalid cget option. Must be { -this -control_map -victim_mask -credit_mask -threshold_resv -packet_size -cs_threshold_resv -cs_return_delay -marking_rate }",-1);
return TCL_ERROR;
}
} else {
- Tcl_SetStringObj(tcl_result,"{ -this -control_map -victim_mask -credit_mask -threshold -packet_size -cs_threshold -cs_return_delay -marking_rate }", -1);
+ Tcl_SetStringObj(tcl_result,"{ -this -control_map -victim_mask -credit_mask -threshold_resv -packet_size -cs_threshold_resv -cs_return_delay -marking_rate }", -1);
return TCL_ERROR;
}
} else if ((c == 'd') && (strncmp(_str,"dump",length) == 0) && (length >= 2)) {
@@ -68035,12 +68035,12 @@
objv[2] = oldarg;
Tcl_AppendStringsToObj(pDumpObj, "-credit_mask ", Tcl_GetStringFromObj(tcl_result, NULL), " ", NULL);
Tcl_SetStringObj(tcl_result, Tcl_GetStringFromObj(pDumpObj, NULL), -1);
- cmd = _wrap_ccSWCongestionSetting_threshold_get;
+ cmd = _wrap_ccSWCongestionSetting_threshold_resv_get;
oldarg = objv[2];
objv[2] = obj;
rcode = (*cmd)(clientData,interp,objc,&objv[1]);
objv[2] = oldarg;
- Tcl_AppendStringsToObj(pDumpObj, "-threshold ", Tcl_GetStringFromObj(tcl_result, NULL), " ", NULL);
+ Tcl_AppendStringsToObj(pDumpObj, "-threshold_resv ", Tcl_GetStringFromObj(tcl_result, NULL), " ", NULL);
Tcl_SetStringObj(tcl_result, Tcl_GetStringFromObj(pDumpObj, NULL), -1);
cmd = _wrap_ccSWCongestionSetting_packet_size_get;
oldarg = objv[2];
@@ -68049,12 +68049,12 @@
objv[2] = oldarg;
Tcl_AppendStringsToObj(pDumpObj, "-packet_size ", Tcl_GetStringFromObj(tcl_result, NULL), " ", NULL);
Tcl_SetStringObj(tcl_result, Tcl_GetStringFromObj(pDumpObj, NULL), -1);
- cmd = _wrap_ccSWCongestionSetting_cs_threshold_get;
+ cmd = _wrap_ccSWCongestionSetting_cs_threshold_resv_get;
oldarg = objv[2];
objv[2] = obj;
rcode = (*cmd)(clientData,interp,objc,&objv[1]);
objv[2] = oldarg;
- Tcl_AppendStringsToObj(pDumpObj, "-cs_threshold ", Tcl_GetStringFromObj(tcl_result, NULL), " ", NULL);
+ Tcl_AppendStringsToObj(pDumpObj, "-cs_threshold_resv ", Tcl_GetStringFromObj(tcl_result, NULL), " ", NULL);
Tcl_SetStringObj(tcl_result, Tcl_GetStringFromObj(pDumpObj, NULL), -1);
cmd = _wrap_ccSWCongestionSetting_cs_return_delay_get;
oldarg = objv[2];
@@ -74774,12 +74774,12 @@
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_victim_mask_get", _wrap_ccSWCongestionSetting_victim_mask_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_credit_mask_set", _wrap_ccSWCongestionSetting_credit_mask_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_credit_mask_get", _wrap_ccSWCongestionSetting_credit_mask_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
- Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_threshold_set", _wrap_ccSWCongestionSetting_threshold_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
- Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_threshold_get", _wrap_ccSWCongestionSetting_threshold_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+ Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_threshold_resv_set", _wrap_ccSWCongestionSetting_threshold_resv_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+ Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_threshold_resv_get", _wrap_ccSWCongestionSetting_threshold_resv_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_packet_size_set", _wrap_ccSWCongestionSetting_packet_size_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_packet_size_get", _wrap_ccSWCongestionSetting_packet_size_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
- Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_cs_threshold_set", _wrap_ccSWCongestionSetting_cs_threshold_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
- Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_cs_threshold_get", _wrap_ccSWCongestionSetting_cs_threshold_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+ Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_cs_threshold_resv_set", _wrap_ccSWCongestionSetting_cs_threshold_resv_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+ Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_cs_threshold_resv_get", _wrap_ccSWCongestionSetting_cs_threshold_resv_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_cs_return_delay_set", _wrap_ccSWCongestionSetting_cs_return_delay_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_cs_return_delay_get", _wrap_ccSWCongestionSetting_cs_return_delay_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_marking_rate_set", _wrap_ccSWCongestionSetting_marking_rate_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Modified: branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibissh_wrap.cpp
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibissh_wrap.cpp?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibissh_wrap.cpp (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibis/src/ibissh_wrap.cpp Fri Aug 7 15:16:47 2009
@@ -67283,8 +67283,8 @@
}
return TCL_OK;
}
-#define _ib_sw_cong_setting_threshold_set(_swigobj,_swigval) (_swigobj->threshold = *(_swigval),_swigval)
-static int _wrap_ccSWCongestionSetting_threshold_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+#define _ib_sw_cong_setting_threshold_resv_set(_swigobj,_swigval) (_swigobj->threshold_resv = *(_swigval),_swigval)
+static int _wrap_ccSWCongestionSetting_threshold_resv_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
uint8_t * _result;
ccSWCongestionSetting * _arg0;
@@ -67296,11 +67296,11 @@
clientData = clientData; objv = objv;
tcl_result = Tcl_GetObjResult(interp);
if ((objc < 3) || (objc > 3)) {
- Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_threshold_set { ccSWCongestionSetting * } { uint8_t * } ",-1);
+ Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_threshold_resv_set { ccSWCongestionSetting * } { uint8_t * } ",-1);
return TCL_ERROR;
}
if ((rettype = SWIG_GetPointerObj(interp,objv[1],(void **) &_arg0,"_ccSWCongestionSetting_p"))) {
- Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_threshold_set. Expected _ccSWCongestionSetting_p, received ", -1);
+ Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_threshold_resv_set. Expected _ccSWCongestionSetting_p, received ", -1);
Tcl_AppendToObj(tcl_result, rettype, -1);
return TCL_ERROR;
}
@@ -67327,7 +67327,7 @@
}
ibis_tcl_error = 0;
- _result = (uint8_t *)_ib_sw_cong_setting_threshold_set(_arg0,_arg1);
+ _result = (uint8_t *)_ib_sw_cong_setting_threshold_resv_set(_arg0,_arg1);
;
if (ibis_tcl_error) {
Tcl_SetStringObj(Tcl_GetObjResult(interp), ibis_tcl_error_msg, -1);
@@ -67341,8 +67341,8 @@
}
return TCL_OK;
}
-#define _ib_sw_cong_setting_threshold_get(_swigobj) (&_swigobj->threshold)
-static int _wrap_ccSWCongestionSetting_threshold_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+#define _ib_sw_cong_setting_threshold_resv_get(_swigobj) (&_swigobj->threshold_resv)
+static int _wrap_ccSWCongestionSetting_threshold_resv_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
uint8_t * _result;
ccSWCongestionSetting * _arg0;
@@ -67352,34 +67352,34 @@
clientData = clientData; objv = objv;
tcl_result = Tcl_GetObjResult(interp);
if ((objc < 2) || (objc > 2)) {
- Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_threshold_get { ccSWCongestionSetting * } ",-1);
+ Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_threshold_resv_get { ccSWCongestionSetting * } ",-1);
return TCL_ERROR;
}
if ((rettype = SWIG_GetPointerObj(interp,objv[1],(void **) &_arg0,"_ccSWCongestionSetting_p"))) {
- Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_threshold_get. Expected _ccSWCongestionSetting_p, received ", -1);
- Tcl_AppendToObj(tcl_result, rettype, -1);
- return TCL_ERROR;
- }
-{
- /* we can check if IBIS was initialized here */
- if (!IbisObj.initialized)
- {
- Tcl_SetStringObj(
- Tcl_GetObjResult(interp),
- "ibis was not yet initialized. please use ibis_init and then ibis_set_port before.", -1);
- return TCL_ERROR;
- }
-
- if (! IbisObj.port_guid)
- {
- Tcl_SetStringObj(
- Tcl_GetObjResult(interp),
- " ibis was not yet initialized. please use ibis_set_port before.", -1);
- return TCL_ERROR;
- }
-
- ibis_tcl_error = 0;
- _result = (uint8_t *)_ib_sw_cong_setting_threshold_get(_arg0);
+ Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_threshold_resv_get. Expected _ccSWCongestionSetting_p, received ", -1);
+ Tcl_AppendToObj(tcl_result, rettype, -1);
+ return TCL_ERROR;
+ }
+{
+ /* we can check if IBIS was initialized here */
+ if (!IbisObj.initialized)
+ {
+ Tcl_SetStringObj(
+ Tcl_GetObjResult(interp),
+ "ibis was not yet initialized. please use ibis_init and then ibis_set_port before.", -1);
+ return TCL_ERROR;
+ }
+
+ if (! IbisObj.port_guid)
+ {
+ Tcl_SetStringObj(
+ Tcl_GetObjResult(interp),
+ " ibis was not yet initialized. please use ibis_set_port before.", -1);
+ return TCL_ERROR;
+ }
+
+ ibis_tcl_error = 0;
+ _result = (uint8_t *)_ib_sw_cong_setting_threshold_resv_get(_arg0);
;
if (ibis_tcl_error) {
Tcl_SetStringObj(Tcl_GetObjResult(interp), ibis_tcl_error_msg, -1);
@@ -67503,8 +67503,8 @@
}
return TCL_OK;
}
-#define _ib_sw_cong_setting_cs_threshold_set(_swigobj,_swigval) (_swigobj->cs_threshold = *(_swigval),_swigval)
-static int _wrap_ccSWCongestionSetting_cs_threshold_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+#define _ib_sw_cong_setting_cs_threshold_resv_set(_swigobj,_swigval) (_swigobj->cs_threshold_resv = *(_swigval),_swigval)
+static int _wrap_ccSWCongestionSetting_cs_threshold_resv_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
ib_net16_t * _result;
ccSWCongestionSetting * _arg0;
@@ -67516,11 +67516,11 @@
clientData = clientData; objv = objv;
tcl_result = Tcl_GetObjResult(interp);
if ((objc < 3) || (objc > 3)) {
- Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_cs_threshold_set { ccSWCongestionSetting * } { ib_net16_t * } ",-1);
+ Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_cs_threshold_resv_set { ccSWCongestionSetting * } { ib_net16_t * } ",-1);
return TCL_ERROR;
}
if ((rettype = SWIG_GetPointerObj(interp,objv[1],(void **) &_arg0,"_ccSWCongestionSetting_p"))) {
- Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_cs_threshold_set. Expected _ccSWCongestionSetting_p, received ", -1);
+ Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_cs_threshold_resv_set. Expected _ccSWCongestionSetting_p, received ", -1);
Tcl_AppendToObj(tcl_result, rettype, -1);
return TCL_ERROR;
}
@@ -67547,7 +67547,7 @@
}
ibis_tcl_error = 0;
- _result = (ib_net16_t *)_ib_sw_cong_setting_cs_threshold_set(_arg0,_arg1);
+ _result = (ib_net16_t *)_ib_sw_cong_setting_cs_threshold_resv_set(_arg0,_arg1);
;
if (ibis_tcl_error) {
Tcl_SetStringObj(Tcl_GetObjResult(interp), ibis_tcl_error_msg, -1);
@@ -67561,8 +67561,8 @@
}
return TCL_OK;
}
-#define _ib_sw_cong_setting_cs_threshold_get(_swigobj) (&_swigobj->cs_threshold)
-static int _wrap_ccSWCongestionSetting_cs_threshold_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+#define _ib_sw_cong_setting_cs_threshold_resv_get(_swigobj) (&_swigobj->cs_threshold_resv)
+static int _wrap_ccSWCongestionSetting_cs_threshold_resv_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
ib_net16_t * _result;
ccSWCongestionSetting * _arg0;
@@ -67572,34 +67572,34 @@
clientData = clientData; objv = objv;
tcl_result = Tcl_GetObjResult(interp);
if ((objc < 2) || (objc > 2)) {
- Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_cs_threshold_get { ccSWCongestionSetting * } ",-1);
+ Tcl_SetStringObj(tcl_result,"Wrong # args. ccSWCongestionSetting_cs_threshold_resv_get { ccSWCongestionSetting * } ",-1);
return TCL_ERROR;
}
if ((rettype = SWIG_GetPointerObj(interp,objv[1],(void **) &_arg0,"_ccSWCongestionSetting_p"))) {
- Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_cs_threshold_get. Expected _ccSWCongestionSetting_p, received ", -1);
- Tcl_AppendToObj(tcl_result, rettype, -1);
- return TCL_ERROR;
- }
-{
- /* we can check if IBIS was initialized here */
- if (!IbisObj.initialized)
- {
- Tcl_SetStringObj(
- Tcl_GetObjResult(interp),
- "ibis was not yet initialized. please use ibis_init and then ibis_set_port before.", -1);
- return TCL_ERROR;
- }
-
- if (! IbisObj.port_guid)
- {
- Tcl_SetStringObj(
- Tcl_GetObjResult(interp),
- " ibis was not yet initialized. please use ibis_set_port before.", -1);
- return TCL_ERROR;
- }
-
- ibis_tcl_error = 0;
- _result = (ib_net16_t *)_ib_sw_cong_setting_cs_threshold_get(_arg0);
+ Tcl_SetStringObj(tcl_result, "Type error in argument 1 of ccSWCongestionSetting_cs_threshold_resv_get. Expected _ccSWCongestionSetting_p, received ", -1);
+ Tcl_AppendToObj(tcl_result, rettype, -1);
+ return TCL_ERROR;
+ }
+{
+ /* we can check if IBIS was initialized here */
+ if (!IbisObj.initialized)
+ {
+ Tcl_SetStringObj(
+ Tcl_GetObjResult(interp),
+ "ibis was not yet initialized. please use ibis_init and then ibis_set_port before.", -1);
+ return TCL_ERROR;
+ }
+
+ if (! IbisObj.port_guid)
+ {
+ Tcl_SetStringObj(
+ Tcl_GetObjResult(interp),
+ " ibis was not yet initialized. please use ibis_set_port before.", -1);
+ return TCL_ERROR;
+ }
+
+ ibis_tcl_error = 0;
+ _result = (ib_net16_t *)_ib_sw_cong_setting_cs_threshold_resv_get(_arg0);
;
if (ibis_tcl_error) {
Tcl_SetStringObj(Tcl_GetObjResult(interp), ibis_tcl_error_msg, -1);
@@ -68003,12 +68003,12 @@
cmd = _wrap_ccSWCongestionSetting_victim_mask_set;
} else if (strcmp(_str,"-credit_mask") == 0) {
cmd = _wrap_ccSWCongestionSetting_credit_mask_set;
- } else if (strcmp(_str,"-threshold") == 0) {
- cmd = _wrap_ccSWCongestionSetting_threshold_set;
+ } else if (strcmp(_str,"-threshold_resv") == 0) {
+ cmd = _wrap_ccSWCongestionSetting_threshold_resv_set;
} else if (strcmp(_str,"-packet_size") == 0) {
cmd = _wrap_ccSWCongestionSetting_packet_size_set;
- } else if (strcmp(_str,"-cs_threshold") == 0) {
- cmd = _wrap_ccSWCongestionSetting_cs_threshold_set;
+ } else if (strcmp(_str,"-cs_threshold_resv") == 0) {
+ cmd = _wrap_ccSWCongestionSetting_cs_threshold_resv_set;
} else if (strcmp(_str,"-cs_return_delay") == 0) {
cmd = _wrap_ccSWCongestionSetting_cs_return_delay_set;
} else if (strcmp(_str,"-marking_rate") == 0) {
@@ -68022,13 +68022,13 @@
if (rcode == TCL_ERROR) return rcode;
cmd = 0;
} else {
- Tcl_SetStringObj(tcl_result,"Invalid configure option. Must be { -control_map -victim_mask -credit_mask -threshold -packet_size -cs_threshold -cs_return_delay -marking_rate }",-1);
+ Tcl_SetStringObj(tcl_result,"Invalid configure option. Must be { -control_map -victim_mask -credit_mask -threshold_resv -packet_size -cs_threshold_resv -cs_return_delay -marking_rate }",-1);
return TCL_ERROR;
}
i+=2;
}
if ((i < objc) || (i == 2)) {
- Tcl_SetStringObj(tcl_result,"{ -control_map -victim_mask -credit_mask -threshold -packet_size -cs_threshold -cs_return_delay -marking_rate }",-1);
+ Tcl_SetStringObj(tcl_result,"{ -control_map -victim_mask -credit_mask -threshold_resv -packet_size -cs_threshold_resv -cs_return_delay -marking_rate }",-1);
return TCL_ERROR;
}
return TCL_OK;
@@ -68042,12 +68042,12 @@
cmd = _wrap_ccSWCongestionSetting_victim_mask_get;
} else if (strcmp(_str,"-credit_mask") == 0) {
cmd = _wrap_ccSWCongestionSetting_credit_mask_get;
- } else if (strcmp(_str,"-threshold") == 0) {
- cmd = _wrap_ccSWCongestionSetting_threshold_get;
+ } else if (strcmp(_str,"-threshold_resv") == 0) {
+ cmd = _wrap_ccSWCongestionSetting_threshold_resv_get;
} else if (strcmp(_str,"-packet_size") == 0) {
cmd = _wrap_ccSWCongestionSetting_packet_size_get;
- } else if (strcmp(_str,"-cs_threshold") == 0) {
- cmd = _wrap_ccSWCongestionSetting_cs_threshold_get;
+ } else if (strcmp(_str,"-cs_threshold_resv") == 0) {
+ cmd = _wrap_ccSWCongestionSetting_cs_threshold_resv_get;
} else if (strcmp(_str,"-cs_return_delay") == 0) {
cmd = _wrap_ccSWCongestionSetting_cs_return_delay_get;
} else if (strcmp(_str,"-marking_rate") == 0) {
@@ -68064,11 +68064,11 @@
objv[2] = oldarg;
return rcode;
} else {
- Tcl_SetStringObj(tcl_result,"Invalid cget option. Must be { -this -control_map -victim_mask -credit_mask -threshold -packet_size -cs_threshold -cs_return_delay -marking_rate }",-1);
+ Tcl_SetStringObj(tcl_result,"Invalid cget option. Must be { -this -control_map -victim_mask -credit_mask -threshold_resv -packet_size -cs_threshold_resv -cs_return_delay -marking_rate }",-1);
return TCL_ERROR;
}
} else {
- Tcl_SetStringObj(tcl_result,"{ -this -control_map -victim_mask -credit_mask -threshold -packet_size -cs_threshold -cs_return_delay -marking_rate }", -1);
+ Tcl_SetStringObj(tcl_result,"{ -this -control_map -victim_mask -credit_mask -threshold_resv -packet_size -cs_threshold_resv -cs_return_delay -marking_rate }", -1);
return TCL_ERROR;
}
} else if ((c == 'd') && (strncmp(_str,"dump",length) == 0) && (length >= 2)) {
@@ -68097,12 +68097,12 @@
objv[2] = oldarg;
Tcl_AppendStringsToObj(pDumpObj, "-credit_mask ", Tcl_GetStringFromObj(tcl_result, NULL), " ", NULL);
Tcl_SetStringObj(tcl_result, Tcl_GetStringFromObj(pDumpObj, NULL), -1);
- cmd = _wrap_ccSWCongestionSetting_threshold_get;
+ cmd = _wrap_ccSWCongestionSetting_threshold_resv_get;
oldarg = objv[2];
objv[2] = obj;
rcode = (*cmd)(clientData,interp,objc,&objv[1]);
objv[2] = oldarg;
- Tcl_AppendStringsToObj(pDumpObj, "-threshold ", Tcl_GetStringFromObj(tcl_result, NULL), " ", NULL);
+ Tcl_AppendStringsToObj(pDumpObj, "-threshold_resv ", Tcl_GetStringFromObj(tcl_result, NULL), " ", NULL);
Tcl_SetStringObj(tcl_result, Tcl_GetStringFromObj(pDumpObj, NULL), -1);
cmd = _wrap_ccSWCongestionSetting_packet_size_get;
oldarg = objv[2];
@@ -68111,12 +68111,12 @@
objv[2] = oldarg;
Tcl_AppendStringsToObj(pDumpObj, "-packet_size ", Tcl_GetStringFromObj(tcl_result, NULL), " ", NULL);
Tcl_SetStringObj(tcl_result, Tcl_GetStringFromObj(pDumpObj, NULL), -1);
- cmd = _wrap_ccSWCongestionSetting_cs_threshold_get;
+ cmd = _wrap_ccSWCongestionSetting_cs_threshold_resv_get;
oldarg = objv[2];
objv[2] = obj;
rcode = (*cmd)(clientData,interp,objc,&objv[1]);
objv[2] = oldarg;
- Tcl_AppendStringsToObj(pDumpObj, "-cs_threshold ", Tcl_GetStringFromObj(tcl_result, NULL), " ", NULL);
+ Tcl_AppendStringsToObj(pDumpObj, "-cs_threshold_resv ", Tcl_GetStringFromObj(tcl_result, NULL), " ", NULL);
Tcl_SetStringObj(tcl_result, Tcl_GetStringFromObj(pDumpObj, NULL), -1);
cmd = _wrap_ccSWCongestionSetting_cs_return_delay_get;
oldarg = objv[2];
@@ -74836,12 +74836,12 @@
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_victim_mask_get", _wrap_ccSWCongestionSetting_victim_mask_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_credit_mask_set", _wrap_ccSWCongestionSetting_credit_mask_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_credit_mask_get", _wrap_ccSWCongestionSetting_credit_mask_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
- Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_threshold_set", _wrap_ccSWCongestionSetting_threshold_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
- Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_threshold_get", _wrap_ccSWCongestionSetting_threshold_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+ Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_threshold_resv_set", _wrap_ccSWCongestionSetting_threshold_resv_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+ Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_threshold_resv_get", _wrap_ccSWCongestionSetting_threshold_resv_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_packet_size_set", _wrap_ccSWCongestionSetting_packet_size_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_packet_size_get", _wrap_ccSWCongestionSetting_packet_size_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
- Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_cs_threshold_set", _wrap_ccSWCongestionSetting_cs_threshold_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
- Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_cs_threshold_get", _wrap_ccSWCongestionSetting_cs_threshold_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+ Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_cs_threshold_resv_set", _wrap_ccSWCongestionSetting_cs_threshold_resv_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+ Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_cs_threshold_resv_get", _wrap_ccSWCongestionSetting_cs_threshold_resv_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_cs_return_delay_set", _wrap_ccSWCongestionSetting_cs_return_delay_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_cs_return_delay_get", _wrap_ccSWCongestionSetting_cs_return_delay_get, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Tcl_CreateObjCommand(interp, SWIG_prefix "ccSWCongestionSetting_marking_rate_set", _wrap_ccSWCongestionSetting_marking_rate_set, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
Modified: branches/ofed-1.4.2/ibutils/trunk/ibmgtsim/src/ibmssh_wrap.cpp
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibmgtsim/src/ibmssh_wrap.cpp?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibmgtsim/src/ibmssh_wrap.cpp (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibmgtsim/src/ibmssh_wrap.cpp Fri Aug 7 15:16:47 2009
@@ -1765,7 +1765,7 @@
char **sub_lists;
#endif
int num_sub_lists;
- unsigned int idx;
+ int idx;
/* we will use the TCL split list to split into elements */
if (Tcl_SplitList(interp,
@@ -2496,7 +2496,7 @@
char **sub_lists;
#endif
int num_sub_lists;
- unsigned int idx;
+ int idx;
/* we will use the TCL split list to split into elements */
if (Tcl_SplitList(interp,
@@ -2635,7 +2635,7 @@
char **sub_lists;
#endif
int num_sub_lists;
- unsigned int idx;
+ int idx;
/* we will use the TCL split list to split into elements */
if (Tcl_SplitList(interp,
@@ -2867,7 +2867,7 @@
char **sub_lists;
#endif
int num_sub_lists;
- unsigned int idx;
+ int idx;
/* we will use the TCL split list to split into elements */
if (Tcl_SplitList(interp,
@@ -3006,7 +3006,7 @@
char **sub_lists;
#endif
int num_sub_lists;
- unsigned int idx;
+ int idx;
/* we will use the TCL split list to split into elements */
if (Tcl_SplitList(interp,
@@ -3359,7 +3359,7 @@
char **sub_lists;
#endif
int num_sub_lists;
- unsigned int idx;
+ int idx;
/* we will use the TCL split list to split into elements */
if (Tcl_SplitList(interp,
Modified: branches/ofed-1.4.2/ibutils/trunk/ibutils.spec
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/ibutils/trunk/ibutils.spec?rev=426&op=diff
==============================================================================
--- branches/ofed-1.4.2/ibutils/trunk/ibutils.spec (original)
+++ branches/ofed-1.4.2/ibutils/trunk/ibutils.spec Fri Aug 7 15:16:47 2009
@@ -30,11 +30,11 @@
Summary: OpenIB Mellanox InfiniBand Diagnostic Tools
Name: ibutils
Version: 1.2
-Release: 1%{?dist}
+Release: 1.ofed1.4.2
License: GPL/BSD
Url: http://openib.org/downloads/%{name}-%{version}.tar.gz
Group: System Environment/Libraries
-Source: %{name}-%{version}.tar.gz
+Source: http://www.openfabrics.org/downloads/ibutils-1.2.tar.gz
BuildRoot: %{?build_root:%{build_root}}%{!?build_root:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
# Requires: opensm
Vendor: Mellanox Technologies Ltd.
More information about the Pkg-ofed-commits
mailing list