Changeset efdfebc in mainline for uspace/srv/net/tcp/rqueue.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/rqueue.c (modified) (6 diffs)

uspace/srv/net/tcp/rqueue.c

@@ -74 +74 @@
         tcp_sockpair_t rident;
 
-        log_msg(LVL_DEBUG, "tcp_rqueue_bounce_seg()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_bounce_seg()");
 
 #ifdef BOUNCE_TRANSCODE
@@ -81 +81 @@
 
         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;
         }
 
         if (tcp_pdu_decode(pdu, &rident, &dseg) != EOK) {
-                log_msg(LVL_WARN, "Not enough memory. Segment dropped.");
+                log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped.");
                 return;
         }
@@ -112 +112 @@
 {
         tcp_rqueue_entry_t *rqe;
-        log_msg(LVL_DEBUG, "tcp_rqueue_insert_seg()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_insert_seg()");
 
         tcp_segment_dump(seg);
@@ -118 +118 @@
         rqe = calloc(1, sizeof(tcp_rqueue_entry_t));
         if (rqe == NULL) {
-                log_msg(LVL_ERROR, "Failed allocating RQE.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating RQE.");
                 return;
         }
@@ -134 +134 @@
         tcp_rqueue_entry_t *rqe;
 
-        log_msg(LVL_DEBUG, "tcp_rqueue_fibril()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_fibril()");
 
         while (true) {
@@ -152 +152 @@
         fid_t fid;
 
-        log_msg(LVL_DEBUG, "tcp_rqueue_fibril_start()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_rqueue_fibril_start()");
 
         fid = fibril_create(tcp_rqueue_fibril, NULL);
         if (fid == 0) {
-                log_msg(LVL_ERROR, "Failed creating rqueue fibril.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed creating rqueue fibril.");
                 return;
         }