Add the FIO* consts for *-apple-* #1049
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
|
One 6GB install later and I can confirm the constants are unchanged in |
|
@bors: r+ Thanks! |
|
📌 Commit 86e8394 has been approved by |
bors
added a commit
that referenced
this pull request
Jul 30, 2018
Add the FIO* consts for *-apple-*
Previously only FIONREAD was implemented for x86_64 apple. The constant is shared between i{3..6}86 and x86_64, so I've moved it into the shared module rather than the 64 bit specific one.
They're defined like this in sys/filio.h:
```
#define FIOCLEX _IO('f', 1) /* set close on exec on fd */
#define FIONCLEX _IO('f', 2) /* remove close on exec */
#define FIONREAD _IOR('f', 127, int) /* get # bytes to read */
#define FIONBIO _IOW('f', 126, int) /* set/clear non-blocking i/o */
#define FIOASYNC _IOW('f', 125, int) /* set/clear async i/o */
#define FIOSETOWN _IOW('f', 124, int) /* set owner */
#define FIOGETOWN _IOR('f', 123, int) /* get owner */
#define FIODTYPE _IOR('f', 122, int) /* get d_type */
```
Rather than decipher the C macros I got the values like so:
```
#include <stdio.h>
#include <sys/ioctl.h>
int main() {
printf("pub const FIOCLEX: ::c_uint = 0x%x;\n", FIOCLEX);
printf("pub const FIONCLEX: ::c_uint = 0x%x;\n", FIONCLEX);
printf("pub const FIONREAD: ::c_ulong = 0x%lx;\n", FIONREAD);
printf("pub const FIONBIO: ::c_ulong = 0x%lx;\n", FIONBIO);
printf("pub const FIOASYNC: ::c_ulong = 0x%lx;\n", FIOASYNC);
printf("pub const FIOSETOWN: ::c_ulong = 0x%lx;\n", FIOSETOWN);
printf("pub const FIOGETOWN: ::c_ulong = 0x%lx;\n", FIOGETOWN);
printf("pub const FIODTYPE: ::c_ulong = 0x%lx;\n", FIODTYPE);
}
$ gcc --target=i686-apple-darwin -o x x.c && file ./x && ./x
./x: Mach-O executable i386
pub const FIOCLEX: ::c_uint = 0x20006601;
pub const FIONCLEX: ::c_uint = 0x20006602;
pub const FIONREAD: ::c_ulong = 0x4004667f;
pub const FIONBIO: ::c_ulong = 0x8004667e;
pub const FIOASYNC: ::c_ulong = 0x8004667d;
pub const FIOSETOWN: ::c_ulong = 0x8004667c;
pub const FIOGETOWN: ::c_ulong = 0x4004667b;
pub const FIODTYPE: ::c_ulong = 0x4004667a;
$ gcc --target=x86_64-apple-darwin -o x x.c && file ./x && ./x
./x: Mach-O 64-bit executable x86_64
pub const FIOCLEX: ::c_uint = 0x20006601;
pub const FIONCLEX: ::c_uint = 0x20006602;
pub const FIONREAD: ::c_ulong = 0x4004667f;
pub const FIONBIO: ::c_ulong = 0x8004667e;
pub const FIOASYNC: ::c_ulong = 0x8004667d;
pub const FIOSETOWN: ::c_ulong = 0x8004667c;
pub const FIOGETOWN: ::c_ulong = 0x4004667b;
pub const FIODTYPE: ::c_ulong = 0x4004667a;
```
I'm just awaiting an XCode install to check they're the same on arm.
|
💥 Test timed out |
|
@bors: retry |
bors
added a commit
that referenced
this pull request
Jul 31, 2018
Add the FIO* consts for *-apple-*
Previously only FIONREAD was implemented for x86_64 apple. The constant is shared between i{3..6}86 and x86_64, so I've moved it into the shared module rather than the 64 bit specific one.
They're defined like this in sys/filio.h:
```
#define FIOCLEX _IO('f', 1) /* set close on exec on fd */
#define FIONCLEX _IO('f', 2) /* remove close on exec */
#define FIONREAD _IOR('f', 127, int) /* get # bytes to read */
#define FIONBIO _IOW('f', 126, int) /* set/clear non-blocking i/o */
#define FIOASYNC _IOW('f', 125, int) /* set/clear async i/o */
#define FIOSETOWN _IOW('f', 124, int) /* set owner */
#define FIOGETOWN _IOR('f', 123, int) /* get owner */
#define FIODTYPE _IOR('f', 122, int) /* get d_type */
```
Rather than decipher the C macros I got the values like so:
```
#include <stdio.h>
#include <sys/ioctl.h>
int main() {
printf("pub const FIOCLEX: ::c_uint = 0x%x;\n", FIOCLEX);
printf("pub const FIONCLEX: ::c_uint = 0x%x;\n", FIONCLEX);
printf("pub const FIONREAD: ::c_ulong = 0x%lx;\n", FIONREAD);
printf("pub const FIONBIO: ::c_ulong = 0x%lx;\n", FIONBIO);
printf("pub const FIOASYNC: ::c_ulong = 0x%lx;\n", FIOASYNC);
printf("pub const FIOSETOWN: ::c_ulong = 0x%lx;\n", FIOSETOWN);
printf("pub const FIOGETOWN: ::c_ulong = 0x%lx;\n", FIOGETOWN);
printf("pub const FIODTYPE: ::c_ulong = 0x%lx;\n", FIODTYPE);
}
$ gcc --target=i686-apple-darwin -o x x.c && file ./x && ./x
./x: Mach-O executable i386
pub const FIOCLEX: ::c_uint = 0x20006601;
pub const FIONCLEX: ::c_uint = 0x20006602;
pub const FIONREAD: ::c_ulong = 0x4004667f;
pub const FIONBIO: ::c_ulong = 0x8004667e;
pub const FIOASYNC: ::c_ulong = 0x8004667d;
pub const FIOSETOWN: ::c_ulong = 0x8004667c;
pub const FIOGETOWN: ::c_ulong = 0x4004667b;
pub const FIODTYPE: ::c_ulong = 0x4004667a;
$ gcc --target=x86_64-apple-darwin -o x x.c && file ./x && ./x
./x: Mach-O 64-bit executable x86_64
pub const FIOCLEX: ::c_uint = 0x20006601;
pub const FIONCLEX: ::c_uint = 0x20006602;
pub const FIONREAD: ::c_ulong = 0x4004667f;
pub const FIONBIO: ::c_ulong = 0x8004667e;
pub const FIOASYNC: ::c_ulong = 0x8004667d;
pub const FIOSETOWN: ::c_ulong = 0x8004667c;
pub const FIOGETOWN: ::c_ulong = 0x4004667b;
pub const FIODTYPE: ::c_ulong = 0x4004667a;
```
I'm just awaiting an XCode install to check they're the same on arm.
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously only FIONREAD was implemented for x86_64 apple. The constant is shared between i{3..6}86 and x86_64, so I've moved it into the shared module rather than the 64 bit specific one.
They're defined like this in sys/filio.h:
Rather than decipher the C macros I got the values like so:
I'm just awaiting an XCode install to check they're the same on arm.