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

diff --git a/src/users.c b/src/users.c
index 486c7bdf..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,9 +19,9 @@
  *   Sebastian Harl <sh at tokkee.org>
  **/
 
+#include "collectd.h"
 #include "common.h"
 #include "plugin.h"
-#include "users.h"
 
 #if HAVE_UTMPX_H
 # include <utmpx.h>
@@ -32,56 +31,32 @@
 # endif /* HAVE_UTMP_H */
 #endif /* HAVE_UTMPX_H */
 
-
-
 #define MODULE_NAME "users"
 
-static char *rrd_file = "users.rrd";
-static char *ds_def[] = {
-	"DS:users:GAUGE:25:0:65535",
-	NULL
-};
-static int ds_num = 1;
-
-
+#if HAVE_GETUTXENT || HAVE_GETUTENT
+# define USERS_HAVE_READ 1
+#else
+# define USERS_HAVE_READ 0
+#endif
 
-static void users_submit(unsigned int users);
-static void users_init(void);
-static void users_read(void);
-static void users_write(char *host, char *inst, char *val);
-
-
-
-/* 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
-static void
-users_submit(unsigned int users)
+#if USERS_HAVE_READ
+static void users_submit (gauge_t value)
 {
-	char buf[BUFSIZE] = "";
-
-	if (snprintf(buf, BUFSIZE, "%u:%u", 
-		(unsigned int)curtime, users) >= BUFSIZE)
-	{
-		return;
-	}
-
-	plugin_submit(MODULE_NAME, NULL, buf);
-	return;
-} /* static void users_submit(unsigned int users) */
-#undef BUFSIZE
+	value_t values[1];
+	value_list_t vl = VALUE_LIST_INIT;
 
+	values[0].gauge = value;
 
+	vl.values = values;
+	vl.values_len = 1;
+	vl.time = time (NULL);
+	strcpy (vl.host, hostname_g);
+	strcpy (vl.plugin, "users");
 
-static void
-users_init(void)
-{
-	/* we have nothing to do here :-) */
-	return;
-} /* static void users_init(void) */
+	plugin_dispatch_values ("users", &vl);
+} /* void users_submit */
 
-static void
-users_read(void)
+static int users_read (void)
 {
 #if HAVE_GETUTXENT
 	unsigned int users = 0;
@@ -98,9 +73,10 @@ users_read(void)
 	}
 	endutxent();
 
-	users_submit(users);
-#else /* !HAVE_GETUTXENT */
-# if HAVE_GETUTENT
+	users_submit (users);
+/* #endif HAVE_GETUTXENT */
+	
+#elif HAVE_GETUTENT
 	unsigned int users = 0;
 	struct utmp *entry = NULL;
 
@@ -115,26 +91,16 @@ users_read(void)
 	}
 	endutent();
 
-	users_submit(users);
-# endif /* HAVE_GETUTENT */
-#endif /* HAVE_GETUTXENT */
-
-	return;
-} /* static void users_read(void) */
-
-static void
-users_write(char *host, char *inst, char *val)
-{
-	rrd_update_file(host, rrd_file, val, ds_def, ds_num);
-	return;
-} /* static void users_write(char *host, char *inst, char *val) */
+	users_submit (users);
+#endif /* HAVE_GETUTENT */
 
+	return (0);
+} /* int users_read */
+#endif /* USERS_HAVE_READ */
 
-
-void
-module_register(void)
+void module_register (void)
 {
-	plugin_register(MODULE_NAME, users_init, users_read, users_write);
-	return;
+#if USERS_HAVE_READ
+	plugin_register_read ("users", users_read);
+#endif
 } /* void module_register(void) */
-