[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34487 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34487 - gnunet/src/ats |
Date: |
Sun, 7 Dec 2014 01:17:25 +0100 |
Author: grothoff
Date: 2014-12-07 01:17:25 +0100 (Sun, 07 Dec 2014)
New Revision: 34487
Modified:
gnunet/src/ats/gnunet-ats-solver-eval.c
gnunet/src/ats/perf_ats_solver.c
Log:
-fixing misc minor ats test/driver bugs
Modified: gnunet/src/ats/gnunet-ats-solver-eval.c
===================================================================
--- gnunet/src/ats/gnunet-ats-solver-eval.c 2014-12-07 00:10:45 UTC (rev
34486)
+++ gnunet/src/ats/gnunet-ats-solver-eval.c 2014-12-07 00:17:25 UTC (rev
34487)
@@ -381,6 +381,7 @@
{
fprintf (stderr, "Cannot open `%s' to write log data!\n",
filename);
GNUNET_free (filename);
+ GNUNET_free (cur);
goto cleanup;
}
GNUNET_free (filename);
@@ -633,15 +634,19 @@
}
if (NULL == (p = find_peer_by_id (pg->peer)))
{
+ GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Setting property generation for unknown peer %u\n",
pg->peer);
+ return;
}
if (NULL == (a = find_address_by_id (p, pg->address_id)))
{
+ GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Setting property generation for unknown peer %u\n",
pg->peer);
+ return;
}
prop_value = get_property (pg);
@@ -2268,11 +2273,15 @@
GNUNET_ATS_solver_generate_property_stop (pg);
}
- GNUNET_CONTAINER_multipeermap_remove (sh->addresses, &p->peer_id,
a->ats_addr);
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_remove (sh->addresses,
+ &p->peer_id,
+ a->ats_addr));
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Removing address %u for peer %u\n",
+ op->address_id,
+ op->peer_id);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Removing address %u for peer %u\n",
- op->address_id, op->peer_id);
-
sh->env.sf.s_del (sh->solver, a->ats_addr, GNUNET_NO);
if (NULL != l)
@@ -2961,7 +2970,7 @@
GNUNET_i2s (&address->peer));
}
p = find_peer_by_pid(&address->peer);
- if(NULL == p)
+ if (NULL == p)
return;
p->assigned_bw_out = address->assigned_bw_out;
p->assigned_bw_in = address->assigned_bw_in;
@@ -3020,13 +3029,15 @@
if (GNUNET_YES == opt_disable_normalization)
{
p = find_peer_by_pid (&address->peer);
+ if (NULL == p)
+ return NULL;
a = find_address_by_ats_address (p, address);
return a->prop_abs;
}
- else
- return GAS_normalization_get_properties ((struct ATS_Address *) address);
+ return GAS_normalization_get_properties ((struct ATS_Address *) address);
}
+
static void
set_updated_property ( struct ATS_Address *address, uint32_t type, double
prop_rel)
{
Modified: gnunet/src/ats/perf_ats_solver.c
===================================================================
--- gnunet/src/ats/perf_ats_solver.c 2014-12-07 00:10:45 UTC (rev 34486)
+++ gnunet/src/ats/perf_ats_solver.c 2014-12-07 00:17:25 UTC (rev 34487)
@@ -786,7 +786,7 @@
for (cp = ph.N_peers_start; cp <= ph.N_peers_end; cp ++)
{
- cur = ph.iterations_results[ph.current_iteration-1].results_array[cp];
+ cur = ph.iterations_results[ph.current_iteration-1].results_array[cp];
if (0 == cp)
continue;
if (NULL == cur)
@@ -794,6 +794,7 @@
GNUNET_break (0);
fprintf (stderr,
"Missing result for %u peers\n", cp);
+ continue;
}
@@ -845,9 +846,9 @@
(unsigned long long )cur->d_mlp_full.rel_value_us);
}
}
-
}
+
/**
* Evaluate average results for all iterations
*/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34487 - gnunet/src/ats,
gnunet <=