Initial Rust porting (WIP)

Author: Alex Hultman

.gitattributes

@@ -1 +1,4 @@
 *.h linguist-language=C
+examples/* linguist-vendored
+misc/* linguist-vendored
+tests/* linguist-vendored

Makefile

@@ -23,13 +23,15 @@ else
 			override LDFLAGS += -L/usr/local/lib -lwolfssl
 		else
 			override CFLAGS += -DLIBUS_NO_SSL
+			override RUSTFLAGS += --cfg LIBUS_NO_SSL
 		endif
 	endif
 endif
 
 # WITH_LIBUV=1 builds with libuv as event-loop
 ifeq ($(WITH_LIBUV),1)
 	override CFLAGS += -DLIBUS_USE_LIBUV
+	override RUSTFLAGS += --cfg LIBUS_USE_LIBUV
 	override LDFLAGS += -luv
 endif
 
@@ -57,12 +59,14 @@ ifeq ($(WITH_QUIC),1)
 	override LDFLAGS += -pthread -lz -lm uSockets.a lsquic/src/liblsquic/liblsquic.a
 else
 	override CFLAGS += -std=c11 -Isrc
-	override LDFLAGS += uSockets.a
+	override LDFLAGS += uSockets.a libflush.a
 endif
 
 # By default we build the uSockets.a static library
 default:
 	rm -f *.o
+	# Do require Rust as experiment
+	rustc $(RUSTFLAGS) src/flush.rs -Clto --crate-type=staticlib -O
 	$(CC) $(CFLAGS) -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
 # Also link in Boost Asio support
 ifeq ($(WITH_ASIO),1)
@@ -78,6 +82,7 @@ ifeq ($(WITH_BORINGSSL),1)
 endif
 # Create a static library (try windows, then unix)
 	lib.exe /out:uSockets.a *.o || $(AR) rvs uSockets.a *.o
+	cp flush.lib libflush.a || echo ok
 
 # BoringSSL needs cmake and golang
 .PHONY: boringssl

src/bsd.c

@@ -299,14 +299,6 @@ LIBUS_SOCKET_DESCRIPTOR bsd_create_socket(int domain, int type, int protocol) {
     return bsd_set_nonblocking(apple_no_sigpipe(created_fd));
 }
 
-void bsd_close_socket(LIBUS_SOCKET_DESCRIPTOR fd) {
-#ifdef _WIN32
-    closesocket(fd);
-#else
-    close(fd);
-#endif
-}
-
 void bsd_shutdown_socket(LIBUS_SOCKET_DESCRIPTOR fd) {
 #ifdef _WIN32
     shutdown(fd, SD_SEND);
@@ -393,10 +385,6 @@ LIBUS_SOCKET_DESCRIPTOR bsd_accept_socket(LIBUS_SOCKET_DESCRIPTOR fd, struct bsd
     return bsd_set_nonblocking(apple_no_sigpipe(accepted_fd));
 }
 
-int bsd_recv(LIBUS_SOCKET_DESCRIPTOR fd, void *buf, int length, int flags) {
-    return recv(fd, buf, length, flags);
-}
-
 int bsd_send(LIBUS_SOCKET_DESCRIPTOR fd, const char *buf, int length, int msg_more) {
 
     // MSG_MORE (Linux), MSG_PARTIAL (Windows), TCP_NOPUSH (BSD)

src/context.c

@@ -20,16 +20,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-int default_is_low_prio_handler(struct us_socket_t *s) {
-    return 0;
-}
+int default_is_low_prio_handler(struct us_socket_t *s);
 
 /* Shared with SSL */
 
-unsigned short us_socket_context_timestamp(int ssl, struct us_socket_context_t *context) {
-    return context->timestamp;
-}
-
 void us_listen_socket_close(int ssl, struct us_listen_socket_t *ls) {
     /* us_listen_socket_t extends us_socket_t so we close in similar ways */
     if (!us_socket_is_closed(0, &ls->s)) {
@@ -128,10 +122,6 @@ void us_internal_socket_context_link_socket(struct us_socket_context_t *context,
     context->head_sockets = s;
 }
 
-struct us_loop_t *us_socket_context_loop(int ssl, struct us_socket_context_t *context) {
-    return context->loop;
-}
-
 /* Not shared with SSL */
 
 /* Lookup userdata by server name pattern */
@@ -198,53 +188,6 @@ void *us_socket_context_get_native_handle(int ssl, struct us_socket_context_t *c
     return 0;
 }
 
-/* Options is currently only applicable for SSL - this will change with time (prefer_low_memory is one example) */
-struct us_socket_context_t *us_create_socket_context(int ssl, struct us_loop_t *loop, int context_ext_size, struct us_socket_context_options_t options) {
-#ifndef LIBUS_NO_SSL
-    if (ssl) {
-        /* This function will call us, again, with SSL = false and a bigger ext_size */
-        return (struct us_socket_context_t *) us_internal_create_ssl_socket_context(loop, context_ext_size, options);
-    }
-#endif
-
-    /* This path is taken once either way - always BEFORE whatever SSL may do LATER.
-     * context_ext_size will however be modified larger in case of SSL, to hold SSL extensions */
-
-    struct us_socket_context_t *context = malloc(sizeof(struct us_socket_context_t) + context_ext_size);
-    context->loop = loop;
-    context->head_sockets = 0;
-    context->head_listen_sockets = 0;
-    context->iterator = 0;
-    context->next = 0;
-    context->is_low_prio = default_is_low_prio_handler;
-
-    /* Begin at 0 */
-    context->timestamp = 0;
-    context->long_timestamp = 0;
-    context->global_tick = 0;
-
-    us_internal_loop_link(loop, context);
-
-    /* If we are called from within SSL code, SSL code will make further changes to us */
-    return context;
-}
-
-void us_socket_context_free(int ssl, struct us_socket_context_t *context) {
-#ifndef LIBUS_NO_SSL
-    if (ssl) {
-        /* This function will call us again with SSL=false */
-        us_internal_ssl_socket_context_free((struct us_internal_ssl_socket_context_t *) context);
-        return;
-    }
-#endif
-
-    /* This path is taken once either way - always AFTER whatever SSL may do BEFORE.
-     * This is the opposite order compared to when creating the context - SSL code is cleaning up before non-SSL */
-
-    us_internal_loop_unlink(context->loop, context);
-    free(context);
-}
-
 struct us_listen_socket_t *us_socket_context_listen(int ssl, struct us_socket_context_t *context, const char *host, int port, int options, int socket_ext_size) {
 #ifndef LIBUS_NO_SSL
     if (ssl) {
@@ -412,94 +355,6 @@ struct us_socket_t *us_socket_context_adopt_socket(int ssl, struct us_socket_con
     return new_s;
 }
 
-void us_socket_context_on_open(int ssl, struct us_socket_context_t *context, struct us_socket_t *(*on_open)(struct us_socket_t *s, int is_client, char *ip, int ip_length)) {
-#ifndef LIBUS_NO_SSL
-    if (ssl) {
-        us_internal_ssl_socket_context_on_open((struct us_internal_ssl_socket_context_t *) context, (struct us_internal_ssl_socket_t * (*)(struct us_internal_ssl_socket_t *, int,  char *, int)) on_open);
-        return;
-    }
-#endif
-
-    context->on_open = on_open;
-}
-
-void us_socket_context_on_close(int ssl, struct us_socket_context_t *context, struct us_socket_t *(*on_close)(struct us_socket_t *s, int code, void *reason)) {
-#ifndef LIBUS_NO_SSL
-    if (ssl) {
-        us_internal_ssl_socket_context_on_close((struct us_internal_ssl_socket_context_t *) context, (struct us_internal_ssl_socket_t * (*)(struct us_internal_ssl_socket_t *, int code, void *reason)) on_close);
-        return;
-    }
-#endif
-
-    context->on_close = on_close;
-}
-
-void us_socket_context_on_data(int ssl, struct us_socket_context_t *context, struct us_socket_t *(*on_data)(struct us_socket_t *s, char *data, int length)) {
-#ifndef LIBUS_NO_SSL
-    if (ssl) {
-        us_internal_ssl_socket_context_on_data((struct us_internal_ssl_socket_context_t *) context, (struct us_internal_ssl_socket_t * (*)(struct us_internal_ssl_socket_t *, char *, int)) on_data);
-        return;
-    }
-#endif
-
-    context->on_data = on_data;
-}
-
-void us_socket_context_on_writable(int ssl, struct us_socket_context_t *context, struct us_socket_t *(*on_writable)(struct us_socket_t *s)) {
-#ifndef LIBUS_NO_SSL
-    if (ssl) {
-        us_internal_ssl_socket_context_on_writable((struct us_internal_ssl_socket_context_t *) context, (struct us_internal_ssl_socket_t * (*)(struct us_internal_ssl_socket_t *)) on_writable);
-        return;
-    }
-#endif
-
-    context->on_writable = on_writable;
-}
-
-void us_socket_context_on_long_timeout(int ssl, struct us_socket_context_t *context, struct us_socket_t *(*on_long_timeout)(struct us_socket_t *)) {
-#ifndef LIBUS_NO_SSL
-    if (ssl) {
-        us_internal_ssl_socket_context_on_long_timeout((struct us_internal_ssl_socket_context_t *) context, (struct us_internal_ssl_socket_t * (*)(struct us_internal_ssl_socket_t *)) on_long_timeout);
-        return;
-    }
-#endif
-
-    context->on_socket_long_timeout = on_long_timeout;
-}
-
-void us_socket_context_on_timeout(int ssl, struct us_socket_context_t *context, struct us_socket_t *(*on_timeout)(struct us_socket_t *)) {
-#ifndef LIBUS_NO_SSL
-    if (ssl) {
-        us_internal_ssl_socket_context_on_timeout((struct us_internal_ssl_socket_context_t *) context, (struct us_internal_ssl_socket_t * (*)(struct us_internal_ssl_socket_t *)) on_timeout);
-        return;
-    }
-#endif
-
-    context->on_socket_timeout = on_timeout;
-}
-
-void us_socket_context_on_end(int ssl, struct us_socket_context_t *context, struct us_socket_t *(*on_end)(struct us_socket_t *)) {
-#ifndef LIBUS_NO_SSL
-    if (ssl) {
-        us_internal_ssl_socket_context_on_end((struct us_internal_ssl_socket_context_t *) context, (struct us_internal_ssl_socket_t * (*)(struct us_internal_ssl_socket_t *)) on_end);
-        return;
-    }
-#endif
-
-    context->on_end = on_end;
-}
-
-void us_socket_context_on_connect_error(int ssl, struct us_socket_context_t *context, struct us_socket_t *(*on_connect_error)(struct us_socket_t *s, int code)) {
-#ifndef LIBUS_NO_SSL
-    if (ssl) {
-        us_internal_ssl_socket_context_on_connect_error((struct us_internal_ssl_socket_context_t *) context, (struct us_internal_ssl_socket_t * (*)(struct us_internal_ssl_socket_t *, int)) on_connect_error);
-        return;
-    }
-#endif
-    
-    context->on_connect_error = on_connect_error;
-}
-
 void *us_socket_context_ext(int ssl, struct us_socket_context_t *context) {
 #ifndef LIBUS_NO_SSL
     if (ssl) {

src/epoll_kqueue.rs

@@ -0,0 +1,63 @@
+use super::*;
+
+struct epoll_event {
+    events: u32,      /* Epoll events */
+    data: u64        /* User data variable */
+}
+
+struct kevent {
+	ident: usize,	/* identifier for this event */
+	filter: i16,	/* filter for event */
+	flags: u16, /* action flags for kqueue */
+	fflags: u32,	/* filter flag value */
+	data: i64,	/* filter data value */
+	udata: usize	/* opaque user data identifier */
+}
+
+
+const LIBUS_SOCKET_READABLE: i32 = 1;
+const LIBUS_SOCKET_WRITABLE: i32 = 2;
+
+#[repr(C)]
+pub struct us_loop_t {
+    /* us_loop_t is always convertible to us_internal_loop_data_t */
+    pub data: us_internal_loop_data_t,
+
+    /* Number of non-fallthrough polls in the loop */
+    num_polls: i32,
+
+    /* Number of ready polls this iteration */
+    num_ready_polls: i32,
+
+    /* Current index in list of ready polls */
+    current_ready_poll: i32,
+
+    /* Loop's own file descriptor */
+    fd: i32,
+
+    /* The list of ready polls */
+    #[cfg(LIBUS_USE_EPOLL)]
+    ready_polls: [epoll_event; 1024],
+    #[cfg(not(LIBUS_USE_EPOLL))]
+    ready_polls: [kevent; 1024]
+}
+
+pub struct us_poll_t {
+    data: u32
+    // alignas(LIBUS_EXT_ALIGNMENT) struct {
+    //     signed int fd : 28; // we could have this unsigned if we wanted to, -1 should never be used
+    //     unsigned int poll_type : 4;
+    // } state;
+}
+
+/* Loop */
+#[no_mangle]
+pub unsafe extern "C" fn us_loop_free(_loop: *mut us_loop_t) {
+    us_internal_loop_data_free(_loop/*(*_loop)*//*.data*/);
+    close((*_loop).fd);
+    free(_loop as *mut us_socket_context_t);
+}
+
+unsafe fn k() {
+    bsd_socket_flush(0);
+}

src/eventing/epoll_kqueue.c

@@ -32,13 +32,6 @@
 #define SET_READY_POLL(loop, index, poll) loop->ready_polls[index].udata = poll
 #endif
 
-/* Loop */
-void us_loop_free(struct us_loop_t *loop) {
-    us_internal_loop_data_free(loop);
-    close(loop->fd);
-    free(loop);
-}
-
 /* Poll */
 struct us_poll_t *us_create_poll(struct us_loop_t *loop, int fallthrough, unsigned int ext_size) {
     if (!fallthrough) {