[metrics-bugs] #33974 [Metrics/Onionperf]: Update OnionPerf to TGen 1.0.0

[Tor Bug Tracker & Wiki]

#33974: Update OnionPerf to TGen 1.0.0
-------------------------------+------------------------------
 Reporter:  karsten            |          Owner:  karsten
     Type:  defect             |         Status:  needs_review
 Priority:  Medium             |      Milestone:
Component:  Metrics/Onionperf  |        Version:
 Severity:  Normal             |     Resolution:
 Keywords:                     |  Actual Points:
Parent ID:                     |         Points:
 Reviewer:                     |        Sponsor:
-------------------------------+------------------------------

Comment (by karsten):

 Whoops! That's good to know. Thanks! New patch:

 {{{
 diff --git a/onionperf/model.py b/onionperf/model.py
 index 3c057c5..5a5fb25 100644
 --- a/onionperf/model.py
 +++ b/onionperf/model.py
 @@ -77,9 +77,9 @@ 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="295 seconds", stallout="300 seconds")
 -        g.add_node("transfer1m", type="get", protocol="tcp", size="1
 MiB", timeout="1795 seconds", stallout="1800 seconds")
 -        g.add_node("transfer5m", type="get", protocol="tcp", size="5
 MiB", timeout="3595 seconds", stallout="3600 seconds")
 +        g.add_node("stream50k", sendsize="1 KiB", recvsize="50 KiB",
 timeout="295 seconds", stallout="300 seconds")
 +        g.add_node("stream1m", sendsize="1 KiB", recvsize="1 MiB",
 timeout="1795 seconds", stallout="1800 seconds")
 +        g.add_node("stream5m", sendsize="1 KiB", recvsize="5 MiB",
 timeout="3595 seconds", stallout="3600 seconds")

          g.add_edge("start", "pause")

 @@ -88,9 +88,9 @@ 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", "stream50k", weight="12.0")
 +        g.add_edge("pause", "stream1m", weight="2.0")
 +        g.add_edge("pause", "stream5m", weight="1.0")

          return g

 @@ -109,10 +109,10 @@ class OneshotModel(GeneratableTGenModel):
          g.add_node("start", serverport=self.tgen_port, peers=server_str,
 loglevel="info", heartbeat="1 minute")
          if self.socksproxy is not None:
              g.node["start"]["socksproxy"] = self.socksproxy
 -        g.add_node("transfer5m", type="get", protocol="tcp", size="5
 MiB", timeout="15 seconds", stallout="10 seconds")
 +        g.add_node("stream5m", sendsize="1 KiB", recvsize="5 MiB",
 timeout="15 seconds", stallout="10 seconds")

 -        g.add_edge("start", "transfer5m")
 -        g.add_edge("transfer5m", "start")
 +        g.add_edge("start", "stream5m")
 +        g.add_edge("stream5m", "start")

          return g

 }}}

 Thanks, acute, for confirming that we both found the same set of changes.
 Will post here how the analysis goes tomorrow.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/33974#comment:5>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online