Changeset efdfebc in mainline for uspace/srv/net/tcp/tqueue.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/tqueue.c (modified) (19 diffs)

uspace/srv/net/tcp/tqueue.c

@@ -88 +88 @@
         tcp_segment_t *seg;
 
-        log_msg(LVL_DEBUG, "tcp_tqueue_ctrl_seg(%p, %u)", conn, ctrl);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_tqueue_ctrl_seg(%p, %u)", conn, ctrl);
 
         seg = tcp_segment_make_ctrl(ctrl);
@@ -99 +99 @@
         tcp_tqueue_entry_t *tqe;
 
-        log_msg(LVL_DEBUG, "%s: tcp_tqueue_seg(%p, %p)", conn->name, conn,
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_tqueue_seg(%p, %p)", conn->name, conn,
             seg);
 
@@ -109 +109 @@
                 rt_seg = tcp_segment_dup(seg);
                 if (rt_seg == NULL) {
-                        log_msg(LVL_ERROR, "Memory allocation failed.");
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed.");
                         /* XXX Handle properly */
                         return;
@@ -116 +116 @@
                 tqe = calloc(1, sizeof(tcp_tqueue_entry_t));
                 if (tqe == NULL) {
-                        log_msg(LVL_ERROR, "Memory allocation failed.");
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed.");
                         /* XXX Handle properly */
                         return;
@@ -165 +165 @@
         tcp_segment_t *seg;
 
-        log_msg(LVL_DEBUG, "%s: tcp_tqueue_new_data()", conn->name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_tqueue_new_data()", conn->name);
 
         /* Number of free sequence numbers in send window */
@@ -172 +172 @@
 
         xfer_seqlen = min(snd_buf_seqlen, avail_wnd);
-        log_msg(LVL_DEBUG, "%s: snd_buf_seqlen = %zu, SND.WND = %zu, "
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: snd_buf_seqlen = %zu, SND.WND = %" PRIu32 ", "
             "xfer_seqlen = %zu", conn->name, snd_buf_seqlen, conn->snd_wnd,
             xfer_seqlen);
@@ -185 +185 @@
 
         if (send_fin) {
-                log_msg(LVL_DEBUG, "%s: Sending out FIN.", conn->name);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: Sending out FIN.", conn->name);
                 /* We are sending out FIN */
                 ctrl = CTL_FIN;
@@ -194 +194 @@
         seg = tcp_segment_make_data(ctrl, conn->snd_buf, data_size);
         if (seg == NULL) {
-                log_msg(LVL_ERROR, "Memory allocation failure.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failure.");
                 return;
         }
@@ -223 +223 @@
         link_t *cur, *next;
 
-        log_msg(LVL_DEBUG, "%s: tcp_tqueue_ack_received(%p)", conn->name,
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_tqueue_ack_received(%p)", conn->name,
             conn);
 
@@ -239 +239 @@
 
                         if ((tqe->seg->ctrl & CTL_FIN) != 0) {
-                                log_msg(LVL_DEBUG, "Fin has been acked");
-                                log_msg(LVL_DEBUG, "SND.UNA=%" PRIu32
+                                log_msg(LOG_DEFAULT, LVL_DEBUG, "Fin has been acked");
+                                log_msg(LOG_DEFAULT, LVL_DEBUG, "SND.UNA=%" PRIu32
                                     " SEG.SEQ=%" PRIu32 " SEG.LEN=%" PRIu32,
                                     conn->snd_una, tqe->seg->seq, tqe->seg->len);
@@ -267 +267 @@
 void tcp_conn_transmit_segment(tcp_conn_t *conn, tcp_segment_t *seg)
 {
-        log_msg(LVL_DEBUG, "%s: tcp_conn_transmit_segment(%p, %p)",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_transmit_segment(%p, %p)",
             conn->name, conn, seg);
 
@@ -282 +282 @@
 void tcp_transmit_segment(tcp_sockpair_t *sp, tcp_segment_t *seg)
 {
-        log_msg(LVL_DEBUG, "tcp_transmit_segment(f:(%x,%u),l:(%x,%u), %p)",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_transmit_segment(f:(%x,%u),l:(%x,%u), %p)",
             sp->foreign.addr.ipv4, sp->foreign.port,
             sp->local.addr.ipv4, sp->local.port, seg);
 
-        log_msg(LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32,
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32,
             seg->seq, seg->wnd);
 
@@ -300 +300 @@
 
         if (tcp_pdu_encode(sp, seg, &pdu) != EOK) {
-                log_msg(LVL_WARN, "Not enough memory. Segment dropped.");
+                log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped.");
                 return;
         }
@@ -315 +315 @@
         link_t *link;
 
-        log_msg(LVL_DEBUG, "### %s: retransmit_timeout_func(%p)", conn->name, conn);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: retransmit_timeout_func(%p)", conn->name, conn);
 
         fibril_mutex_lock(&conn->lock);
 
         if (conn->cstate == st_closed) {
-                log_msg(LVL_DEBUG, "Connection already closed.");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Connection already closed.");
                 fibril_mutex_unlock(&conn->lock);
                 tcp_conn_delref(conn);
@@ -328 +328 @@
         link = list_first(&conn->retransmit.list);
         if (link == NULL) {
-                log_msg(LVL_DEBUG, "Nothing to retransmit");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Nothing to retransmit");
                 fibril_mutex_unlock(&conn->lock);
                 tcp_conn_delref(conn);
@@ -338 +338 @@
         rt_seg = tcp_segment_dup(tqe->seg);
         if (rt_seg == NULL) {
-                log_msg(LVL_ERROR, "Memory allocation failed.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Memory allocation failed.");
                 fibril_mutex_unlock(&conn->lock);
                 tcp_conn_delref(conn);
@@ -345 +345 @@
         }
 
-        log_msg(LVL_DEBUG, "### %s: retransmitting segment", conn->name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: retransmitting segment", conn->name);
         tcp_conn_transmit_segment(tqe->conn, rt_seg);
 
@@ -358 +358 @@
 static void tcp_tqueue_timer_set(tcp_conn_t *conn)
 {
-        log_msg(LVL_DEBUG, "### %s: tcp_tqueue_timer_set()", conn->name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_set()", conn->name);
 
         /* Clear first to make sure we update refcnt correctly */
@@ -371 +371 @@
 static void tcp_tqueue_timer_clear(tcp_conn_t *conn)
 {
-        log_msg(LVL_DEBUG, "### %s: tcp_tqueue_timer_clear()", conn->name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_clear()", conn->name);
 
         if (fibril_timer_clear(conn->retransmit.timer) == fts_active)