Changeset b800b0e in mainline for uspace/srv/net/tcp/iqueue.c

Timestamp:

2012-10-23T13:16:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6ecf5b8

Parents:

32b3a12 (diff), b2ac3998 (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/iqueue.c (modified) (6 diffs)

uspace/srv/net/tcp/iqueue.c

@@ -67 +67 @@
         tcp_iqueue_entry_t *qe;
         link_t *link;
-        log_msg(LVL_DEBUG, "tcp_iqueue_insert_seg()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_iqueue_insert_seg()");
 
         iqe = calloc(1, sizeof(tcp_iqueue_entry_t));
         if (iqe == NULL) {
-                log_msg(LVL_ERROR, "Failed allocating IQE.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating IQE.");
                 return;
         }
@@ -108 +108 @@
         link_t *link;
 
-        log_msg(LVL_DEBUG, "tcp_get_ready_seg()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_get_ready_seg()");
 
         link = list_first(&iqueue->list);
         if (link == NULL) {
-                log_msg(LVL_DEBUG, "iqueue is empty");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "iqueue is empty");
                 return ENOENT;
         }
@@ -119 +119 @@
 
         while (!seq_no_segment_acceptable(iqueue->conn, iqe->seg)) {
-                log_msg(LVL_DEBUG, "Skipping unacceptable segment (RCV.NXT=%"
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Skipping unacceptable segment (RCV.NXT=%"
                     PRIu32 ", RCV.NXT+RCV.WND=%" PRIu32 ", SEG.SEQ=%" PRIu32
                     ", SEG.LEN=%" PRIu32 ")", iqueue->conn->rcv_nxt,
@@ -130 +130 @@
                 link = list_first(&iqueue->list);
                 if (link == NULL) {
-                        log_msg(LVL_DEBUG, "iqueue is empty");
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "iqueue is empty");
                         return ENOENT;
                 }
@@ -139 +139 @@
         /* Do not return segments that are not ready for processing */
         if (!seq_no_segment_ready(iqueue->conn, iqe->seg)) {
-                log_msg(LVL_DEBUG, "Next segment not ready: SEG.SEQ=%u, "
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Next segment not ready: SEG.SEQ=%u, "
                     "RCV.NXT=%u, SEG.LEN=%u", iqe->seg->seq,
                     iqueue->conn->rcv_nxt, iqe->seg->len);
@@ -145 +145 @@
         }
 
-        log_msg(LVL_DEBUG, "Returning ready segment %p", iqe->seg);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Returning ready segment %p", iqe->seg);
         list_remove(&iqe->link);
         *seg = iqe->seg;