Merge branch 't/cleanups'

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index 7c8b54fc6a0502d0a2ab983b5bc8ff3d33e0bda2..745729fae629aa279a1747f5779faa92fe901866 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -33,6 +33,7 @@
 #include "df.h"
 #include "time.h"
 #include "snap.h"
+#include "ipc.h"
 
 /** Command line and config file options. */
 static struct gengetopt_args_info conf;
@@ -170,7 +171,10 @@ static void dump_dss_config(const char *msg)
        COMMAND(ls) \
        COMMAND(create) \
        COMMAND(prune) \
-       COMMAND(run)
+       COMMAND(run) \
+       COMMAND(kill) \
+       COMMAND(reload) \
+
 #define COMMAND(x) static int com_ ##x(void);
 COMMANDS
 #undef COMMAND
@@ -226,6 +230,47 @@ static __printf_1_2 void dss_msg(const char* fmt,...)
        va_end(argp);
 }
 
+static char *get_config_file_name(void)
+{
+       char *home, *config_file;
+
+       if (conf.config_file_given)
+               return dss_strdup(conf.config_file_arg);
+       home = get_homedir();
+       config_file = make_message("%s/.dssrc", home);
+       free(home);
+       return config_file;
+}
+
+static int send_signal(int sig)
+{
+       pid_t pid;
+       char *config_file = get_config_file_name();
+       int ret = get_dss_pid(config_file, &pid);
+
+       free(config_file);
+       if (ret < 0)
+               return ret;
+       if (conf.dry_run_given) {
+               dss_msg("%d\n", (int)pid);
+               return 0;
+       }
+       ret = kill(pid, sig);
+       if (ret < 0)
+               return -ERRNO_TO_DSS_ERROR(errno);
+       return 1;
+}
+
+static int com_kill(void)
+{
+       return send_signal(SIGTERM);
+}
+
+static int com_reload(void)
+{
+       return send_signal(SIGHUP);
+}
+
 static void dss_get_snapshot_list(struct snapshot_list *sl)
 {
        get_snapshot_list(sl, conf.unit_interval_arg, conf.num_intervals_arg);
@@ -410,8 +455,6 @@ static struct snapshot *find_redundant_snapshot(struct snapshot_list *sl)
 
                if (keep >= num)
                        missing += keep - num;
-//             DSS_DEBUG_LOG("interval %i: keep: %u, have: %u, missing: %u\n",
-//                     interval, keep, num, missing);
                if (keep + missing >= num)
                        continue;
                /* redundant snapshot in this interval, pick snapshot with lowest score */
@@ -422,7 +465,6 @@ static struct snapshot *find_redundant_snapshot(struct snapshot_list *sl)
                                continue;
                        if (is_reference_snapshot(s))
                                continue;
-                       //DSS_DEBUG_LOG("checking %s\n", s->name);
                        if (s->interval > interval) {
                                prev = s;
                                continue;
@@ -438,7 +480,6 @@ static struct snapshot *find_redundant_snapshot(struct snapshot_list *sl)
                        /* check if s is a better victim */
                        this_score = s->creation_time - prev->creation_time;
                        assert(this_score >= 0);
-                       //DSS_DEBUG_LOG("%s: score %lli\n", s->name, (long long)score);
                        if (this_score < score) {
                                score = this_score;
                                victim = s;
@@ -888,18 +929,11 @@ static int check_config(void)
 static int parse_config_file(int override)
 {
        int ret, config_file_exists;
-       char *config_file;
+       char *config_file = get_config_file_name();
        struct stat statbuf;
        char *old_logfile_arg = NULL;
        int old_daemon_given = 0;
 
-       if (conf.config_file_given)
-               config_file = dss_strdup(conf.config_file_arg);
-       else {
-               char *home = get_homedir();
-               config_file = make_message("%s/.dssrc", home);
-               free(home);
-       }
        if (override) { /* SIGHUP */
                if (conf.logfile_given)
                        old_logfile_arg = dss_strdup(conf.logfile_arg);
@@ -913,13 +947,12 @@ static int parse_config_file(int override)
                goto out;
        }
        if (config_file_exists) {
-               struct cmdline_parser_params params = {
-                       .override = override,
-                       .initialize = 0,
-                       .check_required = 1,
-                       .check_ambiguity = 0,
-                       .print_errors = 1
-               };
+               struct cmdline_parser_params params;
+               params.override = override;
+               params.initialize = 0;
+               params.check_required = 1;
+               params.check_ambiguity = 0;
+               params.print_errors = 1;
                if (override) { /* invalidate all rsync options */
                        int i;
 
@@ -1024,12 +1057,14 @@ static int use_rsync_locally(char *logname)
 
 static int rename_resume_snap(int64_t creation_time)
 {
-       struct snapshot_list sl = {.num_snapshots = 0};
+       struct snapshot_list sl;
        struct snapshot *s = NULL;
        char *new_name = incomplete_name(creation_time);
        int ret;
        const char *why;
 
+       sl.num_snapshots = 0;
+
        ret = 0;
        if (conf.no_resume_given)
                goto out;
@@ -1231,10 +1266,23 @@ static void exit_hook(int exit_code)
        dss_exec(&pid, conf.exit_hook_arg, argv);
 }
 
+static void lock_dss_or_die(void)
+{
+       char *config_file = get_config_file_name();
+       int ret = lock_dss(config_file);
+
+       free(config_file);
+       if (ret < 0) {
+               DSS_EMERG_LOG("failed to lock: %s\n", dss_strerror(-ret));
+               exit(EXIT_FAILURE);
+       }
+}
+
 static int com_run(void)
 {
        int ret;
 
+       lock_dss_or_die();
        if (conf.dry_run_given) {
                DSS_ERROR_LOG("dry_run not supported by this command\n");
                return -E_SYNTAX;
@@ -1257,6 +1305,7 @@ static int com_prune(void)
        struct disk_space ds;
        const char *why;
 
+       lock_dss_or_die();
        ret = get_disk_space(".", &ds);
        if (ret < 0)
                return ret;
@@ -1312,6 +1361,7 @@ static int com_create(void)
        int ret, status;
        char **rsync_argv;
 
+       lock_dss_or_die();
        if (conf.dry_run_given) {
                int i;
                char *msg = NULL;
@@ -1395,13 +1445,13 @@ static int setup_signal_handling(void)
 int main(int argc, char **argv)
 {
        int ret;
-       struct cmdline_parser_params params = {
-               .override = 0,
-               .initialize = 1,
-               .check_required = 0,
-               .check_ambiguity = 0,
-               .print_errors = 1
-       };
+       struct cmdline_parser_params params;
+
+       params.override = 0;
+       params.initialize = 1;
+       params.check_required = 0;
+       params.check_ambiguity = 0;
+       params.print_errors = 1;
 
        cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
        ret = parse_config_file(0);
@@ -1412,13 +1462,12 @@ int main(int argc, char **argv)
                 * Parse the command line options again, but this time check
                 * that all required options are given.
                 */
-               params = (struct cmdline_parser_params) {
-                       .override = 1,
-                       .initialize = 1,
-                       .check_required = 1,
-                       .check_ambiguity = 1,
-                       .print_errors = 1
-               };
+               struct cmdline_parser_params params;
+               params.override = 1;
+               params.initialize = 1;
+               params.check_required = 1;
+               params.check_ambiguity = 1;
+               params.print_errors = 1;
                cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
        }
        if (conf.daemon_given)