database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

MDEV-14132 follow-up fix: Make os_file_get_size() thread-safe

Browse Source 
os_file_get_size(): Use fstat() instead of calling lseek() 3 times.
In this way, concurrent calls to this function should not interfere
with each other.

Suggested by Vladislav Vaintroub.
This commit is contained in:
Marko Mäkelä
2017-10-27 19:33:38 +03:00
parent 9dfe84d5de
commit 067f83969c
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
storage/innobase/os/os0file.cc
View File

@@ -3238,17 +3238,10 @@ os_file_close_func(
@param[in] file handle to an open file
@return file size, or (os_offset_t) -1 on failure */
os_offset_t
os_file_get_size(
os_file_t file)
os_file_get_size(os_file_t file)
{
/* Store current position */
os_offset_t pos = lseek(file, 0, SEEK_CUR);
os_offset_t file_size = lseek(file, 0, SEEK_END);
/* Restore current position as the function should not change it */
lseek(file, pos, SEEK_SET);
return(file_size);
struct stat statbuf;
return fstat(file, &statbuf) ? os_offset_t(-1) : statbuf.st_size;
}
/** Gets a file size.