* @author LRN
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_network_lib.h"
-#include "gnunet_disk_lib.h"
-#include "gnunet_os_lib.h"
+#include "gnunet_util_lib.h"
#define VERBOSE GNUNET_NO
/**
* How much time the child is allowed to waste on skipped log calls, at most.
- * Raspberry Pi takes 33 microseconds tops, this is 3x that value.
+ * Raspberry Pi takes 113 microseconds tops, this is 3x that value.
*/
-#define MAX_SKIP_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 100).rel_value_us
+#define MAX_SKIP_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 400).rel_value_us
/**
* How much time non-skipped log call should take, at least.
* Keep in sync with the value in the dummy!
*/
-#define OUTPUT_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 200).rel_value_us
+#define OUTPUT_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 1000).rel_value_us
static int ok;
ok);
if (NULL != proc)
{
- 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");
}
static char *
read_output_line (int phase_from1, int phase_to1, int phase_from2,
int phase_to2, char c, const char *expect_level,
- long delay_morethan, long delay_lessthan, int phase,
+ long delay_morethan, long delay_lessthan, int phase,
char *p,
int *len, long *delay, char level[8])
{
/* Delay must be either less than 'lessthan' (log call is skipped)
* or more than 'morethan' (log call is not skipped)
*/
- delay_outside_of_range = ((*delay < delay_lessthan) || (*delay > delay_morethan));
+ delay_outside_of_range = ((*delay < delay_lessthan) || (*delay >= delay_morethan));
if (delay_is_a_dummy)
delay_outside_of_range = 1;
break;
}
- proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, pipe_stdout,
+ proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ NULL, pipe_stdout, NULL,
#if MINGW
"test_common_logging_dummy",
#else