Commit54ce23d

committed

Add memory barrier

1 parent4a8146b commit54ce23dCopy full SHA for 54ce23d

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -986,6 +986,7 @@ static bool cfs_gc_file(char* map_path, bool background)`
`986`	`986`	`else`
`987`	`987`	`remove_backups= true;/* we don't need backups anymore */`
`988`	`988`
	`989`	`+pg_write_barrier();`
`989`	`990`	`pg_atomic_fetch_sub_u32(&map->lock,CFS_GC_LOCK);/* release lock */`
`990`	`991`
`991`	`992`	`/* remove map backup file */`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1708,12 +1708,16 @@ static bool`
`1708`	`1708`	`FileLock(Filefile)`
`1709`	`1709`	`{`
`1710`	`1710`	`Vfd*vfdP=&VfdCache[file];`
	`1711`	`+uint64map_generation;`
`1711`	`1712`
`1712`	`1713`	`/* protect file from GC */`
`1713`	`1714`	`cfs_lock_file(vfdP->map,vfdP->fileName);`
`1714`	`1715`
	`1716`	`+map_generation=vfdP->map->generation;`
	`1717`	`+pg_read_barrier();`
	`1718`	`+`
`1715`	`1719`	`/* Reopen file, because it was rewritten by gc */`
`1716`		`-if (vfdP->generation!=vfdP->map->generation)`
	`1720`	`+if (vfdP->generation!=map_generation)`
`1717`	`1721`	`{`
`1718`	`1722`	`close(vfdP->fd);`
`1719`	`1723`	`vfdP->fd=BasicOpenFile(vfdP->fileName,vfdP->fileFlags,vfdP->fileMode);`
`@@ -1722,7 +1726,7 @@ FileLock(File file)`
`1722`	`1726`	`DO_DB(elog(LOG,"RE_OPEN FAILED: %d",errno));`
`1723`	`1727`	`return false;`
`1724`	`1728`	`}`
`1725`		`-vfdP->generation=vfdP->map->generation;`
	`1729`	`+vfdP->generation=map_generation;`
`1726`	`1730`	`}`
`1727`	`1731`	`return true;`
`1728`	`1732`	`}`
`@@ -2005,6 +2009,8 @@ FileWrite(File file, char *buffer, int amount)`
`2005`	`2009`	`errno=0;`
`2006`	`2010`	`returnCode=write(vfdP->fd,buffer,amount);`
`2007`	`2011`
	`2012`	`+Assert(vfdP->generation=vfdP->map->generation);`
	`2013`	`+`
`2008`	`2014`	`/* if write didn't set errno, assume problem is no disk space */`
`2009`	`2015`	`if (returnCode!=amount&&errno==0)`
`2010`	`2016`	`errno=ENOSPC;`

Comments

(0)