#include "gnunet_transport_service.h"
#include "gnunet_statistics_service.h"
-#define VERBOSE GNUNET_NO
#define SYMMETRIC 0
#define ASYMMETRIC_SEND_LIMITED 1
struct GNUNET_CORE_Handle *ch;
err_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_STATISTICS_destroy (p1.stats, GNUNET_NO);
+ GNUNET_STATISTICS_destroy (p2.stats, GNUNET_NO);
GNUNET_TRANSPORT_get_hello_cancel (p2.ghh);
GNUNET_TRANSPORT_get_hello_cancel (p1.ghh);
if (p1.nth != NULL)
GNUNET_TRANSPORT_get_hello_cancel (p1.ghh);
GNUNET_TRANSPORT_get_hello_cancel (p2.ghh);
-
- GNUNET_CORE_disconnect (p1.ch);
+ if (NULL != p1.ch)
+ GNUNET_CORE_disconnect (p1.ch);
p1.ch = NULL;
- GNUNET_CORE_disconnect (p2.ch);
+ if (NULL != p2.ch)
+ GNUNET_CORE_disconnect (p2.ch);
p2.ch = NULL;
- GNUNET_TRANSPORT_disconnect (p1.th);
+ if (NULL != p1.th)
+ GNUNET_TRANSPORT_disconnect (p1.th);
p1.th = NULL;
- GNUNET_TRANSPORT_disconnect (p2.th);
+ if (NULL != p2.th)
+ GNUNET_TRANSPORT_disconnect (p2.th);
p2.th = NULL;
ok = 42;
}
max_quota_in = GNUNET_MIN (current_quota_p1_in, current_quota_p2_in);
max_quota_out = GNUNET_MIN (current_quota_p1_out, current_quota_p2_out);
if (max_quota_out < max_quota_in)
- quota_delta = max_quota_in / 5;
+ quota_delta = max_quota_in / 3;
else
- quota_delta = max_quota_out / 5;
+ quota_delta = max_quota_out / 3;
if ((throughput_out > (max_quota_out + quota_delta)) ||
(throughput_in > (max_quota_in + quota_delta)))
- ok = 1;
+ ok = 1; /* fail */
else
- ok = 0;
+ ok = 0; /* pass */
GNUNET_STATISTICS_get (p1.stats, "core", "# discarded CORE_SEND requests",
GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p1);
{
case SYMMETRIC:
GNUNET_log (kind, "Core quota compliance test with symmetric quotas: %s\n",
- (ok != 0) ? "PASSED" : "FAILED");
+ (0 == ok) ? "PASSED" : "FAILED");
break;
case ASYMMETRIC_SEND_LIMITED:
GNUNET_log (kind,
"Core quota compliance test with limited sender quota: %s\n",
- (ok != 0) ? "PASSED" : "FAILED");
+ (0 == ok) ? "PASSED" : "FAILED");
break;
case ASYMMETRIC_RECV_LIMITED:
GNUNET_log (kind,
"Core quota compliance test with limited receiver quota: %s\n",
- (ok != 0) ? "PASSED" : "FAILED");
+ (0 == ok) ? "PASSED" : "FAILED");
break;
};
GNUNET_log (kind, "Peer 1 send rate: %llu b/s (%llu bytes in %llu ms)\n",
OKPP;
/* connect p2 */
p2.ch =
- GNUNET_CORE_connect (p2.cfg, 1, &p2, &init_notify, &connect_notify,
+ GNUNET_CORE_connect (p2.cfg, &p2, &init_notify, &connect_notify,
&disconnect_notify, &inbound_notify, GNUNET_YES,
&outbound_notify, GNUNET_YES, handlers);
}
p->arm_proc =
GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
"gnunet-service-arm",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
"-c", cfgname, NULL);
#endif
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
¤t_quota_p2_out));
p1.ch =
- GNUNET_CORE_connect (p1.cfg, 1, &p1, &init_notify, &connect_notify,
+ GNUNET_CORE_connect (p1.cfg, &p1, &init_notify, &connect_notify,
&disconnect_notify, &inbound_notify, GNUNET_YES,
&outbound_notify, GNUNET_YES, handlers);
}
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n",
GNUNET_OS_process_get_pid (p->arm_proc));
- GNUNET_OS_process_close (p->arm_proc);
+ GNUNET_OS_process_destroy (p->arm_proc);
p->arm_proc = NULL;
#endif
GNUNET_CONFIGURATION_destroy (p->cfg);
}
+
static int
check ()
{
-
-
char *const argv[] = { "test-core-quota-compliance",
"-c",
"test_core_api_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
NULL
};
struct GNUNET_GETOPT_CommandLineOption options[] = {
return ok;
}
+
int
main (int argc, char *argv[])
{
}
GNUNET_log_setup ("test-core-quota-compliance",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
-#endif
NULL);
ret = check ();
if (test == SYMMETRIC)
GNUNET_DISK_directory_remove
("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/");
}
-
-
-
return ret;
}
-/* end of test_core_api_reliability.c */
+/* end of test_core_quota_compliance.c */