rework filesize division check.

Author: funny-falcon

src/data.c

@@ -507,8 +507,7 @@ backup_data_file(pgFile *file, const char *from_fullpath, const char *to_fullpat
 	 * NOTE This is a normal situation, if the file size has changed
 	 * since the moment we computed it.
 	 */
-	file->n_blocks = (typeof(file->n_blocks))(file->size/BLCKSZ);
-	Assert((int64_t)file->n_blocks * BLCKSZ == file->size);
+	file->n_blocks = ft_div_i64u32_to_i32(file->size, BLCKSZ);
 
 	/*
 	 * Skip unchanged file only if it exists in previous backup.
@@ -618,8 +617,7 @@ backup_data_file(pgFile *file, const char *from_fullpath, const char *to_fullpat
 	if (backup_mode == BACKUP_MODE_FULL ||
 	    backup_mode == BACKUP_MODE_DIFF_DELTA)
 	{
-		file->n_blocks = (typeof(file->n_blocks))(file->read_size / BLCKSZ);
-		Assert((int64_t)file->n_blocks * BLCKSZ == file->read_size);
+		file->n_blocks = ft_div_i64u32_to_i32(file->read_size, BLCKSZ);
 	}
 
 	/* Determine that file didn`t changed in case of incremental backup */
@@ -666,7 +664,7 @@ catchup_data_file(pgFile *file, const char *from_fullpath, const char *to_fullpa
 	 * NOTE This is a normal situation, if the file size has changed
 	 * since the moment we computed it.
 	 */
-	file->n_blocks = file->size/BLCKSZ;
+	file->n_blocks = ft_div_i64u32_to_i32(file->size, BLCKSZ);
 
 	/*
 	 * Skip unchanged file only if it exists in destination directory.
@@ -1599,8 +1597,7 @@ check_data_file(ConnectionArgs *arguments, pgFile *file,
 	 * NOTE This is a normal situation, if the file size has changed
 	 * since the moment we computed it.
 	 */
-	nblocks = (typeof(nblocks))(file->size/BLCKSZ);
-	Assert((int64_t)nblocks * BLCKSZ == file->size);
+	nblocks = ft_div_i64u32_to_i32(file->size, BLCKSZ);
 
 	for (blknum = 0; blknum < nblocks; blknum++)
 	{

src/fu_util/ft_util.h

@@ -174,6 +174,9 @@ extern void ft_set_allocators(void *(*_realloc)(void *, size_t),
 ft_inline size_t ft_add_size(size_t a, size_t b);
 ft_inline size_t ft_mul_size(size_t a, size_t b);
 
+/* division 64->32 bit */
+ft_inline int32_t ft_div_i64u32_to_i32(int64_t a, uint32_t b);
+
 #define ft_new(type)        ft_calloc(sizeof(type))
 #define ft_newar(type, cnt) ft_calloc(ft_mul_size(sizeof(type), (cnt)))
 

src/fu_util/impl/ft_impl.h

@@ -175,6 +175,15 @@ ft_inline size_t ft_mul_size(size_t a, size_t b) {
     return r;
 }
 
+/* division 64->32 bit */
+ft_inline int32_t ft_div_i64u32_to_i32(int64_t a, uint32_t b) {
+	int64_t r;
+	ft_assert(a >= 0);
+	r = a / b;
+	ft_assert(r <= INT32_MAX);
+	return (int32_t)r;
+}
+
 extern ft_gcc_malloc(ft_realloc, 1) void* ft_realloc(void* ptr, size_t new_sz);
 extern ft_gcc_malloc(ft_realloc, 1) void* ft_calloc(size_t sz);
 

src/utils/file.c

@@ -1913,8 +1913,7 @@ fio_send_pages(const char *to_fullpath, const char *from_fullpath, pgFile *file,
 		req.arg.bitmapsize = 0;
 	}
 
-	req.arg.nblocks = file->size/BLCKSZ;
-	Assert((int64_t)req.arg.nblocks * BLCKSZ == file->size);
+	req.arg.nblocks = ft_div_i64u32_to_i32(file->size, BLCKSZ);
 	req.arg.segmentno = file->segno * RELSEG_SIZE;
 	req.arg.horizonLsn = horizonLsn;
 	req.arg.checksumVersion = checksum_version;