/*
This file is part of GNUnet.
- (C) 2010-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file ats-tests/ats-testing.h
* @param address_active is address active
* @param bandwidth_out bandwidth outbound
* @param bandwidth_in bandwidth inbound
- * @param ats ats information
- * @param ats_count number of ats inforation
+ * @param prop performance information
*/
typedef void
(*GNUNET_ATS_TEST_LogRequest) (void *cls,
int address_active,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count);
+ const struct GNUNET_ATS_Properties *prop);
/**
* Information we track for a peer in the testbed.
* Masters only
* Progress task
*/
- GNUNET_SCHEDULER_TaskIdentifier ats_task;
+ struct GNUNET_SCHEDULER_Task * ats_task;
/**
* Masters only
long int max_rate;
struct GNUNET_TIME_Relative duration_period;
- GNUNET_SCHEDULER_TaskIdentifier send_task;
+ struct GNUNET_SCHEDULER_Task * send_task;
struct GNUNET_TIME_Absolute next_ping_transmission;
struct GNUNET_TIME_Absolute time_start;
};
struct GNUNET_TIME_Relative duration_period;
struct GNUNET_TIME_Relative frequency;
- GNUNET_SCHEDULER_TaskIdentifier set_task;
+ struct GNUNET_SCHEDULER_Task * set_task;
struct GNUNET_TIME_Absolute next_ping_transmission;
struct GNUNET_TIME_Absolute time_start;
};
*/
struct GNUNET_TRANSPORT_TransmitHandle *tth;
+
+ /**
+ * Handle for traffic generator
+ */
struct TrafficGenerator *tg;
+
+ /**
+ * Handle for preference generator
+ */
struct PreferenceGenerator *pg;
/**
unsigned int bytes_received;
/* Current ATS properties */
+ struct GNUNET_ATS_Properties props;
- uint32_t ats_distance;
-
- uint32_t ats_delay;
-
+ /* Bandwidth assigned inbound */
uint32_t bandwidth_in;
+ /* Bandwidth assigned outbound */
uint32_t bandwidth_out;
- uint32_t ats_utilization_up;
-
- uint32_t ats_utilization_down;
-
- uint32_t ats_network_type;
-
- uint32_t ats_cost_wan;
+ /* Current preference values for bandwidth */
+ double pref_bandwidth;
- uint32_t ats_cost_lan;
+ /* Current preference values for delay */
+ double pref_delay;
- uint32_t ats_cost_wlan;
- double pref_bandwidth;
- double pref_delay;
};
/**
struct GNUNET_ATS_TEST_Topology
{
- /**
- * Shutdown task
- */
- GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
-
/**
* Progress task
*/
- GNUNET_SCHEDULER_TaskIdentifier progress_task;
+ struct GNUNET_SCHEDULER_Task *progress_task;
/**
* Test result
unsigned int num_episodes;
struct Episode *start;
- GNUNET_SCHEDULER_TaskIdentifier experiment_timeout_task;
- GNUNET_SCHEDULER_TaskIdentifier episode_timeout_task;
+ struct GNUNET_SCHEDULER_Task * experiment_timeout_task;
+ struct GNUNET_SCHEDULER_Task * episode_timeout_task;
struct Episode *cur;
GNUNET_ATS_TESTING_EpisodeDoneCallback ep_done_cb;
*/
void
GNUNET_ATS_TEST_experimentation_run (struct Experiment *e,
- GNUNET_ATS_TESTING_EpisodeDoneCallback ep_done_cb,
- GNUNET_ATS_TESTING_ExperimentDoneCallback e_done_cb);
+ GNUNET_ATS_TESTING_EpisodeDoneCallback ep_done_cb,
+ GNUNET_ATS_TESTING_ExperimentDoneCallback e_done_cb);
+
/**
* Load an experiment from a file
* @return the Experiment or NULL on failure
*/
struct Experiment *
-GNUNET_ATS_TEST_experimentation_load (char *filename);
+GNUNET_ATS_TEST_experimentation_load (const char *filename);
/**
*/
struct TrafficGenerator *
GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src,
- struct BenchmarkPartner *dest,
- enum GeneratorType type,
- long int base_rate,
- long int max_rate,
- struct GNUNET_TIME_Relative period,
- struct GNUNET_TIME_Relative duration);
+ struct BenchmarkPartner *dest,
+ enum GeneratorType type,
+ unsigned int base_rate,
+ unsigned int max_rate,
+ struct GNUNET_TIME_Relative period,
+ struct GNUNET_TIME_Relative duration);
+
void
GNUNET_ATS_TEST_generate_traffic_stop (struct TrafficGenerator *tg);
* Stop all traffic generators
*/
void
-GNUNET_ATS_TEST_generate_traffic_stop_all ();
+GNUNET_ATS_TEST_generate_traffic_stop_all (void);
+
+/**
+ * Generate between the source master and the partner and set preferences with a
+ * value depending on the generator.
+ *
+ * @param src source
+ * @param dest partner
+ * @param type type of preferences to generate
+ * @param base_value traffic base rate to send data with
+ * @param value_rate traffic maximum rate to send data with
+ * @param period duration of a period of preferences generation (~ 1/frequency)
+ * @param frequency how long to generate preferences
+ * @param kind ATS preference to generate
+ * @return the traffic generator
+ */
struct PreferenceGenerator *
GNUNET_ATS_TEST_generate_preferences_start (struct BenchmarkPeer *src,
- struct BenchmarkPartner *dest,
- enum GeneratorType type,
- long int base_value,
- long int value_rate,
- struct GNUNET_TIME_Relative period,
- struct GNUNET_TIME_Relative frequency,
- enum GNUNET_ATS_PreferenceKind kind);
+ struct BenchmarkPartner *dest,
+ enum GeneratorType type,
+ unsigned int base_value,
+ unsigned int value_rate,
+ struct GNUNET_TIME_Relative period,
+ struct GNUNET_TIME_Relative frequency,
+ enum GNUNET_ATS_PreferenceKind kind);
void
GNUNET_ATS_TEST_generate_preferences_stop (struct PreferenceGenerator *pg);
+
void
-GNUNET_ATS_TEST_generate_preferences_stop_all ();
+GNUNET_ATS_TEST_generate_preferences_stop_all (void);
/*
* Logging related functions
* @param log_frequency the logging frequency
* @param testname the testname
* @param masters the master peers used for benchmarking
- * @param num_master the number of master peers
+ * @param num_masters the number of master peers
+ * @param num_slaves the number of slave peers
+ * @param verbose verbose logging
* @return the logging handle or NULL on error
*/
struct LoggingHandle *
GNUNET_ATS_TEST_logging_start(struct GNUNET_TIME_Relative log_frequency,
- char *testname, struct BenchmarkPeer *masters, int num_masters, int num_slaves,
- int verbose);
+ const char *testname,
+ struct BenchmarkPeer *masters,
+ int num_masters,
+ int num_slaves,
+ int verbose);
+
/**
* Stop logging
void
GNUNET_ATS_TEST_logging_clean_up (struct LoggingHandle *l);
+
/**
* Stop logging
*
void
GNUNET_ATS_TEST_logging_stop (struct LoggingHandle *l);
+
/**
* Log all data now
*
*
* @param l logging handle to use
* @param test_name name of the current test
- * @param plots create gnuplots: GNUNET_YES or GNUNET_NO
+ * @param plots create gnuplots: #GNUNET_YES or #GNUNET_NO
*/
void
GNUNET_ATS_TEST_logging_write_to_file (struct LoggingHandle *l,
- char *test_name, int plots);
+ const char *test_name,
+ int plots);
-/*
+
+/**
* Topology related functions
*/
-
struct BenchmarkPeer *
GNUNET_ATS_TEST_get_peer (int src);
+
struct BenchmarkPartner *
GNUNET_ATS_TEST_get_partner (int src, int dest);
+
/**
* Create a topology for ats testing
*
* @param cfg_file configuration file to use for the peers
* @param num_slaves number of slaves
* @param num_masters number of masters
- * @param test_core connect to CORE service (GNUNET_YES) or transport (GNUNET_NO)
+ * @param test_core connect to CORE service (#GNUNET_YES) or transport (#GNUNET_NO)
* @param done_cb function to call when topology is setup
* @param done_cb_cls cls for callback
- * @param recv_cb callback to call when data are received
- * @param perf_cb callback to call when performance info are received
+ * @param transport_recv_cb callback to call when data are received
+ * @param log_request_cb callback to call when logging is required
*/
void
-GNUNET_ATS_TEST_create_topology (char *name, char *cfg_file,
- unsigned int num_slaves,
- unsigned int num_masters,
- int test_core,
- GNUNET_ATS_TEST_TopologySetupDoneCallback done_cb,
- void *done_cb_cls,
- GNUNET_TRANSPORT_ReceiveCallback recv_cb,
- GNUNET_ATS_TEST_LogRequest ats_perf_cb);
+GNUNET_ATS_TEST_create_topology (char *name,
+ char *cfg_file,
+ unsigned int num_slaves,
+ unsigned int num_masters,
+ int test_core,
+ GNUNET_ATS_TEST_TopologySetupDoneCallback done_cb,
+ void *done_cb_cls,
+ GNUNET_TRANSPORT_ReceiveCallback recv_cb,
+ GNUNET_ATS_TEST_LogRequest ats_perf_cb);
+
/**
* Shutdown topology
void
GNUNET_ATS_TEST_shutdown_topology (void);
+
/* end of file ats-testing.h */
projects / oweals / gnunet.git / blobdiff