Changeset e6a78b9 in mainline for uspace/srv/net/tcp/ncsim.c

Timestamp:

2012-06-29T15:31:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c0 (diff), 0bbd13e (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 mainline changes.

File:

• uspace/srv/net/tcp/ncsim.c (modified) (4 diffs)

uspace/srv/net/tcp/ncsim.c

@@ -44 +44 @@
 #include <io/log.h>
 #include <stdlib.h>
-#include <thread.h>
+#include <fibril.h>
 #include "conn.h"
 #include "ncsim.h"
@@ -119 +119 @@
 }
 
-/** Network condition simulator handler thread. */
-static void tcp_ncsim_thread(void *arg)
+/** Network condition simulator handler fibril. */
+static int tcp_ncsim_fibril(void *arg)
 {
         link_t *link;
@@ -126 +126 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "tcp_ncsim_thread()");
+        log_msg(LVL_DEBUG, "tcp_ncsim_fibril()");
 
 
@@ -151 +151 @@
                 free(sqe);
         }
+
+        /* Not reached */
+        return 0;
 }
 
-/** Start simulator handler thread. */
-void tcp_ncsim_thread_start(void)
+/** Start simulator handler fibril. */
+void tcp_ncsim_fibril_start(void)
 {
-        thread_id_t tid;
-        int rc;
+        fid_t fid;
 
-        log_msg(LVL_DEBUG, "tcp_ncsim_thread_start()");
+        log_msg(LVL_DEBUG, "tcp_ncsim_fibril_start()");
 
-        rc = thread_create(tcp_ncsim_thread, NULL, "ncsim", &tid);
-        if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed creating ncsim thread.");
+        fid = fibril_create(tcp_ncsim_fibril, NULL);
+        if (fid == 0) {
+                log_msg(LVL_ERROR, "Failed creating ncsim fibril.");
                 return;
         }
+
+        fibril_add_ready(fid);
 }