Handle timeouts in epoll

src/lib/sock.c

@@ -59,7 +59,7 @@ const char *sock_strerror(sock *s) {
     }
 }
 
-int sock_set_timeout_micros(sock *s, long recv_micros, long send_micros) {
+int sock_set_socket_timeout_micros(sock *s, long recv_micros, long send_micros) {
     struct timeval recv_to = {.tv_sec = recv_micros / 1000000, .tv_usec = recv_micros % 1000000},
                    send_to = {.tv_sec = send_micros / 1000000, .tv_usec = send_micros % 1000000};
 
@@ -72,8 +72,20 @@ int sock_set_timeout_micros(sock *s, long recv_micros, long send_micros) {
     return 0;
 }
 
-int sock_set_timeout(sock *s, int sec) {
-    return sock_set_timeout_micros(s, sec * 1000000L, sec * 1000000L);
+int sock_set_socket_timeout(sock *s, double sec) {
+    return sock_set_socket_timeout_micros(s, (long) (sec * 1000000L), (long) (sec * 1000000L));
+}
+
+int sock_set_timeout_micros(sock *s, long micros) {
+    if (micros < 0)
+        return -1;
+
+    s->timeout_us = micros;
+    return 0;
+}
+
+int sock_set_timeout(sock *s, double sec) {
+    return sock_set_timeout_micros(s, (long) (sec * 1000000));
 }
 
 long sock_send(sock *s, void *buf, unsigned long len, int flags) {
@@ -86,7 +98,12 @@ long sock_send(sock *s, void *buf, unsigned long len, int flags) {
     }
     s->_last_ret = ret;
     s->_errno = errno;
-    return ret >= 0 ? ret : -1;
+    if (ret >= 0) {
+        s->ts_last = clock_micros();
+        return ret;
+    } else {
+        return -1;
+    }
 }
 
 long sock_recv(sock *s, void *buf, unsigned long len, int flags) {
@@ -100,7 +117,12 @@ long sock_recv(sock *s, void *buf, unsigned long len, int flags) {
     }
     s->_last_ret = ret;
     s->_errno = errno;
-    return ret >= 0 ? ret : -1;
+    if (ret >= 0) {
+        s->ts_last = clock_micros();
+        return ret;
+    } else {
+        return -1;
+    }
 }
 
 long sock_splice(sock *dst, sock *src, void *buf, unsigned long buf_len, unsigned long len) {

src/lib/sock.h

@@ -23,6 +23,7 @@ typedef struct {
     char *addr, *s_addr;
     SSL_CTX *ctx;
     SSL *ssl;
+    long ts_start, ts_last, timeout_us;
     long _last_ret;
     int _errno;
     unsigned long _ssl_error;
@@ -32,9 +33,13 @@ int sock_enc_error(sock *s);
 
 const char *sock_strerror(sock *s);
 
-int sock_set_timeout_micros(sock *s, long recv_micros, long send_micros);
+int sock_set_socket_timeout_micros(sock *s, long recv_micros, long send_micros);
 
-int sock_set_timeout(sock *s, int sec);
+int sock_set_socket_timeout(sock *s, double sec);
+
+int sock_set_timeout_micros(sock *s, long micros);
+
+int sock_set_timeout(sock *s, double sec);
 
 long sock_send(sock *s, void *buf, unsigned long len, int flags);
 

src/lib/utils.c

@@ -211,7 +211,6 @@ long clock_micros(void) {
     return time.tv_sec * 1000000 + time.tv_nsec / 1000;
 }
 
-
 long clock_cpu(void) {
     struct timespec time;
     clock_gettime(CLOCK_THREAD_CPUTIME_ID, &time);