miegl/mud
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename mud_value to mud_stat

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-12-01 11:20:17 +00:00
parent 6494b95700
commit be5020cbae
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mud.c
View File

@@ -1140,16 +1140,16 @@ mud_packet_decrypt(struct mud *mud,
} }
static void static void
mud_value_update(struct mud_value *value, const uint64_t val) mud_stat_update(struct mud_stat *stat, const uint64_t val)
{ {
if (value->setup) { if (stat->setup) {
const uint64_t var = mud_abs_diff(value->val, val); const uint64_t var = mud_abs_diff(stat->val, val);
value->var = ((value->var << 1) + value->var + var) >> 2; stat->var = ((stat->var << 1) + stat->var + var) >> 2;
value->val = ((value->val << 3) - value->val + val) >> 3; stat->val = ((stat->val << 3) - stat->val + val) >> 3;
} else { } else {
value->setup = 1; stat->setup = 1;
value->var = val >> 1; stat->var = val >> 1;
value->val = val; stat->val = val;
} }
} }
@@ -1182,7 +1182,7 @@ mud_packet_recv(struct mud *mud, struct mud_path *path,
const uint64_t peer_sent = mud_read48(packet->sent); const uint64_t peer_sent = mud_read48(packet->sent);
if (peer_sent) { if (peer_sent) {
mud_value_update(&path->rtt, MUD_TIME_MASK(now - peer_sent)); mud_stat_update(&path->rtt, MUD_TIME_MASK(now - peer_sent));
if (path->mtu.ok < size) { if (path->mtu.ok < size) {
path->mtu.ok = size; path->mtu.ok = size;
path->mtu.min = size + 1; path->mtu.min = size + 1;
@@ -1325,7 +1325,7 @@ mud_recv(struct mud *mud, void *data, size_t size)
mud->last_recv_time = now; mud->last_recv_time = now;
const uint64_t lat = MUD_TIME_MASK(now - send_time + mud->time_tolerance); const uint64_t lat = MUD_TIME_MASK(now - send_time + mud->time_tolerance);
mud_value_update(&path->lat, lat); mud_stat_update(&path->lat, lat);
if (!path->latmin) if (!path->latmin)
path->latmin = path->lat.val; path->latmin = path->lat.val;
@@ -1338,7 +1338,7 @@ mud_recv(struct mud *mud, void *data, size_t size)
if (mud_timeout(now, path->recv.stat_time, mud->send_timeout)) { if (mud_timeout(now, path->recv.stat_time, mud->send_timeout)) {
const uint64_t rate = path->recv.bytes; const uint64_t rate = path->recv.bytes;
mud_value_update(&path->rate, rate); mud_stat_update(&path->rate, rate);
if (path->recv.ratemax < path->rate.val) { if (path->recv.ratemax < path->rate.val) {
path->recv.ratemax = path->rate.val; path->recv.ratemax = path->rate.val;

4
mud.h
View File

@@ -20,7 +20,7 @@ struct mud_public {
unsigned char local[MUD_PUB_SIZE]; unsigned char local[MUD_PUB_SIZE];
}; };
struct mud_value { struct mud_stat {
uint64_t val; uint64_t val;
uint64_t var; uint64_t var;
int setup; int setup;
@@ -29,7 +29,7 @@ struct mud_value {
struct mud_path { struct mud_path {
enum mud_state state; enum mud_state state;
struct sockaddr_storage local_addr, addr, r_addr; struct sockaddr_storage local_addr, addr, r_addr;
struct mud_value rtt, lat, rate; struct mud_stat rtt, lat, rate;
uint64_t latmin, dt; uint64_t latmin, dt;
uint64_t send_factor; uint64_t send_factor;
uint64_t r_rate; uint64_t r_rate;