/*
This file is part of GNUnet.
- (C) 2008--2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008--2013 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 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
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.
*/
/**
static processor_cpu_load_info_t prev_cpu_load;
#endif
+#ifdef WINDOWS
+#include <winternl.h>
+#endif
#define DEBUG_STATUSCALLS GNUNET_NO
*/
struct GNUNET_BIO_WriteHandle *bw;
-GNUNET_SCHEDULER_TaskIdentifier sample_load_task_id;
+struct GNUNET_SCHEDULER_Task * sample_load_task_id;
#ifdef OSX
kc = kstat_open ();
if (kc == NULL)
{
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kstat_close");
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kstat_close");
goto ABORT_KSTAT;
}
nproc = 0;
while (NULL != (ent = readdir (dir)))
{
- if((*ent->d_name > '0') && (*ent->d_name <= '9'))
+ if((*ent->d_name > '0') && (*ent->d_name <= '9'))
nproc++;
}
closedir (dir);
static void
-sample_load_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+sample_load_task (void *cls)
{
struct GNUNET_TIME_Absolute now;
char *str;
unsigned int mem_usage;
unsigned int nproc;
- sample_load_task_id = GNUNET_SCHEDULER_NO_TASK;
- if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
- return;
+ sample_load_task_id = NULL;
ld_cpu = cpu_get_load ();
ld_disk = disk_get_load ();
if ( (-1 == ld_cpu) || (-1 == ld_disk) )
now = GNUNET_TIME_absolute_get ();
nbs = GNUNET_asprintf (&str, "%llu %d %d %u %u\n", now.abs_value_us / 1000LL / 1000LL,
ld_cpu, ld_disk, mem_usage, nproc);
- if (0 < nbs)
+ if (0 < nbs)
{
GNUNET_BIO_write (bw, str, nbs);
}
else
GNUNET_break (0);
GNUNET_free (str);
-
+
reschedule:
sample_load_task_id =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
char *stats_dir;
char *fn;
size_t len;
-
+
#if MINGW
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Load statistics logging now available for windows\n");
GNUNET_free (hostname);
return;
}
- fn = NULL;
+ fn = NULL;
(void) GNUNET_asprintf (&fn, "%s/%.*s-%jd.dat", stats_dir, len,
hostname, (intmax_t) getpid());
GNUNET_free (stats_dir);
initMachCpuStats ();
#endif
updateUsage (); /* initialize */
-
+
}
#elif OSX
GNUNET_free_non_null (prev_cpu_load);
#endif
- if (GNUNET_SCHEDULER_NO_TASK != sample_load_task_id)
+ if (NULL != sample_load_task_id)
{
GNUNET_SCHEDULER_cancel (sample_load_task_id);
- sample_load_task_id = GNUNET_SCHEDULER_NO_TASK;
+ sample_load_task_id = NULL;
}
GNUNET_break (GNUNET_OK == GNUNET_BIO_write_close (bw));
bw = NULL;