Changeset d14840d in mainline

Timestamp:

2017-09-06T17:08:23Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fc3d4fd5

Parents:

42f61f01

Message:

Add test for TCP rqueue.

Location:

uspace/srv/net/tcp

Files:

• Makefile (modified) (1 diff)
• rqueue.c (modified) (5 diffs)
• rqueue.h (modified) (1 diff)
• tcp.c (modified) (2 diffs)
• tcp_type.h (modified) (1 diff)
• test/main.c (modified) (1 diff)
• test/rqueue.c (added)

uspace/srv/net/tcp/Makefile

@@ -60 +60 @@
         test/main.c \
         test/pdu.c \
+        test/rqueue.c \
         test/segment.c \
         test/seq_no.c

uspace/srv/net/tcp/rqueue.c

@@ -38 +38 @@
 #include <errno.h>
 #include <io/log.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <fibril.h>
+#include <fibril_synch.h>
 #include "conn.h"
 #include "pdu.h"
@@ -56 +58 @@
 
 static prodcons_t rqueue;
+static bool fibril_active;
+static fibril_mutex_t lock;
+static fibril_condvar_t cv;
+static tcp_rqueue_cb_t *rqueue_cb;
 
 /** Initialize segment receive queue. */
-void tcp_rqueue_init(void)
+void tcp_rqueue_init(tcp_rqueue_cb_t *rcb)
 {
         prodcons_initialize(&rqueue);
+        fibril_mutex_initialize(&lock);
+        fibril_condvar_initialize(&cv);
+        fibril_active = false;
+        rqueue_cb = rcb;
+}
+
+/** Finalize segment receive queue. */
+void tcp_rqueue_fini(void)
+{
+        inet_ep2_t epp;
+
+        inet_ep2_init(&epp);
+        tcp_rqueue_insert_seg(&epp, NULL);
+
+        fibril_mutex_lock(&lock);
+        while (fibril_active)
+                fibril_condvar_wait(&cv, &lock);
+        fibril_mutex_unlock(&lock);
 }
 
@@ -112 +136 @@
 {
         tcp_rqueue_entry_t *rqe;
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_insert_seg()");
-
-        tcp_segment_dump(seg);
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG2, "tcp_rqueue_insert_seg()");
+
+        if (seg != NULL)
+                tcp_segment_dump(seg);
 
         rqe = calloc(1, sizeof(tcp_rqueue_entry_t));
@@ -140 +166 @@
                 rqe = list_get_instance(link, tcp_rqueue_entry_t, link);
 
-                tcp_as_segment_arrived(&rqe->epp, rqe->seg);
+                if (rqe->seg == NULL) {
+                        free(rqe);
+                        break;
+                }
+
+                rqueue_cb->seg_received(&rqe->epp, rqe->seg);
                 free(rqe);
         }
 
-        /* Not reached */
+        log_msg(LOG_DEFAULT, LVL_DEBUG2, "tcp_rqueue_fibril() exiting");
+
+        /* Finished */
+        fibril_mutex_lock(&lock);
+        fibril_active = false;
+        fibril_mutex_unlock(&lock);
+        fibril_condvar_broadcast(&cv);
+
         return 0;
 }
@@ -162 +200 @@
 
         fibril_add_ready(fid);
+        fibril_active = true;
 }
 

uspace/srv/net/tcp/rqueue.h

@@ -39 +39 @@
 #include "tcp_type.h"
 
-extern void tcp_rqueue_init(void);
+extern void tcp_rqueue_init(tcp_rqueue_cb_t *);
+extern void tcp_rqueue_fibril_start(void);
+extern void tcp_rqueue_fini(void);
 extern void tcp_rqueue_bounce_seg(inet_ep2_t *, tcp_segment_t *);
 extern void tcp_rqueue_insert_seg(inet_ep2_t *, tcp_segment_t *);
-extern void tcp_rqueue_handler(void *);
-extern void tcp_rqueue_fibril_start(void);
 
 

uspace/srv/net/tcp/tcp.c

@@ -47 +47 @@
 #include "service.h"
 #include "test.h"
+#include "ucall.h"
 
 #define NAME       "tcp"
+
+static tcp_rqueue_cb_t tcp_rqueue_cb = {
+        .seg_received = tcp_as_segment_arrived
+};
 
 static int tcp_init(void)
@@ -63 +68 @@
         }
 
-        tcp_rqueue_init();
+        tcp_rqueue_init(&tcp_rqueue_cb);
         tcp_rqueue_fibril_start();
 

uspace/srv/net/tcp/tcp_type.h

@@ -280 +280 @@
 } tcp_rqueue_entry_t;
 
+/** Receive queue callbacks */
+typedef struct {
+        /** Segment received */
+        void (*seg_received)(inet_ep2_t *, tcp_segment_t *);
+} tcp_rqueue_cb_t;
+
 /** NCSim queue entry */
 typedef struct {

uspace/srv/net/tcp/test/main.c

@@ -59 +59 @@
 PCUT_IMPORT(iqueue);
 PCUT_IMPORT(pdu);
+PCUT_IMPORT(rqueue);
 PCUT_IMPORT(segment);
 PCUT_IMPORT(seq_no);