From 63a4634d5720594f941b2ac3b7e839111a57a1f9 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 12 May 2018 18:14:24 +0200 Subject: [PATCH] refactor: log_{start,stop} -> log_{open,close} --- include/villas/log.h | 4 ++-- lib/log.c | 12 ++++++------ lib/super_node.c | 4 ++-- src/convert.c | 2 +- src/hook.c | 2 +- src/pipe.c | 2 +- src/signal.c | 4 ++-- src/test-shmem.c | 2 +- tests/unit/main.c | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/villas/log.h b/include/villas/log.h index 928150eca..22ca4b363 100644 --- a/include/villas/log.h +++ b/include/villas/log.h @@ -113,9 +113,9 @@ struct log default_log; /** Initialize log object */ int log_init(struct log *l, int level, long faciltities); -int log_start(struct log *l); +int log_open(struct log *l); -int log_stop(struct log *l); +int log_close(struct log *l); /** Destroy log object */ int log_destroy(struct log *l); diff --git a/lib/log.c b/lib/log.c index bebf5aa7b..8b6646ef4 100644 --- a/lib/log.c +++ b/lib/log.c @@ -54,7 +54,7 @@ void register_default_log() if (ret) error("Failed to initalize log"); - ret = log_start(&default_log); + ret = log_open(&default_log); if (ret) error("Failed to start log"); } @@ -173,7 +173,7 @@ int log_init(struct log *l, int level, long facilitites) return 0; } -int log_start(struct log *l) +int log_open(struct log *l) { if (l->path) { l->file = fopen(l->path, "a+");; @@ -185,7 +185,7 @@ int log_start(struct log *l) else l->file = stderr; - l->state = STATE_STARTED; + l->state = STATE_OPENED; if (l->syslog) { openlog(NULL, LOG_PID, LOG_DAEMON); @@ -196,9 +196,9 @@ int log_start(struct log *l) return 0; } -int log_stop(struct log *l) +int log_close(struct log *l) { - if (l->state != STATE_STARTED) + if (l->state != STATE_OPENED) return 0; if (l->file != stderr && l->file != stdout) { @@ -209,7 +209,7 @@ int log_stop(struct log *l) closelog(); } - l->state = STATE_STOPPED; + l->state = STATE_CLOSED; return 0; } diff --git a/lib/super_node.c b/lib/super_node.c index eb08a7515..a4a8b150c 100644 --- a/lib/super_node.c +++ b/lib/super_node.c @@ -346,7 +346,7 @@ int super_node_start(struct super_node *sn) memory_init(sn->hugepages); rt_init(sn->priority, sn->affinity); - log_start(&sn->log); + log_open(&sn->log); #ifdef WITH_API api_start(&sn->api); #endif @@ -442,7 +442,7 @@ int super_node_stop(struct super_node *sn) #ifdef WITH_WEB web_stop(&sn->web); #endif - log_stop(&sn->log); + log_close(&sn->log); sn->state = STATE_STOPPED; diff --git a/src/convert.c b/src/convert.c index 287c466d8..0d54c171d 100644 --- a/src/convert.c +++ b/src/convert.c @@ -89,7 +89,7 @@ check: if (optarg == endptr) if (ret) error("Failed to initialize log"); - ret = log_start(&log); + ret = log_open(&log); if (ret) error("Failed to start log"); diff --git a/src/hook.c b/src/hook.c index 098de89e0..d9e04cd26 100644 --- a/src/hook.c +++ b/src/hook.c @@ -159,7 +159,7 @@ check: if (optarg == endptr) if (ret) error("Failed to initialize log"); - ret = log_start(&l); + ret = log_open(&l); if (ret) error("Failed to start log"); diff --git a/src/pipe.c b/src/pipe.c index db7a046de..a244e5ca7 100644 --- a/src/pipe.c +++ b/src/pipe.c @@ -301,7 +301,7 @@ check: if (optarg == endptr) if (ret) error("Failed to initialize log"); - ret = log_start(&sn.log); + ret = log_open(&sn.log); if (ret) error("Failed to start log"); diff --git a/src/signal.c b/src/signal.c index f608303c8..f61ad57b3 100644 --- a/src/signal.c +++ b/src/signal.c @@ -97,7 +97,7 @@ static void quit(int signal, siginfo_t *sinfo, void *ctx) if (ret) error("Failed to destroy pool"); - ret = log_stop(&l); + ret = log_close(&l); if (ret) error("Failed to stop log"); @@ -116,7 +116,7 @@ int main(int argc, char *argv[]) if (ret) error("Failed to initialize log"); - ret = log_start(&l); + ret = log_open(&l); if (ret) error("Failed to start log"); diff --git a/src/test-shmem.c b/src/test-shmem.c index ae518b10d..4e1747dcd 100644 --- a/src/test-shmem.c +++ b/src/test-shmem.c @@ -61,7 +61,7 @@ int main(int argc, char* argv[]) }; log_init(&log, V, LOG_ALL); - log_start(&log); + log_open(&log); if (argc != 4) { diff --git a/tests/unit/main.c b/tests/unit/main.c index 8e50fd9f1..673200d9a 100644 --- a/tests/unit/main.c +++ b/tests/unit/main.c @@ -38,7 +38,7 @@ int main(int argc, char *argv[]) if (ret) error("Failed to initialize logging sub-system"); - ret = log_start(&log); + ret = log_open(&log); if (ret) error("Failed to start logging sub-system");