Skip to content

gh-121313: Limit the reading size from pipes to their default buffer size on Unix systems #121314

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

Closed
wants to merge 12 commits into from
+14 −0
Closed

gh-121313: Limit the reading size from pipes to their default buffer size on Unix systems #121314

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
19e11c1
Implement smaller read buffer in case we read from pipe
aplaikner Jun 17, 2024
fce1b73
Add check if on unix before fstat call & comments
aplaikner Jun 18, 2024
90b8c0e
Add todos and comments
aplaikner Jun 21, 2024
bfed37c
Cache pipe size with static int
aplaikner Jun 22, 2024
3b84e66
Add check if read size bigger than 128KiB
aplaikner Jun 27, 2024
df33af1
Add check for 16 * page size for patch
aplaikner Jul 2, 2024
624659f
Merge branch 'python:main' into feature-smaller-pipe-buffer
aplaikner Jul 3, 2024
18779d6
Remove unneeded comments and newlines
aplaikner Jul 3, 2024
6b19492
Remove whitespaces
aplaikner Jul 3, 2024
d34169a
Update spacing
aplaikner Jul 3, 2024
c352f6b
Test something
aplaikner Jul 3, 2024
ec36b7d
Test something
aplaikner Jul 3, 2024
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
14 changes: 14 additions & 0 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11341,6 +11341,20 @@
}

length = Py_MIN(length, _PY_READ_MAX);

static long page_size;
if (page_size == 0)
page_size = sysconf(_SC_PAGE_SIZE);

Check warning on line 11347 in Modules/posixmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build and test (x64) 

'sysconf' undefined; assuming extern returning int [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 11347 in Modules/posixmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build and test (x64) 

'_SC_PAGE_SIZE': undeclared identifier [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 11347 in Modules/posixmodule.c

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / build and test (x64) 

'sysconf' undefined; assuming extern returning int [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 11347 in Modules/posixmodule.c

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / build and test (x64) 

'_SC_PAGE_SIZE': undeclared identifier [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 11347 in Modules/posixmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build (arm64) 

'sysconf' undefined; assuming extern returning int [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 11347 in Modules/posixmodule.c

View workflow job for this annotation

GitHub Actions / Windows / build (arm64) 

'_SC_PAGE_SIZE': undeclared identifier [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check warning on line 11347 in Modules/posixmodule.c

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / build (arm64) 

'sysconf' undefined; assuming extern returning int [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 11347 in Modules/posixmodule.c

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / build (arm64) 

'_SC_PAGE_SIZE': undeclared identifier [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

#ifndef MS_WINDOWS
if (length > page_size * 16) {
struct stat statbuffer;
fstat(fd, &statbuffer);
if (S_ISFIFO(statbuffer.st_mode)) {
length = Py_MIN(page_size* 16, length);
}
}
#endif

buffer = PyBytes_FromStringAndSize((char *)NULL, length);
if (buffer == NULL)
Expand Down
Loading