Merge branch 'collectd-4.3' into collectd-4.4

[collectd.git] / src / users.c

diff --git a/src/users.c b/src/users.c
index 486c7bd..d0bd63c 100644 (file)
--- 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,68 +19,43 @@
  *   Sebastian Harl <sh at tokkee.org>
  **/
 
+#include "collectd.h"
 #include "common.h"
 #include "plugin.h"
-#include "users.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 */
-
-
-
-#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;
-
-
-
-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);
+/* #endif HAVE_UTMPX_H */
 
+#elif HAVE_UTMP_H
+# include <utmp.h>
+/* #endif HAVE_UTMP_H */
 
+#else
+# error "No applicable input method."
+#endif
 
-/* 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)
+static void users_submit (gauge_t value)
 {
-       char buf[BUFSIZE] = "";
+       value_t values[1];
+       value_list_t vl = VALUE_LIST_INIT;
 
-       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
+       values[0].gauge = value;
 
+       vl.values = values;
+       vl.values_len = 1;
+       vl.time = time (NULL);
+       sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+       sstrncpy (vl.plugin, "users", sizeof (vl.plugin));
 
+       plugin_dispatch_values ("users", &vl);
+} /* void users_submit */
 
-static void
-users_init(void)
-{
-       /* we have nothing to do here :-) */
-       return;
-} /* static void users_init(void) */
-
-static void
-users_read(void)
+static int users_read (void)
 {
 #if HAVE_GETUTXENT
        unsigned int users = 0;
@@ -98,9 +72,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 +90,27 @@ users_read(void)
        }
        endutent();
 
-       users_submit(users);
-# endif /* HAVE_GETUTENT */
-#endif /* HAVE_GETUTXENT */
+       users_submit (users);
+/* #endif HAVE_GETUTENT */
 
-       return;
-} /* static void users_read(void) */
+#elif HAVE_LIBSTATGRAB
+       sg_user_stats *us;
 
-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) */
+       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
 
+       return (0);
+} /* int users_read */
 
-void
-module_register(void)
+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) */
-