summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/srv9p/CMakeLists.txt3
-rw-r--r--cmd/srv9p/gnet.c263
-rw-r--r--cmd/srv9p/gnet.h29
-rw-r--r--cmd/srv9p/main.c26
4 files changed, 312 insertions, 9 deletions
diff --git a/cmd/srv9p/CMakeLists.txt b/cmd/srv9p/CMakeLists.txt
index e9d4097..61bd5c2 100644
--- a/cmd/srv9p/CMakeLists.txt
+++ b/cmd/srv9p/CMakeLists.txt
@@ -11,13 +11,14 @@ set(static_srcs
add_executable(srv9p
main.c
static9p.c
+ gnet.c
)
target_include_directories(srv9p PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(srv9p PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
target_link_libraries(srv9p
libcr
libcr_ipc
- libnetio
+ libnet
lib9p
)
diff --git a/cmd/srv9p/gnet.c b/cmd/srv9p/gnet.c
new file mode 100644
index 0000000..5072428
--- /dev/null
+++ b/cmd/srv9p/gnet.c
@@ -0,0 +1,263 @@
+/* gnet.c - libnet implementation for libcr + GNU libc
+ *
+ * Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com>
+ * SPDX-Licence-Identifier: AGPL-3.0-or-later
+ */
+
+#define _GNU_SOURCE /* for pthread_sigqueue(3gnu) */
+/* misc */
+#include <assert.h> /* for assert() */
+#include <errno.h> /* for errno, EAGAIN, EINVAL */
+#include <error.h> /* for error(3gnu) */
+#include <stdlib.h> /* for abs(), shutdown(), SHUT_RD, SHUT_WR, SHUT_RDWR */
+#include <unistd.h> /* for read(), write() */
+/* net */
+#include <arpa/inet.h> /* for htons(3p) */
+#include <netinet/in.h> /* for struct sockaddr_in */
+#include <sys/socket.h> /* for struct sockaddr, socket(), SOCK_* flags, setsockopt(), SOL_SOCKET, SO_REUSEADDR, bind(), listen(), accept() */
+/* async */
+#include <pthread.h> /* for pthread_* */
+#include <signal.h> /* for siginfo_t, struct sigaction, enum sigval, sigaction(), SIGRTMIN, SIGRTMAX, SA_SIGINFO */
+
+#include <libcr/coroutine.h>
+
+#include "gnet.h"
+
+/* common *********************************************************************/
+
+#define UNUSED(name) /* name __attribute__ ((unused)) */
+
+static int gnet_sig_io = 0;
+
+static void gnet_handle_sig_io(int UNUSED(sig), siginfo_t *info, void *UNUSED(ucontext)) {
+ cr_unpause_from_intrhandler((cid_t)info->si_value.sival_int);
+}
+
+static void gnet_init(void) {
+ struct sigaction action = {0};
+
+ if (gnet_sig_io)
+ return;
+
+ gnet_sig_io = SIGRTMIN;
+ if (gnet_sig_io > SIGRTMAX)
+ error(1, 0, "SIGRTMAX exceeded");
+
+ action.sa_flags = SA_SIGINFO;
+ action.sa_sigaction = gnet_handle_sig_io;
+ if (sigaction(gnet_sig_io, &action, NULL) < 0)
+ error(1, errno, "sigaction");
+}
+
+#define WAKE_COROUTINE(args) do { \
+ int r; \
+ union sigval val = {0}; \
+ val.sival_int = (int)((args)->cr_coroutine); \
+ do { \
+ r = pthread_sigqueue((args)->cr_thread, gnet_sig_io, val); \
+ assert(r == 0 || r == EAGAIN); \
+ } while (r == EAGAIN); \
+ } while (0)
+
+static inline bool RUN_PTHREAD(void *(*fn)(void *), void *args) {
+ pthread_t thread;
+ if (pthread_create(&thread, NULL, fn, args))
+ return true;
+ cr_pause_and_yield();
+ if (pthread_join(thread, NULL))
+ return true;
+ return false;
+}
+
+/* vtables ********************************************************************/
+
+static struct libnet_conn *gnet_accept(struct libnet_listener *_listener);
+static ssize_t gnet_read(struct libnet_conn *conn, void *buf, size_t count);
+static ssize_t gnet_write(struct libnet_conn *conn, void *buf, size_t count);
+static int gnet_close(struct libnet_conn *conn, bool rd, bool wr);
+
+static struct libnet_listener_vtable gnet_listener_vtable = {
+ .accept = gnet_accept,
+};
+
+static struct libnet_conn_vtable gnet_conn_vtable = {
+ .read = gnet_read,
+ .write = gnet_write,
+ .close = gnet_close,
+};
+
+/* listen() *******************************************************************/
+
+void gnet_listener_init(struct gnet_listener *self, uint16_t port) {
+ int listenerfd;
+ union {
+ struct sockaddr_in in;
+ struct sockaddr gen;
+ } addr = { 0 };
+
+ gnet_init();
+
+ addr.in.sin_family = AF_INET;
+ addr.in.sin_port = htons(port);
+ listenerfd = socket(AF_INET, SOCK_STREAM, 0);
+ if (listenerfd < 0)
+ error(1, errno, "socket");
+ if (setsockopt(listenerfd, SOL_SOCKET, SO_REUSEADDR, &(int){1}, sizeof(int)) < 0)
+ error(1, errno, "setsockopt");
+ if (bind(listenerfd, &addr.gen, sizeof addr) < 0)
+ error(1, errno, "bind");
+ if (listen(listenerfd, 0) < 0)
+ error(1, errno, "listen");
+
+ self->vtable = &gnet_listener_vtable;
+ self->fd = listenerfd;
+}
+
+/* accept() *******************************************************************/
+
+struct _pthread_accept_args {
+ pthread_t cr_thread;
+ cid_t cr_coroutine;
+
+ int listenerfd;
+
+ int *ret_connfd;
+};
+
+static void *_pthread_accept(void *_args) {
+ struct _pthread_accept_args *args = _args;
+ *(args->ret_connfd) = accept(args->listenerfd, NULL, NULL);
+ if (*(args->ret_connfd) < 0)
+ *(args->ret_connfd) = -errno;
+ WAKE_COROUTINE(args);
+ return NULL;
+};
+
+static struct libnet_conn *gnet_accept(struct libnet_listener *_listener) {
+ struct gnet_listener *listener = (struct gnet_listener *)_listener;
+ assert(listener);
+
+ int ret_connfd;
+ struct _pthread_accept_args args = {
+ .cr_thread = pthread_self(),
+ .cr_coroutine = cr_getcid(),
+ .listenerfd = listener->fd,
+ .ret_connfd = &ret_connfd,
+ };
+ if (RUN_PTHREAD(_pthread_accept, &args))
+ return NULL;
+
+ listener->active_conn.vtable = &gnet_conn_vtable;
+ listener->active_conn.fd = ret_connfd;
+ return (struct libnet_conn *)&listener->active_conn;
+}
+
+/* read() *********************************************************************/
+
+struct _pthread_read_args {
+ pthread_t cr_thread;
+ cid_t cr_coroutine;
+
+ int connfd;
+ void *buf;
+ size_t count;
+
+ ssize_t *ret;
+};
+
+static void *_pthread_read(void *_args) {
+ struct _pthread_read_args *args = _args;
+ *(args->ret) = read(args->connfd, args->buf, args->count);
+ if (*(args->ret) < 0)
+ *(args->ret) = -errno;
+ WAKE_COROUTINE(args);
+ return NULL;
+};
+
+static ssize_t gnet_read(struct libnet_conn *_conn, void *buf, size_t count) {
+ struct gnet_conn *conn = (struct gnet_conn *)_conn;
+ assert(conn);
+
+ ssize_t ret;
+ struct _pthread_read_args args = {
+ .cr_thread = pthread_self(),
+ .cr_coroutine = cr_getcid(),
+
+ .connfd = conn->fd,
+ .buf = buf,
+ .count = count,
+
+ .ret = &ret,
+ };
+ if (RUN_PTHREAD(_pthread_read, &args))
+ return -1;
+ return ret;
+}
+
+/* write() ********************************************************************/
+
+struct _pthread_write_args {
+ pthread_t cr_thread;
+ cid_t cr_coroutine;
+
+ int connfd;
+ void *buf;
+ size_t count;
+
+ ssize_t *ret;
+};
+
+static void *_pthread_write(void *_args) {
+ struct _pthread_read_args *args = _args;
+ size_t done = 0;
+ while (done < args->count) {
+ ssize_t r = write(args->connfd, args->buf, args->count);
+ if (r < 0) {
+ *(args->ret) = -errno;
+ break;
+ }
+ done += r;
+ }
+ if (done == args->count)
+ *(args->ret) = done;
+ WAKE_COROUTINE(args);
+ return NULL;
+};
+
+static ssize_t gnet_write(struct libnet_conn *_conn, void *buf, size_t count) {
+ struct gnet_conn *conn = (struct gnet_conn *)_conn;
+ assert(conn);
+
+ ssize_t ret;
+ struct _pthread_write_args args = {
+ .cr_thread = pthread_self(),
+ .cr_coroutine = cr_getcid(),
+
+ .connfd = conn->fd,
+ .buf = buf,
+ .count = count,
+
+ .ret = &ret,
+ };
+ if (RUN_PTHREAD(_pthread_write, &args))
+ return -1;
+ return ret;
+}
+
+/* close() ********************************************************************/
+
+static int gnet_close(struct libnet_conn *_conn, bool rd, bool wr) {
+ struct gnet_conn *conn = (struct gnet_conn *)_conn;
+ assert(conn);
+
+ int how;
+ if (rd && wr)
+ how = SHUT_RDWR;
+ else if (rd && !wr)
+ how = SHUT_RD;
+ else if (!rd && wr)
+ how = SHUT_WR;
+ else
+ return -EINVAL;
+ return shutdown(conn->fd, how) ? -errno : 0;
+}
diff --git a/cmd/srv9p/gnet.h b/cmd/srv9p/gnet.h
new file mode 100644
index 0000000..a724128
--- /dev/null
+++ b/cmd/srv9p/gnet.h
@@ -0,0 +1,29 @@
+/* gnet.c - libnet implementation for libcr + GNU libc
+ *
+ * Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com>
+ * SPDX-Licence-Identifier: AGPL-3.0-or-later
+ */
+
+#ifndef _GNET_H_
+#define _GNET_H_
+
+#include <stdint.h> /* for uint16_6 */
+
+#include <libnet/libnet.h>
+
+struct gnet_conn {
+ struct libnet_conn_vtable *vtable;
+
+ int fd;
+};
+
+struct gnet_listener {
+ struct libnet_listener_vtable *vtable;
+
+ int fd;
+ struct gnet_conn active_conn;
+};
+
+void gnet_listener_init(struct gnet_listener *self, uint16_t port);
+
+#endif /* _GNET_H_ */
diff --git a/cmd/srv9p/main.c b/cmd/srv9p/main.c
index 94a00f7..4170b5d 100644
--- a/cmd/srv9p/main.c
+++ b/cmd/srv9p/main.c
@@ -2,11 +2,12 @@
#include <stdio.h>
#include <libcr/coroutine.h>
-#include <libnetio/netio.h>
+#include <libnet/libnet.h>
#include <lib9p/srv.h>
#include "static9p.h"
#include "static.h"
+#include "gnet.h"
/* configuration **************************************************************/
@@ -78,19 +79,28 @@ static struct lib9p_srv_file *get_root(struct lib9p_srv_ctx *UNUSED(ctx), char *
/* main ***********************************************************************/
-int main() {
- int sock = netio_listen(9000);
- if (sock < 0)
- error(1, -sock, "netio_listen");
+static COROUTINE read_cr(void *_srv) {
+ struct lib9p_srv *srv = _srv;
+ assert(srv);
+
+ cr_begin();
+
+ struct gnet_listener listener;
+ gnet_listener_init(&listener, 9000);
+
+ lib9p_srv_read_cr(srv, (struct libnet_listener *)&listener);
+ cr_end();
+}
+
+int main() {
struct lib9p_srv srv = {
- .sockfd = sock,
.rootdir = get_root,
};
for (int i = 0; i < CONFIG_NETIO_NUM_CONNS; i++)
- if (!coroutine_add(lib9p_srv_read_cr, &srv))
- error(1, 0, "coroutine_add(lib9p_srv_read_cr, &srv)");
+ if (!coroutine_add(read_cr, &srv))
+ error(1, 0, "coroutine_add(read_cr, &srv)");
for (int i = 0; i < 2*CONFIG_NETIO_NUM_CONNS; i++)
if (!coroutine_add(lib9p_srv_write_cr, &srv))
error(1, 0, "coroutine_add(lib9p_srv_write_cr, &srv)");
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-11-21 20:03:27 +0000