projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2618 from ajssmith/amqp1_dev1_branch
[collectd.git]
/
src
/
daemon
/
collectd.c
diff --git
a/src/daemon/collectd.c
b/src/daemon/collectd.c
index
517eec7
..
a656b37
100644
(file)
--- a/
src/daemon/collectd.c
+++ b/
src/daemon/collectd.c
@@
-43,11
+43,15
@@
#include <statgrab.h>
#endif
#include <statgrab.h>
#endif
+#if HAVE_KSTAT_H
+#include <kstat.h>
+#endif
+
#ifndef COLLECTD_LOCALE
#define COLLECTD_LOCALE "C"
#endif
#ifndef COLLECTD_LOCALE
#define COLLECTD_LOCALE "C"
#endif
-static int loop
= 0
;
+static int loop;
static void *do_flush(void __attribute__((unused)) * arg) {
INFO("Flushing all data.");
static void *do_flush(void __attribute__((unused)) * arg) {
INFO("Flushing all data.");
@@
-152,7
+156,7
@@
static int init_global_variables(void) {
return 0;
} /* int init_global_variables */
return 0;
} /* int init_global_variables */
-static int change_basedir(const char *orig_dir,
_B
ool create) {
+static int change_basedir(const char *orig_dir,
b
ool create) {
char *dir;
size_t dirlen;
int status;
char *dir;
size_t dirlen;
int status;
@@
-201,6
+205,7
@@
static int change_basedir(const char *orig_dir, _Bool create) {
} /* static int change_basedir (char *dir) */
#if HAVE_LIBKSTAT
} /* static int change_basedir (char *dir) */
#if HAVE_LIBKSTAT
+extern kstat_ctl_t *kc;
static void update_kstat(void) {
if (kc == NULL) {
if ((kc = kstat_open()) == NULL)
static void update_kstat(void) {
if (kc == NULL) {
if ((kc = kstat_open()) == NULL)
@@
-367,7
+372,7
@@
static int notify_upstart(void) {
return 0;
}
return 0;
}
- NOTICE("Upstart detected, stopping now to signal read
y
ness.");
+ NOTICE("Upstart detected, stopping now to signal read
i
ness.");
raise(SIGSTOP);
unsetenv("UPSTART_JOB");
raise(SIGSTOP);
unsetenv("UPSTART_JOB");
@@
-392,7
+397,7
@@
static int notify_systemd(void) {
notifysocket);
return 0;
}
notifysocket);
return 0;
}
- NOTICE("Systemd detected, trying to signal read
y
ness.");
+ NOTICE("Systemd detected, trying to signal read
i
ness.");
unsetenv("NOTIFY_SOCKET");
unsetenv("NOTIFY_SOCKET");
@@
-437,14
+442,14
@@
static int notify_systemd(void) {
#endif /* KERNEL_LINUX */
struct cmdline_config {
#endif /* KERNEL_LINUX */
struct cmdline_config {
-
_B
ool test_config;
-
_B
ool test_readall;
-
_B
ool create_basedir;
+
b
ool test_config;
+
b
ool test_readall;
+
b
ool create_basedir;
const char *configfile;
const char *configfile;
-
_B
ool daemonize;
+
b
ool daemonize;
};
};
-void read_cmdline(int argc, char **argv, struct cmdline_config *config) {
+
static
void read_cmdline(int argc, char **argv, struct cmdline_config *config) {
/* read options */
while (1) {
int c;
/* read options */
while (1) {
int c;
@@
-459,19
+464,19
@@
void read_cmdline(int argc, char **argv, struct cmdline_config *config) {
switch (c) {
case 'B':
switch (c) {
case 'B':
- config->create_basedir =
0
;
+ config->create_basedir =
false
;
break;
case 'C':
config->configfile = optarg;
break;
case 't':
break;
case 'C':
config->configfile = optarg;
break;
case 't':
- config->test_config =
1
;
+ config->test_config =
true
;
break;
case 'T':
break;
case 'T':
- config->test_readall =
1
;
+ config->test_readall =
true
;
global_option_set("ReadThreads", "-1", 1);
#if COLLECT_DAEMON
global_option_set("ReadThreads", "-1", 1);
#if COLLECT_DAEMON
- config->daemonize =
0
;
+ config->daemonize =
false
;
#endif /* COLLECT_DAEMON */
break;
#if COLLECT_DAEMON
#endif /* COLLECT_DAEMON */
break;
#if COLLECT_DAEMON
@@
-479,19
+484,18
@@
void read_cmdline(int argc, char **argv, struct cmdline_config *config) {
global_option_set("PIDFile", optarg, 1);
break;
case 'f':
global_option_set("PIDFile", optarg, 1);
break;
case 'f':
- config->daemonize =
0
;
+ config->daemonize =
false
;
break;
#endif /* COLLECT_DAEMON */
case 'h':
exit_usage(0);
break;
#endif /* COLLECT_DAEMON */
case 'h':
exit_usage(0);
- break;
default:
exit_usage(1);
} /* switch (c) */
} /* while (1) */
}
default:
exit_usage(1);
} /* switch (c) */
} /* while (1) */
}
-int configure_collectd(struct cmdline_config *config) {
+
static
int configure_collectd(struct cmdline_config *config) {
const char *basedir;
/*
* Read options from the config file, the environment and the command
const char *basedir;
/*
* Read options from the config file, the environment and the command
@@
-537,7
+541,7
@@
int main(int argc, char **argv) {
int exit_status = 0;
struct cmdline_config config = {
int exit_status = 0;
struct cmdline_config config = {
- .daemonize =
1, .create_basedir = 1
, .configfile = CONFIGFILE,
+ .daemonize =
true, .create_basedir = true
, .configfile = CONFIGFILE,
};
read_cmdline(argc, argv, &config);
};
read_cmdline(argc, argv, &config);
@@
-550,8
+554,7
@@
int main(int argc, char **argv) {
plugin_init_ctx();
plugin_init_ctx();
- int status;
- if ((status = configure_collectd(&config)) != 0)
+ if (configure_collectd(&config) != 0)
exit(EXIT_FAILURE);
#if COLLECT_DAEMON
exit(EXIT_FAILURE);
#if COLLECT_DAEMON