Commit 5c4d12fc authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Minor tweaks for change to delays table (see bridge support).

parent 3e824190
#!/usr/bin/perl -w
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
use English;
......@@ -2373,6 +2373,7 @@ foreach $delayid (sort {$a <=> $b} keys(%nodedelays)) {
DBQueryFatal("insert into delays " .
" (pid,eid,exptidx,node_id,vname,noshaping,iface0,iface1" .
",vlan0,vlan1".
",vnode0,pipe0,delay0,bandwidth0,backfill0,lossrate0" .
",vnode1,pipe1,delay1,bandwidth1,backfill1,lossrate1" .
",q0_limit,q0_maxthresh,q0_minthresh,q0_weight,q0_linterm" .
......@@ -2382,7 +2383,7 @@ foreach $delayid (sort {$a <=> $b} keys(%nodedelays)) {
",q1_qinbytes,q1_bytes,q1_meanpsize,q1_wait,q1_setbit" .
",q1_droptail,q1_red,q1_gentle)" .
" values ('$pid','$eid','$experiment_idx','$pnode','$vname' ".
",$noshaping,'$int0','$int1'".
",$noshaping,'$int0','$int1','$vname','$vname'".
",'$vnode0',$pipe0,$delay,$bandwidth,$backfill,$lossrate".
",'$vnode1',$pipe1,$rdelay,$rbandwidth,$rbackfill,$rlossrate".
",$q0_limit,$q0_maxthresh,$q0_minthresh,$q0_weight,$q0_linterm".
......@@ -2412,13 +2413,14 @@ foreach $delayid (sort {$a <=> $b} keys(%nodedelays)) {
#
DBQueryFatal("insert into delays" .
" (pid,eid,exptidx,node_id,vname,noshaping,iface0,iface1," .
" vlan0,vlan1,".
" vnode0,pipe0,delay0,bandwidth0,backfill0,lossrate0," .
" vnode1,pipe1,delay1,bandwidth1,backfill1,lossrate1," .
" q0_limit,q0_maxthresh,q0_minthresh,q0_weight,q0_linterm," .
" q0_qinbytes,q0_bytes,q0_meanpsize,q0_wait,q0_setbit," .
" q0_droptail,q0_red,q0_gentle,q1_limit,q1_qinbytes) " .
" values ('$pid','$eid','$experiment_idx','$pnode','$vname', ".
" $noshaping,'$int0','$int1',".
" $noshaping,'$int0','$int1','$vname','$vname',".
" '$vnode0',$pipe0,$delay,$bandwidth,$backfill,$lossrate,".
" '$vnode1',$pipe1,$rdelay,$rbandwidth,$rbackfill,$rlossrate,".
" $q0_limit,$q0_maxthresh,$q0_minthresh,$q0_weight,$q0_linterm,".
......
......@@ -6518,6 +6518,7 @@ sub AddDelay($$$$$$$$$)
DBQueryWarn("insert into delays " .
" (pid,eid,exptidx,node_id,vname,noshaping,iface0,iface1" .
",vlan0,vlan1".
",vnode0,pipe0,delay0,bandwidth0,backfill0,lossrate0" .
",vnode1,pipe1,delay1,bandwidth1,backfill1,lossrate1" .
",q0_limit,q0_maxthresh,q0_minthresh,q0_weight,q0_linterm" .
......@@ -6527,7 +6528,7 @@ sub AddDelay($$$$$$$$$)
",q1_qinbytes,q1_bytes,q1_meanpsize,q1_wait,q1_setbit" .
",q1_droptail,q1_red,q1_gentle)" .
" values ('$pid','$eid','$idx','$pnodename','$lan' ".
",$noshaping,'$iface0','$iface1'".
",$noshaping,'$iface0','$iface1','$lan','$lan'".
",'$vnodename0',$pipe0,$delay,$bandwidth,$backfill,$lossrate".
",'$vnodename1',$pipe1,$rdelay,$rbandwidth,$rbackfill,$rlossrate".
",$q0_limit,$q0_maxthresh,$q0_minthresh,$q0_weight,$q0_linterm".
......@@ -6557,13 +6558,14 @@ sub AddDelay($$$$$$$$$)
#
DBQueryWarn("insert into delays" .
" (pid,eid,exptidx,node_id,vname,noshaping,iface0,iface1," .
" vlan0,vlan1,".
" vnode0,pipe0,delay0,bandwidth0,backfill0,lossrate0," .
" vnode1,pipe1,delay1,bandwidth1,backfill1,lossrate1," .
" q0_limit,q0_maxthresh,q0_minthresh,q0_weight,q0_linterm," .
" q0_qinbytes,q0_bytes,q0_meanpsize,q0_wait,q0_setbit," .
" q0_droptail,q0_red,q0_gentle,q1_limit,q1_qinbytes) " .
" values ('$pid','$eid','$idx','$pnodename','$lan', ".
" $noshaping,'$iface0','$iface1',".
" $noshaping,'$iface0','$iface1','$lan','$lan',".
" '$vnodename0',$pipe0,$delay,$bandwidth,$backfill,$lossrate,".
" '$vnodename1',$pipe1,$rdelay,$rbandwidth,$rbackfill,$rlossrate,".
" $q0_limit,$q0_maxthresh,$q0_minthresh,$q0_weight,$q0_linterm,".
......
Supports Markdown
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