From a94f6b2af9eae1fbf52b7b0436a32b17b8e485a6 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Wed, 23 Oct 2019 14:55:24 +0200 Subject: [PATCH] Various fixes --- scripts/Makefile | 5 +++++ scripts/container/orig-server | 6 +++--- src/algo_lightning.c | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/Makefile b/scripts/Makefile index 3934551..d6f1405 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -747,3 +747,8 @@ lightning-scheduler-effect: tor2 -f /etc/torrc_simple, \ tor2 -f /etc/torrc_simple, \ tor2 -f /etc/torrc_simple. + +tor2-pkt-per-sec: + ./run-3 \ + 32,tor2_pkt_per_sec. \ + orig-client 1000 1 172, \ diff --git a/scripts/container/orig-server b/scripts/container/orig-server index 28ac030..4ee4d0f 100755 --- a/scripts/container/orig-server +++ b/scripts/container/orig-server @@ -1,4 +1,4 @@ #!/bin/bash -mkdir -p $3/{log,shared} -cd $3/shared -measlat -t tor -p 7500 -l -i $1 -s $2 > ../log/server-measlat-stdout.log 2> ../log/server-measlat-stderr.log +mkdir -p $4/{log,shared} +cd $4/shared +measlat -t tor -p 7500 -l -i $1 -s $2 -c $3 > ../log/server-measlat-stdout.log 2> ../log/server-measlat-stderr.log diff --git a/src/algo_lightning.c b/src/algo_lightning.c index 0b837be..7efc06b 100644 --- a/src/algo_lightning.c +++ b/src/algo_lightning.c @@ -112,7 +112,7 @@ void algo_lightning_init(struct evt_core_ctx* ctx, struct algo_ctx* app_ctx, str struct light_ctx* lightc = app_ctx->misc; lightc->total_links = app_ctx->ap.links; lightc->selected_link = lightc->total_links - 1; - lightc->sent_past_links = lightc->total_links; + lightc->sent_past_links = lightc->total_links / 2; lightc->fast_count = lightc->total_links / 4; lightc->csv = 0; lightc->explain = 0;