Ledda/djstdlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

made sockets non-blocking

Browse Source
This commit is contained in:
Daniel Ledda
2025-11-28 19:35:09 +01:00
parent 45d3f28546
commit f311b242c2
4 changed files with 73 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
os_linux.c
View File

@@ -8,6 +8,8 @@
#include "unistd.h" // POSIX Standard
#include "stdio.h"
#include "pthread.h"
#include "fcntl.h"
#include "sys/epoll.h"
#include "sys/socket.h"
#include "arpa/inet.h"
@@ -141,9 +143,17 @@ OS_Thread os_createThread(void *(*entry)(void *), void *ctx) {
return (OS_Thread){ .id=handle };
}
typedef struct EPollServerEvents EPollServerEvents;
struct EPollServerEvents {
int epollFd;
};
Server serverInit(ServerInitInfo info) {
Arena *arena = arenaAlloc(info.memory);
EPollServerEvents *events = PushStructZero(arena, EPollServerEvents);
events->epollFd = epoll_create1(0);
struct sockaddr_in6 *serverAddr = PushStructZero(arena, struct sockaddr_in6);
serverAddr->sin6_family = AF_INET6;
serverAddr->sin6_port = htons(info.port);
@@ -156,9 +166,12 @@ Server serverInit(ServerInitInfo info) {
.listening=false,
.port=info.port,
.handle=(SocketHandle *)(uint64)socket(AF_INET6, SOCK_STREAM, 0 /* IPPROTO_TCP */),
.events=(ServerEvents *)events,
};
int bindErr = bind((int)(uint64)server.handle, (struct sockaddr *)serverAddr, sizeof(*serverAddr));
fcntl((uint64)server.handle, F_SETFL, fcntl((uint64)server.handle, F_GETFL, 0) | O_NONBLOCK);
int bindErr = bind((uint64)server.handle, (struct sockaddr *)serverAddr, sizeof(*serverAddr));
if (bindErr == -1) {
// TODO(dledda): handle err
}
@@ -169,7 +182,7 @@ Server serverInit(ServerInitInfo info) {
void serverListen(Server *s) {
int listenErr = listen((uint64)s->handle, s->clients.capacity);
if (listenErr == -1) {
// TODO(dledda): handle err
// TODO(dledda): handle err ?
}
}
@@ -177,19 +190,22 @@ Socket *serverAccept(Server *s) {
struct sockaddr_in6 *clientAddr = PushStructZero(s->arena, struct sockaddr_in6);
socklen_t clientAddrLen = sizeof(*clientAddr);
uint64 clientSock = accept((int)(uint64)s->handle, (struct sockaddr *)clientAddr, &clientAddrLen);
if (clientSock == -1) {
// TODO(dledda): handle err
uint64 clientSockHandle = accept((int)(uint64)s->handle, (struct sockaddr *)clientAddr, &clientAddrLen);
if (clientSockHandle == -1) {
clientSockHandle = (uint64)NULL;
} else {
fcntl((uint64)clientSockHandle, F_SETFL, fcntl((uint64)clientSockHandle, F_GETFL, 0) | O_NONBLOCK);
}
if (s->clients.length < s->clients.capacity) {
AppendList(&s->clients, ((Socket){
.handle=(SocketHandle *)(uint64)clientSock,
.handle=(SocketHandle *)(uint64)clientSockHandle,
.address=(Address *)clientAddr,
}));
return &s->clients.data[s->clients.length - 1];
} else {
return PushStructZero(s->arena, Socket);
}
return &s->clients.data[s->clients.length - 1];
}
int64 socketRead(Socket *socket, byte *dest, uint64 numBytes) {