X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fusers.c;h=30e0dbe67020817ed0d4b2630eb0341f99cdd5be;hb=b55658bb615f6d33e70791d2a7d2a0f2114598cc;hp=d0bd63cdb540ef2bc8d5e145e386f2590e604ef7;hpb=714644fb443eb2dc8fd8c683cae171caef40cf7a;p=collectd.git diff --git a/src/users.c b/src/users.c index d0bd63cd..30e0dbe6 100644 --- a/src/users.c +++ b/src/users.c @@ -1,6 +1,9 @@ /** * collectd - src/users.c * 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 @@ -17,9 +20,13 @@ * * Authors: * Sebastian Harl + * Niki W. Waibel + * Florian octo Forster + * Oleg King **/ #include "collectd.h" + #include "common.h" #include "plugin.h" @@ -34,9 +41,6 @@ #elif HAVE_UTMP_H # include /* #endif HAVE_UTMP_H */ - -#else -# error "No applicable input method." #endif static void users_submit (gauge_t value) @@ -48,11 +52,11 @@ static void users_submit (gauge_t 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)); + sstrncpy (vl.type, "users", sizeof (vl.plugin)); - plugin_dispatch_values ("users", &vl); + plugin_dispatch_values (&vl); } /* void users_submit */ static int users_read (void) @@ -74,7 +78,7 @@ static int users_read (void) users_submit (users); /* #endif HAVE_GETUTXENT */ - + #elif HAVE_GETUTENT unsigned int users = 0; struct utmp *entry = NULL; @@ -96,11 +100,21 @@ static int users_read (void) #elif HAVE_LIBSTATGRAB sg_user_stats *us; +# if HAVE_LIBSTATGRAB_0_90 + size_t num_entries; + us = sg_get_user_stats (&num_entries); +# else us = sg_get_user_stats (); +# endif if (us == NULL) - return (-1); - - users_submit ((gauge_t) us->num_entries); + return (-1); + + users_submit ((gauge_t) +# if HAVE_LIBSTATGRAB_0_90 + num_entries); +# else + us->num_entries); +# endif /* #endif HAVE_LIBSTATGRAB */ #else