/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2012, 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file statistics/test_statistics_api.c
* @brief testcase for statistics_api.c
+ * @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
+#include "gnunet_util_lib.h"
#include "gnunet_statistics_service.h"
-#define DEBUG_STATISTICS GNUNET_EXTRA_LOGGING
-#define START_SERVICE GNUNET_YES
+static struct GNUNET_STATISTICS_Handle *h;
+
+static struct GNUNET_STATISTICS_GetHandle *g;
+
+
+static void
+do_shutdown ()
+{
+ if (NULL != g)
+ {
+ GNUNET_STATISTICS_get_cancel (g);
+ g = NULL;
+ }
+ GNUNET_STATISTICS_destroy (h, GNUNET_NO);
+ h = NULL;
+}
+
static int
-check_1 (void *cls, const char *subsystem, const char *name, uint64_t value,
+check_1 (void *cls,
+ const char *subsystem,
+ const char *name,
+ uint64_t value,
int is_persistent)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received value %llu for `%s:%s\n",
- (unsigned long long) value, subsystem, name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received value %llu for `%s:%s\n",
+ (unsigned long long) value,
+ subsystem,
+ name);
GNUNET_assert (0 == strcmp (name, "test-1"));
GNUNET_assert (0 == strcmp (subsystem, "test-statistics-api"));
GNUNET_assert (value == 1);
return GNUNET_OK;
}
+
static int
-check_2 (void *cls, const char *subsystem, const char *name, uint64_t value,
+check_2 (void *cls,
+ const char *subsystem,
+ const char *name,
+ uint64_t value,
int is_persistent)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received value %llu for `%s:%s\n",
- (unsigned long long) value, subsystem, name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received value %llu for `%s:%s\n",
+ (unsigned long long) value,
+ subsystem,
+ name);
GNUNET_assert (0 == strcmp (name, "test-2"));
GNUNET_assert (0 == strcmp (subsystem, "test-statistics-api"));
GNUNET_assert (value == 2);
return GNUNET_OK;
}
+
static int
-check_3 (void *cls, const char *subsystem, const char *name, uint64_t value,
+check_3 (void *cls,
+ const char *subsystem,
+ const char *name,
+ uint64_t value,
int is_persistent)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received value %llu for `%s:%s\n",
- (unsigned long long) value, subsystem, name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received value %llu for `%s:%s\n",
+ (unsigned long long) value,
+ subsystem,
+ name);
GNUNET_assert (0 == strcmp (name, "test-3"));
GNUNET_assert (0 == strcmp (subsystem, "test-statistics-api"));
GNUNET_assert (value == 3);
return GNUNET_OK;
}
-static struct GNUNET_STATISTICS_Handle *h;
static void
-next_fin (void *cls, int success)
+next_fin (void *cls,
+ int success)
{
int *ok = cls;
- GNUNET_STATISTICS_destroy (h, GNUNET_NO);
+ g = NULL;
+ GNUNET_SCHEDULER_shutdown ();
GNUNET_assert (success == GNUNET_OK);
*ok = 0;
}
+
static void
next (void *cls, int success)
{
+ g = NULL;
GNUNET_assert (success == GNUNET_OK);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Issuing GET request\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Issuing GET request\n");
GNUNET_break (NULL !=
GNUNET_STATISTICS_get (h, NULL, "test-2",
- GNUNET_TIME_UNIT_SECONDS, &next_fin,
+ &next_fin,
&check_2, cls));
}
+
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
h = GNUNET_STATISTICS_create ("test-statistics-api", cfg);
+ if (NULL == h)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+ NULL);
GNUNET_STATISTICS_set (h, "test-1", 1, GNUNET_NO);
GNUNET_STATISTICS_set (h, "test-2", 2, GNUNET_NO);
GNUNET_STATISTICS_set (h, "test-3", 2, GNUNET_NO);
GNUNET_STATISTICS_update (h, "test-3", 1, GNUNET_YES);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Issuing GET request\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Issuing GET request\n");
GNUNET_break (NULL !=
- GNUNET_STATISTICS_get (h, NULL, "test-1",
- GNUNET_TIME_UNIT_SECONDS, &next,
- &check_1, cls));
+ (g = GNUNET_STATISTICS_get (h, NULL, "test-1",
+ &next,
+ &check_1, cls)));
}
+
static void
-run_more (void *cls, char *const *args, const char *cfgfile,
+run_more (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- h = GNUNET_STATISTICS_create ("test-statistics-api", cfg);
+ h = GNUNET_STATISTICS_create ("test-statistics-api",
+ cfg);
+ GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+ NULL);
GNUNET_break (NULL !=
- GNUNET_STATISTICS_get (h, NULL, "test-3",
- GNUNET_TIME_UNIT_SECONDS, &next_fin,
- &check_3, cls));
+ (g = GNUNET_STATISTICS_get (h, NULL,
+ "test-3",
+ &next_fin,
+ &check_3, cls)));
}
-static int
-check ()
+
+int
+main (int argc, char *argv_ign[])
{
int ok = 1;
-
char *const argv[] = { "test-statistics-api",
"-c",
"test_statistics_api_data.conf",
-#if DEBUG_STATISTICS
- "-L", "DEBUG",
-#else
"-L", "WARNING",
-#endif
NULL
};
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
-#if START_SERVICE
struct GNUNET_OS_Process *proc;
+ char *binary;
+ GNUNET_log_setup ("test_statistics_api",
+ "WARNING",
+ NULL);
+ binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-statistics");
proc =
- GNUNET_OS_start_process (NULL, NULL, "gnunet-service-statistics",
+ GNUNET_OS_start_process (GNUNET_YES,
+ GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ NULL, NULL, NULL,
+ binary,
"gnunet-service-statistics",
-#if DEBUG_STATISTICS
- "-L", "DEBUG",
-#endif
"-c", "test_statistics_api_data.conf", NULL);
-#endif
GNUNET_assert (NULL != proc);
- GNUNET_PROGRAM_run (5, argv, "test-statistics-api", "nohelp", options, &run,
+ GNUNET_PROGRAM_run (5, argv,
+ "test-statistics-api", "nohelp",
+ options, &run,
&ok);
-#if START_SERVICE
- if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
+ if (0 != GNUNET_OS_process_kill (proc,
+ GNUNET_TERM_SIG))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
ok = 1;
}
GNUNET_OS_process_wait (proc);
- GNUNET_OS_process_close (proc);
+ GNUNET_OS_process_destroy (proc);
proc = NULL;
-#endif
if (ok != 0)
+ {
+ GNUNET_free (binary);
return ok;
+ }
ok = 1;
-#if START_SERVICE
/* restart to check persistence! */
proc =
- GNUNET_OS_start_process (NULL, NULL, "gnunet-service-statistics",
+ GNUNET_OS_start_process (GNUNET_YES,
+ GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ NULL, NULL, NULL,
+ binary,
"gnunet-service-statistics",
-#if DEBUG_STATISTICS
- "-L", "DEBUG",
-#endif
- "-c", "test_statistics_api_data.conf", NULL);
-#endif
- GNUNET_PROGRAM_run (5, argv, "test-statistics-api", "nohelp", options,
+ "-c", "test_statistics_api_data.conf",
+ NULL);
+ GNUNET_PROGRAM_run (5, argv,
+ "test-statistics-api", "nohelp",
+ options,
&run_more, &ok);
-#if START_SERVICE
- if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
+ if (0 != GNUNET_OS_process_kill (proc,
+ GNUNET_TERM_SIG))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
ok = 1;
}
GNUNET_OS_process_wait (proc);
- GNUNET_OS_process_close (proc);
+ GNUNET_OS_process_destroy (proc);
proc = NULL;
-#endif
+ GNUNET_free (binary);
return ok;
}
-int
-main (int argc, char *argv[])
-{
- int ret;
-
- GNUNET_log_setup ("test_statistics_api",
-#if DEBUG_STATISTICS
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- ret = check ();
-
- return ret;
-}
-
/* end of test_statistics_api.c */
projects / oweals / gnunet.git / blobdiff