From patchwork Thu Jul 28 17:19:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Haws X-Patchwork-Id: 16573 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id E4CF381B20; Thu, 28 Jul 2016 19:19:29 +0200 (CEST) Authentication-Results: open-mesh.org; dmarc=none header.from=sdl.usu.edu Received-SPF: None (no SPF record) identity=mailfrom; client-ip=129.123.197.145; helo=perses.usurf.usu.edu; envelope-from=jonathan.haws@sdl.usu.edu; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=none header.from=sdl.usu.edu Received: from Perses.usurf.usu.edu (unknown [129.123.197.145]) by open-mesh.org (Postfix) with ESMTPS id 9E86E81933 for ; Thu, 28 Jul 2016 19:19:26 +0200 (CEST) Received: from EK.usurf.usu.edu (172.31.35.73) by Perses.usurf.usu.edu (172.31.35.68) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Thu, 28 Jul 2016 11:19:24 -0600 Received: from EK.usurf.usu.edu (172.31.35.73) by Ek.usurf.usu.edu (172.31.35.73) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Thu, 28 Jul 2016 11:19:23 -0600 Received: from EK.usurf.usu.edu ([172.31.191.13]) by Ek.usurf.usu.edu ([172.31.191.13]) with mapi id 15.00.1210.000; Thu, 28 Jul 2016 11:19:23 -0600 From: Jonathan Haws To: "b.a.t.m.a.n@lists.open-mesh.org" Thread-Topic: [PATCH] alfred: Externalizing ALFRED_INTERVAL for setting synchronization interval Thread-Index: AQHR6PQuT0WvE7fdXkGIkjkT2uo/dA== Date: Thu, 28 Jul 2016 17:19:22 +0000 Message-ID: <1469726363.5505.7.camel@c00941> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.10.4-0ubuntu2 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [172.31.22.119] Content-ID: <1AD64045CF5A1F4794D7F7F4BE6E309D@sdl.usu.edu> MIME-Version: 1.0 Subject: [B.A.T.M.A.N.] [PATCH] alfred: Externalizing ALFRED_INTERVAL for setting synchronization interval X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Jonathan Haws , The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" ALFRED_INTERVAL is now externalized via the -p option (synchronization period). If specified as option, user supplied interval is used, otherwise the default interval of ALFRED_INTERVAL is used. Signed-off-by: Jonathan Haws --- alfred.h | 1 + main.c | 14 +++++++++++++- man/alfred.8 | 5 +++++ server.c | 4 ++-- 4 files changed, 21 insertions(+), 3 deletions(-) } else { -- 1.9.1 diff --git a/alfred.h b/alfred.h index a9906c8..5b7e965 100644 --- a/alfred.h +++ b/alfred.h @@ -131,6 +131,7 @@ struct globals { uint16_t changed_data_type_count; /* maximum is 256 */ struct timespec if_check; + struct timespec sync_period; struct hashtable_t *data_hash; struct hashtable_t *transaction_hash; diff --git a/main.c b/main.c index 9cab705..3aa89fd 100644 --- a/main.c +++ b/main.c @@ -59,6 +59,8 @@ static void alfred_usage(void) printf(" -m, --master start up the daemon in master mode, which\n"); printf(" accepts data from slaves and syncs it with\n"); printf(" other masters\n"); + printf(" -p, --sync-period [period] set synchronization period, in seconds\n"); + printf(" fractional seconds are supported (i.e. 0.2 = 5 Hz)\n"); printf("\n"); printf(" -u, --unix-path [path] path to unix socket used for client-server\n"); printf(" communication (default: \""ALFRED_SOCK_PATH_DEFAULT"\")\n"); @@ -156,6 +158,7 @@ out: static struct globals *alfred_init(int argc, char *argv[]) { int opt, opt_ind, i, ret; + double sync_period = 0.0; struct globals *globals; struct option long_options[] = { {"set-data", required_argument, NULL, 's'}, @@ -170,6 +173,7 @@ static struct globals *alfred_init(int argc, char *argv[]) {"update-command", required_argument, NULL, 'c'}, {"version", no_argument, NULL, 'v'}, {"verbose", no_argument, NULL, 'd'}, + {"sync-period", required_argument, NULL, 'p'}, {NULL, 0, NULL, 0}, }; @@ -193,12 +197,14 @@ static struct globals *alfred_init(int argc, char *argv[]) globals->unix_path = ALFRED_SOCK_PATH_DEFAULT; globals->verbose = 0; globals->update_command = NULL; + globals->sync_period.tv_sec = ALFRED_INTERVAL; + globals->sync_period.tv_nsec = 0; INIT_LIST_HEAD(&globals->changed_data_types); globals->changed_data_type_count = 0; time_random_seed(); - while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:dc:", long_options, + while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:dc:p:", long_options, &opt_ind)) != -1) { switch (opt) { case 'r': @@ -265,6 +271,12 @@ static struct globals *alfred_init(int argc, char *argv[]) printf("%s %s\n", argv[0], SOURCE_VERSION); printf("A.L.F.R.E.D. - Almighty Lightweight Remote Fact Exchange Daemon\n"); return NULL; + case 'p': + sync_period = strtod(optarg, NULL); + globals->sync_period.tv_sec = (int) sync_period; + globals->sync_period.tv_nsec = (double)(sync_period - (int)sync_period) * 1e9; + printf(" ** Setting sync interval to: %.9f seconds (%ld.%09ld)\n", sync_period, globals->sync_period.tv_sec, globals->sync_period.tv_nsec); + break; case 'h': default: alfred_usage(); diff --git a/man/alfred.8 b/man/alfred.8 index 49d42bc..df37040 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -118,6 +118,11 @@ overhead). \fB\-c\fP, \fB\-\-update-command\fP \fIcommand\fP Specify command to execute on data change. It will be called with data-type list as arguments. +.TP +\fB\-p\fP, \fB\-\-sync-period\fP \fIperiod\fP +Specify alfred synchronization period, in seconds. If not specified, the default +ALFRED_INTERVAL setting of 10 seconds will be used. Fractional seconds are +supported. . .SH EXAMPLES Start an alfred server listening on bridge br0 (assuming that this bridge diff --git a/server.c b/server.c index 47aee4f..c5df945 100644 --- a/server.c +++ b/server.c @@ -372,7 +372,7 @@ int alfred_server(struct globals *globals) while (1) { clock_gettime(CLOCK_MONOTONIC, &now); - now.tv_sec -= ALFRED_INTERVAL; + time_diff(&now, &globals->sync_period, &now); if (!time_diff(&last_check, &now, &tv)) { tv.tv_sec = 0; tv.tv_nsec = 0; @@ -409,7 +409,7 @@ int alfred_server(struct globals *globals) if (globals->opmode == OPMODE_MASTER) { /* we are a master */ - printf("announce master ...\n"); + printf("[%ld.%09ld] announce master ...\n", last_check.tv_sec, last_check.tv_nsec); announce_master(globals); sync_data(globals);