[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Added tests for bandwidth functions
commit a93c3d7a8d98f04f8e651543e4031bb18008aa74
Author: MrSquanchee <usuraj35@xxxxxxxxx>
Date: Sat Apr 4 17:49:50 2020 +0530
Added tests for bandwidth functions
Added tests for
1. commit_max
2. advance_obs
3. add_obs
4. rep_hist_fill_bandwidth_history
5. rep_hist_get_bandwidth_lines
(Lightly edited by nickm to use new names from bwhist refactoring.)
Signed-off-by: Suraj Upadhyay <usuraj35@xxxxxxxxx>
---
src/feature/stats/bwhist.c | 11 ++++-------
src/feature/stats/bwhist.h | 7 +++++++
src/test/test_stats.c | 21 ++++++++++++---------
3 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/feature/stats/bwhist.c b/src/feature/stats/bwhist.c
index 48e33948da..7cbc5f60a6 100644
--- a/src/feature/stats/bwhist.c
+++ b/src/feature/stats/bwhist.c
@@ -74,7 +74,7 @@ advance_obs(bw_array_t *b)
/** Add <b>n</b> bytes to the number of bytes in <b>b</b> for second
* <b>when</b>. */
-static inline void
+STATIC void
add_obs(bw_array_t *b, time_t when, uint64_t n)
{
if (when < b->cur_obs_time)
@@ -95,7 +95,7 @@ add_obs(bw_array_t *b, time_t when, uint64_t n)
}
/** Allocate, initialize, and return a new bw_array. */
-static bw_array_t *
+STATIC bw_array_t *
bw_array_new(void)
{
bw_array_t *b;
@@ -107,11 +107,8 @@ bw_array_new(void)
return b;
}
-#define bw_array_free(val) \
- FREE_AND_NULL(bw_array_t, bw_array_free_, (val))
-
/** Free storage held by bandwidth array <b>b</b>. */
-static void
+STATIC void
bw_array_free_(bw_array_t *b)
{
if (!b) {
@@ -250,7 +247,7 @@ bwhist_bandwidth_assess,(void))
*
* It returns the number of bytes written.
*/
-static size_t
+STATIC size_t
bwhist_fill_bandwidth_history(char *buf, size_t len, const bw_array_t *b)
{
char *cp = buf;
diff --git a/src/feature/stats/bwhist.h b/src/feature/stats/bwhist.h
index d556f5a026..f88b951447 100644
--- a/src/feature/stats/bwhist.h
+++ b/src/feature/stats/bwhist.h
@@ -31,6 +31,13 @@ typedef struct bw_array_t bw_array_t;
STATIC uint64_t find_largest_max(bw_array_t *b);
STATIC void commit_max(bw_array_t *b);
STATIC void advance_obs(bw_array_t *b);
+STATIC bw_array_t *bw_array_new(void);
+STATIC void add_obs(bw_array_t *b, time_t when, uint64_t n);
+#define bw_array_free(val) \
+ FREE_AND_NULL(bw_array_t, bw_array_free_, (val))
+STATIC void bw_array_free_(bw_array_t *b);
+STATIC size_t bwhist_fill_bandwidth_history(char *buf, size_t len,
+ const bw_array_t *b);
#endif /* defined(REPHIST_PRIVATE) */
#ifdef TOR_UNIT_TESTS
diff --git a/src/test/test_stats.c b/src/test/test_stats.c
index 01981f602b..16dd2ca37c 100644
--- a/src/test/test_stats.c
+++ b/src/test/test_stats.c
@@ -31,6 +31,7 @@
#define MAINLOOP_PRIVATE
#define STATEFILE_PRIVATE
#define CONFIG_PRIVATE
+#define BWHIST_PRIVATE
#include "core/or/or.h"
#include "lib/err/backtrace.h"
@@ -43,6 +44,8 @@
#include "feature/stats/connstats.h"
#include "feature/stats/rephist.h"
#include "app/config/statefile.h"
+#include "feature/stats/bwhist.h"
+#include "feature/stats/bw_array_st.h"
/** Run unit tests for some stats code. */
static void
@@ -382,7 +385,7 @@ mock_get_options(void)
#define test_fill_bw(b, buf, rv, str, checkrv) STMT_BEGIN \
buf = tor_malloc_zero(MAX_HIST_VALUE_LEN); \
- rv = rep_hist_fill_bandwidth_history(buf, MAX_HIST_VALUE_LEN, b); \
+ rv = bwhist_fill_bandwidth_history(buf, MAX_HIST_VALUE_LEN, b); \
tt_str_op(buf, OP_EQ, str); \
tt_int_op(rv, OP_EQ, checkrv); \
tor_free(buf); \
@@ -399,7 +402,7 @@ test_fill_bandwidth_history(void *arg)
/* Day 1. */
set_test_case(b, 0, 0, 0, 0, 0, 0, 0);
buf = tor_malloc_zero(MAX_HIST_VALUE_LEN);
- rv = rep_hist_fill_bandwidth_history(buf, MAX_HIST_VALUE_LEN, b);
+ rv = bwhist_fill_bandwidth_history(buf, MAX_HIST_VALUE_LEN, b);
tt_int_op(rv, OP_EQ, 0);
tor_free(buf);
/* Day 2. */
@@ -434,14 +437,14 @@ test_fill_bandwidth_history(void *arg)
}
#define set_test_bw_lines(r, w, dr, dw, when) STMT_BEGIN \
- rep_hist_note_bytes_read(r, when); \
- rep_hist_note_bytes_written(w, when); \
- rep_hist_note_dir_bytes_read(dr, when); \
- rep_hist_note_dir_bytes_written(dw, when); \
+ bwhist_note_bytes_read(r, when, false); \
+ bwhist_note_bytes_written(w, when, false); \
+ bwhist_note_dir_bytes_read(dr, when); \
+ bwhist_note_dir_bytes_written(dw, when); \
STMT_END;
#define test_get_bw_lines(str, checkstr) STMT_BEGIN \
- str = rep_hist_get_bandwidth_lines(); \
+ str = bwhist_get_bandwidth_lines(); \
tt_str_op(str, OP_EQ, checkstr); \
tor_free(str); \
STMT_END;
@@ -455,7 +458,7 @@ test_get_bandwidth_lines(void *arg)
int len = (67+MAX_HIST_VALUE_LEN)*4;
checkstr = tor_malloc_zero(len);
time_t now = time(NULL);
- bw_arrays_init();
+ bwhist_init();
/* Day 1. */
now += 86400;
@@ -486,7 +489,7 @@ test_get_bandwidth_lines(void *arg)
test_get_bw_lines(str, checkstr);
done:
tor_free(checkstr);
- bw_arrays_free_all();
+ bwhist_free_all();
}
#define ENT(name) \
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits