projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/daemon/utils_cache.c: Refactor uc_check_timeout().
[collectd.git]
/
src
/
users.c
diff --git
a/src/users.c
b/src/users.c
index
ca05f50
..
e0c5116
100644
(file)
--- a/
src/users.c
+++ b/
src/users.c
@@
-3,7
+3,7
@@
* Copyright (C) 2005-2007 Sebastian Harl
* Copyright (C) 2005 Niki W. Waibel
* Copyright (C) 2005-2007 Florian octo Forster
* Copyright (C) 2005-2007 Sebastian Harl
* Copyright (C) 2005 Niki W. Waibel
* Copyright (C) 2005-2007 Florian octo Forster
- * Copyright (C) 2008 Oleg King
+ * Copyright (C) 2008 Oleg King
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-21,11
+21,12
@@
* Authors:
* Sebastian Harl <sh at tokkee.org>
* Niki W. Waibel <niki.waibel at newlogic.com>
* Authors:
* Sebastian Harl <sh at tokkee.org>
* Niki W. Waibel <niki.waibel at newlogic.com>
- * Florian octo Forster <octo at
verplant
.org>
+ * Florian octo Forster <octo at
collectd
.org>
* Oleg King <king2 at kaluga.ru>
**/
#include "collectd.h"
* Oleg King <king2 at kaluga.ru>
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
@@
-44,14
+45,10
@@
static void users_submit (gauge_t value)
{
static void users_submit (gauge_t value)
{
- value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
value_list_t vl = VALUE_LIST_INIT;
- values[0].gauge = value;
-
- vl.values = values;
+ vl.values = &(value_t) { .gauge = value };
vl.values_len = 1;
vl.values_len = 1;
- sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "users", sizeof (vl.plugin));
sstrncpy (vl.type, "users", sizeof (vl.plugin));
sstrncpy (vl.plugin, "users", sizeof (vl.plugin));
sstrncpy (vl.type, "users", sizeof (vl.plugin));
@@
-77,7
+74,7
@@
static int users_read (void)
users_submit (users);
/* #endif HAVE_GETUTXENT */
users_submit (users);
/* #endif HAVE_GETUTXENT */
-
+
#elif HAVE_GETUTENT
unsigned int users = 0;
struct utmp *entry = NULL;
#elif HAVE_GETUTENT
unsigned int users = 0;
struct utmp *entry = NULL;
@@
-99,11
+96,21
@@
static int users_read (void)
#elif HAVE_LIBSTATGRAB
sg_user_stats *us;
#elif HAVE_LIBSTATGRAB
sg_user_stats *us;
+# if HAVE_LIBSTATGRAB_0_90
+ size_t num_entries;
+ us = sg_get_user_stats (&num_entries);
+# else
us = sg_get_user_stats ();
us = sg_get_user_stats ();
+# endif
if (us == NULL)
if (us == NULL)
- return (-1);
-
- users_submit ((gauge_t) us->num_entries);
+ return (-1);
+
+ users_submit ((gauge_t)
+# if HAVE_LIBSTATGRAB_0_90
+ num_entries);
+# else
+ us->num_entries);
+# endif
/* #endif HAVE_LIBSTATGRAB */
#else
/* #endif HAVE_LIBSTATGRAB */
#else