Skip to content

Improve the success rate when use mkdir() in multiprocessing environment #7383

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

Merged
merged 3 commits into from
Aug 18, 2021
Merged

Improve the success rate when use mkdir() in multiprocessing environment #7383

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ebbb65
Improve the success rate when use mkdir() in multiprocessing environment
NathanFreeman Aug 18, 2021
632c004
add return 0
NathanFreeman Aug 18, 2021
cc7804d
use tab and keep the options & REPORT_ERRORS check here.
NathanFreeman Aug 18, 2021
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
9 changes: 8 additions & 1 deletion main/streams/plain_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1414,7 +1414,7 @@ static int php_plain_files_mkdir(php_stream_wrapper *wrapper, const char *dir, i
}
while (true) {
int ret = VCWD_MKDIR(buf, (mode_t) mode);
if (ret < 0) {
if (ret < 0 && errno != EEXIST) {
if (options & REPORT_ERRORS) {
php_error_docref(NULL, E_WARNING, "%s", strerror(errno));
}
Expand All @@ -1433,6 +1433,13 @@ static int php_plain_files_mkdir(php_stream_wrapper *wrapper, const char *dir, i
}
if (p == e || !replaced_slash) {
/* No more directories to create */
/* issue a warning to client when the last directory was created failed */
if (ret < 0) {
if (options & REPORT_ERRORS) {
php_error_docref(NULL, E_WARNING, "%s", strerror(errno));
}
return 0;
}
return 1;
}
}
Expand Down