[Bismark-commits] rev 319 - trunk/device/OpenWrt_common/etc trunk/device/OpenWrt_common/lib trunk/device/OpenWrt_common/scripts

[Bismark-commits] rev 319 - trunk/device/OpenWrt_common/etc trunk/device/OpenWrt_common/lib trunk/device/OpenWrt_common/scripts

[walter]

Author: walter
Date: 2011-04-14 18:27:55 +0200 (Thu, 14 Apr 2011)
New Revision: 319

Added:
   trunk/device/OpenWrt_common/lib/world_ips.list
Removed:
   trunk/device/OpenWrt_common/lib/gd.list
Modified:
   trunk/device/OpenWrt_common/etc/bismark.conf
   trunk/device/OpenWrt_common/scripts/bismark-measure-active
Log:
few misc changes

Modified: trunk/device/OpenWrt_common/etc/bismark.conf
===================================================================
--- trunk/device/OpenWrt_common/etc/bismark.conf	2011-04-14 15:09:45 UTC (rev 318)
+++ trunk/device/OpenWrt_common/etc/bismark.conf	2011-04-14 16:27:55 UTC (rev 319)
@@ -31,7 +31,7 @@
 
 # Measurement frequencies (n*5 minutes)
 TR_FQ=6
-BR_FQ=6
+BR_FQ=12
 UDP_FQ=3
 SP_FQ=144
 DNS_FQ=2
@@ -46,8 +46,8 @@
 TR_TYPE=UDP
 RTR_TYPE=UDP
 
-# HTTP transfer options
-HTTP_DURATION=15
+# Throughput options
+BR_DURATION=15
 
 # UDP options
 UDP_DURATION=10

Deleted: trunk/device/OpenWrt_common/lib/gd.list
===================================================================
--- trunk/device/OpenWrt_common/lib/gd.list	2011-04-14 15:09:45 UTC (rev 318)
+++ trunk/device/OpenWrt_common/lib/gd.list	2011-04-14 16:27:55 UTC (rev 319)
@@ -1,4 +0,0 @@
-# California
-128.48.110.150
-# Italy
-143.225.229.254

Copied: trunk/device/OpenWrt_common/lib/world_ips.list (from rev 318, trunk/device/OpenWrt_common/lib/gd.list)
===================================================================
--- trunk/device/OpenWrt_common/lib/world_ips.list	                        (rev 0)
+++ trunk/device/OpenWrt_common/lib/world_ips.list	2011-04-14 16:27:55 UTC (rev 319)
@@ -0,0 +1,4 @@
+# California
+128.48.110.150
+# Italy
+143.225.229.254

Modified: trunk/device/OpenWrt_common/scripts/bismark-measure-active
===================================================================
--- trunk/device/OpenWrt_common/scripts/bismark-measure-active	2011-04-14 15:09:45 UTC (rev 318)
+++ trunk/device/OpenWrt_common/scripts/bismark-measure-active	2011-04-14 16:27:55 UTC (rev 319)
@@ -50,7 +50,7 @@
 # XML file header
 cat > $xml_file <<-end
 	<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-	<measurements version="1.1">
+	<measurements version="1.2">
 	        <info deviceid=$DEVICE_ID />
 end
 
@@ -100,7 +100,7 @@
 
 	# Geo-distributed servers RTT
 	mkdir -p /tmp/gdrtt
-	for srv in $(grep -v ^# ~/conf/gd.list); do
+	for srv in $(grep -v ^# /usr/lib/bismark/world_ips.list); do
 		( bismark-ping $srv | bismark-mstats RTT PING $src $srv > /tmp/gdrtt/$srv ; cat /tmp/gdrtt/$srv >> $xml_file ) &
 	done