diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2019-02-09 15:53:16 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2019-02-09 15:53:16 +0100 |
| commit | cd16538fc91778e31f8241f62ee47056f099c051 (patch) | |
| tree | e94474a81ff652c8d8d6d46722aac62043aa3770 /proto | |
| parent | 6e8fb66859a17b295cd9246264221a75cdbe6c55 (diff) | |
| parent | f9b97f1c6282be398d2c2bb896dbb453f638f720 (diff) | |
Merge remote-tracking branch 'origin/mq-opt'
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/perf/config.Y | 1 | ||||
| -rw-r--r-- | proto/perf/perf.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/proto/perf/config.Y b/proto/perf/config.Y index 617b2233..60a96c11 100644 --- a/proto/perf/config.Y +++ b/proto/perf/config.Y @@ -38,6 +38,7 @@ perf_proto_start: proto_start PERF perf_proto: perf_proto_start proto_name '{' | perf_proto perf_proto_item ';' + | perf_proto proto_item ';' ; perf_proto_item: diff --git a/proto/perf/perf.c b/proto/perf/perf.c index 6741f7cb..8412254a 100644 --- a/proto/perf/perf.c +++ b/proto/perf/perf.c @@ -29,7 +29,7 @@ #include <stdlib.h> #include <time.h> -#define PLOG(msg, ...) log(L_INFO "Perf %s " msg, p->p.name, ##__VA_ARGS__) +#define PLOG(msg, ...) log(L_INFO "Perf %s %s " msg, BIRD_VERSION, p->p.name, ##__VA_ARGS__) static inline void random_data(void *p, uint len) @@ -206,6 +206,7 @@ perf_loop(void *data) p->exp++; } + rt_schedule_prune(P->main_channel->table); ev_schedule(p->loop); } |