Changeset 8218b6b in mainline

Timestamp:

2011-10-26T18:01:22Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7cf7ded

Parents:

2a3214e

Message:

Simulate variable network latency for TCP testing.

Location:

uspace/srv/net/tl/tcp

Files:

• Makefile (modified) (1 diff)
• conn.c (modified) (1 diff)
• ncsim.c (added)
• ncsim.h (added)
• rqueue.c (modified) (1 diff)
• tcp.c (modified) (2 diffs)
• tcp_type.h (modified) (1 diff)
• tqueue.c (modified) (2 diffs)

uspace/srv/net/tl/tcp/Makefile

@@ -36 +36 @@
         header.c \
         iqueue.c \
+        ncsim.c \
         rqueue.c \
         segment.c \

uspace/srv/net/tl/tcp/conn.c

@@ -49 +49 @@
 #include "tqueue.h"
 
-#define RCV_BUF_SIZE 4096
+#define RCV_BUF_SIZE 2/*4096*/
 #define SND_BUF_SIZE 4096
 

uspace/srv/net/tl/tcp/rqueue.c

@@ -120 +120 @@
         rc = thread_create(tcp_rqueue_thread, NULL, "rqueue", &tid);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failde creating rqueue thread.");
+                log_msg(LVL_ERROR, "Failed creating rqueue thread.");
                 return;
         }

uspace/srv/net/tl/tcp/tcp.c

@@ -41 +41 @@
 #include <task.h>
 
+#include "ncsim.h"
 #include "rqueue.h"
 #include "test.h"
@@ -64 +65 @@
         tcp_rqueue_thread_start();
 
+        tcp_ncsim_init();
+        tcp_ncsim_thread_start();
+
         tcp_test();
 

uspace/srv/net/tl/tcp/tcp_type.h

@@ -208 +208 @@
 } tcp_rqueue_entry_t;
 
+/** NCSim queue entry */
+typedef struct {
+        link_t link;
+        suseconds_t delay;
+        tcp_sockpair_t sp;
+        tcp_segment_t *seg;
+} tcp_squeue_entry_t;
+
 typedef struct {
         link_t link;

uspace/srv/net/tl/tcp/tqueue.c

@@ -43 +43 @@
 #include "conn.h"
 #include "header.h"
+#include "ncsim.h"
 #include "rqueue.h"
 #include "segment.h"
@@ -219 +220 @@
         tcp_pdu_transmit(data, len);
 */
-        tcp_rqueue_bounce_seg(sp, seg);
+        //tcp_rqueue_bounce_seg(sp, seg);
+        tcp_ncsim_bounce_seg(sp, seg);
 }