[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r38182 - gnunet/src/nse
From: |
gnunet |
Subject: |
[GNUnet-SVN] r38182 - gnunet/src/nse |
Date: |
Sun, 23 Oct 2016 17:54:01 +0200 |
Author: grothoff
Date: 2016-10-23 17:54:01 +0200 (Sun, 23 Oct 2016)
New Revision: 38182
Modified:
gnunet/src/nse/gnunet-nse.c
Log:
simplify gnunet-nse to avoid deprecated CLIENT_service_test
Modified: gnunet/src/nse/gnunet-nse.c
===================================================================
--- gnunet/src/nse/gnunet-nse.c 2016-10-22 22:29:06 UTC (rev 38181)
+++ gnunet/src/nse/gnunet-nse.c 2016-10-23 15:54:01 UTC (rev 38182)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet
- Copyright (C) 2008--2014 GNUnet e.V.
+ Copyright (C) 2008--2014, 2016 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -28,26 +28,11 @@
#include "gnunet_nse_service.h"
/**
- * Handle to our configuration
- */
-static struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
* The handle to the NSE service
*/
static struct GNUNET_NSE_Handle *nse;
/**
- * The handle to test if NSE service is running or not
- */
-static struct GNUNET_CLIENT_TestHandle *test;
-
-/**
- * Shutdown task
- */
-static struct GNUNET_SCHEDULER_Task * shutdown_task;
-
-/**
* The program status; 0 for success.
*/
static int status;
@@ -61,13 +46,11 @@
static void
do_shutdown (void *cls)
{
- shutdown_task = NULL;
- if (NULL != test)
- GNUNET_CLIENT_service_test_cancel (test);
if (NULL != nse)
+ {
GNUNET_NSE_disconnect (nse);
- if (NULL != cfg)
- GNUNET_CONFIGURATION_destroy (cfg);
+ nse = NULL;
+ }
}
@@ -83,8 +66,10 @@
static void
handle_estimate (void *cls,
struct GNUNET_TIME_Absolute timestamp,
- double estimate, double std_dev)
+ double estimate,
+ double std_dev)
{
+ status = 0;
FPRINTF (stdout, "%llu %f %f %f\n",
(unsigned long long) timestamp.abs_value_us,
GNUNET_NSE_log_estimate_to_n (estimate),
@@ -94,38 +79,6 @@
/**
- * Function called with the result on the service test for the NSE service
- *
- * @param cls NULL
- * @param result #GNUNET_YES if the service is running,
- * #GNUNET_NO if the service is not running
- * #GNUNET_SYSERR if the configuration is invalid
- */
-static void
-nse_test_result (void *cls, int result)
-{
- test = NULL;
- switch (result)
- {
- case GNUNET_YES:
- nse = GNUNET_NSE_connect (cfg, &handle_estimate, NULL);
- status = 0;
- break;
- case GNUNET_NO:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("NSE service is not running\n"));
- GNUNET_SCHEDULER_shutdown ();
- return;
- default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Error while checking if NSE service is running or not\n"));
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
-}
-
-
-/**
* Actual main function that runs the emulation.
*
* @param cls unused
@@ -134,17 +87,16 @@
* @param cfg configuration handle
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *_cfg)
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- cfg = GNUNET_CONFIGURATION_dup (_cfg);
- test = GNUNET_CLIENT_service_test ("nse",
- cfg,
- GNUNET_TIME_UNIT_SECONDS,
- nse_test_result,
- NULL);
- shutdown_task = GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
- NULL);
+ nse = GNUNET_NSE_connect (cfg,
+ &handle_estimate,
+ NULL);
+ GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+ NULL);
}
@@ -154,7 +106,8 @@
* @return 0 on success
*/
int
-main (int argc, char *const *argv)
+main (int argc,
+ char *const *argv)
{
static struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
@@ -162,10 +115,13 @@
status = 1;
if (GNUNET_OK !=
- GNUNET_PROGRAM_run (argc, argv, "gnunet-nse",
+ GNUNET_PROGRAM_run (argc,
+ argv,
+ "gnunet-nse",
gettext_noop
("Show network size estimates from NSE service."),
- options, &run, NULL))
+ options,
+ &run, NULL))
return 2;
return status;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r38182 - gnunet/src/nse,
gnunet <=