Add memory barrier

knizhnik · knizhnik · commit 54ce23d6e114 · 2017-06-17T10:34:15.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -986,6 +986,7 @@ static bool cfs_gc_file(char* map_path, bool background)
 		else
 			remove_backups = true; /* we don't need backups anymore */
 
+		pg_write_barrier();
 		pg_atomic_fetch_sub_u32(&map->lock, CFS_GC_LOCK); /* release lock */
 
 		/* remove map backup file */
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -1708,12 +1708,16 @@ static bool
 FileLock(File file)
 {
 	Vfd *vfdP = &VfdCache[file];
+	uint64 map_generation;
 
 	 /* protect file from GC */
 	cfs_lock_file(vfdP->map, vfdP->fileName);
 
+	map_generation = vfdP->map->generation;
+	pg_read_barrier();
+	
 	/* Reopen file, because it was rewritten by gc */
-	if (vfdP->generation != vfdP->map->generation)
+	if (vfdP->generation != map_generation)
 	{
 		close(vfdP->fd);
 		vfdP->fd = BasicOpenFile(vfdP->fileName, vfdP->fileFlags, vfdP->fileMode);
@@ -1722,7 +1726,7 @@ FileLock(File file)
 			DO_DB(elog(LOG, "RE_OPEN FAILED: %d", errno));
 			return false;
 		}
-		vfdP->generation = vfdP->map->generation;
+		vfdP->generation = map_generation;
 	}
 	return true;
 }
@@ -2005,6 +2009,8 @@ FileWrite(File file, char *buffer, int amount)
 	errno = 0;
 	returnCode = write(vfdP->fd, buffer, amount);
 
+    Assert(vfdP->generation = vfdP->map->generation);
+
 	/* if write didn't set errno, assume problem is no disk space */
 	if (returnCode != amount && errno == 0)
 		errno = ENOSPC;
