X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.c;h=1d7f7fbdaf0115af5cbf9e43901cd0122c74fbb7;hp=ffbf5004505559cb30d8c1deed25a0ab842a8121;hb=45ae697d187c12a7ed40ae71b6a8adeda4b32b6c;hpb=006e53e5e4503defd5555522f6b38417faed451b

diff --git a/dss.c b/dss.c
index ffbf500..1d7f7fb 100644
--- a/dss.c
+++ b/dss.c
@@ -413,7 +413,8 @@ static void dss_get_snapshot_list(struct snapshot_list *sl)
 static int64_t compute_next_snapshot_time(void)
 {
 	int64_t x = 0, now = get_current_time(), unit_interval
-		= 24 * 3600 * OPT_UINT32_VAL(DSS, UNIT_INTERVAL), ret;
+		= 24 * 3600 * OPT_UINT32_VAL(DSS, UNIT_INTERVAL), ret,
+		last_completion_time;
 	unsigned wanted = desired_number_of_snapshots(0,
 		OPT_UINT32_VAL(DSS, NUM_INTERVALS)),
 		num_complete = 0;
@@ -427,6 +428,7 @@ static int64_t compute_next_snapshot_time(void)
 			continue;
 		num_complete++;
 		x += s->completion_time - s->creation_time;
+		last_completion_time = s->completion_time;
 	}
 	assert(x >= 0);
 
@@ -436,7 +438,7 @@ static int64_t compute_next_snapshot_time(void)
 	x /= num_complete; /* avg time to create one snapshot */
 	if (unit_interval < x * wanted) /* oops, no sleep at all */
 		goto out;
-	ret = s->completion_time + unit_interval / wanted - x;
+	ret = last_completion_time + unit_interval / wanted - x;
 out:
 	free_snapshot_list(&sl);
 	return ret;
@@ -1299,9 +1301,7 @@ static int handle_signal(void)
 	switch (sig) {
 	case SIGINT:
 	case SIGTERM:
-		kill_children();
-		ret = -E_SIGNAL;
-		break;
+		return -E_SIGNAL;
 	case SIGHUP:
 		ret = handle_sighup();
 		break;