From cc8d51ef5f113b6bfbb9d376593db7c708c1ba68 Mon Sep 17 00:00:00 2001 From: Kenneth Giusti Date: Mon, 21 Apr 2014 08:25:13 -0400 Subject: [PATCH] tweak perf test to exercise flow path --- tests/python/README.md | 8 ++++---- tests/python/perf-test.py | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/python/README.md b/tests/python/README.md index 2631122..5e5b705 100644 --- a/tests/python/README.md +++ b/tests/python/README.md @@ -40,8 +40,8 @@ To run, invoke it using the *time* command. Example: ### Lenovo T530 ### - master @ 3c0f144eceed8b8b0a16d9947ef66cbfef82f95e (Proton 0.7 RC3) - real 2m15.789s - user 2m15.357s - sys 0m0.039s + master @ 7cc6f77b781916ee679d36e8fd1d1bcf77760353 (Proton 0.7 RC4) + real 2m1.102s + user 2m0.814s + sys 0m0.026s diff --git a/tests/python/perf-test.py b/tests/python/perf-test.py index 06f89fb..9882a45 100755 --- a/tests/python/perf-test.py +++ b/tests/python/perf-test.py @@ -17,7 +17,7 @@ # specific language governing permissions and limitations # under the License. # -""" Minimal message receive example code.""" +"""A benchmarking utility.""" import optparse import sys @@ -121,14 +121,15 @@ class PerfSender(dingus.SenderEventHandler): def send_complete(self, link, handle, result, info): self.acked += 1 - if self.sent < self.msg_count: - self._send_msgs() - elif self.acked == self.msg_count: + if self.acked == self.msg_count: # test done, shutdown self.link.close() self.perf_conn.senders.discard(self) if len(self.perf_conn.senders) == 0: self.link.connection.close() + elif self.acked == self.sent: + # send next batch + self._send_msgs() class PerfReceiver(dingus.ReceiverEventHandler): @@ -187,10 +188,10 @@ def main(argv=None): default=100, help="# of link pairs.") parser.add_option("--send-batch", dest="send_batch", type="int", - default=1, + default=10, help="# of msgs sender queues at once.") parser.add_option("--credit-batch", dest="credit_batch", type="int", - default=0, + default=5, help="Credit window issued by receiver.") parser.add_option("--ca", help="Certificate Authority PEM file")