X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fusers.c;h=afe26e1e27fc27a3d155b135b56d3571290bcd46;hb=633c3966f770e4d46651a2fe219a18d8a9907a9f;hp=31c936c84d9ab018cb23756c74358677d2711d73;hpb=f9ee71b22e47eec32ceedd8d85afc99949a084a6;p=collectd.git

diff --git a/src/users.c b/src/users.c
index 31c936c8..781e7787 100644
--- a/src/users.c
+++ b/src/users.c
@@ -1,11 +1,13 @@
 /**
  * collectd - src/users.c
- * Copyright (C) 2005  Sebastian Harl
+ * 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
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * Free Software Foundation; only version 2 of the license is applicable.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,106 +20,103 @@
  *
  * Authors:
  *   Sebastian Harl <sh at tokkee.org>
+ *   Niki W. Waibel <niki.waibel at newlogic.com>
+ *   Florian octo Forster <octo at collectd.org>
+ *   Oleg King <king2 at kaluga.ru>
  **/
 
-#include "users.h"
-
-#if COLLECT_USERS
-#define MODULE_NAME "users"
-
-#include "plugin.h"
+#include "collectd.h"
 #include "common.h"
+#include "plugin.h"
 
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#elif defined(HAVE_UTMP_H)
-#include <utmp.h>
-#endif
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif /* HAVE_STATGRAB_H */
 
-static char *rrd_file = "users.rrd";
+#if HAVE_UTMPX_H
+# include <utmpx.h>
+/* #endif HAVE_UTMPX_H */
 
-static char *ds_def[] = {
-    "DS:users:GAUGE:25:0:65535",
-    NULL
-};
-static int ds_num = 1;
+#elif HAVE_UTMP_H
+# include <utmp.h>
+/* #endif HAVE_UTMP_H */
 
-void users_init(void)
-{
-    /* we have nothing to do here :-) */
-    return;
-}
+#else
+# error "No applicable input method."
+#endif
 
-void users_read(void)
+static void users_submit (gauge_t value)
 {
-#ifdef HAVE_GETUTXENT
-    unsigned int users = 0;
-    struct utmpx *entry = NULL;
+	value_t values[1];
+	value_list_t vl = VALUE_LIST_INIT;
+
+	values[0].gauge = value;
 
-    /* according to the *utent(3) man page none of the functions sets errno in
-     * case of an error, so we cannot do any error-checking here */
-    setutxent();
+	vl.values = values;
+	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));
 
-    while (NULL != (entry = getutxent()))
-        if (USER_PROCESS == entry->ut_type)
-            ++users;
-    endutxent();
+	plugin_dispatch_values (&vl);
+} /* void users_submit */
 
-    users_submit(users);
+static int users_read (void)
+{
+#if HAVE_GETUTXENT
+	unsigned int users = 0;
+	struct utmpx *entry = NULL;
+
+	/* according to the *utent(3) man page none of the functions sets errno
+	   in case of an error, so we cannot do any error-checking here */
+	setutxent();
+
+	while (NULL != (entry = getutxent())) {
+		if (USER_PROCESS == entry->ut_type) {
+			++users;
+		}
+	}
+	endutxent();
+
+	users_submit (users);
 /* #endif HAVE_GETUTXENT */
+	
+#elif HAVE_GETUTENT
+	unsigned int users = 0;
+	struct utmp *entry = NULL;
 
-#elif defined(HAVE_GETUTENT)
-    unsigned int users = 0;
-    struct utmp *entry = NULL;
+	/* according to the *utent(3) man page none of the functions sets errno
+	   in case of an error, so we cannot do any error-checking here */
+	setutent();
 
-    /* according to the *utent(3) man page none of the functions sets errno in
-     * case of an error, so we cannot do any error-checking here */
-    setutent();
+	while (NULL != (entry = getutent())) {
+		if (USER_PROCESS == entry->ut_type) {
+			++users;
+		}
+	}
+	endutent();
 
-    while (NULL != (entry = getutent()))
-        if (USER_PROCESS == entry->ut_type)
-            ++users;
-    endutent();
+	users_submit (users);
+/* #endif HAVE_GETUTENT */
 
-    users_submit(users);
-#endif
+#elif HAVE_LIBSTATGRAB
+	sg_user_stats *us;
 
-	return;
-}
+	us = sg_get_user_stats ();
+	if (us == NULL)
+		return (-1);   
 
-/* I don't like this temporary macro definition - well it's used everywhere
- * else in the collectd-sources, so I will just stick with it...  */
-#define BUFSIZE 256
-void users_submit(users)
-    unsigned int users;
-{
-    char buf[BUFSIZE] = "";
-
-    if (snprintf(buf, BUFSIZE, "%u:%u", 
-                (unsigned int)curtime, 
-                users) >= BUFSIZE)
-        return;
-
-    plugin_submit(MODULE_NAME, NULL, buf);
-    return;
-}
-#undef BUFSIZE
-
-void users_write(host, inst, val)
-    char *host;
-    char *inst;
-    char *val;
-{
-    rrd_update_file(host, rrd_file, val, ds_def, ds_num);
-    return;
-}
+	users_submit ((gauge_t) us->num_entries);
+/* #endif HAVE_LIBSTATGRAB */
 
-void module_register(void)
-{
-    plugin_register(MODULE_NAME, users_init, users_read, users_write);
-    return;
-}
+#else
+# error "No applicable input method."
+#endif
 
-#undef MODULE_NAME
-#endif /* COLLECT_USERS */
+	return (0);
+} /* int users_read */
 
+void module_register (void)
+{
+	plugin_register_read ("users", users_read);
+} /* void module_register(void) */