cfs: a bit prettify cfs_shmem_size

Sokolov Yura · Sokolov Yura · commit c43dbbc32401 · 2017-06-26T16:43:54.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -391,9 +391,9 @@ void cfs_decrypt(const char* fname, void* block, uint32 offs, uint32 size)
  *	Section 3: Compression implementation.
  * ----------------------------------------------------------------
  */
-int cfs_shmem_size()
+size_t cfs_shmem_size()
 {
-	return sizeof(CfsState) + sizeof(pg_atomic_uint32)*MaxBackends;
+	return add_size(sizeof(CfsState), mul_size(sizeof(pg_atomic_uint32), MaxBackends));
 }
 
 void cfs_initialize()
@@ -405,8 +405,7 @@ void cfs_initialize()
 	StaticAssertStmt(CFS_GC_LOCK > MAX_BACKENDS,
 			"CFS_GC_LOCK should be larger than MAX_BACKENDS");
 
-	cfs_state = (CfsState*)ShmemInitStruct("CFS Control",
-			sizeof(CfsState) + sizeof(pg_atomic_uint32)*MaxBackends, &found);
+	cfs_state = (CfsState*)ShmemInitStruct("CFS Control", cfs_shmem_size(), &found);
 	if (!found)
 	{
 		int i;
diff --git a/src/include/storage/cfs.h b/src/include/storage/cfs.h
@@ -133,7 +133,7 @@ int      cfs_msync(FileMap* map);
 FileMap* cfs_mmap(int md);
 int      cfs_munmap(FileMap* map);
 void     cfs_initialize(void);
-int      cfs_shmem_size(void);
+size_t   cfs_shmem_size(void);
 
 void     cfs_encrypt(const char* fname, void* block, uint32 offs, uint32 size);
 void     cfs_decrypt(const char* fname, void* block, uint32 offs, uint32 size);

Original file line number	Diff line number	Diff line change
`@@ -391,9 +391,9 @@ void cfs_decrypt(const char* fname, void* block, uint32 offs, uint32 size)`
`391`	`391`	`* Section 3: Compression implementation.`
`392`	`392`	`* ----------------------------------------------------------------`
`393`	`393`	`*/`
`394`		`-int cfs_shmem_size()`
	`394`	`+size_t cfs_shmem_size()`
`395`	`395`	`{`
`396`		`- return sizeof(CfsState) + sizeof(pg_atomic_uint32)*MaxBackends;`
	`396`	`+ return add_size(sizeof(CfsState), mul_size(sizeof(pg_atomic_uint32), MaxBackends));`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`void cfs_initialize()`
`@@ -405,8 +405,7 @@ void cfs_initialize()`
`405`	`405`	`StaticAssertStmt(CFS_GC_LOCK > MAX_BACKENDS,`
`406`	`406`	`"CFS_GC_LOCK should be larger than MAX_BACKENDS");`
`407`	`407`
`408`		`- cfs_state = (CfsState*)ShmemInitStruct("CFS Control",`
`409`		`- sizeof(CfsState) + sizeof(pg_atomic_uint32)*MaxBackends, &found);`
	`408`	`+ cfs_state = (CfsState*)ShmemInitStruct("CFS Control", cfs_shmem_size(), &found);`
`410`	`409`	`if (!found)`
`411`	`410`	`{`
`412`	`411`	`int i;`