Skip to content

Allow adding external event loop in socket server #614

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 1 commit into from
Nov 8, 2024
Merged

Allow adding external event loop in socket server #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions ggl-socket/include/ggl/socket_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,7 @@ GglError ggl_socket_server_listen(
void *ctx
);

extern void (*ggl_socket_server_ext_handler)(void);
extern int ggl_socket_server_ext_fd;

#endif
17 changes: 17 additions & 0 deletions ggl-socket/src/socket_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
#include <unistd.h>
#include <stdint.h>

void (*ggl_socket_server_ext_handler)(void) = NULL;
int ggl_socket_server_ext_fd;

static void new_client_available(
GglSocketPool *pool, int epoll_fd, int socket_fd
) {
Expand Down Expand Up @@ -171,13 +174,18 @@ typedef struct {
// server_fd's data must be out of range of handle (uint32_t)
static const uint64_t SERVER_FD_DATA = UINT64_MAX;

static const uint64_t EXT_FD_DATA = UINT64_MAX - 1;

static GglError epoll_fd_ready(void *epoll_ctx, uint64_t data) {
SocketServerCtx *server_ctx = epoll_ctx;

if (data == SERVER_FD_DATA) {
new_client_available(
server_ctx->pool, server_ctx->epoll_fd, server_ctx->server_fd
);
} else if ((ggl_socket_server_ext_handler != NULL)
&& (data == EXT_FD_DATA)) {
ggl_socket_server_ext_handler();
} else if (data <= UINT32_MAX) {
client_data_ready(
server_ctx->pool,
Expand Down Expand Up @@ -230,6 +238,15 @@ GglError ggl_socket_server_listen(
return ret;
}

if (ggl_socket_server_ext_handler != NULL) {
ret = ggl_socket_epoll_add(
epoll_fd, ggl_socket_server_ext_fd, EXT_FD_DATA
);
if (ret != GGL_ERR_OK) {
return ret;
}
}

SocketServerCtx server_ctx = {
.pool = pool,
.epoll_fd = epoll_fd,
Expand Down