From 98d902b024cb80f08f7f8960493b98b41e48756b Mon Sep 17 00:00:00 2001
From: Samy Al Bahra <sbahra@repnop.org>
Date: Sat, 1 Sep 2012 20:57:16 -0400
Subject: [PATCH] ck_epoch: Barrier placement for RMO.

---
 include/ck_epoch.h |  6 ++++++
 src/ck_epoch.c     | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/include/ck_epoch.h b/include/ck_epoch.h
index 33dcc1c..fcf5592 100644
--- a/include/ck_epoch.h
+++ b/include/ck_epoch.h
@@ -80,6 +80,9 @@ struct ck_epoch {
 };
 typedef struct ck_epoch ck_epoch_t;
 
+/*
+ * Marks the beginning of an epoch-protected section.
+ */
 CK_CC_INLINE static void
 ck_epoch_begin(ck_epoch_t *epoch, ck_epoch_record_t *record)
 {
@@ -98,6 +101,9 @@ ck_epoch_begin(ck_epoch_t *epoch, ck_epoch_record_t *record)
 	return;
 }
 
+/*
+ * Marks the end of an epoch-protected section.
+ */
 CK_CC_INLINE static void
 ck_epoch_end(ck_epoch_t *global, ck_epoch_record_t *record)
 {
diff --git a/src/ck_epoch.c b/src/ck_epoch.c
index e445d94..6ab71b8 100644
--- a/src/ck_epoch.c
+++ b/src/ck_epoch.c
@@ -276,17 +276,25 @@ ck_epoch_barrier(struct ck_epoch *global, struct ck_epoch_record *record)
 	struct ck_epoch_record *cr;
 	unsigned int delta, epoch, goal, i;
 
+	/*
+	 * Technically, we are vulnerable to an overflow in presence of multiple
+	 * writers. Realistically, this will require 2^32 scans. You can use
+	 * epoch-protected sections on the writer-side if this is a concern.
+	 */
+	delta = epoch = ck_pr_load_uint(&global->epoch);
+	goal = epoch + CK_EPOCH_GRACE;
+
 	/*
 	 * Guarantee any mutations previous to the barrier will be made visible
 	 * with respect to epoch snapshots we will read.
 	 */
 	ck_pr_fence_memory();
 
-	delta = epoch = ck_pr_load_uint(&global->epoch);
-	goal = epoch + CK_EPOCH_GRACE;
-
 	for (i = 0, cr = NULL; i < CK_EPOCH_GRACE; cr = NULL, i++) {
-		/* Determine whether all threads have observed the current epoch. */
+		/*
+		 * Determine whether all threads have observed the current epoch.
+		 * We can get away without a fence here.
+		 */
 		while (cr = ck_epoch_scan(global, cr, delta), cr != NULL)
 			ck_pr_stall();
 
@@ -337,6 +345,8 @@ ck_epoch_poll(struct ck_epoch *global, struct ck_epoch_record *record)
 	unsigned int snapshot;
 	struct ck_epoch_record *cr = NULL;
 
+	/* Serialize record epoch snapshots with respect to global epoch load. */
+	ck_pr_fence_memory();
 	cr = ck_epoch_scan(global, cr, epoch);
 	if (cr != NULL)
 		return false;