projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compare query_format and snprintf performances.
[apps/pfixtools.git]
/
common
/
common.c
diff --git
a/common/common.c
b/common/common.c
index
3d2862f
..
1b8cd98
100644
(file)
--- a/
common/common.c
+++ b/
common/common.c
@@
-41,33
+41,23
@@
#include "common.h"
#include "common.h"
-sig_atomic_t sigint = false;
-sig_atomic_t sighup = false;
-
-bool daemon_process = true;
-int log_level = LOG_INFO;
+bool daemon_process = true;
+int log_level = LOG_INFO;
+bool log_syslog = false;
+const char *log_state = "";
static FILE *pidfile = NULL;
void common_sighandler(int sig)
{
switch (sig) {
static FILE *pidfile = NULL;
void common_sighandler(int sig)
{
switch (sig) {
- case SIGTERM:
- case SIGINT:
- sigint = true;
- return;
-
- case SIGHUP:
- sighup = true;
- return;
-
default:
err("Killed (got signal %d)...", sig);
exit(-1);
}
}
default:
err("Killed (got signal %d)...", sig);
exit(-1);
}
}
-
static
int setnonblock(int sock)
+int setnonblock(int sock)
{
int res = fcntl(sock, F_GETFL);
{
int res = fcntl(sock, F_GETFL);
@@
-291,32
+281,41
@@
int common_setup(const char* pidfilename, bool unsafe, const char* runas_user,
return EXIT_SUCCESS;
}
return EXIT_SUCCESS;
}
-extern initcall_t __madinit[];
-extern exitcall_t __madexit[];
+#include "array.h"
+
+ARRAY(exitcall_t)
+
+static A(exitcall_t) __exit = ARRAY_INIT;
+
+void common_register_exit(exitcall_t exitcall)
+{
+ array_add(__exit, exitcall);
+}
static void common_shutdown(void)
{
static void common_shutdown(void)
{
- if (daemon_process) {
- info("stopping...");
+ log_state = "stopping ";
+ if (daemon_process && log_syslog) {
+ info("");
}
pidfile_close();
}
pidfile_close();
- for (int i =
-1; __madexit[i]; i--
) {
-
(*__madexit[i]
)();
+ for (int i =
array_len(__exit) - 1 ; i >= 0 ; --i
) {
+
array_elt(__exit, i
)();
}
}
+ array_wipe(__exit);
}
}
-static void __attribute__((__constructor__,__used__))
-common_initialize(void)
+void common_init(void)
{
{
+ static bool __ran = false;
+ if (__ran) {
+ return;
+ }
+ log_state = "starting ";
if (atexit(common_shutdown)) {
fputs("Cannot hook my atexit function, quitting !\n", stderr);
abort();
}
if (atexit(common_shutdown)) {
fputs("Cannot hook my atexit function, quitting !\n", stderr);
abort();
}
-
- for (int i = 0; __madinit[i]; i++) {
- if ((*__madinit[i])()) {
- exit(EXIT_FAILURE);
- }
- }
+ __ran = true;
}
}