X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fusers.c;h=b605ff84c9d7ab98cfb8abbd762b8d30207882fe;hb=bc7992ed0693313a2b1fe282a5bf23f1cc9f8e42;hp=973fda0a57df2bc149cd8fba03e32a26ac4d3121;hpb=cb7fed8bf0af2646dfcb32844933398c28e39be5;p=collectd.git

diff --git a/src/users.c b/src/users.c
index 973fda0a..b605ff84 100644
--- a/src/users.c
+++ b/src/users.c
@@ -1,11 +1,10 @@
 /**
  * collectd - src/users.c
- * Copyright (C) 2005,2006  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
@@ -24,62 +23,39 @@
 #include "common.h"
 #include "plugin.h"
 
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif /* HAVE_STATGRAB_H */
+
 #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 */
+/* #endif HAVE_UTMPX_H */
 
-#define MODULE_NAME "users"
+#elif HAVE_UTMP_H
+# include <utmp.h>
+/* #endif HAVE_UTMP_H */
 
-#if HAVE_GETUTXENT || HAVE_GETUTENT
-# define USERS_HAVE_READ 1
 #else
-# define USERS_HAVE_READ 0
+# error "No applicable input method."
 #endif
 
-static char *rrd_file = "users.rrd";
-static char *ds_def[] =
-{
-	"DS:users:GAUGE:"COLLECTD_HEARTBEAT":0:65535",
-	NULL
-};
-static int ds_num = 1;
-
-static void users_init (void)
+static void users_submit (gauge_t value)
 {
-	/* we have nothing to do here :-) */
-	return;
-} /* static void users_init(void) */
+	value_t values[1];
+	value_list_t vl = VALUE_LIST_INIT;
 
-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) */
-
-#if USERS_HAVE_READ
-/* 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)
-{
-	char buf[BUFSIZE] = "";
+	values[0].gauge = value;
 
-	if (snprintf(buf, BUFSIZE, "%u:%u", 
-		(unsigned int)curtime, users) >= BUFSIZE)
-	{
-		return;
-	}
+	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));
 
-	plugin_submit(MODULE_NAME, "-", buf);
-	return;
-} /* static void users_submit(unsigned int users) */
-#undef BUFSIZE
+	plugin_dispatch_values (&vl);
+} /* void users_submit */
 
-static void users_read (void)
+static int users_read (void)
 {
 #if HAVE_GETUTXENT
 	unsigned int users = 0;
@@ -114,17 +90,27 @@ static void users_read (void)
 	}
 	endutent();
 
-	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 */
 
-	return;
-} /* static void users_read(void) */
 #else
-# define users_read NULL
-#endif /* USERS_HAVE_READ */
+# error "No applicable input method."
+#endif
+
+	return (0);
+} /* int users_read */
 
 void module_register (void)
 {
-	plugin_register (MODULE_NAME, users_init, users_read, users_write);
-	return;
+	plugin_register_read ("users", users_read);
 } /* void module_register(void) */