Changeset a1e2df13 in mainline for uspace/srv/net/udp/assoc.c

Timestamp:

2012-11-11T21:31:03Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25eec4ef

Parents:

141a20d (diff), d1538a1 (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/udp/assoc.c (modified) (18 diffs)

uspace/srv/net/udp/assoc.c

@@ -104 +104 @@
 static void udp_assoc_free(udp_assoc_t *assoc)
 {
-        log_msg(LVL_DEBUG, "%s: udp_assoc_free(%p)", assoc->name, assoc);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_assoc_free(%p)", assoc->name, assoc);
 
         while (!list_empty(&assoc->rcv_queue)) {
@@ -127 +127 @@
 void udp_assoc_addref(udp_assoc_t *assoc)
 {
-        log_msg(LVL_DEBUG, "%s: upd_assoc_addref(%p)", assoc->name, assoc);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: upd_assoc_addref(%p)", assoc->name, assoc);
         atomic_inc(&assoc->refcnt);
 }
@@ -139 +139 @@
 void udp_assoc_delref(udp_assoc_t *assoc)
 {
-        log_msg(LVL_DEBUG, "%s: udp_assoc_delref(%p)", assoc->name, assoc);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_assoc_delref(%p)", assoc->name, assoc);
 
         if (atomic_predec(&assoc->refcnt) == 0)
@@ -154 +154 @@
 void udp_assoc_delete(udp_assoc_t *assoc)
 {
-        log_msg(LVL_DEBUG, "%s: udp_assoc_delete(%p)", assoc->name, assoc);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_assoc_delete(%p)", assoc->name, assoc);
 
         assert(assoc->deleted == false);
@@ -192 +192 @@
 void udp_assoc_set_foreign(udp_assoc_t *assoc, udp_sock_t *fsock)
 {
-        log_msg(LVL_DEBUG, "udp_assoc_set_foreign(%p, %p)", assoc, fsock);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_foreign(%p, %p)", assoc, fsock);
         fibril_mutex_lock(&assoc->lock);
         assoc->ident.foreign = *fsock;
@@ -205 +205 @@
 void udp_assoc_set_local(udp_assoc_t *assoc, udp_sock_t *lsock)
 {
-        log_msg(LVL_DEBUG, "udp_assoc_set_local(%p, %p)", assoc, lsock);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_local(%p, %p)", assoc, lsock);
         fibril_mutex_lock(&assoc->lock);
         assoc->ident.local = *lsock;
@@ -228 +228 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "udp_assoc_send(%p, %p, %p)",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_send(%p, %p, %p)",
             assoc, fsock, msg);
 
@@ -261 +261 @@
         udp_rcv_queue_entry_t *rqe;
 
-        log_msg(LVL_DEBUG, "udp_assoc_recv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv()");
 
         fibril_mutex_lock(&assoc->lock);
         while (list_empty(&assoc->rcv_queue) && !assoc->reset) {
-                log_msg(LVL_DEBUG, "udp_assoc_recv() - waiting");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - waiting");
                 fibril_condvar_wait(&assoc->rcv_queue_cv, &assoc->lock);
         }
 
         if (assoc->reset) {
-                log_msg(LVL_DEBUG, "udp_assoc_recv() - association was reset");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - association was reset");
                 fibril_mutex_unlock(&assoc->lock);
                 return ECONNABORTED;
         }
 
-        log_msg(LVL_DEBUG, "udp_assoc_recv() - got a message");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - got a message");
         link = list_first(&assoc->rcv_queue);
         rqe = list_get_instance(link, udp_rcv_queue_entry_t, link);
@@ -297 +297 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "udp_assoc_received(%p, %p)", rsp, msg);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_received(%p, %p)", rsp, msg);
 
         assoc = udp_assoc_find_ref(rsp);
         if (assoc == NULL) {
-                log_msg(LVL_DEBUG, "No association found. Message dropped.");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "No association found. Message dropped.");
                 /* XXX Generate ICMP error. */
                 /* XXX Might propagate error directly by error return. */
@@ -309 +309 @@
         rc = udp_assoc_queue_msg(assoc, rsp, msg);
         if (rc != EOK) {
-                log_msg(LVL_DEBUG, "Out of memory. Message dropped.");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Out of memory. Message dropped.");
                 /* XXX Generate ICMP error? */
         }
@@ -332 +332 @@
         udp_rcv_queue_entry_t *rqe;
 
-        log_msg(LVL_DEBUG, "udp_assoc_queue_msg(%p, %p, %p)",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_queue_msg(%p, %p, %p)",
             assoc, sp, msg);
 
@@ -355 +355 @@
 static bool udp_socket_match(udp_sock_t *sock, udp_sock_t *patt)
 {
-        log_msg(LVL_DEBUG, "udp_socket_match(sock=(%x,%u), pat=(%x,%u))",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_socket_match(sock=(%x,%u), pat=(%x,%u))",
             sock->addr.ipv4, sock->port, patt->addr.ipv4, patt->port);
 
@@ -366 +366 @@
                 return false;
 
-        log_msg(LVL_DEBUG, " -> match");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, " -> match");
 
         return true;
@@ -374 +374 @@
 static bool udp_sockpair_match(udp_sockpair_t *sp, udp_sockpair_t *pattern)
 {
-        log_msg(LVL_DEBUG, "udp_sockpair_match(%p, %p)", sp, pattern);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sockpair_match(%p, %p)", sp, pattern);
 
         if (!udp_socket_match(&sp->local, &pattern->local))
@@ -382 +382 @@
                 return false;
 
-        log_msg(LVL_DEBUG, "Socket pair matched.");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Socket pair matched.");
         return true;
 }
@@ -398 +398 @@
 static udp_assoc_t *udp_assoc_find_ref(udp_sockpair_t *sp)
 {
-        log_msg(LVL_DEBUG, "udp_assoc_find_ref(%p)", sp);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_find_ref(%p)", sp);
 
         fibril_mutex_lock(&assoc_list_lock);
@@ -405 +405 @@
                 udp_assoc_t *assoc = list_get_instance(link, udp_assoc_t, link);
                 udp_sockpair_t *asp = &assoc->ident;
-                log_msg(LVL_DEBUG, "compare with assoc (f:(%x,%u), l:(%x,%u))",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "compare with assoc (f:(%x,%u), l:(%x,%u))",
                     asp->foreign.addr.ipv4, asp->foreign.port,
                     asp->local.addr.ipv4, asp->local.port);
@@ -414 +414 @@
 
                 if (udp_sockpair_match(sp, asp)) {
-                        log_msg(LVL_DEBUG, "Returning assoc %p", assoc);
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "Returning assoc %p", assoc);
                         udp_assoc_addref(assoc);
                         fibril_mutex_unlock(&assoc_list_lock);