From 07b73ad8272084b706d18ee2286bf25711dbaabb Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Wed, 23 Oct 2024 18:45:30 +0200 Subject: [PATCH] Switch back to variadic log macros. This essentially reverts commit 66cdd5bc99a5 which aimed to make the dss log facility C89 conform. While this was a worthwhile goal in 2012, it has little value today, since in 2025 we can safely assume a C99 compliant compiler. The patch was created with git revert -Xours 66cdd5bc followed by manual tweaks to make it compile again. --- daemon.c | 16 ++--- df.c | 4 +- dss.c | 199 +++++++++++++++++++++++---------------------------- err.h | 3 +- exec.c | 4 +- gcc-compat.h | 1 + ipc.c | 6 +- log.h | 58 ++------------- sig.c | 22 +++--- str.c | 12 ++-- 10 files changed, 131 insertions(+), 194 deletions(-) diff --git a/daemon.c b/daemon.c index f667870..8333ec3 100644 --- a/daemon.c +++ b/daemon.c @@ -27,7 +27,7 @@ int daemon_init(void) pid_t pid; int null, fd[2]; - DSS_INFO_LOG(("daemonizing\n")); + DSS_INFO_LOG("daemonizing\n"); if (pipe(fd) < 0) goto err; pid = fork(); @@ -46,7 +46,7 @@ int daemon_init(void) close(fd[1]); ret = read(fd[0], &c, 1); if (ret <= 0) { - DSS_EMERG_LOG(("child terminated unexpectedly\n")); + DSS_EMERG_LOG("child terminated unexpectedly\n"); exit(EXIT_FAILURE); } exit(EXIT_SUCCESS); @@ -67,7 +67,7 @@ int daemon_init(void) close(null); return fd[1]; err: - DSS_EMERG_LOG(("fatal: %s\n", strerror(errno))); + DSS_EMERG_LOG("fatal: %s\n", strerror(errno)); exit(EXIT_FAILURE); } @@ -82,8 +82,8 @@ FILE *open_log(const char *logfile_name) assert(logfile_name); logfile = fopen(logfile_name, "a"); if (!logfile) { - DSS_EMERG_LOG(("can not open %s: %s\n", logfile_name, - strerror(errno))); + DSS_EMERG_LOG("can not open %s: %s\n", logfile_name, + strerror(errno)); exit(EXIT_FAILURE); } setlinebuf(logfile); @@ -97,12 +97,12 @@ void close_log(FILE* logfile) { if (!logfile) return; - DSS_INFO_LOG(("closing logfile\n")); + DSS_INFO_LOG("closing logfile\n"); fclose(logfile); } void log_welcome(int loglevel) { - DSS_INFO_LOG(("***** welcome to dss ******\n")); - DSS_DEBUG_LOG(("using loglevel %d\n", loglevel)); + DSS_INFO_LOG("***** welcome to dss ******\n"); + DSS_DEBUG_LOG("using loglevel %d\n", loglevel); } diff --git a/df.c b/df.c index 7fb319e..5d7c880 100644 --- a/df.c +++ b/df.c @@ -38,7 +38,7 @@ int get_disk_space(const char *path, struct disk_space *result) void log_disk_space(struct disk_space *ds) { - DSS_INFO_LOG(("free: %uM/%uM (%u%%), %u%% inodes unused\n", + DSS_INFO_LOG("free: %uM/%uM (%u%%), %u%% inodes unused\n", ds->free_mb, ds->total_mb, ds->percent_free, - ds->percent_free_inodes)); + ds->percent_free_inodes); } diff --git a/dss.c b/dss.c index 253c234..c23cca7 100644 --- a/dss.c +++ b/dss.c @@ -143,12 +143,12 @@ static void dump_dss_config(const char *msg) fprintf(log, "\n*** disk space ***\n\n"); ret = get_disk_space(".", &ds); if (ret >= 0) { - DSS_INFO_LOG(("disk space low: %s\n", disk_space_low(&ds)? - "yes" : "no")); + DSS_INFO_LOG("disk space low: %s\n", disk_space_low(&ds)? + "yes" : "no"); log_disk_space(&ds); } else - DSS_ERROR_LOG(("can not get free disk space: %s\n", - dss_strerror(-ret))); + DSS_ERROR_LOG("can not get free disk space: %s\n", + dss_strerror(-ret)); /* we continue on errors from get_disk_space */ @@ -212,21 +212,8 @@ static void dump_dss_config(const char *msg) fprintf(log, "%s %s\n", dash, msg, dash); } -static int loglevel = -1; -static const char *location_file = NULL; -static int location_line = -1; -static const char *location_func = NULL; - -void dss_log_set_params(int ll, const char *file, int line, const char *func) -{ - loglevel = ll; - location_file = file; - location_line = line; - location_func = func; -} - /* All DSS_XXX_LOG() macros use this function. */ -__printf_1_2 void dss_log(const char* fmt,...) +__printf_2_3 void dss_log(int ll, const char* fmt,...) { va_list argp; FILE *outfd; @@ -235,7 +222,7 @@ __printf_1_2 void dss_log(const char* fmt,...) char str[255] = ""; int lpr_ll = lpr? OPT_UINT32_VAL(DSS, LOGLEVEL) : WARNING; - if (loglevel < lpr_ll) + if (ll < lpr_ll) return; outfd = logfile? logfile : stderr; if (subcmd == CMD_PTR(RUN)) { @@ -244,14 +231,8 @@ __printf_1_2 void dss_log(const char* fmt,...) strftime(str, sizeof(str), "%b %d %H:%M:%S", tm); fprintf(outfd, "%s ", str); if (lpr_ll <= INFO) - fprintf(outfd, "%i: ", loglevel); + fprintf(outfd, "%i: ", ll); } - if (subcmd == CMD_PTR(RUN)) -#ifdef DSS_NO_FUNC_NAMES - fprintf(outfd, "%s:%d: ", location_file, location_line); -#else - fprintf(outfd, "%s: ", location_func); -#endif va_start(argp, fmt); vfprintf(outfd, fmt, argp); va_end(argp); @@ -274,8 +255,8 @@ static void set_config_file_name(void) const char *arg = OPT_STRING_VAL(DSS, CONFIG_FILE); config_file = realpath(arg, NULL); if (!config_file) { - DSS_EMERG_LOG(("could not resolve path %s: %s\n", arg, - strerror(errno))); + DSS_EMERG_LOG("could not resolve path %s: %s\n", arg, + strerror(errno)); exit(EXIT_FAILURE); } } else { @@ -288,7 +269,7 @@ static void set_config_file_name(void) else /* not fatal */ config_file = arg; } - DSS_DEBUG_LOG(("config file: %s\n", config_file)); + DSS_DEBUG_LOG("config file: %s\n", config_file); ipc_key = super_fast_hash((uint8_t *)config_file, strlen(config_file), 0) >> 1; } @@ -306,7 +287,7 @@ static int send_signal(int sig, bool wait) dss_msg("%d\n", (int)pid); return 0; } - DSS_NOTICE_LOG(("sending signal %d to pid %d\n", sig, (int)pid)); + DSS_NOTICE_LOG("sending signal %d to pid %d\n", sig, (int)pid); ret = kill(pid, sig); if (ret < 0) return -ERRNO_TO_DSS_ERROR(errno); @@ -407,7 +388,7 @@ static int com_kill(void) for (i = 0; i < SIGNAL_TABLE_SIZE; i++) if (strcasecmp(arg, signal_table[i].name) == 0) return send_signal(signal_table[i].num, w_given); - DSS_ERROR_LOG(("invalid sigspec: %s\n", arg)); + DSS_ERROR_LOG("invalid sigspec: %s\n", arg); return -ERRNO_TO_DSS_ERROR(EINVAL); } EXPORT_CMD_HANDLER(kill); @@ -469,11 +450,11 @@ static int next_snapshot_is_due(void) if (!next_snapshot_time_is_valid()) next_snapshot_time = compute_next_snapshot_time(); if (next_snapshot_time <= now) { - DSS_DEBUG_LOG(("next snapshot: now\n")); + DSS_DEBUG_LOG("next snapshot: now\n"); return 1; } - DSS_DEBUG_LOG(("next snapshot due in %" PRId64 " seconds\n", - next_snapshot_time - now)); + DSS_DEBUG_LOG("next snapshot due in %" PRId64 " seconds\n", + next_snapshot_time - now); return 0; } @@ -482,7 +463,7 @@ static void pre_create_hook(void) assert(snapshot_creation_status == HS_READY); /* make sure that the next snapshot time will be recomputed */ invalidate_next_snapshot_time(); - DSS_DEBUG_LOG(("executing %s\n", OPT_STRING_VAL(DSS, PRE_CREATE_HOOK))); + DSS_DEBUG_LOG("executing %s\n", OPT_STRING_VAL(DSS, PRE_CREATE_HOOK)); dss_exec_cmdline_pid(&create_pid, OPT_STRING_VAL(DSS, PRE_CREATE_HOOK)); snapshot_creation_status = HS_PRE_RUNNING; } @@ -493,7 +474,7 @@ static void pre_remove_hook(struct snapshot *s, const char *why) if (!s) return; - DSS_DEBUG_LOG(("%s snapshot %s\n", why, s->name)); + DSS_DEBUG_LOG("%s snapshot %s\n", why, s->name); assert(snapshot_removal_status == HS_READY); assert(remove_pid == 0); assert(!snapshot_currently_being_removed); @@ -504,7 +485,7 @@ static void pre_remove_hook(struct snapshot *s, const char *why) cmd = make_message("%s %s/%s", OPT_STRING_VAL(DSS, PRE_REMOVE_HOOK), OPT_STRING_VAL(DSS, DEST_DIR), s->name); - DSS_DEBUG_LOG(("executing %s\n", cmd)); + DSS_DEBUG_LOG("executing %s\n", cmd); dss_exec_cmdline_pid(&remove_pid, cmd); free(cmd); snapshot_removal_status = HS_PRE_RUNNING; @@ -525,7 +506,7 @@ static int exec_rm(void) assert(snapshot_removal_status == HS_PRE_SUCCESS); assert(remove_pid == 0); - DSS_NOTICE_LOG(("removing %s (interval = %i)\n", s->name, s->interval)); + DSS_NOTICE_LOG("removing %s (interval = %i)\n", s->name, s->interval); ret = dss_rename(s->name, new_name); if (ret < 0) goto out; @@ -546,7 +527,7 @@ static struct snapshot *find_orphaned_snapshot(struct snapshot_list *sl) struct snapshot *s; int i; - DSS_DEBUG_LOG(("looking for old incomplete snapshots\n")); + DSS_DEBUG_LOG("looking for old incomplete snapshots\n"); FOR_EACH_SNAPSHOT(s, i, sl) { if (snapshot_is_being_created(s)) continue; @@ -589,7 +570,7 @@ static struct snapshot *find_redundant_snapshot(struct snapshot_list *sl) unsigned missing = 0; uint32_t N = OPT_UINT32_VAL(DSS, NUM_INTERVALS); - DSS_DEBUG_LOG(("looking for intervals containing too many snapshots\n")); + DSS_DEBUG_LOG("looking for intervals containing too many snapshots\n"); for (interval = N - 1; interval >= 0; interval--) { unsigned keep = desired_number_of_snapshots(interval, N); unsigned num = sl->interval_count[interval]; @@ -640,8 +621,8 @@ static struct snapshot *find_outdated_snapshot(struct snapshot_list *sl) int i; struct snapshot *s; - DSS_DEBUG_LOG(("looking for snapshots belonging to intervals >= %d\n", - OPT_UINT32_VAL(DSS, NUM_INTERVALS))); + DSS_DEBUG_LOG("looking for snapshots belonging to intervals >= %d\n", + OPT_UINT32_VAL(DSS, NUM_INTERVALS)); FOR_EACH_SNAPSHOT(s, i, sl) { if (snapshot_is_being_created(s)) continue; @@ -659,7 +640,7 @@ static struct snapshot *find_oldest_removable_snapshot(struct snapshot_list *sl) int i, num_complete; struct snapshot *s, *ref = NULL; - DSS_DEBUG_LOG(("picking snapshot with earliest creation time\n")); + DSS_DEBUG_LOG("picking snapshot with earliest creation time\n"); num_complete = num_complete_snapshots(sl); if (num_complete <= OPT_UINT32_VAL(DSS, MIN_COMPLETE)) return NULL; @@ -673,7 +654,7 @@ static struct snapshot *find_oldest_removable_snapshot(struct snapshot_list *sl) return s; } assert(ref); - DSS_WARNING_LOG(("removing reference snapshot %s\n", ref->name)); + DSS_WARNING_LOG("removing reference snapshot %s\n", ref->name); return ref; } @@ -710,7 +691,7 @@ static struct snapshot *find_removable_snapshot(struct snapshot_list *sl, } if (!try_hard) goto nope; - DSS_WARNING_LOG(("nothing obvious to remove\n")); + DSS_WARNING_LOG("nothing obvious to remove\n"); victim = find_oldest_removable_snapshot(sl); if (victim) { *reason = make_message("oldest"); @@ -741,8 +722,8 @@ static int rename_incomplete_snapshot(int64_t start) old_name = incomplete_name(start); ret = dss_rename(old_name, path_to_last_complete_snapshot); if (ret >= 0) - DSS_NOTICE_LOG(("%s -> %s\n", old_name, - path_to_last_complete_snapshot)); + DSS_NOTICE_LOG("%s -> %s\n", old_name, + path_to_last_complete_snapshot); free(old_name); return ret; } @@ -781,7 +762,7 @@ static int try_to_free_disk_space(void) return 1; if (!low_disk_space) return 0; - DSS_CRIT_LOG(("uhuhu: disk space low and nothing to remove\n")); + DSS_CRIT_LOG("uhuhu: disk space low and nothing to remove\n"); return -ERRNO_TO_DSS_ERROR(ENOSPC); } @@ -790,7 +771,7 @@ static void post_create_hook(void) char *cmd = make_message("%s %s/%s", OPT_STRING_VAL(DSS, POST_CREATE_HOOK), OPT_STRING_VAL(DSS, DEST_DIR), path_to_last_complete_snapshot); - DSS_NOTICE_LOG(("executing %s\n", cmd)); + DSS_NOTICE_LOG("executing %s\n", cmd); dss_exec_cmdline_pid(&create_pid, cmd); free(cmd); snapshot_creation_status = HS_POST_RUNNING; @@ -805,7 +786,7 @@ static void post_remove_hook(void) cmd = make_message("%s %s/%s", OPT_STRING_VAL(DSS, POST_REMOVE_HOOK), OPT_STRING_VAL(DSS, DEST_DIR), s->name); - DSS_NOTICE_LOG(("executing %s\n", cmd)); + DSS_NOTICE_LOG("executing %s\n", cmd); dss_exec_cmdline_pid(&remove_pid, cmd); free(cmd); snapshot_removal_status = HS_POST_RUNNING; @@ -831,13 +812,13 @@ static void dss_kill(pid_t pid, int sig, const char *msg) else process_name = "??????"; if (msg) - DSS_INFO_LOG(("%s\n", msg)); - DSS_DEBUG_LOG(("sending signal %d (%s) to pid %d (%s process)\n", - sig, signame, (int)pid, process_name)); + DSS_INFO_LOG("%s\n", msg); + DSS_DEBUG_LOG("sending signal %d (%s) to pid %d (%s process)\n", + sig, signame, (int)pid, process_name); if (kill(pid, sig) >= 0) return; - DSS_INFO_LOG(("failed to send signal %d (%s) to pid %d (%s process)\n", - sig, signame, (int)pid, process_name)); + DSS_INFO_LOG("failed to send signal %d (%s) to pid %d (%s process)\n", + sig, signame, (int)pid, process_name); } static void stop_create_process(void) @@ -859,20 +840,20 @@ static void restart_create_process(void) static void log_termination_msg(pid_t pid, int status) { if (WIFEXITED(status)) - DSS_INFO_LOG(("child %i exited. Exit status: %i\n", (int)pid, - WEXITSTATUS(status))); + DSS_INFO_LOG("child %i exited. Exit status: %i\n", (int)pid, + WEXITSTATUS(status)); else if (WIFSIGNALED(status)) - DSS_NOTICE_LOG(("child %i was killed by signal %i\n", (int)pid, - WTERMSIG(status))); + DSS_NOTICE_LOG("child %i was killed by signal %i\n", (int)pid, + WTERMSIG(status)); else - DSS_WARNING_LOG(("child %i terminated abormally\n", (int)pid)); + DSS_WARNING_LOG("child %i terminated abormally\n", (int)pid); } static int wait_for_process(pid_t pid, int *status) { int ret; - DSS_DEBUG_LOG(("Waiting for process %d to terminate\n", (int)pid)); + DSS_DEBUG_LOG("Waiting for process %d to terminate\n", (int)pid); for (;;) { fd_set rfds; @@ -897,7 +878,7 @@ static int wait_for_process(pid_t pid, int *status) dss_kill(pid, SIGTERM, "killing child process"); } if (ret < 0) - DSS_ERROR_LOG(("failed to wait for process %d\n", (int)pid)); + DSS_ERROR_LOG("failed to wait for process %d\n", (int)pid); else log_termination_msg(pid, *status); return ret; @@ -984,7 +965,7 @@ static int handle_rsync_exit(int status) int es, ret; if (!WIFEXITED(status)) { - DSS_ERROR_LOG(("rsync process %d died involuntary\n", (int)create_pid)); + DSS_ERROR_LOG("rsync process %d died involuntary\n", (int)create_pid); ret = -E_INVOLUNTARY_EXIT; snapshot_creation_status = HS_READY; goto out; @@ -995,8 +976,8 @@ static int handle_rsync_exit(int status) * 24: Partial transfer due to vanished source files */ if (es != 0 && es != 24) { - DSS_WARNING_LOG(("rsync exit code %d, error count %d\n", - es, ++num_consecutive_rsync_errors)); + DSS_WARNING_LOG("rsync exit code %d, error count %d\n", + es, ++num_consecutive_rsync_errors); if (!logfile) { /* called by com_run() */ ret = -E_BAD_EXIT_CODE; goto out; @@ -1007,7 +988,7 @@ static int handle_rsync_exit(int status) snapshot_creation_status = HS_READY; goto out; } - DSS_WARNING_LOG(("restarting rsync process\n")); + DSS_WARNING_LOG("restarting rsync process\n"); snapshot_creation_status = HS_NEEDS_RESTART; next_snapshot_time = get_current_time() + 60; ret = 1; @@ -1038,9 +1019,9 @@ static int handle_pre_create_hook_exit(int status) es = WEXITSTATUS(status); if (es) { if (!warn_count--) { - DSS_NOTICE_LOG(("pre_create_hook %s returned %d\n", - OPT_STRING_VAL(DSS, PRE_CREATE_HOOK), es)); - DSS_NOTICE_LOG(("deferring snapshot creation...\n")); + DSS_NOTICE_LOG("pre_create_hook %s returned %d\n", + OPT_STRING_VAL(DSS, PRE_CREATE_HOOK), es); + DSS_NOTICE_LOG("deferring snapshot creation...\n"); warn_count = 60; /* warn only once per hour */ } next_snapshot_time = get_current_time() + 60; @@ -1076,8 +1057,8 @@ static int handle_sigchld(void) ret = 1; break; default: - DSS_EMERG_LOG(("BUG: create can't die in status %d\n", - snapshot_creation_status)); + DSS_EMERG_LOG("BUG: create can't die in status %d\n", + snapshot_creation_status); return -E_BUG; } create_pid = 0; @@ -1089,7 +1070,7 @@ static int handle_sigchld(void) return ret; return ret; } - DSS_EMERG_LOG(("BUG: unknown process %d died\n", (int)pid)); + DSS_EMERG_LOG("BUG: unknown process %d died\n", (int)pid); return -E_BUG; } @@ -1100,26 +1081,26 @@ static int change_to_dest_dir(void) const char *dd = OPT_STRING_VAL(DSS, DEST_DIR); struct stat dot, dotdot; - DSS_INFO_LOG(("changing cwd to %s\n", dd)); + DSS_INFO_LOG("changing cwd to %s\n", dd); if (chdir(dd) < 0) { ret = -ERRNO_TO_DSS_ERROR(errno); - DSS_ERROR_LOG(("could not change cwd to %s\n", dd)); + DSS_ERROR_LOG("could not change cwd to %s\n", dd); return ret; } if (!OPT_GIVEN(DSS, MOUNTPOINT)) return 0; if (stat(".", &dot) < 0) { ret = -ERRNO_TO_DSS_ERROR(errno); - DSS_ERROR_LOG(("could not stat .\n")); + DSS_ERROR_LOG("could not stat .\n"); return ret; } if (stat("..", &dotdot) < 0) { ret = -ERRNO_TO_DSS_ERROR(errno); - DSS_ERROR_LOG(("could not stat ..\n")); + DSS_ERROR_LOG("could not stat ..\n"); return ret; } if (dot.st_dev == dotdot.st_dev && dot.st_ino != dotdot.st_ino) { - DSS_ERROR_LOG(("mountpoint check failed for %s\n", dd)); + DSS_ERROR_LOG("mountpoint check failed for %s\n", dd); return -E_MOUNTPOINT; } return 1; @@ -1131,28 +1112,28 @@ static int check_config(void) uint32_t num_intervals = OPT_UINT32_VAL(DSS, NUM_INTERVALS); if (unit_interval == 0) { - DSS_ERROR_LOG(("bad unit interval: %i\n", unit_interval)); + DSS_ERROR_LOG("bad unit interval: %i\n", unit_interval); return -E_INVALID_NUMBER; } - DSS_DEBUG_LOG(("unit interval: %i day(s)\n", unit_interval)); + DSS_DEBUG_LOG("unit interval: %i day(s)\n", unit_interval); if (num_intervals == 0 || num_intervals > 30) { - DSS_ERROR_LOG(("bad number of intervals: %i\n", num_intervals)); + DSS_ERROR_LOG("bad number of intervals: %i\n", num_intervals); return -E_INVALID_NUMBER; } if (subcmd == CMD_PTR(RUN) || subcmd == CMD_PTR(CREATE)) if (!OPT_GIVEN(DSS, SOURCE_DIR)) { - DSS_ERROR_LOG(("--source-dir required\n")); + DSS_ERROR_LOG("--source-dir required\n"); return -E_SYNTAX; } if (subcmd == CMD_PTR(RUN) || subcmd == CMD_PTR(CREATE) || subcmd == CMD_PTR(LS) || subcmd == CMD_PTR(PRUNE)) { if (!OPT_GIVEN(DSS, DEST_DIR)) { - DSS_ERROR_LOG(("--dest-dir required\n")); + DSS_ERROR_LOG("--dest-dir required\n"); return -E_SYNTAX; } } - DSS_DEBUG_LOG(("number of intervals: %i\n", num_intervals)); + DSS_DEBUG_LOG("number of intervals: %i\n", num_intervals); return 1; } @@ -1160,9 +1141,9 @@ static int lopsub_error(int lopsub_ret, char **errctx) { const char *msg = lls_strerror(-lopsub_ret); if (*errctx) - DSS_ERROR_LOG(("%s: %s\n", *errctx, msg)); + DSS_ERROR_LOG("%s: %s\n", *errctx, msg); else - DSS_ERROR_LOG(("%s\n", msg)); + DSS_ERROR_LOG("%s\n", msg); free(*errctx); *errctx = NULL; return -E_LOPSUB; @@ -1183,8 +1164,8 @@ static int parse_config_file(bool sighup, const struct lls_command *cmd) if (ret < 0) { if (errno != ENOENT || OPT_GIVEN(DSS, CONFIG_FILE)) { ret = -ERRNO_TO_DSS_ERROR(errno); - DSS_ERROR_LOG(("config file %s can not be opened\n", - config_file)); + DSS_ERROR_LOG("config file %s can not be opened\n", + config_file); goto out; } /* no config file -- nothing to do */ @@ -1195,7 +1176,7 @@ static int parse_config_file(bool sighup, const struct lls_command *cmd) ret = fstat(fd, &statbuf); if (ret < 0) { ret = -ERRNO_TO_DSS_ERROR(errno); - DSS_ERROR_LOG(("failed to stat config file %s\n", config_file)); + DSS_ERROR_LOG("failed to stat config file %s\n", config_file); goto close_fd; } sz = statbuf.st_size; @@ -1206,8 +1187,8 @@ static int parse_config_file(bool sighup, const struct lls_command *cmd) map = mmap(NULL, sz, PROT_READ, MAP_PRIVATE, fd, 0); if (map == MAP_FAILED) { ret = -ERRNO_TO_DSS_ERROR(errno); - DSS_ERROR_LOG(("failed to mmap config file %s\n", - config_file)); + DSS_ERROR_LOG("failed to mmap config file %s\n", + config_file); goto close_fd; } if (cmd == CMD_PTR(DSS)) @@ -1217,8 +1198,8 @@ static int parse_config_file(bool sighup, const struct lls_command *cmd) ret = lls_convert_config(map, sz, subcmd_name, &cf_argv, &errctx); munmap(map, sz); if (ret < 0) { - DSS_ERROR_LOG(("failed to convert config file %s\n", - config_file)); + DSS_ERROR_LOG("failed to convert config file %s\n", + config_file); ret = lopsub_error(ret, &errctx); goto close_fd; } @@ -1242,7 +1223,7 @@ static int parse_config_file(bool sighup, const struct lls_command *cmd) ret = 1; success: assert(ret >= 0); - DSS_DEBUG_LOG(("loglevel: %d\n", OPT_UINT32_VAL(DSS, LOGLEVEL))); + DSS_DEBUG_LOG("loglevel: %d\n", OPT_UINT32_VAL(DSS, LOGLEVEL)); if (cmd != CMD_PTR(DSS)) { if (ret > 0) { if (sublpr != cmdline_sublpr) @@ -1269,7 +1250,7 @@ static int handle_sighup(void) { int ret; - DSS_NOTICE_LOG(("SIGHUP, re-reading config\n")); + DSS_NOTICE_LOG("SIGHUP, re-reading config\n"); dump_dss_config("old"); ret = parse_config_file(true /* SIGHUP */, CMD_PTR(DSS)); if (ret < 0) @@ -1319,7 +1300,7 @@ static int handle_signal(void) } out: if (ret < 0) - DSS_ERROR_LOG(("%s\n", dss_strerror(-ret))); + DSS_ERROR_LOG("%s\n", dss_strerror(-ret)); return ret; } @@ -1381,11 +1362,11 @@ static int rename_resume_snap(int64_t creation_time) s = find_orphaned_snapshot(&sl); out: if (s) { - DSS_NOTICE_LOG(("recycling %s snapshot %s\n", why, s->name)); + DSS_NOTICE_LOG("recycling %s snapshot %s\n", why, s->name); ret = dss_rename(s->name, new_name); } if (ret >= 0) - DSS_NOTICE_LOG(("creating %s\n", new_name)); + DSS_NOTICE_LOG("creating %s\n", new_name); free(new_name); free_snapshot_list(&sl); return ret; @@ -1418,18 +1399,18 @@ static void create_rsync_argv(char ***argv, int64_t *num) seeded = true; } if (1000 * (random() / (RAND_MAX + 1.0)) < OPT_UINT32_VAL(DSS, CHECKSUM)) { - DSS_NOTICE_LOG(("adding --checksum to rsync options\n")); + DSS_NOTICE_LOG("adding --checksum to rsync options\n"); (*argv)[i++] = dss_strdup("--checksum"); } for (j = 0; j < OPT_GIVEN(DSS, RSYNC_OPTION); j++) (*argv)[i++] = dss_strdup(lls_string_val(j, OPT_RESULT(DSS, RSYNC_OPTION))); if (name_of_reference_snapshot) { - DSS_INFO_LOG(("using %s as reference\n", name_of_reference_snapshot)); + DSS_INFO_LOG("using %s as reference\n", name_of_reference_snapshot); (*argv)[i++] = make_message("--link-dest=../%s", name_of_reference_snapshot); } else - DSS_INFO_LOG(("no suitable reference snapshot found\n")); + DSS_INFO_LOG("no suitable reference snapshot found\n"); logname = dss_logname(); if (use_rsync_locally(logname)) { for (j = 0; j < OPT_GIVEN(DSS, SOURCE_DIR); j++) @@ -1464,7 +1445,7 @@ static void create_rsync_argv(char ***argv, int64_t *num) (*argv)[i++] = incomplete_name(*num); (*argv)[i++] = NULL; for (j = 0; j < i; j++) - DSS_DEBUG_LOG(("argv[%d] = %s\n", j, (*argv)[j])); + DSS_DEBUG_LOG("argv[%d] = %s\n", j, (*argv)[j]); } static void free_rsync_argv(char **argv) @@ -1595,7 +1576,7 @@ static void lock_dss_or_die(void) int ret = lock_dss(ipc_key); if (ret < 0) { - DSS_EMERG_LOG(("failed to lock: %s\n", dss_strerror(-ret))); + DSS_EMERG_LOG("failed to lock: %s\n", dss_strerror(-ret)); exit(EXIT_FAILURE); } } @@ -1606,12 +1587,12 @@ static int com_run(void) pid_t pid; if (OPT_GIVEN(DSS, DRY_RUN)) { - DSS_ERROR_LOG(("dry run not supported by this command\n")); + DSS_ERROR_LOG("dry run not supported by this command\n"); return -E_SYNTAX; } ret = get_dss_pid(ipc_key, &pid); if (ret >= 0) { - DSS_ERROR_LOG(("pid %d\n", (int)pid)); + DSS_ERROR_LOG("pid %d\n", (int)pid); return -E_ALREADY_RUNNING; } /* @@ -1638,8 +1619,8 @@ static int com_run(void) if (fd >= 0) { ret = write(fd, "\0", 1); if (ret != 1) { - DSS_ERROR_LOG(("write to daemon pipe returned %d\n", - ret)); + DSS_ERROR_LOG("write to daemon pipe returned %d\n", + ret); if (ret < 0) return -ERRNO_TO_DSS_ERROR(errno); return -E_BUG; @@ -1807,7 +1788,7 @@ static int setup_signal_handling(void) { int ret; - DSS_INFO_LOG(("setting up signal handlers\n")); + DSS_INFO_LOG("setting up signal handlers\n"); signal_pipe = signal_init(); /* always successful */ ret = install_sighandler(SIGINT); if (ret < 0) @@ -1936,8 +1917,8 @@ int main(int argc, char **argv) out: if (ret < 0) { if (errctx) - DSS_ERROR_LOG(("%s\n", errctx)); - DSS_EMERG_LOG(("%s\n", dss_strerror(-ret))); + DSS_ERROR_LOG("%s\n", errctx); + DSS_EMERG_LOG("%s\n", dss_strerror(-ret)); } free(errctx); lls_free_parse_result(lpr, CMD_PTR(DSS)); diff --git a/err.h b/err.h index f567671..7e93c9d 100644 --- a/err.h +++ b/err.h @@ -3,8 +3,7 @@ extern char *dss_errlist[]; extern char *dss_error_txt; -void dss_log_set_params(int ll, const char *file, int line, const char *func); -__printf_1_2 void dss_log(const char* fmt,...); +__printf_2_3 void dss_log(int ll, const char* fmt,...); /* * This bit indicates whether a number is considered a system error number diff --git a/exec.c b/exec.c index c538eab..3d3963f 100644 --- a/exec.c +++ b/exec.c @@ -17,7 +17,7 @@ void dss_exec(pid_t *pid, const char *file, char *const *const args) { if ((*pid = fork()) < 0) { - DSS_EMERG_LOG(("fork error: %s\n", strerror(errno))); + DSS_EMERG_LOG("fork error: %s\n", strerror(errno)); exit(EXIT_FAILURE); } if (*pid) /* parent */ @@ -26,7 +26,7 @@ void dss_exec(pid_t *pid, const char *file, char *const *const args) signal(SIGTERM, SIG_DFL); signal(SIGCHLD, SIG_DFL); execvp(file, args); - DSS_EMERG_LOG(("execvp error: %s\n", strerror(errno))); + DSS_EMERG_LOG("execvp error: %s\n", strerror(errno)); _exit(EXIT_FAILURE); } diff --git a/gcc-compat.h b/gcc-compat.h index a70519a..fb94877 100644 --- a/gcc-compat.h +++ b/gcc-compat.h @@ -21,6 +21,7 @@ #endif #define __printf_1_2 __printf(1,2) +#define __printf_2_3 __printf(2,3) #if HAVE_GNUC(3,3) # define __must_check __attribute__ ((warn_unused_result)) diff --git a/ipc.c b/ipc.c index e6ec79e..b6b822f 100644 --- a/ipc.c +++ b/ipc.c @@ -82,7 +82,7 @@ static int mutex_get(key_t key, int flags) { int ret; - DSS_DEBUG_LOG(("getting semaphore 0x%lx\n", (long)key)); + DSS_DEBUG_LOG("getting semaphore 0x%lx\n", (long)key); ret = semget(key, 2, flags); if (ret < 0) return -ERRNO_TO_DSS_ERROR(errno); @@ -93,7 +93,7 @@ static int do_semop(int id, struct sembuf *sops, int num) { int ret; - DSS_DEBUG_LOG(("calling semop\n")); + DSS_DEBUG_LOG("calling semop\n"); do { ret = semop(id, sops, num); if (ret >= 0) @@ -107,7 +107,7 @@ static bool mutex_is_locked(int id) struct sembuf sops; int ret; - DSS_DEBUG_LOG(("trying to lock\n")); + DSS_DEBUG_LOG("trying to lock\n"); sops.sem_num = 0; sops.sem_op = 0; diff --git a/log.h b/log.h index 3077c2e..0259abd 100644 --- a/log.h +++ b/log.h @@ -15,54 +15,10 @@ /* last message before exit */ #define EMERG 7 -/* Not all compilers support __func__ or an equivalent. */ -#if (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) && !defined(__GNUC__) -# if defined(_MSC_VER) && _MSC_VER >= 1300 -# define __func__ __FUNCTION__ -# else -# define DSS_NO_FUNC_NAMES -# define __func__ "" -# endif -#endif - -#define DSS_DEBUG_LOG(args) \ - do { \ - dss_log_set_params(DEBUG, __FILE__, __LINE__, __func__); \ - dss_log args ; \ - } while (0) - -#define DSS_INFO_LOG(args) \ - do { \ - dss_log_set_params(INFO, __FILE__, __LINE__, __func__); \ - dss_log args ; \ - } while (0) - -#define DSS_NOTICE_LOG(args) \ - do { \ - dss_log_set_params(NOTICE, __FILE__, __LINE__, __func__); \ - dss_log args ; \ - } while (0) - -#define DSS_WARNING_LOG(args) \ - do { \ - dss_log_set_params(WARNING, __FILE__, __LINE__, __func__); \ - dss_log args ; \ - } while (0) - -#define DSS_ERROR_LOG(args) \ - do { \ - dss_log_set_params(ERROR, __FILE__, __LINE__, __func__); \ - dss_log args ; \ - } while (0) - -#define DSS_CRIT_LOG(args) \ - do { \ - dss_log_set_params(CRIT, __FILE__, __LINE__, __func__); \ - dss_log args ; \ - } while (0) - -#define DSS_EMERG_LOG(args) \ - do { \ - dss_log_set_params(EMERG, __FILE__, __LINE__, __func__); \ - dss_log args ; \ - } while (0) +#define DSS_DEBUG_LOG(f,...) dss_log(DEBUG, "%s: " f, __FUNCTION__, ## __VA_ARGS__) +#define DSS_INFO_LOG(f,...) dss_log(INFO, "%s: " f, __FUNCTION__, ## __VA_ARGS__) +#define DSS_NOTICE_LOG(f,...) dss_log(NOTICE, "%s: " f, __FUNCTION__, ## __VA_ARGS__) +#define DSS_WARNING_LOG(f,...) dss_log(WARNING, "%s: " f, __FUNCTION__, ## __VA_ARGS__) +#define DSS_ERROR_LOG(f,...) dss_log(ERROR, "%s: " f, __FUNCTION__, ## __VA_ARGS__) +#define DSS_CRIT_LOG(f,...) dss_log(CRIT, "%s: " f, __FUNCTION__, ## __VA_ARGS__) +#define DSS_EMERG_LOG(f,...) dss_log(EMERG, "%s: " f, __FUNCTION__, ## __VA_ARGS__) diff --git a/sig.c b/sig.c index 90a8811..11efe01 100644 --- a/sig.c +++ b/sig.c @@ -55,7 +55,7 @@ int signal_init(void) goto err_out; return signal_pipe[0]; err_out: - DSS_EMERG_LOG(("%s\n", dss_strerror(-ret))); + DSS_EMERG_LOG("%s\n", dss_strerror(-ret)); exit(EXIT_FAILURE); } @@ -76,9 +76,9 @@ static void generic_signal_handler(int s) return; } if (ret < 0) - DSS_EMERG_LOG(("%s\n", strerror(errno))); + DSS_EMERG_LOG("%s\n", strerror(errno)); else - DSS_EMERG_LOG(("short write to signal pipe\n")); + DSS_EMERG_LOG("short write to signal pipe\n"); exit(EXIT_FAILURE); } @@ -99,13 +99,13 @@ int reap_child(pid_t *pid, int *status) if (*pid < 0) return -ERRNO_TO_DSS_ERROR(errno); if (WIFEXITED(*status)) - DSS_DEBUG_LOG(("child %i exited. Exit status: %i\n", (int)*pid, - WEXITSTATUS(*status))); + DSS_DEBUG_LOG("child %i exited. Exit status: %i\n", (int)*pid, + WEXITSTATUS(*status)); else if (WIFSIGNALED(*status)) - DSS_DEBUG_LOG(("child %i was killed by signal %i\n", (int)*pid, - WTERMSIG(*status))); + DSS_DEBUG_LOG("child %i was killed by signal %i\n", (int)*pid, + WTERMSIG(*status)); else - DSS_WARNING_LOG(("child %i terminated abormally\n", (int)*pid)); + DSS_WARNING_LOG("child %i terminated abormally\n", (int)*pid); return 1; } @@ -115,7 +115,7 @@ int reap_child(pid_t *pid, int *status) */ int install_sighandler(int sig) { - DSS_DEBUG_LOG(("catching signal %d\n", sig)); + DSS_DEBUG_LOG("catching signal %d\n", sig); if (signal(sig, &generic_signal_handler) != SIG_ERR) return 1; return -E_SIGNAL_SIG_ERR; @@ -134,14 +134,14 @@ int next_signal(void) r = read(signal_pipe[0], &s, sizeof(s)); if (r == sizeof(s)) { - DSS_DEBUG_LOG(("next signal: %d\n", s)); + DSS_DEBUG_LOG("next signal: %d\n", s); return s; } err = errno; assert(r < 0); if (err == EAGAIN) return 0; - DSS_ERROR_LOG(("failed to read from signal pipe\n")); + DSS_ERROR_LOG("failed to read from signal pipe\n"); return -ERRNO_TO_DSS_ERROR(err); } diff --git a/str.c b/str.c index ed04e47..f507379 100644 --- a/str.c +++ b/str.c @@ -29,8 +29,8 @@ __must_check __malloc void *dss_realloc(void *p, size_t size) */ assert(size); if (!(p = realloc(p, size))) { - DSS_EMERG_LOG(("realloc failed (size = %zu), aborting\n", - size)); + DSS_EMERG_LOG("realloc failed (size = %zu), aborting\n", + size); exit(EXIT_FAILURE); } return p; @@ -44,8 +44,8 @@ __must_check __malloc void *dss_malloc(size_t size) p = malloc(size); if (!p) { - DSS_EMERG_LOG(("malloc failed (size = %zu), aborting\n", - size)); + DSS_EMERG_LOG("malloc failed (size = %zu), aborting\n", + size); exit(EXIT_FAILURE); } return p; @@ -70,7 +70,7 @@ __must_check __malloc char *dss_strdup(const char *s) if ((ret = strdup(s? s: ""))) return ret; - DSS_EMERG_LOG(("strdup failed, aborting\n")); + DSS_EMERG_LOG("strdup failed, aborting\n"); exit(EXIT_FAILURE); } @@ -113,7 +113,7 @@ __must_check __malloc char *get_homedir(void) const char *home = getenv("HOME"); if (home && *home) return dss_strdup(home); - DSS_EMERG_LOG(("fatal: HOME is unset or empty\n")); + DSS_EMERG_LOG("fatal: HOME is unset or empty\n"); exit(EXIT_FAILURE); } -- 2.39.5