X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fusers.c;h=7df06c2baa41fe382ab536a25b7e2468dabf8b12;hb=63cbff115ba03717e81087d1419fc07c24d205c2;hp=31c936c84d9ab018cb23756c74358677d2711d73;hpb=a82ff6683f0011a498b4fc0947833d2e28925b76;p=collectd.git

diff --git a/src/users.c b/src/users.c
index 31c936c8..7df06c2b 100644
--- a/src/users.c
+++ b/src/users.c
@@ -1,11 +1,10 @@
 /**
  * collectd - src/users.c
- * Copyright (C) 2005  Sebastian Harl
+ * Copyright (C) 2005-2007  Sebastian Harl
  *
  * 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
@@ -20,104 +19,88 @@
  *   Sebastian Harl <sh at tokkee.org>
  **/
 
-#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
-
-static char *rrd_file = "users.rrd";
+#if HAVE_UTMPX_H
+# include <utmpx.h>
+#else /* !HAVE_UTMPX_H */
+# if HAVE_UTMP_H
+#  include <utmp.h>
+# endif /* HAVE_UTMP_H */
+#endif /* HAVE_UTMPX_H */
 
-static char *ds_def[] = {
-    "DS:users:GAUGE:25:0:65535",
-    NULL
-};
-static int ds_num = 1;
+#define MODULE_NAME "users"
 
-void users_init(void)
-{
-    /* we have nothing to do here :-) */
-    return;
-}
+#if HAVE_GETUTXENT || HAVE_GETUTENT
+# define USERS_HAVE_READ 1
+#else
+# define USERS_HAVE_READ 0
+#endif
 
-void users_read(void)
+#if USERS_HAVE_READ
+static void users_submit (gauge_t value)
 {
-#ifdef 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();
+	value_t values[1];
+	value_list_t vl = VALUE_LIST_INIT;
 
-    while (NULL != (entry = getutxent()))
-        if (USER_PROCESS == entry->ut_type)
-            ++users;
-    endutxent();
+	values[0].gauge = value;
 
-    users_submit(users);
-/* #endif HAVE_GETUTXENT */
+	vl.values = values;
+	vl.values_len = 1;
+	vl.time = time (NULL);
+	strcpy (vl.host, hostname_g);
+	strcpy (vl.plugin, "users");
 
-#elif defined(HAVE_GETUTENT)
-    unsigned int users = 0;
-    struct utmp *entry = NULL;
+	plugin_dispatch_values ("users", &vl);
+} /* void users_submit */
 
-    /* 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();
-
-    users_submit(users);
-#endif
-
-	return;
-}
-
-/* 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;
+static int users_read (void)
 {
-    rrd_update_file(host, rrd_file, val, ds_def, ds_num);
-    return;
-}
-
-void module_register(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;
+
+	/* 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();
+
+	users_submit (users);
+#endif /* HAVE_GETUTENT */
+
+	return (0);
+} /* int users_read */
+#endif /* USERS_HAVE_READ */
+
+void module_register (void)
 {
-    plugin_register(MODULE_NAME, users_init, users_read, users_write);
-    return;
-}
-
-#undef MODULE_NAME
-#endif /* COLLECT_USERS */
-
+#if USERS_HAVE_READ
+	plugin_register_read ("users", users_read);
+#endif
+} /* void module_register(void) */