X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=snap.c;h=2ec195653c8ce65091b31f512010326649387bf1;hp=1bc97b595a7bb99ecb1bfdf2a050168814c5ef3c;hb=324d1364004376fa0b018afcb57cfe14aca7fcdb;hpb=222b3355ee441ab4a310ef2830181ffd4300223b;ds=sidebyside diff --git a/snap.c b/snap.c index 1bc97b5..2ec1956 100644 --- a/snap.c +++ b/snap.c @@ -1,3 +1,8 @@ +/* + * Copyright (C) 2008-2010 Andre Noll + * + * Licensed under the GPL v2. For licencing details see COPYING. + */ #include #include #include @@ -6,13 +11,29 @@ #include #include #include +#include #include "gcc-compat.h" -#include "error.h" +#include "err.h" #include "snap.h" -#include "string.h" -#include "time.h" -#include "fd.h" +#include "str.h" +#include "tv.h" +#include "file.h" + +/** + * Wrapper for isdigit. + * NetBSD needs this. + * + * The values should be cast to an unsigned char first, then to int. + * Why? Because the isdigit (as do all other is/to functions/macros) + * expect a number from 0 upto and including 255 as their (int) argument. + * Because char is signed on most systems, casting it to int immediately + * gives the functions an argument between -128 and 127 (inclusive), + * which they will use as an array index, and which will thus fail + * horribly for characters which have their most significant bit set. + */ +#define dss_isdigit(c) isdigit((int)(unsigned char)(c)) + /** * Return the desired number of snapshots of an interval. @@ -42,7 +63,7 @@ static int is_snapshot(const char *dirname, int64_t now, int unit_interval, if (!dash || !dash[1] || dash == dirname) return 0; for (i = 0; dirname[i] != '-'; i++) - if (!isdigit(dirname[i])) + if (!dss_isdigit(dirname[i])) return 0; tmp = dss_strdup(dirname); tmp[i] = '\0'; @@ -54,7 +75,6 @@ static int is_snapshot(const char *dirname, int64_t now, int unit_interval, 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")) { @@ -64,7 +84,7 @@ static int is_snapshot(const char *dirname, int64_t now, int unit_interval, } if (!strcmp(dash + 1, "incomplete.being_deleted")) { s->completion_time = -1; - s->flags = SS_BEING_DELETED; /* mot cpmplete, being deleted */ + s->flags = SS_BEING_DELETED; /* not complete, being deleted */ goto success; } tmp = dash + 1; @@ -72,7 +92,7 @@ static int is_snapshot(const char *dirname, int64_t now, int unit_interval, if (!dot || !dot[1] || dot == tmp) return 0; for (i = 0; tmp[i] != '.'; i++) - if (!isdigit(tmp[i])) + if (!dss_isdigit(tmp[i])) return 0; tmp = dss_strdup(dash + 1); tmp[i] = '\0'; @@ -80,7 +100,7 @@ static int is_snapshot(const char *dirname, int64_t now, int unit_interval, free(tmp); if (ret < 0) return 0; - if (num > now) + if (num > now || num < s->creation_time) return 0; s->completion_time = num; s->flags = SS_COMPLETE; @@ -125,8 +145,8 @@ static int add_snapshot(const char *dirname, void *private) 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); } @@ -134,11 +154,10 @@ static int compare_snapshots(const void *a, const void *b) 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; @@ -167,17 +186,15 @@ void free_snapshot_list(struct snapshot_list *sl) __malloc char *incomplete_name(int64_t start) { - return make_message("%lli-incomplete", (long long)start); + return make_message("%" PRId64 "-incomplete", start); } __malloc char *being_deleted_name(struct snapshot *s) { if (s->flags & SS_COMPLETE) - return make_message("%lli-%lli.being_deleted", - (long long)s->creation_time, - (long long)s->completion_time); - return make_message("%lli-incomplete.being_deleted", - (long long)s->creation_time); + return make_message("%" PRId64 "-%" PRId64 ".being_deleted", + s->creation_time, s->completion_time); + return make_message("%" PRId64 "-incomplete.being_deleted", s->creation_time); } int complete_name(int64_t start, int64_t end, char **result) @@ -195,7 +212,7 @@ int complete_name(int64_t start, int64_t end, char **result) return -E_STRFTIME; if (!strftime(end_str, sizeof(end_str), "%a_%b_%d_%Y_%H_%M_%S", &end_tm)) return -E_STRFTIME; - *result = make_message("%lli-%lli.%s-%s", (long long) start, (long long) end, + *result = make_message("%" PRId64 "-%" PRId64 ".%s-%s", start, end, start_str, end_str); return 1; } @@ -215,3 +232,13 @@ __malloc char *name_of_newest_complete_snapshot(struct snapshot_list *sl) return name; } +int num_complete_snapshots(struct snapshot_list *sl) +{ + struct snapshot *s; + int i, ret = 0; + + FOR_EACH_SNAPSHOT(s, i, sl) + if (s->flags & SS_COMPLETE) + ret++; + return ret; +}