- cleanup

[oweals/gnunet.git] / src / ats / ats_api_scheduling.c

diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index cdf948291cefd144194c66ee0e8b3ee543dd6c4c..5a174b838573d26593b6cec440217db972f48c49 100644 (file)
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -384,9 +384,6 @@ find_empty_session_slot (struct GNUNET_ATS_SchedulingHandle *sh, struct Session
                        sh->session_array_size * 2);
   }
   GNUNET_assert (f > 0);
-  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
-              "Session %p for peer `%s' stored in slot %u \n",
-              session, GNUNET_i2s (peer), f);
   sh->session_array[f].session = session;
   sh->session_array[f].peer = *peer;
   sh->session_array[f].slot_used = GNUNET_YES;
@@ -1117,8 +1114,11 @@ GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh,
     s = find_session_id (sh, session, &address->peer);
     if (NOT_FOUND != s)
     {
-      /* Already existing */
-      GNUNET_break (0);
+      /* Already existing, nothing todo */
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Adding duplicate address for peer `%s', plugin `%s', session %p id %u\n",
+                  GNUNET_i2s (&address->peer),
+                  address->transport_name, session, s);
       return GNUNET_SYSERR;
     }
     s = find_empty_session_slot (sh, session, &address->peer);
@@ -1214,16 +1214,19 @@ GNUNET_ATS_address_update (struct GNUNET_ATS_SchedulingHandle *sh,
     s = find_session_id (sh, session, &address->peer);
     if (NOT_FOUND == s)
     {
-      /* new session without slot, find one */
-      s = find_empty_session_slot (sh, session, &address->peer);
-      GNUNET_break (NOT_FOUND != s);
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Update for unknown address for peer `%s', plugin `%s', session %p id %u\n",
+                  GNUNET_i2s (&address->peer),
+                  address->transport_name, session, s);
+
+      GNUNET_break (0);
       return;
     }
   }
   m->session_id = htonl (s);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Trying to update address for peer `%s', plugin `%s', session %p id %u\n",
+              "Updating address for peer `%s', plugin `%s', session %p id %u\n",
               GNUNET_i2s (&address->peer),
               address->transport_name, session, s);
 
@@ -1272,12 +1275,6 @@ GNUNET_ATS_address_in_use (struct GNUNET_ATS_SchedulingHandle *sh,
     return;
   }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Trying to set address to %s for peer `%s', plugin `%s', session %p\n",
-              GNUNET_i2s (&address->peer),
-              (GNUNET_NO == in_use) ? "NO" : "YES",
-              address->transport_name, session);
-
   p = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
   p->size = msize;
   p->is_init = GNUNET_NO;
@@ -1308,6 +1305,11 @@ GNUNET_ATS_address_in_use (struct GNUNET_ATS_SchedulingHandle *sh,
     }
   }
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Setting address used to %s for peer `%s', plugin `%s', session %p\n",
+              (GNUNET_YES == in_use) ? "YES" : "NO",
+              GNUNET_i2s (&address->peer), address->transport_name, session);
+
   m->session_id = htonl (s);
   pm = (char *) &m[1];
   memcpy (pm, address->address, address->address_length);
@@ -1371,12 +1373,10 @@ GNUNET_ATS_address_destroyed (struct GNUNET_ATS_SchedulingHandle *sh,
                 GNUNET_i2s (&address->peer), address->transport_name, session);
     return;
   }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Deleting address for peer `%s', plugin `%s', session %p\n",
-                GNUNET_i2s (&address->peer), address->transport_name, session);
-  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Deleting address for peer `%s', plugin `%s', session %p\n",
+              GNUNET_i2s (&address->peer), address->transport_name, session);
 
   m->session_id = htonl (s);
   pm = (char *) &m[1];