From: bismark@svn.comics.unina.it
To: bismark-commits@lists.bufferbloat.net
Subject: [Bismark-commits] rev 326 - trunk/device/OpenWrt_common/lib trunk/device/OpenWrt_common/scripts
Date: Sat, 16 Apr 2011 19:33:41 +0200 [thread overview]
Message-ID: <E1QB9NN-00045W-56@svn.comics.unina.it> (raw)
Author: bismark
Date: 2011-04-16 19:33:41 +0200 (Sat, 16 Apr 2011)
New Revision: 326
Modified:
trunk/device/OpenWrt_common/lib/functions.inc.sh
trunk/device/OpenWrt_common/scripts/bismark-measure-active
trunk/device/OpenWrt_common/scripts/bismark-netperf-thread
trunk/device/OpenWrt_common/scripts/bismark-tr
Log:
Modified: trunk/device/OpenWrt_common/lib/functions.inc.sh
===================================================================
--- trunk/device/OpenWrt_common/lib/functions.inc.sh 2011-04-15 18:08:44 UTC (rev 325)
+++ trunk/device/OpenWrt_common/lib/functions.inc.sh 2011-04-16 17:33:41 UTC (rev 326)
@@ -58,7 +58,7 @@
if [ -e /tmp/ip ] && [ $(grep -c '^[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*$' /tmp/ip) -ge 1 ]; then
src=$(cat /tmp/ip)
else
- src=$(ifconfig $WAN_IF | awk '/inet:/{ print substr($2,6) }')
+ src=$(ifconfig $WAN_IF | awk '/inet addr:/{ print substr($2,6) }')
fi
}
Modified: trunk/device/OpenWrt_common/scripts/bismark-measure-active
===================================================================
--- trunk/device/OpenWrt_common/scripts/bismark-measure-active 2011-04-15 18:08:44 UTC (rev 325)
+++ trunk/device/OpenWrt_common/scripts/bismark-measure-active 2011-04-16 17:33:41 UTC (rev 326)
@@ -133,14 +133,17 @@
if get_target Bismark NETPERF $ZONE $BR_DURATION ; then
sleep $wait
( sleep 3 ; bismark-ping $dst | bismark-mstats ULRTTDW PING $src $dst >> $XML_FILE ) &
- bismark-netperf $BR_DURATION $NTHREADS $dst dw | bismark-mstats BITRATE NETPERF $dst $src | grep -v nan >> $XML_FILE
+ bismark-netperf $BR_DURATION $NTHREADS $dst dw > /tmp/bismark/data/netperf-out
+ cat /tmp/bismark/data/netperf-out | bismark-mstats BITRATE NETPERF $dst $src | grep -v nan >> $XML_FILE
fi
# Upstream bitrate using NETPERF
if get_target Bismark NETPERF $ZONE $BR_DURATION ; then
sleep $wait
( sleep 3 ; bismark-ping $dst | bismark-mstats ULRTTUP PING $src $dst >> $XML_FILE ) &
- bismark-netperf $BR_DURATION $NTHREADS $dst up | bismark-mstats BITRATE NETPERF $src $dst | grep -v nan >> $XML_FILE
+ bismark-netperf $BR_DURATION $NTHREADS $dst up > /tmp/bismark/data/netperf-out
+ cat /tmp/bismark/data/netperf-out | bismark-mstats BITRATE NETPERF $src $dst | grep -v nan >> $XML_FILE
+ rm /tmp/bismark/data/netperf-out
fi
fi
Modified: trunk/device/OpenWrt_common/scripts/bismark-netperf-thread
===================================================================
--- trunk/device/OpenWrt_common/scripts/bismark-netperf-thread 2011-04-15 18:08:44 UTC (rev 325)
+++ trunk/device/OpenWrt_common/scripts/bismark-netperf-thread 2011-04-16 17:33:41 UTC (rev 326)
@@ -39,11 +39,11 @@
}
keys=" -l$T -P0 -fk"
-if [ $dir = 'rev' ]
+if [ $dir = 'dw' ]
then
keys=$keys' -t TCP_MAERTS'
fi
-if [ $dir = 'fwd' ]
+if [ $dir = 'up' ]
then
keys=$keys' -t TCP_STREAM'
fi
Modified: trunk/device/OpenWrt_common/scripts/bismark-tr
===================================================================
--- trunk/device/OpenWrt_common/scripts/bismark-tr 2011-04-15 18:08:44 UTC (rev 325)
+++ trunk/device/OpenWrt_common/scripts/bismark-tr 2011-04-16 17:33:41 UTC (rev 326)
@@ -29,7 +29,6 @@
}'
# Select traceroute type
-echo $TR_TYPE
case $TR_TYPE in
UDP)
cmd="traceroute"
reply other threads:[~2011-04-16 17:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1QB9NN-00045W-56@svn.comics.unina.it \
--to=bismark@svn.comics.unina.it \
--cc=bismark-commits@lists.bufferbloat.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox