[tor-commits] [onionperf/master] Remove 50 KiB and 1 MiB downloads.

[karsten at torproject.org]

commit 3252ddfaad76f6e940afd29285b5644a8ffafcee
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Fri May 22 12:20:04 2020 +0200

    Remove 50 KiB and 1 MiB downloads.
    
    With the new partial downloads timestamps we can easily extract
    time-to-first-50-KiB and time-to-first-1-MiB numbers from the 5 MiB
    downloads. An analysis of past measurements showed that these numbers
    are comparable.
    
    By removing those smaller downloads we increase the total number of
    actually useful measurements.
    
    Total bandwidth consumption from this change increases from 14 to 140
    kbps which still seems very reasonable.
    
    Implements #34023.
---
 onionperf/model.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/onionperf/model.py b/onionperf/model.py
index 03e7084..cd44118 100644
--- a/onionperf/model.py
+++ b/onionperf/model.py
@@ -73,8 +73,6 @@ class TorperfModel(GeneratableTGenModel):
         if self.socksproxy is not None:
             g.node["start"]["socksproxy"] = self.socksproxy
         g.add_node("pause", time="5 minutes")
-        g.add_node("transfer50k", type="get", protocol="tcp", size="50 KiB", timeout="270 seconds", stallout="0 seconds")
-        g.add_node("transfer1m", type="get", protocol="tcp", size="1 MiB", timeout="270 seconds", stallout="0 seconds")
         g.add_node("transfer5m", type="get", protocol="tcp", size="5 MiB", timeout="270 seconds", stallout="0 seconds")
 
         g.add_edge("start", "pause")
@@ -84,9 +82,7 @@ class TorperfModel(GeneratableTGenModel):
         g.add_edge("pause", "pause")
 
         # these are chosen with weighted probability, change edge 'weight' attributes to adjust probability
-        g.add_edge("pause", "transfer50k", weight="12.0")
-        g.add_edge("pause", "transfer1m", weight="2.0")
-        g.add_edge("pause", "transfer5m", weight="1.0")
+        g.add_edge("pause", "transfer5m")
 
         return g