projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.0
[collectd.git]
/
src
/
users.c
diff --git
a/src/users.c
b/src/users.c
index
afe26e1
..
1e33754
100644
(file)
--- a/
src/users.c
+++ b/
src/users.c
@@
-1,6
+1,9
@@
/**
* collectd - src/users.c
* Copyright (C) 2005-2007 Sebastian Harl
/**
* collectd - src/users.c
* Copyright (C) 2005-2007 Sebastian Harl
+ * Copyright (C) 2005 Niki W. Waibel
+ * Copyright (C) 2005-2007 Florian octo Forster
+ * 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
@@
-17,12
+20,19
@@
*
* Authors:
* Sebastian Harl <sh at tokkee.org>
*
* Authors:
* Sebastian Harl <sh at tokkee.org>
+ * Niki W. Waibel <niki.waibel at newlogic.com>
+ * Florian octo Forster <octo at verplant.org>
+ * Oleg King <king2 at kaluga.ru>
**/
#include "collectd.h"
#include "common.h"
#include "plugin.h"
**/
#include "collectd.h"
#include "common.h"
#include "plugin.h"
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif /* HAVE_STATGRAB_H */
+
#if HAVE_UTMPX_H
# include <utmpx.h>
/* #endif HAVE_UTMPX_H */
#if HAVE_UTMPX_H
# include <utmpx.h>
/* #endif HAVE_UTMPX_H */
@@
-44,11
+54,11
@@
static void users_submit (gauge_t value)
vl.values = values;
vl.values_len = 1;
vl.values = values;
vl.values_len = 1;
-
vl.time = time (NULL
);
- s
trcpy (vl.host, hostname_g
);
- s
trcpy (vl.plugin, "users"
);
+
sstrncpy (vl.host, hostname_g, sizeof (vl.host)
);
+ s
strncpy (vl.plugin, "users", sizeof (vl.plugin)
);
+ s
strncpy (vl.type, "users", sizeof (vl.plugin)
);
- plugin_dispatch_values (
"users",
&vl);
+ plugin_dispatch_values (&vl);
} /* void users_submit */
static int users_read (void)
} /* void users_submit */
static int users_read (void)
@@
-89,6
+99,16
@@
static int users_read (void)
users_submit (users);
/* #endif HAVE_GETUTENT */
users_submit (users);
/* #endif HAVE_GETUTENT */
+#elif HAVE_LIBSTATGRAB
+ sg_user_stats *us;
+
+ us = sg_get_user_stats ();
+ if (us == NULL)
+ return (-1);
+
+ users_submit ((gauge_t) us->num_entries);
+/* #endif HAVE_LIBSTATGRAB */
+
#else
# error "No applicable input method."
#endif
#else
# error "No applicable input method."
#endif