Skip to content

Use NOCANCEL variants for close on Mac - #596

Merged
bors merged 1 commit into
rust-lang:masterfrom
Susurrus:master
May 19, 2017
Merged

Use NOCANCEL variants for close on Mac#596
bors merged 1 commit into
rust-lang:masterfrom
Susurrus:master

Conversation

@Susurrus

@SusurrusSusurrus commented May 18, 2017

Copy link
Copy Markdown
Contributor

The default close() on OS X does not provide clear errors, instead the $NOCANCEL variants should be used. These are available as of OS X 10.6 onwards.

Fixes#595.

@Susurrus

Susurrus commented May 18, 2017

Copy link
Copy Markdown
ContributorAuthor

I'm seeing failures on Mac like bad close function pointer: rust: 140735501702368 (0x7fff899614e0) != c 140735501707312 (0x7fff89962830), which I'm uncertain how I should fix. We aren't trying to point to close() on mac now, but the $NOCANCEL versions. How should I correct the tests for this?

@alexcrichton

alexcrichton commented May 18, 2017

Copy link
Copy Markdown
Member

Heh that's to be expected! It's ok to just add an exception for that as we're conciously expecting it to be different than the default close function.

@Susurrus
Use NOCANCEL variants for close on Mac
9b9f36a
The default on OS X does not provide clear errors,
instead the NOCANCEL variants should be used. These are available
as of OS X 10.6 onwards.
@Susurrus

Susurrus commented May 19, 2017

Copy link
Copy Markdown
ContributorAuthor

Alright, looks like this is good-to-go. @docbrown Any comments on this, since you originally discovered the issue. Maybe you wanna take a shot at this and confirm it fixes #595 as expected.

@docbrown

docbrown commented May 19, 2017

Copy link
Copy Markdown

@Susurrus I think you mean @DanielJoyce. :)

@Susurrus

Susurrus commented May 19, 2017

Copy link
Copy Markdown
ContributorAuthor

@docbrown Sorry, you're right! Too many PRs going around!

@alexcrichton

alexcrichton commented May 19, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented May 19, 2017

Copy link
Copy Markdown
Contributor

📌 Commit 9b9f36a has been approved by alexcrichton

@bors

bors commented May 19, 2017

Copy link
Copy Markdown
Contributor

⌛ Testing commit 9b9f36a with merge fda4049...

bors added a commit that referenced this pull request May 19, 2017
@bors
Auto merge of#596- Susurrus:master, r=alexcrichton
fda4049
Use NOCANCEL variants for close on Mac
The default `close()` on OS X does not provide clear errors, instead the `$NOCANCEL` variants should be used. These are available as of OS X 10.6 onwards.
Fixes#595.
@bors

bors commented May 19, 2017

Copy link
Copy Markdown
Contributor

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing fda4049 to master...

@bors
bors merged commit 9b9f36a into rust-lang:masterMay 19, 2017
@SusurrusSusurrus mentioned this pull request May 19, 2017
Closed
@LemonBoyLemonBoy mentioned this pull request May 27, 2019
Merged
5 tasks
@hamarb123hamarb123 mentioned this pull request Jul 4, 2025
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

plain libc close(fd) is unreliable on MacOSX

4 participants

@Susurrus@alexcrichton@docbrown@bors