projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-doxygen, indentation
[oweals/gnunet.git]
/
src
/
statistics
/
test_statistics_api.c
diff --git
a/src/statistics/test_statistics_api.c
b/src/statistics/test_statistics_api.c
index 0647a4942d65fff3eb0e39d0a0c764392e14085c..aa9088f3595daba78daf5c04a97a93eaf8e737df 100644
(file)
--- a/
src/statistics/test_statistics_api.c
+++ b/
src/statistics/test_statistics_api.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ (C) 2009
, 2012
Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-20,18
+20,15
@@
/**
* @file statistics/test_statistics_api.c
* @brief testcase for statistics_api.c
/**
* @file statistics/test_statistics_api.c
* @brief testcase for statistics_api.c
+ * @author Christian Grothoff
*/
#include "platform.h"
*/
#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"
#include "gnunet_statistics_service.h"
-#define DEBUG_STATISTICS GNUNET_EXTRA_LOGGING
-#define START_SERVICE GNUNET_YES
+static struct GNUNET_STATISTICS_Handle *h;
+
static int
check_1 (void *cls, const char *subsystem, const char *name, uint64_t value,
static int
check_1 (void *cls, const char *subsystem, const char *name, uint64_t value,
@@
-46,6
+43,7
@@
check_1 (void *cls, const char *subsystem, const char *name, uint64_t value,
return GNUNET_OK;
}
return GNUNET_OK;
}
+
static int
check_2 (void *cls, const char *subsystem, const char *name, uint64_t value,
int is_persistent)
static int
check_2 (void *cls, const char *subsystem, const char *name, uint64_t value,
int is_persistent)
@@
-59,6
+57,7
@@
check_2 (void *cls, const char *subsystem, const char *name, uint64_t value,
return GNUNET_OK;
}
return GNUNET_OK;
}
+
static int
check_3 (void *cls, const char *subsystem, const char *name, uint64_t value,
int is_persistent)
static int
check_3 (void *cls, const char *subsystem, const char *name, uint64_t value,
int is_persistent)
@@
-72,7
+71,6
@@
check_3 (void *cls, const char *subsystem, const char *name, uint64_t value,
return GNUNET_OK;
}
return GNUNET_OK;
}
-static struct GNUNET_STATISTICS_Handle *h;
static void
next_fin (void *cls, int success)
static void
next_fin (void *cls, int success)
@@
-84,6
+82,7
@@
next_fin (void *cls, int success)
*ok = 0;
}
*ok = 0;
}
+
static void
next (void *cls, int success)
{
static void
next (void *cls, int success)
{
@@
-95,6
+94,7
@@
next (void *cls, int success)
&check_2, cls));
}
&check_2, cls));
}
+
static void
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
static void
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
@@
-111,6
+111,7
@@
run (void *cls, char *const *args, const char *cfgfile,
&check_1, cls));
}
&check_1, cls));
}
+
static void
run_more (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
static void
run_more (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
@@
-122,91
+123,68
@@
run_more (void *cls, char *const *args, const char *cfgfile,
&check_3, cls));
}
&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",
{
int ok = 1;
char *const argv[] = { "test-statistics-api",
"-c",
"test_statistics_api_data.conf",
-#if DEBUG_STATISTICS
- "-L", "DEBUG",
-#else
"-L", "WARNING",
"-L", "WARNING",
-#endif
NULL
};
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
NULL
};
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
-#if START_SERVICE
struct GNUNET_OS_Process *proc;
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 =
proc =
- GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-statistics",
+ GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL,
+ binary,
"gnunet-service-statistics",
"gnunet-service-statistics",
-#if DEBUG_STATISTICS
- "-L", "DEBUG",
-#endif
"-c", "test_statistics_api_data.conf", NULL);
"-c", "test_statistics_api_data.conf", NULL);
-#endif
GNUNET_assert (NULL != proc);
GNUNET_PROGRAM_run (5, argv, "test-statistics-api", "nohelp", options, &run,
&ok);
GNUNET_assert (NULL != proc);
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_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;
proc = NULL;
-#endif
if (ok != 0)
if (ok != 0)
+ {
+ GNUNET_free (binary);
return ok;
return ok;
+ }
ok = 1;
ok = 1;
-#if START_SERVICE
/* restart to check persistence! */
proc =
/* restart to check persistence! */
proc =
- GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-statistics",
+ GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL,
+ binary,
"gnunet-service-statistics",
"gnunet-service-statistics",
-#if DEBUG_STATISTICS
- "-L", "DEBUG",
-#endif
"-c", "test_statistics_api_data.conf", NULL);
"-c", "test_statistics_api_data.conf", NULL);
-#endif
GNUNET_PROGRAM_run (5, argv, "test-statistics-api", "nohelp", options,
&run_more, &ok);
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_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;
proc = NULL;
-#endif
+ GNUNET_free (binary);
return ok;
}
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 */
/* end of test_statistics_api.c */