Commit 46155476 authored by Leigh Stoller's avatar Leigh Stoller

Add tb-set-uselinkdelays to switch between normal delay nodes and

link delays setup on the nodes.

Add tb-set-forcelinkdelays to force a linkdelay (when uselinkdelays is
on of course) to be inserted, even if the link was unshaped. This
allows it to be controlled later, say via the event system. This is
nice, cause in the current system an unshaped link cannot be later
shaped.

Note that these are currently require FBSD-47.
parent 1d6800ae
# -*- tcl -*-
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -36,6 +36,8 @@ proc tb-set-link-simplex-params {link src delay bw loss} {}
proc tb-set-uselatestwadata {onoff} {}
proc tb-set-usewatunnels {onoff} {}
proc tb-set-wasolver-weights {delay bw plr} {}
proc tb-set-uselinkdelays {onoff} {}
proc tb-set-forcelinkdelays {onoff} {}
Class Program
......
......@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -199,6 +199,12 @@ namespace eval GLOBALS {
# For remote nodes. Use tunnels
variable usewatunnels 1
# Use link delays instead of delay nodes.
variable uselinkdelays 0
# Force link delays (where a delay would not otherwise be inserted)
variable forcelinkdelays 0
# For remote nodes. The solver weights.
variable wa_delay_solverweight 1
variable wa_bw_solverweight 7
......
......@@ -537,6 +537,28 @@ proc tb-set-usewatunnels {onoff} {
set usewatunnels $onoff
}
proc tb-set-uselinkdelays {onoff} {
var_import ::GLOBALS::uselinkdelays
if {$onoff != 0 && $onoff != 1} {
perror "\[tb-set-uselinkdelays] $onoff must be 0/1"
return
}
set uselinkdelays $onoff
}
proc tb-set-forcelinkdelays {onoff} {
var_import ::GLOBALS::forcelinkdelays
if {$onoff != 0 && $onoff != 1} {
perror "\[tb-set-forcelinkdelays] $onoff must be 0/1"
return
}
set forcelinkdelays $onoff
}
proc tb-set-wasolver-weights {delay bw plr} {
var_import ::GLOBALS::wa_delay_solverweight
var_import ::GLOBALS::wa_bw_solverweight
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment