/*
This file is part of GNUnet.
- (C) 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011 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
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.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
/**
* 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;
/* Pipe to read from started processes stdout (on read end) */
static struct GNUNET_DISK_PipeHandle *pipe_stdout;
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
+static struct GNUNET_SCHEDULER_Task * die_task;
-static GNUNET_SCHEDULER_TaskIdentifier read_task;
+static struct GNUNET_SCHEDULER_Task * read_task;
static void
runone (void);
static void
-end_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_task (void *cls)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending phase %d, ok is %d\n", phase,
ok);
GNUNET_OS_process_destroy (proc);
proc = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != read_task)
+ if (NULL != read_task)
{
GNUNET_SCHEDULER_cancel (read_task);
- read_task = GNUNET_SCHEDULER_NO_TASK;
+ read_task = NULL;
}
GNUNET_DISK_pipe_close (pipe_stdout);
if (ok == 1)
/* 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;
- if (!stop)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Wrong log format?\n");
- if (!level_matches)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Wrong log level\n");
- if (!delay_is_sane)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Delay %ld is insane\n", *delay);
- if (!delay_outside_of_range)
+ if (! stop)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Wrong log format?\n");
+ if (! level_matches)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Wrong log level\n");
+ if (! delay_is_sane)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Delay %ld is insane\n",
+ *delay);
+ if (! delay_outside_of_range)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Delay %ld is not outside of range (%ld ; %ld)\n",
- *delay, delay_lessthan, delay_morethan, c);
+ *delay,
+ delay_lessthan,
+ delay_morethan);
if (!stop || !level_matches || !delay_is_sane || !delay_outside_of_range)
return NULL;
*len = *len - i;
static void
-read_call (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+read_call (void *cls)
{
const struct GNUNET_DISK_FileHandle *stdout_read_handle = cls;
char level[8];
long delays[8];
int rd;
- read_task = GNUNET_SCHEDULER_NO_TASK;
+ read_task = NULL;
rd = GNUNET_DISK_file_read (stdout_read_handle, buf_ptr,
sizeof (buf) - bytes);
if (rd > 0)
FPRINTF (stderr, "got %d bytes, reading more\n", rd);
#endif
read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
- stdout_read_handle, &read_call,
+ stdout_read_handle,
+ &read_call,
(void*) stdout_read_handle);
return;
}
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
die_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 10), &end_task,
+ (GNUNET_TIME_UNIT_SECONDS, 10),
+ &end_task,
NULL);
bytes = 0;
memset (&buf, 0, sizeof (buf));
read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
- stdout_read_handle, &read_call,
+ stdout_read_handle,
+ &read_call,
(void*) stdout_read_handle);
}
static void
-task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+task (void *cls)
{
phase = 0;
runone ();