complete logic for incremental imports

2 files changed, 48 insertions, 1 deletions

diff --git a/src/namestore/gnunet-zoneimport.c b/src/namestore/gnunet-zoneimport.c
index 763a94c3a..493569bca 100644
--- a/src/namestore/gnunet-zoneimport.c
+++ b/src/namestore/gnunet-zoneimport.c
@@ -1093,8 +1093,25 @@ queue (const char *hostname)
   }
   else
   {
+    unsigned int rd_count = 0;
+    
+    req->expires = GNUNET_TIME_UNIT_FOREVER_ABS;
+    for (struct Record *rec = req->rec_head;
+         NULL != rec;
+         rec = rec->next)
+    {
+      struct GNUNET_TIME_Absolute at;
+
+      at.abs_value_us = rec->grd.expiration_time;
+      req->expires = GNUNET_TIME_absolute_min (req->expires,
+                                               at);
+      rd_count++;
+    }
+    if (0 == rd_count)
+      req->expires = GNUNET_TIME_UNIT_ZERO_ABS;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Succeeded hot-start with existing data for `%s'\n",
+                "Hot-start with %u existing records for `%s'\n",
+                rd_count,
                 req->label);
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c
index 03524eaeb..60a743167 100644
--- a/src/rps/test_rps.c
+++ b/src/rps/test_rps.c
@@ -1917,6 +1917,9 @@ static uint32_t get_idx_of_pid (const struct GNUNET_PeerIdentity *pid)
     }
   }
   //return 0; /* Should not happen - make compiler happy */
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+             "No known _PeerIdentity %s!\n",
+             GNUNET_i2s_full (pid));
   GNUNET_assert (0);
 }
 
@@ -1967,10 +1970,16 @@ static void compute_probabilities (uint32_t peer_idx)
   int tmp;
   uint32_t count_non_zero_prob = 0;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Computing probabilities for peer %" PRIu32 "\n", peer_idx);
   /* Firstly without knowledge of old views */
   for (i = 0; i < num_peers; i++)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+        "\tfor peer %" PRIu32 ":\n", i);
     view_size = rps_peers[i].cur_view_count;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+        "\t\tview_size: %" PRIu32 "\n", view_size);
     /* For peer i the probability of being sampled is
      * evenly distributed among all possibly observed peers. */
     /* We could have observed a peer in three cases:
@@ -2010,6 +2019,27 @@ static void compute_probabilities (uint32_t peer_idx)
       prob_pull = 0;
     }
     probs[i] = prob_push + prob_pull - (prob_push * prob_pull);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "\t\t%" PRIu32 " has %" PRIu32 " of %" PRIu32
+               " peers in its view who know %" PRIu32 " prob: %f\n",
+               peer_idx,
+               cont_views,
+               view_size,
+               i,
+               prob_pull);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "\t\tnumber of possible pull combinations: %" PRIu32 "\n",
+               binom (view_size, 0.45 * view_size));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "\t\tnumber of possible pull combinations without %" PRIu32
+               ": %" PRIu32 "\n",
+               i,
+               binom (view_size - cont_views, 0.45 * view_size));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "\t\tnumber of possible pull combinations with %" PRIu32
+               ": %" PRIu32 "\n",
+               i,
+               number_of_being_in_pull_events);
 
     if (0 != probs[i]) count_non_zero_prob++;
   }