Changes in uspace/srv/net/tcp/rqueue.c [69a93df7:a1a101d] in mainline

File:

• uspace/srv/net/tcp/rqueue.c (modified) (7 diffs)

uspace/srv/net/tcp/rqueue.c

@@ -39 +39 @@
 #include <io/log.h>
 #include <stdlib.h>
-#include <thread.h>
+#include <fibril.h>
 #include "conn.h"
 #include "pdu.h"
@@ -74 +74 @@
         tcp_sockpair_t rident;
 
-        log_msg(LVL_DEBUG, "tcp_rqueue_bounce_seg()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_bounce_seg()");
 
 #ifdef BOUNCE_TRANSCODE
@@ -81 +81 @@
 
         if (tcp_pdu_encode(sp, seg, &pdu) != EOK) {
-                log_msg(LVL_WARN, "Not enough memory. Segment dropped.");
+                log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped.");
                 return;
         }
 
         if (tcp_pdu_decode(pdu, &rident, &dseg) != EOK) {
-                log_msg(LVL_WARN, "Not enough memory. Segment dropped.");
+                log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped.");
                 return;
         }
@@ -112 +112 @@
 {
         tcp_rqueue_entry_t *rqe;
-        log_msg(LVL_DEBUG, "tcp_rqueue_insert_seg()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_insert_seg()");
 
         tcp_segment_dump(seg);
@@ -118 +118 @@
         rqe = calloc(1, sizeof(tcp_rqueue_entry_t));
         if (rqe == NULL) {
-                log_msg(LVL_ERROR, "Failed allocating RQE.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating RQE.");
                 return;
         }
@@ -128 +128 @@
 }
 
-/** Receive queue handler thread. */
-static void tcp_rqueue_thread(void *arg)
+/** Receive queue handler fibril. */
+static int tcp_rqueue_fibril(void *arg)
 {
         link_t *link;
         tcp_rqueue_entry_t *rqe;
 
-        log_msg(LVL_DEBUG, "tcp_rqueue_thread()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_fibril()");
 
         while (true) {
@@ -142 +142 @@
                 tcp_as_segment_arrived(&rqe->sp, rqe->seg);
         }
+
+        /* Not reached */
+        return 0;
 }
 
-/** Start receive queue handler thread. */
-void tcp_rqueue_thread_start(void)
+/** Start receive queue handler fibril. */
+void tcp_rqueue_fibril_start(void)
 {
-        thread_id_t tid;
-        int rc;
+        fid_t fid;
 
-        log_msg(LVL_DEBUG, "tcp_rqueue_thread_start()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_fibril_start()");
 
-        rc = thread_create(tcp_rqueue_thread, NULL, "rqueue", &tid);
-        if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed creating rqueue thread.");
+        fid = fibril_create(tcp_rqueue_fibril, NULL);
+        if (fid == 0) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed creating rqueue fibril.");
                 return;
         }
+
+        fibril_add_ready(fid);
 }