Skip to content

Fix macOS dir behaviour by providing EINTR handling #48694

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
Feb 25, 2021
Merged

Fix macOS dir behaviour by providing EINTR handling #48694

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fd2777
Fix macOS dir behaviour by providing EINTR handling
Therzok Feb 24, 2021
89605a0
Add comments
Therzok Feb 24, 2021
82fa411
Use errno instead of error for looping.
Therzok Feb 25, 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
24 changes: 21 additions & 3 deletions src/libraries/Native/Unix/System.Native/pal_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,10 @@ int32_t SystemNative_ReadDirR(DIR* dir, uint8_t* buffer, int32_t bufferSize, Dir
return errno == 0 ? -1 : errno;
}
#else
int error = readdir_r(dir, entry, &result);
int error;

// EINTR isn't documented, happens in practice on macOS.
while ((error = readdir_r(dir, entry, &result)) && errno == EINTR);

// positive error number returned -> failure
if (error != 0)
Expand Down Expand Up @@ -473,12 +476,27 @@ int32_t SystemNative_ReadDirR(DIR* dir, uint8_t* buffer, int32_t bufferSize, Dir

DIR* SystemNative_OpenDir(const char* path)
{
return opendir(path);
DIR *result;

// EINTR isn't documented, happens in practice on macOS.
while ((result = opendir(path)) == NULL && errno == EINTR);

return result;
}

int32_t SystemNative_CloseDir(DIR* dir)
{
return closedir(dir);
int32_t result;

result = closedir(dir);

// EINTR isn't documented, happens in practice on macOS.
if (result < 0 && errno == EINTR)
{
result = 0;
}

return result;
}

int32_t SystemNative_Pipe(int32_t pipeFds[2], int32_t flags)
Expand Down