edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-20 06:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

added ping spike detection

Browse source
This commit is contained in:
Magnus Auvinen 2009-01-24 14:08:09 +00:00
parent 5f186c8906
commit 91e337c7ab
1 changed files with 73 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

131
src/engine/client/ec_client.c
View file

@ -97,6 +97,10 @@ static float intratick = 0;
static float ticktime = 0; static float ticktime = 0;
static int prev_tick = 0; static int prev_tick = 0;
/* */
/*static int predictiontime_pingspikecounter = 0;
static int gametime_pingspikecounter = 0;*/
/* predicted time */ /* predicted time */
static int current_predtick = 0; static int current_predtick = 0;
static float predintratick = 0; static float predintratick = 0;
@ -222,8 +226,9 @@ typedef struct
int64 tlast; int64 tlast;
GRAPH graph; GRAPH graph;
float up_adjustspeed; int spikecounter;
float down_adjustspeed;
float adjustspeed[2]; /* 0 = down, 1 = up */
} SMOOTHTIME; } SMOOTHTIME;
static void st_init(SMOOTHTIME *st, int64 target) static void st_init(SMOOTHTIME *st, int64 target)
@ -231,8 +236,8 @@ static void st_init(SMOOTHTIME *st, int64 target)
st->snap = time_get(); st->snap = time_get();
st->current = target; st->current = target;
st->target = target; st->target = target;
st->up_adjustspeed = 1.0f; st->adjustspeed[0] = 0.2f;
st->down_adjustspeed = 0.2f; st->adjustspeed[1] = 0.2f;
graph_init(&st->graph, 0.0f, 0.5f); graph_init(&st->graph, 0.0f, 0.5f);
} }
@ -246,9 +251,9 @@ static int64 st_get(SMOOTHTIME *st, int64 now)
/* it's faster to adjust upward instead of downward */ /* it's faster to adjust upward instead of downward */
/* we might need to adjust these abit */ /* we might need to adjust these abit */
adjust_speed = st->down_adjustspeed; adjust_speed = st->adjustspeed[0];
if(t > c) if(t > c)
adjust_speed = st->up_adjustspeed; adjust_speed = st->adjustspeed[1];
a = ((now-st->snap)/(float)time_freq()) * adjust_speed; a = ((now-st->snap)/(float)time_freq()) * adjust_speed;
if(a > 1.0f) if(a > 1.0f)
@ -261,7 +266,7 @@ static int64 st_get(SMOOTHTIME *st, int64 now)
return r; return r;
} }
static void st_update(SMOOTHTIME *st, int64 target) static void st_update_int(SMOOTHTIME *st, int64 target)
{ {
int64 now = time_get(); int64 now = time_get();
st->current = st_get(st, now); st->current = st_get(st, now);
@ -269,6 +274,47 @@ static void st_update(SMOOTHTIME *st, int64 target)
st->target = target; st->target = target;
} }
static void st_update(SMOOTHTIME *st, GRAPH *graph, int64 target, int time_left, int adjust_direction)
{
int update_timer = 1;
if(time_left < 0)
{
if(time_left < -50)
st->spikecounter += 5;
if(st->spikecounter > 15)
{
graph_add(graph, time_left, 1,0,0);
if(st->adjustspeed[adjust_direction] < 30.0f)
st->adjustspeed[adjust_direction] *= 2.0f;
}
else
{
/* ignore this ping spike */
update_timer = 0;
graph_add(graph, time_left, 1,1,0);
}
}
else
{
if(st->spikecounter)
st->spikecounter--;
graph_add(graph, time_left, 0,1,0);
st->adjustspeed[adjust_direction] *= 0.95f;
if(st->adjustspeed[adjust_direction] < 1.0f)
st->adjustspeed[adjust_direction] = 1.0f;
}
last_input_timeleft = time_left;
if(update_timer)
st_update_int(st, target);
}
static SMOOTHTIME game_time; static SMOOTHTIME game_time;
static SMOOTHTIME predicted_time; static SMOOTHTIME predicted_time;
@ -724,7 +770,7 @@ static void client_debug_render()
str_format(buffer, sizeof(buffer), "pred: %d ms %3.2f", str_format(buffer, sizeof(buffer), "pred: %d ms %3.2f",
(int)((st_get(&predicted_time, now)-st_get(&game_time, now))*1000/(float)time_freq()), (int)((st_get(&predicted_time, now)-st_get(&game_time, now))*1000/(float)time_freq()),
predicted_time.up_adjustspeed); predicted_time.adjustspeed[1]);
gfx_quads_text(2, 70, 16, 1,1,1,1, buffer); gfx_quads_text(2, 70, 16, 1,1,1,1, buffer);
/* render graphs */ /* render graphs */
@ -1075,33 +1121,20 @@ static void client_process_packet(NETCHUNK *packet)
/* adjust our prediction time */ /* adjust our prediction time */
int k; int k;
int64 target = 0;
if(time_left < 0) for(k = 0; k < 200; k++)
{
graph_add(&inputtime_margin_graph, time_left, 1,0,0);
if(predicted_time.up_adjustspeed < 30.0f)
predicted_time.up_adjustspeed *= 2.0f;
}
else
{
graph_add(&inputtime_margin_graph, time_left, 0,1,0);
predicted_time.up_adjustspeed *= 0.95f;
if(predicted_time.up_adjustspeed < 1.0f)
predicted_time.up_adjustspeed = 1.0f;
}
last_input_timeleft = time_left;
for(k = 0; k < 200; k++) /* TODO: do this better */
{ {
if(inputs[k].tick == input_predtick) if(inputs[k].tick == input_predtick)
{ {
/*-1000/50 prediction_margin */ target = inputs[k].predicted_time + (time_get() - inputs[k].time);
int64 target = inputs[k].predicted_time + (time_get() - inputs[k].time); target = target - (int64)(((time_left-prediction_margin)/1000.0f)*time_freq());
st_update(&predicted_time, target - (int64)(((time_left-prediction_margin)/1000.0f)*time_freq())); //st_update(&predicted_time, );
break; break;
} }
} }
if(target)
st_update(&predicted_time, &inputtime_margin_graph, target, time_left, 1);
} }
else if(msg == NETMSG_SNAP || msg == NETMSG_SNAPSINGLE || msg == NETMSG_SNAPEMPTY) else if(msg == NETMSG_SNAP || msg == NETMSG_SNAPSINGLE || msg == NETMSG_SNAPEMPTY)
{ {
@ -1246,28 +1279,6 @@ static void client_process_packet(NETCHUNK *packet)
/* add new */ /* add new */
snapstorage_add(&snapshot_storage, game_tick, time_get(), snapsize, (SNAPSHOT*)tmpbuffer3, 1); snapstorage_add(&snapshot_storage, game_tick, time_get(), snapsize, (SNAPSHOT*)tmpbuffer3, 1);
/* adjust gametime timer */
{
int64 now = st_get(&game_time, time_get());
int64 tickstart = game_tick*time_freq()/50;
int64 time_left = (tickstart-now)*1000 / time_freq();
if(time_left < 0)
{
graph_add(&gametime_margin_graph, time_left, 1,0,0);
if(game_time.down_adjustspeed < 30.0f)
game_time.down_adjustspeed *= 2.0f;
}
else
{
graph_add(&gametime_margin_graph, time_left, 0,1,0);
game_time.down_adjustspeed *= 0.95f;
if(game_time.down_adjustspeed < 1.0f)
game_time.down_adjustspeed = 1.0f;
}
}
/* add snapshot to demo */ /* add snapshot to demo */
if(demorec_isrecording()) if(demorec_isrecording())
{ {
@ -1295,7 +1306,7 @@ static void client_process_packet(NETCHUNK *packet)
{ {
/* start at 200ms and work from there */ /* start at 200ms and work from there */
st_init(&predicted_time, game_tick*time_freq()/50); st_init(&predicted_time, game_tick*time_freq()/50);
predicted_time.up_adjustspeed = 1000.0f; predicted_time.adjustspeed[1] = 1000.0f;
st_init(&game_time, (game_tick-1)*time_freq()/50); st_init(&game_time, (game_tick-1)*time_freq()/50);
snapshots[SNAP_PREV] = snapshot_storage.first; snapshots[SNAP_PREV] = snapshot_storage.first;
snapshots[SNAP_CURRENT] = snapshot_storage.last; snapshots[SNAP_CURRENT] = snapshot_storage.last;
@ -1303,12 +1314,14 @@ static void client_process_packet(NETCHUNK *packet)
client_set_state(CLIENTSTATE_ONLINE); client_set_state(CLIENTSTATE_ONLINE);
} }
/*{ /* adjust game time */
int64 now = time_get(); {
graph_add(&predict_graph, (st_get(&predicted_time, now)-st_get(&game_time, now))/(float)time_freq()); int64 now = st_get(&game_time, time_get());
}*/ int64 tickstart = game_tick*time_freq()/50;
int64 time_left = (tickstart-now)*1000 / time_freq();
st_update(&game_time, (game_tick-1)*time_freq()/50); /*st_update(&game_time, (game_tick-1)*time_freq()/50);*/
st_update(&game_time, &gametime_margin_graph, (game_tick-1)*time_freq()/50, time_left, 0);
}
/* ack snapshot */ /* ack snapshot */
ack_game_tick = game_tick; ack_game_tick = game_tick;
@ -1494,7 +1507,7 @@ static void client_update()
prevtick_start = prev_pred_tick*time_freq()/50; prevtick_start = prev_pred_tick*time_freq()/50;
predintratick = (pred_now - prevtick_start) / (float)(curtick_start-prevtick_start); predintratick = (pred_now - prevtick_start) / (float)(curtick_start-prevtick_start);
if(new_pred_tick < snapshots[SNAP_PREV]->tick-SERVER_TICK_SPEED/10 || new_pred_tick > snapshots[SNAP_PREV]->tick+SERVER_TICK_SPEED) if(new_pred_tick < snapshots[SNAP_PREV]->tick-SERVER_TICK_SPEED || new_pred_tick > snapshots[SNAP_PREV]->tick+SERVER_TICK_SPEED)
{ {
dbg_msg("client", "prediction time reset!"); dbg_msg("client", "prediction time reset!");
st_init(&predicted_time, snapshots[SNAP_CURRENT]->tick*time_freq()/50); st_init(&predicted_time, snapshots[SNAP_CURRENT]->tick*time_freq()/50);