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

uspace/srv/net/tcp/ucall.c

@@ -70 +70 @@
         tcp_conn_t *nconn;
 
-        log_msg(LVL_DEBUG, "tcp_uc_open(%p, %p, %s, %s, %p)",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open(%p, %p, %s, %s, %p)",
             lsock, fsock, acpass == ap_active ? "active" : "passive",
             oflags == tcp_open_nonblock ? "nonblock" : "none", conn);
@@ -88 +88 @@
 
         /* Wait for connection to be established or reset */
-        log_msg(LVL_DEBUG, "tcp_uc_open: Wait for connection.");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open: Wait for connection.");
         fibril_mutex_lock(&nconn->lock);
         while (nconn->cstate == st_listen ||
@@ -97 +97 @@
 
         if (nconn->cstate != st_established) {
-                log_msg(LVL_DEBUG, "tcp_uc_open: Connection was reset.");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open: Connection was reset.");
                 assert(nconn->cstate == st_closed);
                 fibril_mutex_unlock(&nconn->lock);
@@ -104 +104 @@
 
         fibril_mutex_unlock(&nconn->lock);
-        log_msg(LVL_DEBUG, "tcp_uc_open: Connection was established.");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open: Connection was established.");
 
         *conn = nconn;
-        log_msg(LVL_DEBUG, "tcp_uc_open -> %p", nconn);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open -> %p", nconn);
         return TCP_EOK;
 }
@@ -118 +118 @@
         size_t xfer_size;
 
-        log_msg(LVL_DEBUG, "%s: tcp_uc_send()", conn->name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_send()", conn->name);
 
         fibril_mutex_lock(&conn->lock);
@@ -141 +141 @@
                 buf_free = conn->snd_buf_size - conn->snd_buf_used;
                 while (buf_free == 0 && !conn->reset) {
-                        log_msg(LVL_DEBUG, "%s: buf_free == 0, waiting.",
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: buf_free == 0, waiting.",
                             conn->name);
                         fibril_condvar_wait(&conn->snd_buf_cv, &conn->lock);
@@ -175 +175 @@
         size_t xfer_size;
 
-        log_msg(LVL_DEBUG, "%s: tcp_uc_receive()", conn->name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_receive()", conn->name);
 
         fibril_mutex_lock(&conn->lock);
@@ -186 +186 @@
         /* Wait for data to become available */
         while (conn->rcv_buf_used == 0 && !conn->rcv_buf_fin && !conn->reset) {
-                log_msg(LVL_DEBUG, "tcp_uc_receive() - wait for data");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_receive() - wait for data");
                 fibril_condvar_wait(&conn->rcv_buf_cv, &conn->lock);
         }
@@ -223 +223 @@
         tcp_tqueue_ctrl_seg(conn, CTL_ACK);
 
-        log_msg(LVL_DEBUG, "%s: tcp_uc_receive() - returning %zu bytes",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_receive() - returning %zu bytes",
             conn->name, xfer_size);
 
@@ -234 +234 @@
 tcp_error_t tcp_uc_close(tcp_conn_t *conn)
 {
-        log_msg(LVL_DEBUG, "%s: tcp_uc_close()", conn->name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_close()", conn->name);
 
         fibril_mutex_lock(&conn->lock);
@@ -258 +258 @@
 void tcp_uc_abort(tcp_conn_t *conn)
 {
-        log_msg(LVL_DEBUG, "tcp_uc_abort()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_abort()");
 }
 
@@ -264 +264 @@
 void tcp_uc_status(tcp_conn_t *conn, tcp_conn_status_t *cstatus)
 {
-        log_msg(LVL_DEBUG, "tcp_uc_status()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_status()");
         cstatus->cstate = conn->cstate;
 }
@@ -276 +276 @@
 void tcp_uc_delete(tcp_conn_t *conn)
 {
-        log_msg(LVL_DEBUG, "tcp_uc_delete()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_delete()");
         tcp_conn_delete(conn);
 }
@@ -282 +282 @@
 void tcp_uc_set_cstate_cb(tcp_conn_t *conn, tcp_cstate_cb_t cb, void *arg)
 {
-        log_msg(LVL_DEBUG, "tcp_uc_set_ctate_cb(%p, %p, %p)",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_set_ctate_cb(%p, %p, %p)",
             conn, cb, arg);
 
@@ -298 +298 @@
         tcp_conn_t *conn;
 
-        log_msg(LVL_DEBUG, "tcp_as_segment_arrived(f:(%x,%u), l:(%x,%u))",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_as_segment_arrived(f:(%x,%u), l:(%x,%u))",
             sp->foreign.addr.ipv4, sp->foreign.port,
             sp->local.addr.ipv4, sp->local.port);
@@ -304 +304 @@
         conn = tcp_conn_find_ref(sp);
         if (conn == NULL) {
-                log_msg(LVL_WARN, "No connection found.");
+                log_msg(LOG_DEFAULT, LVL_WARN, "No connection found.");
                 tcp_unexpected_segment(sp, seg);
                 return;
@@ -312 +312 @@
 
         if (conn->cstate == st_closed) {
-                log_msg(LVL_WARN, "Connection is closed.");
+                log_msg(LOG_DEFAULT, LVL_WARN, "Connection is closed.");
                 tcp_unexpected_segment(sp, seg);
                 fibril_mutex_unlock(&conn->lock);
@@ -339 +339 @@
 void tcp_to_user(void)
 {
-        log_msg(LVL_DEBUG, "tcp_to_user()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_to_user()");
 }