Index: uspace/srv/net/tl/tcp/Makefile =================================================================== --- uspace/srv/net/tl/tcp/Makefile (revision 2a3214e79622fd100bc5588ff1b233dea739fc5c) +++ uspace/srv/net/tl/tcp/Makefile (revision 8218b6bbf08ac4c9a5e61142d2b5a6fa28d09f5f) @@ -36,4 +36,5 @@ header.c \ iqueue.c \ + ncsim.c \ rqueue.c \ segment.c \ Index: uspace/srv/net/tl/tcp/conn.c =================================================================== --- uspace/srv/net/tl/tcp/conn.c (revision 2a3214e79622fd100bc5588ff1b233dea739fc5c) +++ uspace/srv/net/tl/tcp/conn.c (revision 8218b6bbf08ac4c9a5e61142d2b5a6fa28d09f5f) @@ -49,5 +49,5 @@ #include "tqueue.h" -#define RCV_BUF_SIZE 4096 +#define RCV_BUF_SIZE 2/*4096*/ #define SND_BUF_SIZE 4096 Index: uspace/srv/net/tl/tcp/ncsim.c =================================================================== --- uspace/srv/net/tl/tcp/ncsim.c (revision 8218b6bbf08ac4c9a5e61142d2b5a6fa28d09f5f) +++ uspace/srv/net/tl/tcp/ncsim.c (revision 8218b6bbf08ac4c9a5e61142d2b5a6fa28d09f5f) @@ -0,0 +1,162 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup tcp + * @{ + */ + +/** + * @file Network condition simulator + * + * Simulate network conditions for testing the reliability implementation: + * - variable latency + * - frame drop + */ + +#include +#include +#include +#include +#include +#include +#include "conn.h" +#include "ncsim.h" +#include "rqueue.h" +#include "tcp_type.h" + +static list_t sim_queue; +static fibril_mutex_t sim_queue_lock; +static fibril_condvar_t sim_queue_cv; + +/** Initialize segment receive queue. */ +void tcp_ncsim_init(void) +{ + list_initialize(&sim_queue); + fibril_mutex_initialize(&sim_queue_lock); + fibril_condvar_initialize(&sim_queue_cv); +} + +/** Bounce segment through simulator into receive queue. + * + * @param sp Socket pair, oriented for transmission + * @param seg Segment + */ +void tcp_ncsim_bounce_seg(tcp_sockpair_t *sp, tcp_segment_t *seg) +{ + tcp_squeue_entry_t *sqe; + tcp_squeue_entry_t *old_qe; + link_t *link; + + log_msg(LVL_DEBUG, "tcp_ncsim_insert_seg()"); + + sqe = calloc(1, sizeof(tcp_squeue_entry_t)); + if (sqe == NULL) { + log_msg(LVL_ERROR, "Failed allocating SQE."); + return; + } + + sqe->delay = random() % (1000 * 1000); + sqe->sp = *sp; + sqe->seg = seg; + + fibril_mutex_lock(&sim_queue_lock); + + link = list_first(&sim_queue); + while (link != NULL && sqe->delay > 0) { + old_qe = list_get_instance(link, tcp_squeue_entry_t, link); + if (sqe->delay < old_qe->delay) + break; + + sqe->delay -= old_qe->delay; + + link = link->next; + if (link == &sim_queue.head) + link = NULL; + } + + if (link != NULL) + list_insert_after(&sqe->link, link); + else + list_append(&sqe->link, &sim_queue); + + fibril_condvar_broadcast(&sim_queue_cv); + fibril_mutex_unlock(&sim_queue_lock); +} + +/** Network condition simulator handler thread. */ +static void tcp_ncsim_thread(void *arg) +{ + link_t *link; + tcp_squeue_entry_t *sqe; + int rc; + + log_msg(LVL_DEBUG, "tcp_ncsim_thread()"); + + + while (true) { + fibril_mutex_lock(&sim_queue_lock); + + while (list_empty(&sim_queue)) + fibril_condvar_wait(&sim_queue_cv, &sim_queue_lock); + + do { + link = list_first(&sim_queue); + sqe = list_get_instance(link, tcp_squeue_entry_t, link); + + log_msg(LVL_DEBUG, "NCSim - Sleep"); + rc = fibril_condvar_wait_timeout(&sim_queue_cv, + &sim_queue_lock, sqe->delay); + } while (rc != ETIMEOUT); + + list_remove(link); + fibril_mutex_unlock(&sim_queue_lock); + + log_msg(LVL_DEBUG, "NCSim - End Sleep"); + tcp_rqueue_bounce_seg(&sqe->sp, sqe->seg); + free(sqe); + } +} + +/** Start simulator handler thread. */ +void tcp_ncsim_thread_start(void) +{ + thread_id_t tid; + int rc; + + log_msg(LVL_DEBUG, "tcp_ncsim_thread_start()"); + + rc = thread_create(tcp_ncsim_thread, NULL, "ncsim", &tid); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed creating ncsim thread."); + return; + } +} + +/** + * @} + */ Index: uspace/srv/net/tl/tcp/ncsim.h =================================================================== --- uspace/srv/net/tl/tcp/ncsim.h (revision 8218b6bbf08ac4c9a5e61142d2b5a6fa28d09f5f) +++ uspace/srv/net/tl/tcp/ncsim.h (revision 8218b6bbf08ac4c9a5e61142d2b5a6fa28d09f5f) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup tcp + * @{ + */ +/** @file Network condition simulator + */ + +#ifndef NCSIM_H +#define NCSIM_H + +#include "tcp_type.h" + +extern void tcp_ncsim_init(void); +extern void tcp_ncsim_bounce_seg(tcp_sockpair_t *, tcp_segment_t *); +extern void tcp_ncsim_thread_start(void); + + +#endif + +/** @} + */ Index: uspace/srv/net/tl/tcp/rqueue.c =================================================================== --- uspace/srv/net/tl/tcp/rqueue.c (revision 2a3214e79622fd100bc5588ff1b233dea739fc5c) +++ uspace/srv/net/tl/tcp/rqueue.c (revision 8218b6bbf08ac4c9a5e61142d2b5a6fa28d09f5f) @@ -120,5 +120,5 @@ 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; } Index: uspace/srv/net/tl/tcp/tcp.c =================================================================== --- uspace/srv/net/tl/tcp/tcp.c (revision 2a3214e79622fd100bc5588ff1b233dea739fc5c) +++ uspace/srv/net/tl/tcp/tcp.c (revision 8218b6bbf08ac4c9a5e61142d2b5a6fa28d09f5f) @@ -41,4 +41,5 @@ #include +#include "ncsim.h" #include "rqueue.h" #include "test.h" @@ -64,4 +65,7 @@ tcp_rqueue_thread_start(); + tcp_ncsim_init(); + tcp_ncsim_thread_start(); + tcp_test(); Index: uspace/srv/net/tl/tcp/tcp_type.h =================================================================== --- uspace/srv/net/tl/tcp/tcp_type.h (revision 2a3214e79622fd100bc5588ff1b233dea739fc5c) +++ uspace/srv/net/tl/tcp/tcp_type.h (revision 8218b6bbf08ac4c9a5e61142d2b5a6fa28d09f5f) @@ -208,4 +208,12 @@ } 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; Index: uspace/srv/net/tl/tcp/tqueue.c =================================================================== --- uspace/srv/net/tl/tcp/tqueue.c (revision 2a3214e79622fd100bc5588ff1b233dea739fc5c) +++ uspace/srv/net/tl/tcp/tqueue.c (revision 8218b6bbf08ac4c9a5e61142d2b5a6fa28d09f5f) @@ -43,4 +43,5 @@ #include "conn.h" #include "header.h" +#include "ncsim.h" #include "rqueue.h" #include "segment.h" @@ -219,5 +220,6 @@ tcp_pdu_transmit(data, len); */ - tcp_rqueue_bounce_seg(sp, seg); + //tcp_rqueue_bounce_seg(sp, seg); + tcp_ncsim_bounce_seg(sp, seg); }