[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 03/04: Merge branch 'master' of git+ssh://gnunet.o
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 03/04: Merge branch 'master' of git+ssh://gnunet.org/gnunet |
|
Date: |
Thu, 27 Sep 2018 16:50:40 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit c0d1c79b4ba77ea37f0beca241644038bbaf26df
Merge: bb3057fd0 2c3b40e7c
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Sep 27 16:50:19 2018 +0200
Merge branch 'master' of git+ssh://gnunet.org/gnunet
README.md | 2 +-
contrib/benchmark/collect.awk | 110 ++++
contrib/benchmark/collect_ops.awk | 45 --
contrib/benchmark/collect_urls.awk | 47 --
po/POTFILES.in | 1 +
src/curl/curl.c | 9 +-
src/include/gnunet_common.h | 2 +-
src/include/gnunet_protocols.h | 34 +-
src/include/gnunet_rps_service.h | 28 +-
src/include/gnunet_time_lib.h | 14 +
src/rps/Makefile.am | 14 +-
src/rps/gnunet-rps-profiler.c | 4 +-
src/rps/gnunet-rps.c | 73 ++-
src/rps/gnunet-service-rps.c | 678 ++++++++-------------
src/rps/gnunet-service-rps_sampler.c | 575 +----------------
src/rps/gnunet-service-rps_sampler.h | 30 +-
src/rps/rps-sampler_client.c | 327 ++++++++++
...-service-rps_sampler.h => rps-sampler_client.h} | 40 +-
...-service-rps_sampler.c => rps-sampler_common.c} | 614 +++++--------------
src/rps/rps-sampler_common.h | 280 +++++++++
src/rps/rps-test_util.c | 36 +-
src/rps/rps-test_util.h | 2 +-
src/rps/rps.conf.in | 1 +
src/rps/rps.h | 92 +--
src/rps/rps_api.c | 517 ++++++++++++----
src/statistics/gnunet-statistics.c | 16 +-
src/util/benchmark.c | 5 +-
src/util/common_logging.c | 8 +-
src/util/configuration.c | 18 +-
src/util/strings.c | 2 +
src/util/time.c | 57 ++
31 files changed, 1859 insertions(+), 1822 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden