* e1f886 Only define gcc function attributes on gcc.
-dss_objects := cmdline.o dss.o string.o fd.o exec.o signal.o daemon.o df.o time.o snap.o
+dss_objects := cmdline.o dss.o string.o fd.o exec.o signal.o daemon.o df.o time.o snap.o ipc.o
all: dss
man: dss.1
-DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
-DEBUG_CPPFLAGS += -Wredundant-decls
-CPPFLAGS += -Os
-CPPFLAGS += -Wall
-CPPFLAGS += -Wuninitialized
-CPPFLAGS += -Wchar-subscripts
-CPPFLAGS += -Wformat-security
-CPPFLAGS += -Werror-implicit-function-declaration
-CPPFLAGS += -Wmissing-format-attribute
-CPPFLAGS += -Wunused-macros
-CPPFLAGS += -Wbad-function-cast
+DEBUG_CFLAGS ?=
+DEBUG_CFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
+DEBUG_CFLAGS += -Wredundant-decls
+CFLAGS ?=
+CFLAGS += -Os
+CFLAGS += -Wall
+CFLAGS += -Wuninitialized
+CFLAGS += -Wchar-subscripts
+CFLAGS += -Wformat-security
+CFLAGS += -Werror-implicit-function-declaration
+CFLAGS += -Wmissing-format-attribute
+CFLAGS += -Wunused-macros
+CFLAGS += -Wbad-function-cast
Makefile.deps: $(wildcard *.c *.h)
gcc -MM -MG *.c > $@
$(CC) -o $@ $(dss_objects)
cmdline.o: cmdline.c cmdline.h
- $(CC) -c $(CPPFLAGS) $<
+ $(CC) -c $(CFLAGS) $<
%.o: %.c Makefile
- $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
+ $(CC) -c $(CFLAGS) $(DEBUG_CFLAGS) $<
%.ppm: %.sk
sk2ppm $< > $@
#include "df.h"
#include "time.h"
#include "snap.h"
+#include "ipc.h"
/** Command line and config file options. */
static struct gengetopt_args_info conf;
DEFINE_DSS_ERRLIST;
-static const char const *hook_status_description[] = {HOOK_STATUS_ARRAY};
+static const char *hook_status_description[] = {HOOK_STATUS_ARRAY};
/* may be called with ds == NULL. */
static int disk_space_low(struct disk_space *ds)
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
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);
{
struct snapshot *s = snapshot_currently_being_removed;
char *new_name = being_deleted_name(s);
- char *argv[] = {"rm", "-rf", new_name, NULL};
+ char *argv[4];
int ret;
+ argv[0] = "rm";
+ argv[1] = "-rf";
+ argv[2] = new_name;
+ argv[3] = NULL;
+
assert(snapshot_removal_status == HS_PRE_SUCCESS);
assert(remove_pid == 0);
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 */
continue;
if (is_reference_snapshot(s))
continue;
- //DSS_DEBUG_LOG("checking %s\n", s->name);
if (s->interval > interval) {
prev = s;
continue;
/* 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;
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);
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;
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;
static void exit_hook(int exit_code)
{
- char *argv[] = {conf.exit_hook_arg, dss_strerror(-exit_code), NULL};
+ char *argv[3];
pid_t pid;
+ argv[0] = conf.exit_hook_arg;
+ argv[1] = dss_strerror(-exit_code);
+ argv[2] = NULL;
+
DSS_NOTICE_LOG("executing %s %s\n", argv[0], argv[1]);
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;
struct disk_space ds;
const char *why;
+ lock_dss_or_die();
ret = get_disk_space(".", &ds);
if (ret < 0)
return ret;
int ret, status;
char **rsync_argv;
+ lock_dss_or_die();
if (conf.dry_run_given) {
int i;
char *msg = NULL;
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, ¶ms); /* aborts on errors */
ret = parse_config_file(0);
* 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, ¶ms); /* aborts on errors */
}
if (conf.daemon_given)
received. See also the --exit-hook option.
"
+groupoption "kill" K
+#~~~~~~~~~~~~~~~~~~~
+"Kill a running dss process"
+group="command"
+details="
+ This sends SIGTERM to the dss process that corresponds to the
+ given config file. If --dry-run is given, the PID of the dss
+ process is written to stdout, but no signal is sent.
+"
+
+groupoption "reload" -
+#~~~~~~~~~~~~~~~~~~~~~
+"force a running dss process to reload its config file"
+group="command"
+details="
+ This differs from --kill only in that SIGHUP rather than SIGTERM
+ is sent to the dss process.
+"
+
###############################
section "Rsync-related options"
###############################
}
#define DSS_ERRORS \
- DSS_ERROR(SUCCESS, "success") \
- DSS_ERROR(SYNTAX, "syntax error") \
- DSS_ERROR(ATOI_OVERFLOW, "value too large") \
- DSS_ERROR(STRTOLL, "unknown strtoll error") \
- DSS_ERROR(ATOI_NO_DIGITS, "no digits found in string") \
- DSS_ERROR(ATOI_JUNK_AT_END, "further characters after number") \
- DSS_ERROR(INVALID_NUMBER, "invalid number") \
- DSS_ERROR(STRFTIME, "strftime() failed") \
- DSS_ERROR(LOCALTIME, "localtime() failed") \
- DSS_ERROR(NULL_OPEN, "can not open /dev/null") \
- DSS_ERROR(DUP_PIPE, "exec error: can not create pipe") \
- DSS_ERROR(INVOLUNTARY_EXIT, "unexpected termination cause") \
- DSS_ERROR(BAD_EXIT_CODE, "unexpected exit code") \
- DSS_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR") \
- DSS_ERROR(SIGNAL, "caught terminating signal") \
- DSS_ERROR(BUG, "values of beta might cause dom!") \
-
+ DSS_ERROR(SUCCESS, "success"), \
+ DSS_ERROR(SYNTAX, "syntax error"), \
+ DSS_ERROR(ATOI_OVERFLOW, "value too large"), \
+ DSS_ERROR(STRTOLL, "unknown strtoll error"), \
+ DSS_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \
+ DSS_ERROR(ATOI_JUNK_AT_END, "further characters after number"), \
+ DSS_ERROR(INVALID_NUMBER, "invalid number"), \
+ DSS_ERROR(STRFTIME, "strftime() failed"), \
+ DSS_ERROR(LOCALTIME, "localtime() failed"), \
+ DSS_ERROR(NULL_OPEN, "can not open /dev/null"), \
+ DSS_ERROR(DUP_PIPE, "exec error: can not create pipe"), \
+ DSS_ERROR(INVOLUNTARY_EXIT, "unexpected termination cause"), \
+ DSS_ERROR(BAD_EXIT_CODE, "unexpected exit code"), \
+ DSS_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR"), \
+ DSS_ERROR(SIGNAL, "caught terminating signal"), \
+ DSS_ERROR(BUG, "values of beta might cause dom!"), \
+ DSS_ERROR(NOT_RUNNING, "dss not running")
/**
* This is temporarily defined to expand to its first argument (prefixed by
* 'E_') and gets later redefined to expand to the error text only
*/
-#define DSS_ERROR(err, msg) E_ ## err,
+#define DSS_ERROR(err, msg) E_ ## err
enum dss_error_codes {
DSS_ERRORS
};
#undef DSS_ERROR
-#define DSS_ERROR(err, msg) msg,
+#define DSS_ERROR(err, msg) msg
#define DEFINE_DSS_ERRLIST char *dss_errlist[] = {DSS_ERRORS}
--- /dev/null
+#include <sys/wait.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+#include <string.h>
+#include <assert.h>
+#include <sys/stat.h>
+#include <stddef.h>
+#include <limits.h>
+#include <sys/param.h>
+
+#include "gcc-compat.h"
+#include "string.h"
+#include "log.h"
+#include "gcc-compat.h"
+#include "error.h"
+
+#if (defined(__GNUC__) && defined(__i386__))
+#define get16bits(d) (*((const uint16_t *) (d)))
+#else
+#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)\
+ +(uint32_t)(((const uint8_t *)(d))[0]) )
+#endif
+
+/*
+ * SuperFastHash, by Paul Hsieh.
+ * http://www.azillionmonkeys.com/qed/hash.html
+ */
+static uint32_t super_fast_hash(const uint8_t *data, uint32_t len, uint32_t hash)
+{
+ uint32_t tmp;
+ int rem = len & 3;
+
+ len >>= 2;
+
+ for (;len > 0; len--) {
+ hash += get16bits (data);
+ tmp = (get16bits (data+2) << 11) ^ hash;
+ hash = (hash << 16) ^ tmp;
+ data += 2*sizeof (uint16_t);
+ hash += hash >> 11;
+ }
+
+ /* Handle end cases */
+ switch (rem) {
+ case 3:
+ hash += get16bits (data);
+ hash ^= hash << 16;
+ hash ^= data[sizeof (uint16_t)] << 18;
+ hash += hash >> 11;
+ break;
+ case 2:
+ hash += get16bits (data);
+ hash ^= hash << 11;
+ hash += hash >> 17;
+ break;
+ case 1:
+ hash += *data;
+ hash ^= hash << 10;
+ hash += hash >> 1;
+ }
+ /* Force "avalanching" of final 127 bits */
+ hash ^= hash << 3;
+ hash += hash >> 5;
+ hash ^= hash << 4;
+ hash += hash >> 17;
+ hash ^= hash << 25;
+ hash += hash >> 6;
+ return hash;
+}
+
+/*
+ * Return the canonical absolute name of a given file name.
+ *
+ * Slightly modified version of glibc's realpath, Copyright (C)
+ * 1996-2002,2004,2005,2006,2008 Free Software Foundation, Inc.
+ *
+ * A canonical name does not contain any `.', `..' components nor any repeated
+ * path separators ('/') or symlinks. All path components must exist. The
+ * result is malloc'd and must be freed by the caller.
+ */
+static int dss_realpath(const char *name, char **resolved_path)
+{
+ char *rpath = NULL, *dest, *extra_buf = NULL;
+ const char *start, *end, *rpath_limit;
+ long int path_max;
+ int ret, num_links = 0;
+
+ if (name[0] == '\0') {
+ /*
+ * As per Single Unix Specification V2 we must return an error
+ * if the name argument points to an empty string.
+ */
+ ret = -ERRNO_TO_DSS_ERROR(ENOENT);
+ goto error;
+ }
+#ifdef PATH_MAX
+ path_max = PATH_MAX;
+#else
+ /*
+ * From realpath(3): Asking pathconf(3) does not really help, since on
+ * the one hand POSIX warns that the result of pathconf(3) may be
+ * huge and unsuitable for mallocing memory. And on the other hand
+ * pathconf(3) may return -1 to signify that PATH_MAX is not bounded.
+ */
+ path_max = pathconf(name, _PC_PATH_MAX);
+ if (path_max <= 0 || path_max >= 4096)
+ path_max = 4096;
+#endif
+ rpath = dss_malloc(path_max);
+ rpath_limit = rpath + path_max;
+
+ if (name[0] != '/') {
+ if (!getcwd(rpath, path_max)) {
+ ret = -ERRNO_TO_DSS_ERROR(errno);
+ goto error;
+ }
+ dest = memchr(rpath, '\0', path_max);
+ } else {
+ rpath[0] = '/';
+ dest = rpath + 1;
+ }
+
+ for (start = end = name; *start; start = end) {
+ struct stat st;
+ int n;
+
+ /* Skip sequence of multiple path-separators. */
+ while (*start == '/')
+ ++start;
+
+ /* Find end of path component. */
+ for (end = start; *end && *end != '/'; ++end)
+ /* Nothing. */ ;
+
+ if (end - start == 0)
+ break;
+ else if (end - start == 1 && start[0] == '.')
+ /* nothing */ ;
+ else if (end - start == 2 && start[0] == '.' && start[1] == '.') {
+ /* Back up to previous component, ignore if at root already. */
+ if (dest > rpath + 1)
+ while ((--dest)[-1] != '/') ;
+ } else {
+ size_t new_size;
+
+ if (dest[-1] != '/')
+ *dest++ = '/';
+
+ if (dest + (end - start) >= rpath_limit) {
+ ptrdiff_t dest_offset = dest - rpath;
+
+ new_size = rpath_limit - rpath;
+ if (end - start + 1 > path_max)
+ new_size += end - start + 1;
+ else
+ new_size += path_max;
+ rpath = dss_realloc(rpath, new_size);
+ rpath_limit = rpath + new_size;
+ dest = rpath + dest_offset;
+ }
+
+ memcpy(dest, start, end - start);
+ dest += end - start;
+ *dest = '\0';
+
+ if (stat(rpath, &st) < 0) {
+ ret = -ERRNO_TO_DSS_ERROR(errno);
+ goto error;
+ }
+
+ if (S_ISLNK(st.st_mode)) {
+ char *buf = alloca(path_max);
+ size_t len;
+
+ if (++num_links > MAXSYMLINKS) {
+ ret = -ERRNO_TO_DSS_ERROR(ELOOP);
+ goto error;
+ }
+
+ n = readlink(rpath, buf, path_max - 1);
+ if (n < 0) {
+ ret = -ERRNO_TO_DSS_ERROR(errno);
+ goto error;
+ }
+ buf[n] = '\0';
+
+ if (!extra_buf)
+ extra_buf = alloca(path_max);
+
+ len = strlen(end);
+ if ((long int) (n + len) >= path_max) {
+ ret = -ERRNO_TO_DSS_ERROR(ENAMETOOLONG);
+ goto error;
+ }
+
+ /* Careful here, end may be a pointer into extra_buf... */
+ memmove(&extra_buf[n], end, len + 1);
+ name = end = memcpy(extra_buf, buf, n);
+
+ if (buf[0] == '/') /* It's an absolute symlink */
+ dest = rpath + 1;
+ else /* Back up to previous component, ignore if at root already: */
+ if (dest > rpath + 1)
+ while ((--dest)[-1] != '/')
+ ; /* nothing */
+ } else if (!S_ISDIR(st.st_mode) && *end != '\0') {
+ ret = -ERRNO_TO_DSS_ERROR(ENOTDIR);
+ goto error;
+ }
+ }
+ }
+ if (dest > rpath + 1 && dest[-1] == '/')
+ --dest;
+ *dest = '\0';
+ *resolved_path = rpath;
+ return 1;
+error:
+ free(rpath);
+ *resolved_path = NULL;
+ return ret;
+}
+
+static inline int get_key_or_die(char *config_file)
+{
+ int ret;
+ struct stat statbuf;
+ char *rpath;
+
+ assert(config_file);
+ if (stat(config_file, &statbuf) == 0) {
+ ret = dss_realpath(config_file, &rpath);
+ if (ret < 0) {
+ DSS_EMERG_LOG("could not resolve path %s: %s\n", config_file,
+ dss_strerror(-ret));
+ exit(EXIT_FAILURE);
+ }
+ DSS_DEBUG_LOG("resolved path: %s\n", rpath);
+ } else
+ /*
+ * This happens if the user did not specify a config file, and
+ * the default config file does not exist. Another (unlikely)
+ * possibility is that the config file was removed between
+ * startup and this call. We don't care about these corner
+ * cases too much and just use the unresolved path in this
+ * case.
+ */
+ rpath = dss_strdup(config_file);
+ ret = super_fast_hash((uint8_t *)rpath, strlen(rpath), 0) >> 1;
+ free(rpath);
+ return ret;
+}
+
+static int mutex_get(int key, int flags)
+{
+ int ret;
+
+ DSS_DEBUG_LOG("getting semaphore 0x%x\n", key);
+ ret = semget(key, 2, flags);
+ if (ret < 0)
+ return -ERRNO_TO_DSS_ERROR(errno);
+ return ret;
+}
+
+static int do_semop(int id, struct sembuf *sops, int num)
+{
+ int ret;
+
+ DSS_DEBUG_LOG("calling semop\n");
+ do {
+ ret = semop(id, sops, num);
+ if (ret >= 0)
+ return 1;
+ } while (errno == EINTR);
+ return -ERRNO_TO_DSS_ERROR(errno);
+}
+
+static int mutex_lock(int id)
+{
+ int ret;
+
+ DSS_DEBUG_LOG("locking\n");
+ struct sembuf sops[4] = {
+ {
+ .sem_num = 0,
+ .sem_op = 0,
+ .sem_flg = SEM_UNDO | IPC_NOWAIT
+ },
+ {
+ .sem_num = 0,
+ .sem_op = 1,
+ .sem_flg = SEM_UNDO | IPC_NOWAIT
+ },
+ {
+ .sem_num = 1,
+ .sem_op = 0,
+ .sem_flg = SEM_UNDO | IPC_NOWAIT
+ },
+ {
+ .sem_num = 1,
+ .sem_op = 1,
+ .sem_flg = SEM_UNDO | IPC_NOWAIT
+ }
+ };
+ ret = do_semop(id, sops, 4);
+ if (ret < 0)
+ return -ERRNO_TO_DSS_ERROR(errno);
+ return 1;
+}
+
+static int mutex_try_lock(int id)
+{
+ int ret;
+
+ DSS_DEBUG_LOG("trying to lock\n");
+ struct sembuf sops[2] = {
+ {
+ .sem_num = 0,
+ .sem_op = 0,
+ .sem_flg = SEM_UNDO | IPC_NOWAIT
+ },
+ {
+ .sem_num = 0,
+ .sem_op = 1,
+ .sem_flg = SEM_UNDO | IPC_NOWAIT
+ }
+ };
+ ret = do_semop(id, sops, 2);
+ if (ret < 0)
+ return -ERRNO_TO_DSS_ERROR(errno);
+ return 1;
+}
+
+int lock_dss(char *config_file)
+{
+ int ret, key = get_key_or_die(config_file);
+
+ ret = mutex_get(key, IPC_CREAT | 0600);
+ if (ret < 0)
+ return ret;
+ return mutex_lock(ret);
+}
+
+int get_dss_pid(char *config_file, pid_t *pid)
+{
+ int ret, semid, key = get_key_or_die(config_file);
+
+ ret = mutex_get(key, 0);
+ if (ret < 0)
+ return ret;
+ semid = ret;
+ ret = semctl(semid, 1, GETPID);
+ if (ret < 0)
+ return -E_NOT_RUNNING;
+ *pid = ret;
+ ret = mutex_try_lock(semid);
+ if (ret >= 0)
+ return -E_NOT_RUNNING;
+ return 1;
+}
--- /dev/null
+int lock_dss(char *config_file);
+int get_dss_pid(char *config_file, pid_t *pid);
static void generic_signal_handler(int s)
{
write(signal_pipe[1], &s, sizeof(int));
- //fprintf(stderr, "got sig %i\n", s);
}
/**
if (num > now)
return 0;
s->creation_time = num;
- //DSS_DEBUG_LOG("%s start time: %lli\n", dirname, (long long)s->creation_time);
s->interval = (long long) ((now - s->creation_time)
/ unit_interval / 24 / 3600);
if (!strcmp(dash + 1, "incomplete")) {
static int compare_snapshots(const void *a, const void *b)
{
- struct snapshot *s1 = *(struct snapshot **)a;
- struct snapshot *s2 = *(struct snapshot **)b;
+ struct snapshot *s1 = *(struct snapshot * const *)a;
+ struct snapshot *s2 = *(struct snapshot * const *)b;
return NUM_COMPARE(s2->creation_time, s1->creation_time);
}
void get_snapshot_list(struct snapshot_list *sl, int unit_interval,
int num_intervals)
{
- struct add_snapshot_data asd = {
- .unit_interval = unit_interval,
- .num_intervals = num_intervals,
- .sl = sl
- };
+ struct add_snapshot_data asd;
+ asd.unit_interval = unit_interval;
+ asd.num_intervals = num_intervals;
+ asd.sl = sl;
sl->now = get_current_time();
sl->num_snapshots = 0;
sl->array_size = 0;
HSA_ITEM(HS_RUNNING, "in progress"), \
HSA_ITEM(HS_SUCCESS, "process terminated successfully"), \
HSA_ITEM(HS_NEEDS_RESTART, "restart needed"), \
- HSA_ITEM(HS_POST_RUNNING, "post-hook running"), \
+ HSA_ITEM(HS_POST_RUNNING, "post-hook running")
#define HSA_ITEM(x, y) x
enum hook_status {HOOK_STATUS_ARRAY};
#undef HSA_ITEM
-#define HSA_ITEM(x, y) [x] = y
+#define HSA_ITEM(x, y) y
/**
/** The rsync process terminated successfully. */
SS_COMPLETE = 1,
/** The rm process is running to remove this snapshot. */
- SS_BEING_DELETED = 2,
+ SS_BEING_DELETED = 2
};
/** Describes one snapshot. */
*/
__must_check __malloc void *dss_malloc(size_t size)
{
+ void *p;
assert(size);
- void *p = malloc(size);
+ p = malloc(size);
if (!p) {
DSS_EMERG_LOG("malloc failed (size = %zu), aborting\n",
projects / dss.git / commitdiff