Make circuitmux_compare_muxes() and circuitmux_get_policy() mockable

This commit is contained in:
Andrea Shepard 2014-01-24 03:10:55 -08:00
parent 030608d68d
commit c5f73e52e5
2 changed files with 8 additions and 6 deletions

View File

@ -621,8 +621,8 @@ circuitmux_clear_policy(circuitmux_t *cmux)
* Return the policy currently installed on a circuitmux_t
*/
const circuitmux_policy_t *
circuitmux_get_policy(circuitmux_t *cmux)
MOCK_IMPL(const circuitmux_policy_t *,
circuitmux_get_policy, (circuitmux_t *cmux))
{
tor_assert(cmux);
@ -1961,8 +1961,8 @@ circuitmux_count_queued_destroy_cells(const channel_t *chan,
* support the cmp_cmux method, return 0.
*/
int
circuitmux_compare_muxes(circuitmux_t *cmux_1, circuitmux_t *cmux_2)
MOCK_IMPL(int,
circuitmux_compare_muxes, (circuitmux_t *cmux_1, circuitmux_t *cmux_2))
{
const circuitmux_policy_t *policy;

View File

@ -108,7 +108,8 @@ void circuitmux_free(circuitmux_t *cmux);
/* Policy control */
void circuitmux_clear_policy(circuitmux_t *cmux);
const circuitmux_policy_t * circuitmux_get_policy(circuitmux_t *cmux);
MOCK_DECL(const circuitmux_policy_t *,
circuitmux_get_policy, (circuitmux_t *cmux));
void circuitmux_set_policy(circuitmux_t *cmux,
const circuitmux_policy_t *pol);
@ -152,7 +153,8 @@ void circuitmux_mark_destroyed_circids_usable(circuitmux_t *cmux,
channel_t *chan);
/* Optional interchannel comparisons for scheduling */
int circuitmux_compare_muxes(circuitmux_t *cmux_1, circuitmux_t *cmux_2);
MOCK_DECL(int, circuitmux_compare_muxes,
(circuitmux_t *cmux_1, circuitmux_t *cmux_2));
#endif /* TOR_CIRCUITMUX_H */