projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netapp plugin: Fix a typo.
[collectd.git]
/
src
/
collectd.c
diff --git
a/src/collectd.c
b/src/collectd.c
index
9526ec9
..
576abef
100644
(file)
--- a/
src/collectd.c
+++ b/
src/collectd.c
@@
-47,7
+47,7
@@
kstat_ctl_t *kc;
static int loop = 0;
static int loop = 0;
-static void *do_flush (void *arg)
+static void *do_flush (void
__attribute__((unused))
*arg)
{
INFO ("Flushing all data.");
plugin_flush (NULL, -1, NULL);
{
INFO ("Flushing all data.");
plugin_flush (NULL, -1, NULL);
@@
-56,17
+56,17
@@
static void *do_flush (void *arg)
return NULL;
}
return NULL;
}
-static void sig_int_handler (int signal)
+static void sig_int_handler (int
__attribute__((unused))
signal)
{
loop++;
}
{
loop++;
}
-static void sig_term_handler (int signal)
+static void sig_term_handler (int
__attribute__((unused))
signal)
{
loop++;
}
{
loop++;
}
-static void sig_usr1_handler (int signal)
+static void sig_usr1_handler (int
__attribute__((unused))
signal)
{
pthread_t thread;
pthread_attr_t attr;
{
pthread_t thread;
pthread_attr_t attr;
@@
-253,6
+253,7
@@
static void exit_usage (int status)
" -C <file> Configuration file.\n"
" Default: "CONFIGFILE"\n"
" -t Test config and exit.\n"
" -C <file> Configuration file.\n"
" Default: "CONFIGFILE"\n"
" -t Test config and exit.\n"
+ " -T Test plugin read and exit.\n"
" -P <file> PID-file.\n"
" Default: "PIDFILE"\n"
#if COLLECT_DAEMON
" -P <file> PID-file.\n"
" Default: "PIDFILE"\n"
#if COLLECT_DAEMON
@@
-300,6
+301,7
@@
static int do_loop (void)
{
struct timeval tv_now;
struct timeval tv_next;
{
struct timeval tv_now;
struct timeval tv_next;
+ struct timeval tv_wait;
struct timespec ts_wait;
while (loop == 0)
struct timespec ts_wait;
while (loop == 0)
@@
-330,14
+332,17
@@
static int do_loop (void)
return (-1);
}
return (-1);
}
- if (timeval_
sub_timespec (&tv_next, &tv_now, &ts_wait) !
= 0)
+ if (timeval_
cmp (tv_next, tv_now, &tv_wait) <
= 0)
{
{
- WARNING ("Not sleeping because "
- "
`timeval_sub_timespec' returned "
-
"non-zero!"
);
+ WARNING ("Not sleeping because
the next interval is
"
+ "
%i.%06i seconds in the past!",
+
(int) tv_wait.tv_sec, (int) tv_wait.tv_usec
);
continue;
}
continue;
}
+ ts_wait.tv_sec = tv_wait.tv_sec;
+ ts_wait.tv_nsec = (long) (1000 * tv_wait.tv_usec);
+
while ((loop == 0) && (nanosleep (&ts_wait, &ts_wait) == -1))
{
if (errno != EINTR)
while ((loop == 0) && (nanosleep (&ts_wait, &ts_wait) == -1))
{
if (errno != EINTR)
@@
-398,19
+403,21
@@
int main (int argc, char **argv)
struct sigaction sig_pipe_action;
char *configfile = CONFIGFILE;
int test_config = 0;
struct sigaction sig_pipe_action;
char *configfile = CONFIGFILE;
int test_config = 0;
+ int test_readall = 0;
const char *basedir;
#if COLLECT_DAEMON
struct sigaction sig_chld_action;
pid_t pid;
int daemonize = 1;
#endif
const char *basedir;
#if COLLECT_DAEMON
struct sigaction sig_chld_action;
pid_t pid;
int daemonize = 1;
#endif
+ int exit_status = 0;
/* read options */
while (1)
{
int c;
/* read options */
while (1)
{
int c;
- c = getopt (argc, argv, "htC:"
+ c = getopt (argc, argv, "ht
T
C:"
#if COLLECT_DAEMON
"fP:"
#endif
#if COLLECT_DAEMON
"fP:"
#endif
@@
-427,6
+434,13
@@
int main (int argc, char **argv)
case 't':
test_config = 1;
break;
case 't':
test_config = 1;
break;
+ case 'T':
+ test_readall = 1;
+ global_option_set ("ReadThreads", "-1");
+#if COLLECT_DAEMON
+ daemonize = 0;
+#endif /* COLLECT_DAEMON */
+ break;
#if COLLECT_DAEMON
case 'P':
global_option_set ("PIDFile", optarg);
#if COLLECT_DAEMON
case 'P':
global_option_set ("PIDFile", optarg);
@@
-580,10
+594,20
@@
int main (int argc, char **argv)
* run the actual loops
*/
do_init ();
* run the actual loops
*/
do_init ();
- do_loop ();
+
+ if (test_readall)
+ {
+ if (plugin_read_all_once () != 0)
+ exit_status = 1;
+ }
+ else
+ {
+ INFO ("Initialization complete, entering read-loop.");
+ do_loop ();
+ }
/* close syslog */
/* close syslog */
- INFO ("Exiting normally");
+ INFO ("Exiting normally
.
");
do_shutdown ();
do_shutdown ();
@@
-592,5
+616,5
@@
int main (int argc, char **argv)
pidfile_remove ();
#endif /* COLLECT_DAEMON */
pidfile_remove ();
#endif /* COLLECT_DAEMON */
- return (
0
);
+ return (
exit_status
);
} /* int main */
} /* int main */