fix: wip libev

Author: AeroNotix

c-src/dns.c

@@ -8,7 +8,6 @@
 #include <sys/types.h>
 
 struct sockaddr* gen_sockaddr(int family, const char *ip, const u_short port) {
-    printf("Creating sockaddr for %s:%d\n", ip, port);
     struct sockaddr_storage *ss = malloc(sizeof(struct sockaddr_storage));
 
     switch (family)

lsquic.i

@@ -2,6 +2,7 @@
 %feature("export");
 %typemap(cin) int * "(:pointer :int)";
 %typemap(cin) size_t ":unsigned-int";
+%typemap(cin) ssize_t ":int";
 %typemap(cin) lsxpack_strlen_t ":uint16";
 %typemap(cin) uint32_t ":uint32";
 %typemap(cin) uint16_t ":uint16";

src/http3/test/tests.lisp

@@ -9,15 +9,16 @@
 ;;   (let ((request (make-instance 'lsquic:request :authority "google.com")))
 ;;     (is (lsquic:lsxpack-headers request))))
 
-;; (test can-make-network-request
-;;   (let ((client (make-instance 'lsquic:client
-;;                                :quic-version "Q050"
-;;                                :host "google.com")))
-;;     (http3:connect client)
-;;     (http3:make-get-request client :path "/")))
+(test can-make-network-request
+  (let ((client (make-instance 'lsquic:client
+                               :quic-version "Q050"
+                               :log-level "info"
+                               :host "google.com")))
+    (http3:connect client)
+    (http3:make-get-request client :path "/")))
 
 
-(test header-packer
-  (let ((request (make-instance 'lsquic:request :authority "google.com")))
-    (lsquic:lsxpack-headers request)
-    (is (eq 1 0))))
+;; (test header-packer
+;;   (let* ((request (make-instance 'lsquic:request :authority "google.com"))
+;;          (hdrs (sb-sys:without-gcing (lsquic:lsxpack-headers request))))
+;;     (is (eq 1 0))))

src/lsquic/client.lisp

@@ -105,11 +105,8 @@
                    0
                    (cffi:null-pointer)
                    0)))
-          (check-null-p conn)
+        (check-null-p conn)
           (setf quic-conn conn))))
-  (sb-ext:schedule-timer
-   (sb-ext:make-timer (lambda () (process-conns client)) :thread t)
-   0.1)
   client)
 
 (defmethod new-engine ((client client))
@@ -122,33 +119,11 @@
   (with-slots (engine) client
     (engine-destroy engine)))
 
-(defmethod process-conns ((client client))
-  (bt:with-lock-held ((lock client))
-    (with-slots (engine) client
-      (lsquic:engine-process-conns engine)
-      (with-pointer-to-int (diff 0)
-        (when (> (lsquic:engine-earliest-adv-tick engine diff) 0)
-          (sb-ext:schedule-timer
-           (sb-ext:make-timer (lambda () (process-conns client)) :thread t)
-           (/ (mem-aref diff :int) 1000000)))))))
-
 (defmethod connect ((client client))
   (set-context client)
   (new-engine client)
   (quic-connect client)
-  (process-conns client)
-  (packets-in client))
-
-(defmethod packets-in ((client client))
-  ;; TODO: Switch to libev
-  (bt:with-lock-held ((lock client))
-    (with-slots (socket engine peer-ctx) client
-      (let ((read (udp:recv-packets-in engine (local-sockaddr socket) (sb-bsd-sockets:socket-file-descriptor (socket socket)) peer-ctx)))
-        (when (>= read 0)
-          (lsquic:engine-process-conns engine)
-          (sb-ext:schedule-timer
-           (sb-ext:make-timer (lambda () (packets-in client)) :thread t)
-           0.1))))))
+  (start-new-loop client))
 
 (defmethod push-stream-ctx ((client client) ctx)
   (bt:with-lock-held ((rq-lock client))
@@ -163,3 +138,12 @@
     (push-stream-ctx client pipe)
     (conn-make-stream (quic-conn client))
     pipe))
+
+(defmethod get-fd ((client client))
+  (sb-bsd-sockets:socket-file-descriptor (socket (socket client))))
+
+(defmethod start-new-loop ((client client))
+  (let ((io (cffi:foreign-alloc '(:struct lev:ev-io)))
+        (timer (cffi:foreign-alloc '(:struct lev:ev-timer))))
+    (lev:ev-init timer (callback process-conns-cb))
+    (lev:ev-io-init io (callback packets-in-cb) (get-fd client) lev:+ev-read+)))

src/lsquic/ev.lisp

@@ -0,0 +1,24 @@
+(in-package :lsquic)
+
+(defcallback process-conns-cb :void ((evloop :pointer) (timer :pointer) (revents :int))
+  (declare (ignore revents))
+  (with-foreign-slots ((lev::data) timer (:struct lev:ev-timer))
+    (let ((client (weird-pointers:restore lev::data)))
+      (with-slots (engine) client
+        (lev:ev-timer-stop evloop timer)
+        (lsquic:engine-process-conns engine)
+        (with-pointer-to-int (diff 0)
+          (when (> (lsquic:engine-earliest-adv-tick engine diff) 0)
+            (lev:ev-timer-init evloop (callback process-conns-cb) diff 0)))))))
+
+(defcallback packets-in-cb :void ((evloop :pointer) (io :pointer) (revents :int))
+  (declare (ignore revents evloop))
+  ;; TODO: Switch to libev
+  (with-foreign-slots ((lev::data) io (:struct lev:ev-io))
+    (let ((client (weird-pointers:restore lev::data)))
+      (with-slots (socket engine peer-ctx) client
+        (udp:recv-packets-in
+         engine
+         (local-sockaddr socket)
+         (get-fd client)
+         peer-ctx)))))

src/lsquic/lsquic.asd

@@ -12,11 +12,13 @@
                (:file "lsquic")
                (:file "request")
                (:file "io")
+               (:file "ev")
                (:file "client"))
   :depends-on (:bordeaux-threads
                :cffi
                :dns
                :cffi-helpers
+               :lev
                :split-sequence
                :weird-pointers
                :udp))