Changeset bed78cb in mainline for uspace/srv/net/tcp/rqueue.c

Timestamp:

2012-05-10T07:28:31Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

81a7858

Parents:

5b26747 (diff), fce7b43 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

• uspace/srv/net/tcp/rqueue.c (modified) (3 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"
@@ -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(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(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(LVL_ERROR, "Failed creating rqueue fibril.");
                 return;
         }
+
+        fibril_add_ready(fid);
 }