diff --git a/r/lightning_begin.R b/r/lightning_begin.R index 65c54ed..2e62b99 100644 --- a/r/lightning_begin.R +++ b/r/lightning_begin.R @@ -10,7 +10,7 @@ ggplot(data=link_info, aes(x=timestamp, y=link, color=speed)) + theme_classic() -xx <- read.csv("../res/tmp_light/o.csv") +xx <- read.csv("../res/tmp_light/q.csv") xx2 <- sqldf("select packet_id,1.0 * MIN(latency) / 1000.0 as lat,way from xx group by packet_id,way") ggplot(data=xx2, aes(x=packet_id, y=lat, color=way)) + geom_line() + diff --git a/scripts/Makefile b/scripts/Makefile index 5806767..19b0f7c 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -707,7 +707,43 @@ thunder_guards: lightning-base: ./run-3 \ 1,lightning_base. \ - lightning-client 3000 40 172 8 tick_tock=1. \ - lightning-server 3000 40 172 8 tick_tock=1. \ + lightning-client 3000 40 172 8 tick_tock=1!measlat=1. \ + lightning-server 3000 40 172 8 tick_tock=1!measlat=1. \ tor2 -f /etc/torrc_simple. \ tor2 -f /etc/torrc_simple + +lightning-scheduler-effect: + ./run-3 \ + 32,lightning_base. \ + lightning-client 7500 40 172 8 disable_scheduler=0!tick_tock=1!measlat=1, \ + lightning-client 7500 40 172 8 disable_scheduler=1!tick_tock=1!measlat=1, \ + lightning-client 7500 40 172 8 disable_scheduler=0!tick_tock=0!measlat=1, \ + lightning-client 7500 40 172 8 disable_scheduler=1!tick_tock=0!measlat=1, \ + lightning-client 7500 40 172 8 disable_scheduler=0!tick_tock=1!measlat=1, \ + lightning-client 7500 40 172 8 disable_scheduler=1!tick_tock=1!measlat=1, \ + lightning-client 7500 40 172 8 disable_scheduler=0!tick_tock=0!measlat=1, \ + lightning-client 7500 40 172 8 disable_scheduler=1!tick_tock=0!measlat=1. \ + lightning-server 7500 40 172 8 disable_scheduler=0!tick_tock=1!measlat=1, \ + lightning-server 7500 40 172 8 disable_scheduler=1!tick_tock=1!measlat=1, \ + lightning-server 7500 40 172 8 disable_scheduler=0!tick_tock=0!measlat=1, \ + lightning-server 7500 40 172 8 disable_scheduler=1!tick_tock=0!measlat=1, \ + lightning-server 7500 40 172 8 disable_scheduler=0!tick_tock=1!measlat=1, \ + lightning-server 7500 40 172 8 disable_scheduler=1!tick_tock=1!measlat=1, \ + lightning-server 7500 40 172 8 disable_scheduler=0!tick_tock=0!measlat=1, \ + lightning-server 7500 40 172 8 disable_scheduler=1!tick_tock=0!measlat=1. \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple. \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple, \ + tor2 -f /etc/torrc_simple. diff --git a/scripts/lightning-client b/scripts/lightning-client index 61f13c0..f4e6d09 100755 --- a/scripts/lightning-client +++ b/scripts/lightning-client @@ -11,5 +11,5 @@ donar \ > $6/log/client-donar-stdout.log 2> $6/log/client-donar-stderr.log & sleep 2 -measlat -h 127.13.3.7 -p 9000 -r > $6/log/client-measboot-stdout.log 2> $6/log/client-measboot-stderr.log +measlat -h 127.13.3.7 -p 9000 -r -s $3 > $6/log/client-measboot-stdout.log 2> $6/log/client-measboot-stderr.log measlat -h 127.13.3.7 -p 9000 -c $1 -i $2 -s $3 > $6/log/client-measlat-stdout.log 2> $6/log/client-measlat-stderr.log diff --git a/src/algo_lightning.c b/src/algo_lightning.c index fb358bb..e1ccd61 100644 --- a/src/algo_lightning.c +++ b/src/algo_lightning.c @@ -105,7 +105,7 @@ void algo_lightning_init(struct evt_core_ctx* ctx, struct algo_ctx* app_ctx, str char *parse_ptr, *token, *params; for (params = ap->algo_specific_params; ; params = NULL) { - token = strtok_r(params, ",", &parse_ptr); + token = strtok_r(params, "!", &parse_ptr); if (token == NULL) break; sscanf(token, "fast_count=%d", &lightc->fast_count); sscanf(token, "window=%ld", &window); diff --git a/src/measure.c b/src/measure.c index 5675349..02a8915 100644 --- a/src/measure.c +++ b/src/measure.c @@ -4,7 +4,7 @@ void measure_parse(int size, struct measure_conf* mc) { struct timespec curr; uint64_t micro_sec; if (size != mc->payload_size) { - perror("read error"); + perror("read error, payload has wrong size"); exit(EXIT_FAILURE); } struct measure_packet* head = (struct measure_packet*) mc->payload;