aboutsummaryrefslogtreecommitdiff
path: root/src/ats
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-07-05 14:00:50 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-07-05 14:00:50 +0000
commit5c7e09ae41cc0b52640d8a5f6e2dd58a9c4b232d (patch)
treec43c1c56029899e7c8ccd16e68e3c97ef08ca8b0 /src/ats
parent7de61257214260f334e04007351c215c2d25622d (diff)
downloadgnunet-5c7e09ae41cc0b52640d8a5f6e2dd58a9c4b232d.tar.gz
gnunet-5c7e09ae41cc0b52640d8a5f6e2dd58a9c4b232d.zip
doxygen documentation
Diffstat (limited to 'src/ats')
-rw-r--r--src/ats/gnunet-service-ats-solver_mlp.c16
-rw-r--r--src/ats/gnunet-service-ats-solver_mlp.h17
-rw-r--r--src/ats/gnunet-service-ats-solver_proportional.c6
-rw-r--r--src/ats/gnunet-service-ats-solver_proportional.h48
-rw-r--r--src/ats/gnunet-service-ats_addresses.c8
-rw-r--r--src/ats/gnunet-service-ats_addresses.h4
-rw-r--r--src/ats/perf_ats_mlp.c2
7 files changed, 59 insertions, 42 deletions
diff --git a/src/ats/gnunet-service-ats-solver_mlp.c b/src/ats/gnunet-service-ats-solver_mlp.c
index 27ff63ea3..84cacd017 100644
--- a/src/ats/gnunet-service-ats-solver_mlp.c
+++ b/src/ats/gnunet-service-ats-solver_mlp.c
@@ -421,7 +421,7 @@ static int mlp_create_problem_count_addresses (
421 * @param col the column to create the value in 421 * @param col the column to create the value in
422 * @param val the value to set 422 * @param val the value to set
423 * @param line calling line for debbuging 423 * @param line calling line for debbuging
424 * @param GNUNET_YES value changed, GNUNET_NO value did not change, GNUNET_SYSERR 424 * @return GNUNET_YES value changed, GNUNET_NO value did not change, GNUNET_SYSERR
425 * on error 425 * on error
426 */ 426 */
427static int 427static int
@@ -803,7 +803,6 @@ mlp_create_problem_add_invariant_columns (struct GAS_MLP_Handle *mlp, struct MLP
803 * Create the MLP problem 803 * Create the MLP problem
804 * 804 *
805 * @param mlp the MLP handle 805 * @param mlp the MLP handle
806 * @param addresses the hashmap containing all adresses
807 * @return GNUNET_OK or GNUNET_SYSERR 806 * @return GNUNET_OK or GNUNET_SYSERR
808 */ 807 */
809static int 808static int
@@ -1150,7 +1149,6 @@ GAS_mlp_solve_problem (void *solver)
1150 * Add a single address to the solve 1149 * Add a single address to the solve
1151 * 1150 *
1152 * @param solver the solver Handle 1151 * @param solver the solver Handle
1153 * @param addresses the address hashmap containing all addresses
1154 * @param address the address to add 1152 * @param address the address to add
1155 * @param network network type of this address 1153 * @param network network type of this address
1156 */ 1154 */
@@ -1288,13 +1286,11 @@ GAS_mlp_address_session_changed (void *solver,
1288 * 1286 *
1289 * @param solver solver handle 1287 * @param solver solver handle
1290 * @param address the address 1288 * @param address the address
1291 * @param cur_session the current session 1289 * @param in_use usage state
1292 * @param new_session the new session
1293 */ 1290 */
1294void 1291void
1295GAS_mlp_address_inuse_changed (void *solver, 1292GAS_mlp_address_inuse_changed (void *solver,
1296 struct ATS_Address *address, 1293 struct ATS_Address *address,
1297 uint32_t session,
1298 int in_use) 1294 int in_use)
1299{ 1295{
1300 /* Nothing to do here */ 1296 /* Nothing to do here */
@@ -1406,8 +1402,6 @@ GAS_mlp_address_change_network (void *solver,
1406 * The MLP problem has to be recreated and the problem has to be resolved 1402 * The MLP problem has to be recreated and the problem has to be resolved
1407 * 1403 *
1408 * @param solver the MLP Handle 1404 * @param solver the MLP Handle
1409 * @param addresses the address hashmap
1410 * the address has to be already removed from the hashmap
1411 * @param address the address to delete 1405 * @param address the address to delete
1412 * @param session_only delete only session not whole address 1406 * @param session_only delete only session not whole address
1413 */ 1407 */
@@ -1502,7 +1496,6 @@ static double get_peer_pref_value (struct GAS_MLP_Handle *mlp, const struct GNUN
1502 * Get the preferred address for a specific peer 1496 * Get the preferred address for a specific peer
1503 * 1497 *
1504 * @param solver the MLP Handle 1498 * @param solver the MLP Handle
1505 * @param addresses address hashmap
1506 * @param peer the peer 1499 * @param peer the peer
1507 * @return suggested address 1500 * @return suggested address
1508 */ 1501 */
@@ -1589,7 +1582,6 @@ GAS_mlp_bulk_stop (void *solver)
1589 * Stop notifying about address and bandwidth changes for this peer 1582 * Stop notifying about address and bandwidth changes for this peer
1590 * 1583 *
1591 * @param solver the MLP handle 1584 * @param solver the MLP handle
1592 * @param addresses address hashmap
1593 * @param peer the peer 1585 * @param peer the peer
1594 */ 1586 */
1595void 1587void
@@ -1614,7 +1606,6 @@ GAS_mlp_stop_get_preferred_address (void *solver,
1614 * Changes the preferences for a peer in the MLP problem 1606 * Changes the preferences for a peer in the MLP problem
1615 * 1607 *
1616 * @param solver the MLP Handle 1608 * @param solver the MLP Handle
1617 * @param addresses the address hashmap
1618 * @param peer the peer 1609 * @param peer the peer
1619 * @param kind the kind to change the preference 1610 * @param kind the kind to change the preference
1620 * @param pref_rel the relative score 1611 * @param pref_rel the relative score
@@ -1699,6 +1690,7 @@ GAS_mlp_done (void *solver)
1699 * 1690 *
1700 * @param cfg the GNUNET_CONFIGURATION_Handle handle 1691 * @param cfg the GNUNET_CONFIGURATION_Handle handle
1701 * @param stats the GNUNET_STATISTICS handle 1692 * @param stats the GNUNET_STATISTICS handle
1693 * @param addresses the address hashmap
1702 * @param network array of GNUNET_ATS_NetworkType with length dest_length 1694 * @param network array of GNUNET_ATS_NetworkType with length dest_length
1703 * @param out_dest array of outbound quotas 1695 * @param out_dest array of outbound quotas
1704 * @param in_dest array of outbound quota 1696 * @param in_dest array of outbound quota
@@ -1707,6 +1699,8 @@ GAS_mlp_done (void *solver)
1707 * @param bw_changed_cb_cls cls for callback 1699 * @param bw_changed_cb_cls cls for callback
1708 * @param get_preference callback to get relative preferences for a peer 1700 * @param get_preference callback to get relative preferences for a peer
1709 * @param get_preference_cls cls for callback to get relative preferences 1701 * @param get_preference_cls cls for callback to get relative preferences
1702 * @param get_properties callback to get relative properties
1703 * @param get_properties_cls cls for callback to get relative properties
1710 * @return struct GAS_MLP_Handle on success, NULL on fail 1704 * @return struct GAS_MLP_Handle on success, NULL on fail
1711 */ 1705 */
1712void * 1706void *
diff --git a/src/ats/gnunet-service-ats-solver_mlp.h b/src/ats/gnunet-service-ats-solver_mlp.h
index 960f63186..4a5d35b00 100644
--- a/src/ats/gnunet-service-ats-solver_mlp.h
+++ b/src/ats/gnunet-service-ats-solver_mlp.h
@@ -371,7 +371,9 @@ GAS_mlp_solve_problem (void *solver);
371 * @param bw_changed_cb callback for changed bandwidth amounts 371 * @param bw_changed_cb callback for changed bandwidth amounts
372 * @param bw_changed_cb_cls cls for callback 372 * @param bw_changed_cb_cls cls for callback
373 * @param get_preference callback to get relative preferences for a peer 373 * @param get_preference callback to get relative preferences for a peer
374 * @param get_preference_cls cls for callback to get relative preferences 374 * @param get_preference callback to get relative preferences for a peer
375 * @param get_properties_cls for callback to get relative properties
376 * @param get_properties_cls cls for callback to get relative properties
375 * @return struct GAS_MLP_Handle on success, NULL on fail 377 * @return struct GAS_MLP_Handle on success, NULL on fail
376 */ 378 */
377void * 379void *
@@ -394,7 +396,6 @@ GAS_mlp_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
394 * Add a single address within a network to the solver 396 * Add a single address within a network to the solver
395 * 397 *
396 * @param solver the solver Handle 398 * @param solver the solver Handle
397 * @param addresses the address hashmap containing all addresses
398 * @param address the address to add 399 * @param address the address to add
399 * @param network network type of this address 400 * @param network network type of this address
400 */ 401 */
@@ -439,19 +440,17 @@ GAS_mlp_address_session_changed (void *solver,
439 440
440 441
441/** 442/**
442 * Transport session for this address has changed 443 * Usage for this address has changed
443 * 444 *
444 * NOTE: values in addresses are already updated 445 * NOTE: values in addresses are already updated
445 * 446 *
446 * @param solver solver handle 447 * @param solver solver handle
447 * @param address the address 448 * @param address the address
448 * @param cur_session the current session 449 * @param in_use usage state
449 * @param new_session the new session
450 */ 450 */
451void 451void
452GAS_mlp_address_inuse_changed (void *solver, 452GAS_mlp_address_inuse_changed (void *solver,
453 struct ATS_Address *address, 453 struct ATS_Address *address,
454 uint32_t session,
455 int in_use); 454 int in_use);
456 455
457 456
@@ -477,8 +476,6 @@ GAS_mlp_address_change_network (void *solver,
477 * The MLP problem has to be recreated and the problem has to be resolved 476 * The MLP problem has to be recreated and the problem has to be resolved
478 * 477 *
479 * @param solver the MLP Handle 478 * @param solver the MLP Handle
480 * @param addresses the address hashmap
481 * the address has to be already removed from the hashmap
482 * @param address the address to delete 479 * @param address the address to delete
483 * @param session_only delete only session not whole address 480 * @param session_only delete only session not whole address
484 */ 481 */
@@ -492,7 +489,6 @@ GAS_mlp_address_delete (void *solver,
492 * Changes the preferences for a peer in the MLP problem 489 * Changes the preferences for a peer in the MLP problem
493 * 490 *
494 * @param solver the MLP Handle 491 * @param solver the MLP Handle
495 * @param addresses the address hashmap
496 * @param peer the peer 492 * @param peer the peer
497 * @param kind the kind to change the preference 493 * @param kind the kind to change the preference
498 * @param pref_rel the relative score 494 * @param pref_rel the relative score
@@ -524,7 +520,6 @@ GAS_mlp_bulk_stop (void *solver);
524 * Get the preferred address for a specific peer 520 * Get the preferred address for a specific peer
525 * 521 *
526 * @param solver the MLP Handle 522 * @param solver the MLP Handle
527 * @param addresses address hashmap
528 * @param peer the peer 523 * @param peer the peer
529 * @return suggested address 524 * @return suggested address
530 */ 525 */
@@ -537,10 +532,8 @@ GAS_mlp_get_preferred_address (void *solver,
537 * Stop notifying about address and bandwidth changes for this peer 532 * Stop notifying about address and bandwidth changes for this peer
538 * 533 *
539 * @param solver the MLP handle 534 * @param solver the MLP handle
540 * @param addresses address hashmap
541 * @param peer the peer 535 * @param peer the peer
542 */ 536 */
543
544void 537void
545GAS_mlp_stop_get_preferred_address (void *solver, 538GAS_mlp_stop_get_preferred_address (void *solver,
546 const struct GNUNET_PeerIdentity *peer); 539 const struct GNUNET_PeerIdentity *peer);
diff --git a/src/ats/gnunet-service-ats-solver_proportional.c b/src/ats/gnunet-service-ats-solver_proportional.c
index d248638ca..4fe5b3559 100644
--- a/src/ats/gnunet-service-ats-solver_proportional.c
+++ b/src/ats/gnunet-service-ats-solver_proportional.c
@@ -888,7 +888,6 @@ GAS_proportional_address_change_preference (void *solver,
888 * Get the preferred address for a specific peer 888 * Get the preferred address for a specific peer
889 * 889 *
890 * @param solver the solver handle 890 * @param solver the solver handle
891 * @param addresses the address hashmap containing all addresses
892 * @param peer the identity of the peer 891 * @param peer the identity of the peer
893 */ 892 */
894const struct ATS_Address * 893const struct ATS_Address *
@@ -970,7 +969,6 @@ GAS_proportional_get_preferred_address (void *solver,
970 * Stop notifying about address and bandwidth changes for this peer 969 * Stop notifying about address and bandwidth changes for this peer
971 * 970 *
972 * @param solver the solver handle 971 * @param solver the solver handle
973 * @param addresses address hashmap
974 * @param peer the peer 972 * @param peer the peer
975 */ 973 */
976void 974void
@@ -985,7 +983,6 @@ GAS_proportional_stop_get_preferred_address (void *solver,
985 * Remove an address from the solver 983 * Remove an address from the solver
986 * 984 *
987 * @param solver the solver handle 985 * @param solver the solver handle
988 * @param addresses the address hashmap containing all addresses
989 * @param address the address to remove 986 * @param address the address to remove
990 * @param session_only delete only session not whole address 987 * @param session_only delete only session not whole address
991 */ 988 */
@@ -1251,7 +1248,6 @@ GAS_proportional_address_change_network (void *solver,
1251 * Add a new single address to a network 1248 * Add a new single address to a network
1252 * 1249 *
1253 * @param solver the solver Handle 1250 * @param solver the solver Handle
1254 * @param addresses the address hashmap containing all addresses
1255 * @param address the address to add 1251 * @param address the address to add
1256 * @param network network type of this address 1252 * @param network network type of this address
1257 */ 1253 */
@@ -1310,6 +1306,8 @@ GAS_proportional_address_add (void *solver,
1310 * @param bw_changed_cb_cls cls for callback 1306 * @param bw_changed_cb_cls cls for callback
1311 * @param get_preference callback to get relative preferences for a peer 1307 * @param get_preference callback to get relative preferences for a peer
1312 * @param get_preference_cls cls for callback to get relative preferences 1308 * @param get_preference_cls cls for callback to get relative preferences
1309 * @param get_properties for callback to get relative properties
1310 * @param get_properties_cls cls for callback to get relative properties
1313 * @return handle for the solver on success, NULL on fail 1311 * @return handle for the solver on success, NULL on fail
1314 */ 1312 */
1315void * 1313void *
diff --git a/src/ats/gnunet-service-ats-solver_proportional.h b/src/ats/gnunet-service-ats-solver_proportional.h
index 8ce341847..f09c4e2be 100644
--- a/src/ats/gnunet-service-ats-solver_proportional.h
+++ b/src/ats/gnunet-service-ats-solver_proportional.h
@@ -38,7 +38,6 @@
38 * Changes the preferences for a peer in the problem 38 * Changes the preferences for a peer in the problem
39 * 39 *
40 * @param solver the solver handle 40 * @param solver the solver handle
41 * @param addresses the address hashmap
42 * @param peer the peer to change the preference for 41 * @param peer the peer to change the preference for
43 * @param kind the kind to change the preference 42 * @param kind the kind to change the preference
44 * @param pref_rel the normalized preference value for this kind over all clients 43 * @param pref_rel the normalized preference value for this kind over all clients
@@ -75,6 +74,8 @@ GAS_proportional_address_change_preference (void *solver,
75 * @param bw_changed_cb_cls cls for callback 74 * @param bw_changed_cb_cls cls for callback
76 * @param get_preference callback to get relative preferences for a peer 75 * @param get_preference callback to get relative preferences for a peer
77 * @param get_preference_cls cls for callback to get relative preferences 76 * @param get_preference_cls cls for callback to get relative preferences
77 * @param get_properties_cls for callback to get relative properties
78 * @param get_properties_cls cls for callback to get relative properties
78 * @return handle for the solver on success, NULL on fail 79 * @return handle for the solver on success, NULL on fail
79 */ 80 */
80void * 81void *
@@ -105,7 +106,6 @@ GAS_proportional_done (void * solver);
105 * Add a single address within a network to the solver 106 * Add a single address within a network to the solver
106 * 107 *
107 * @param solver the solver Handle 108 * @param solver the solver Handle
108 * @param addresses the address hashmap containing all addresses
109 * @param address the address to add 109 * @param address the address to add
110 * @param network network type of this address 110 * @param network network type of this address
111 */ 111 */
@@ -114,6 +114,16 @@ GAS_proportional_address_add (void *solver,
114 struct ATS_Address *address, 114 struct ATS_Address *address,
115 uint32_t network); 115 uint32_t network);
116 116
117
118/**
119 * Transport properties for this address have changed
120 *
121 * @param solver solver handle
122 * @param address the address
123 * @param type the ATSI type in HBO
124 * @param abs_value the absolute value of the property
125 * @param rel_value the normalized value
126 */
117void 127void
118GAS_proportional_address_property_changed (void *solver, 128GAS_proportional_address_property_changed (void *solver,
119 struct ATS_Address *address, 129 struct ATS_Address *address,
@@ -122,18 +132,47 @@ GAS_proportional_address_property_changed (void *solver,
122 double rel_value); 132 double rel_value);
123 133
124 134
135/**
136 * Transport session for this address has changed
137 *
138 * NOTE: values in addresses are already updated
139 *
140 * @param solver solver handle
141 * @param address the address
142 * @param cur_session the current session
143 * @param new_session the new session
144 */
125void 145void
126GAS_proportional_address_session_changed (void *solver, 146GAS_proportional_address_session_changed (void *solver,
127 struct ATS_Address *address, 147 struct ATS_Address *address,
128 uint32_t cur_session, 148 uint32_t cur_session,
129 uint32_t new_session); 149 uint32_t new_session);
130 150
151
152/**
153 * Usage for this address has changed
154 *
155 * NOTE: values in addresses are already updated
156 *
157 * @param solver solver handle
158 * @param address the address
159 * @param in_use usage state
160 */
131void 161void
132GAS_proportional_address_inuse_changed (void *solver, 162GAS_proportional_address_inuse_changed (void *solver,
133 struct ATS_Address *address, 163 struct ATS_Address *address,
134 uint32_t session,
135 int in_use); 164 int in_use);
136 165
166/**
167 * Network scope for this address has changed
168 *
169 * NOTE: values in addresses are already updated
170 *
171 * @param solver solver handle
172 * @param address the address
173 * @param current_network the current network
174 * @param new_network the new network
175 */
137void 176void
138GAS_proportional_address_change_network (void *solver, 177GAS_proportional_address_change_network (void *solver,
139 struct ATS_Address *address, 178 struct ATS_Address *address,
@@ -144,7 +183,6 @@ GAS_proportional_address_change_network (void *solver,
144 * Remove an address from the solver 183 * Remove an address from the solver
145 * 184 *
146 * @param solver the solver handle 185 * @param solver the solver handle
147 * @param addresses the address hashmap containing all addresses
148 * @param address the address to remove 186 * @param address the address to remove
149 * @param session_only delete only session not whole address 187 * @param session_only delete only session not whole address
150 */ 188 */
@@ -172,7 +210,6 @@ GAS_proportional_bulk_stop (void *solver);
172 * Stop notifying about address and bandwidth changes for this peer 210 * Stop notifying about address and bandwidth changes for this peer
173 * 211 *
174 * @param solver the proportional handle 212 * @param solver the proportional handle
175 * @param addresses address hashmap
176 * @param peer the peer 213 * @param peer the peer
177 */ 214 */
178void 215void
@@ -184,7 +221,6 @@ GAS_proportional_stop_get_preferred_address (void *solver,
184 * Get the prefered address for a specific peer 221 * Get the prefered address for a specific peer
185 * 222 *
186 * @param solver the solver handle 223 * @param solver the solver handle
187 * @param addresses the address hashmap containing all addresses
188 * @param peer the identity of the peer 224 * @param peer the identity of the peer
189 */ 225 */
190const struct ATS_Address * 226const struct ATS_Address *
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 781ef2f8d..717daa576 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -678,8 +678,6 @@ find_equivalent_address (struct GAS_Addresses_Handle *handle,
678 * @param plugin_addr plugin address 678 * @param plugin_addr plugin address
679 * @param plugin_addr_len length of the plugin address 679 * @param plugin_addr_len length of the plugin address
680 * @param session_id session id, can be 0 680 * @param session_id session id, can be 0
681 * @param atsi performance information for this address
682 * @param atsi_count number of performance information contained
683 * @return an ATS_address or NULL 681 * @return an ATS_address or NULL
684 */ 682 */
685 683
@@ -1179,7 +1177,7 @@ GAS_addresses_in_use (struct GAS_Addresses_Handle *handle,
1179 1177
1180 /* Tell solver about update */ 1178 /* Tell solver about update */
1181 ea->used = in_use; 1179 ea->used = in_use;
1182 handle->s_address_update_inuse (handle->solver, ea, ea->session_id, ea->used); 1180 handle->s_address_update_inuse (handle->solver, ea, ea->used);
1183 return GNUNET_OK; 1181 return GNUNET_OK;
1184} 1182}
1185 1183
@@ -1356,7 +1354,7 @@ normalized_preference_changed_cb (void *cls,
1356 * The relative value for a property changed 1354 * The relative value for a property changed
1357 * 1355 *
1358 * @param cls the address handle 1356 * @param cls the address handle
1359 * @param peer the peer 1357 * @param address the peer
1360 * @param type the ATS type 1358 * @param type the ATS type
1361 * @param prop_rel the new relative preference value 1359 * @param prop_rel the new relative preference value
1362 */ 1360 */
@@ -1402,7 +1400,7 @@ get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
1402 * values for an address from solver 1400 * values for an address from solver
1403 * 1401 *
1404 * @param cls unused 1402 * @param cls unused
1405 * @param id the peer to return the normalized properties for 1403 * @param address the address
1406 * @return array of double values with |GNUNET_ATS_QualityPropertiesCount| elements 1404 * @return array of double values with |GNUNET_ATS_QualityPropertiesCount| elements
1407 */ 1405 */
1408const double * 1406const double *
diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h
index fa9a2663f..3c2e040f2 100644
--- a/src/ats/gnunet-service-ats_addresses.h
+++ b/src/ats/gnunet-service-ats_addresses.h
@@ -536,13 +536,11 @@ typedef void
536 * 536 *
537 * @param solver solver handle 537 * @param solver solver handle
538 * @param address the address 538 * @param address the address
539 * @param cur_session the current session 539 * @param in_use usage state
540 * @param new_session the new session
541 */ 540 */
542typedef void 541typedef void
543(*GAS_solver_address_inuse_changed) (void *solver, 542(*GAS_solver_address_inuse_changed) (void *solver,
544 struct ATS_Address *address, 543 struct ATS_Address *address,
545 uint32_t session,
546 int in_use); 544 int in_use);
547 545
548/** 546/**
diff --git a/src/ats/perf_ats_mlp.c b/src/ats/perf_ats_mlp.c
index 5f39c24d7..13e7e9f04 100644
--- a/src/ats/perf_ats_mlp.c
+++ b/src/ats/perf_ats_mlp.c
@@ -222,7 +222,7 @@ update_single_addresses (struct ATS_Address *cur)
222 default: 222 default:
223 break; 223 break;
224 } 224 }
225 GAS_mlp_address_inuse_changed(mlp, cur, 0, GNUNET_YES); 225 GAS_mlp_address_inuse_changed(mlp, cur, GNUNET_YES);
226 226
227} 227}
228 228