mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-01 18:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Support non-blocking i/o across platforms

Browse source 
This change introduces new tests for `O_NONBLOCK` and `SOCK_NONBLOCK` to
confirm that non-blocking i/o is now working on all supported platforms,
including Windows. For example, you can now say on Windows, MacOS, etc.:

    socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, IPPROTO_TCP);

To create a non-blocking IPv4 TCP socket. Or you can enable non-blocking
i/o on an existing socket / pipe / etc. file descriptor by calling fcntl

    fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);

This functionality is polyfilled on older Linux kernels too, e.g. RHEL5.
Now that fcntl() support is much better the FIOCLEX / FIONCLEX polyfills
for ioctl() have been removed since they're ugly non-POSIX diameond APIs

This change fixes a weakness in kprintf() that was causing Windows trace
tools to frequently crash.
This commit is contained in:
Justine Tunney 2023-07-23 02:56:47 -07:00
parent 5c9e03e3e0
commit 1d4eb08fa1
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
102 changed files with 678 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libc/sock/sockatmark.c
View file

@ -16,36 +16,50 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/internal.h"
#include "libc/calls/struct/fd.internal.h"
#include "libc/calls/syscall-sysv.internal.h"
#include "libc/dce.h"
#include "libc/intrin/strace.internal.h"
#include "libc/nt/winsock.h"
#include "libc/sock/internal.h"
#include "libc/sock/sock.h"
#include "libc/sysv/consts/sio.h"
#include "libc/sysv/errfuns.h"
static textwindows int sockatmark_nt(int64_t fd) {
static textwindows int sockatmark_nt(int fd, unsigned long magnum) {
bool32 res;
int64_t hand;
uint32_t bytes;
if (WSAIoctl(fd, SIOCATMARK, 0, 0, &res, sizeof(res), &bytes, 0, 0) != -1) {
return !res;
} else {
return -1;
if (fd >= g_fds.n) return ebadf();
if (g_fds.p[fd].kind != kFdSocket) return einval();
hand = g_fds.p[fd].handle;
if (WSAIoctl(hand, magnum, 0, 0, &res, sizeof(res), &bytes, 0, 0) == -1) {
return __winsockerr();
}
return !res;
}
/**
* Returns true if out of band data is available on socket for reading.
*
* @return 1 if OOB'd, 0 if not, or -1 w/ errno
* @raise EBADF if `fd` isn't an open file descriptor
* @raise EINVAL if `fd` isn't an appropriate file descriptor
*/
int sockatmark(int fd) {
int rc;
unsigned long magnum;
if (IsLinux()) {
magnum = 0x8905; // SIOCATMARK (Linux only)
} else { //
magnum = 0x40047307; // SIOCATMARK (BSD, Windows)
}
if (!IsWindows()) {
if (sys_ioctl(fd, SIOCATMARK, &rc) == -1) {
if (sys_ioctl(fd, magnum, &rc) == -1) {
rc = -1;
}
} else {
rc = sockatmark_nt(fd);
rc = sockatmark_nt(fd, magnum);
}
STRACE("sockatmark(%d) → %d% m", fd, rc);
return rc;