Skip to content

free disk space improvements #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xwang1498 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

free disk space improvements #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e626528
support free disk size on Windows
xwang1498 Dec 20, 2023
32abff0
use f_frsize instead of f_bsize for correct free space on macOS
xwang1498 Dec 21, 2023
f2d3783
use f_bfree & f_bavail for correct number of free blocks on linux
xwang1498 Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions disk-filltest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
#include <unistd.h>

#if defined(_MSC_VER) || defined(__MINGW32__)
/* no <sys/statvfs.h> */
#include <fileapi.h>
#define HAVE_FILEAPI 1
#else
#include <sys/statvfs.h>
#define HAVE_STATVFS 1
Expand Down Expand Up @@ -270,17 +271,29 @@ void write_randfiles(void)
unsigned int expected_file_limit = UINT_MAX;

if (gopt_file_limit == UINT_MAX) {
#if HAVE_STATVFS
#if HAVE_FILEAPI
ULARGE_INTEGER free_size;

if (GetDiskFreeSpaceEx(NULL, &free_size, NULL, NULL)) {
expected_file_limit = (free_size.QuadPart + gopt_file_size - 1)
/ (1024 * 1024) / gopt_file_size;
}
#elif HAVE_STATVFS
struct statvfs buf;

if (statvfs(".", &buf) == 0) {
uint64_t free_size =
(uint64_t)(buf.f_blocks) * (uint64_t)(buf.f_bsize);
uint64_t free_blocks;
if (geteuid() == 0)
free_blocks = (uint64_t)(buf.f_bfree);
else
free_blocks = (uint64_t)(buf.f_bavail);

uint64_t free_size = free_blocks * (uint64_t)(buf.f_frsize);

expected_file_limit = (free_size + gopt_file_size - 1)
/ (1024 * 1024) / gopt_file_size;
}
#endif /* HAVE_STATVFS */
#endif
}
else {
expected_file_limit = gopt_file_limit;
Expand Down