X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=snap.h;h=626ecad003a52a1a465ea6f7f2e11f960a97df3c;hp=063a38e2497f86eba22416679fc4b37137f2d94e;hb=fafaa26953e4f452c6b91de4e24ec5ad2a8f6700;hpb=b8c18ccfb0dbe89c9a35d4989cd506b8461ea850

diff --git a/snap.h b/snap.h
index 063a38e..626ecad 100644
--- a/snap.h
+++ b/snap.h
@@ -1,32 +1,32 @@
 /*
- * Copyright (C) 2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008-2010 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** The state of snapshot creation. */
-enum {
-	/** We are ready to take the next snapshot. */
-	SCS_READY,
-	/** The pre-creation hook has been started. */
-	SCS_PRE_HOOK_RUNNING,
-	/** The pre-creation hook exited successfully. */
-	SCS_PRE_HOOK_SUCCESS,
-	/** The rsync process is running. */
-	SCS_RSYNC_RUNNING,
-	/** The rsync process exited successfully. */
-	SCS_RSYNC_SUCCESS,
-	/** The rsync process needs to be restarted. */
-	SCS_RSYNC_NEEDS_RESTART,
-	/** The post-create hook has been started. */
-	SCS_POST_HOOK_RUNNING,
-};
+
+/** The possible states for snapshot creation/removal. */
+#define HOOK_STATUS_ARRAY \
+	HSA_ITEM(HS_READY, "ready for action"), \
+	HSA_ITEM(HS_PRE_RUNNING, "pre-hook running"), \
+	HSA_ITEM(HS_PRE_SUCCESS, "pre-hook completed successfully"), \
+	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")
+
+
+#define HSA_ITEM(x, y) x
+enum hook_status {HOOK_STATUS_ARRAY};
+#undef HSA_ITEM
+#define HSA_ITEM(x, y) y
+
 
 /**
  * The status of a snapshot.
  *
  * The snapshot directories come in four different flavours, depending
- * on how the two staus flags are set. Examples:
+ * on how the two status flags are set. Examples:
  *
  * Complete, not being deleted: 1204565370-1204565371.Sun_Mar_02_2008_14_33-Sun_Mar_02_2008_14_43.
  * Complete, being deleted: 1204565370-1204565371.being_deleted.
@@ -37,10 +37,10 @@ enum snapshot_status_flags {
 	/** 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
 };
 
-/** Desribes one snapshot */
+/** Describes one snapshot. */
 struct snapshot {
 	/** The name of the directory, relative to the destination dir. */
 	char *name;
@@ -48,7 +48,7 @@ struct snapshot {
 	int64_t creation_time;
 	/**
 	 * Seconds after the epoch when creation of this snapshot completed.
-	 * Only meaningful if the SS_COMPLTE bit is set.
+	 * Only meaningful if the SS_COMPLETE bit is set.
 	 */
 	int64_t completion_time;
 	/** See \ref snapshot_status_flags. */
@@ -88,13 +88,14 @@ __malloc char *incomplete_name(int64_t start);
 __malloc char *being_deleted_name(struct snapshot *s);
 int complete_name(int64_t start, int64_t end, char **result);
 __malloc char *name_of_newest_complete_snapshot(struct snapshot_list *sl);
+int num_complete_snapshots(struct snapshot_list *sl);
 
 /**
- * Get the oldest snapshot in a snapshot list.
+ * Get the newest snapshot in a snapshot list.
  */
-_static_inline_ struct snapshot *get_oldest_snapshot(struct snapshot_list *sl)
+_static_inline_ struct snapshot *get_newest_snapshot(struct snapshot_list *sl)
 {
 	if (!sl->num_snapshots)
 		return NULL;
-	return sl->snapshots[0];
+	return sl->snapshots[sl->num_snapshots - 1];
 }