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

cleaned up abit. halfed the default snapping rate. fixed different snapping rates, init, full and recover to help the bandwidth.

Browse source
This commit is contained in:
Magnus Auvinen 2007-12-17 22:14:00 +00:00
parent b6ccb8bd8b
commit c2b650a217
4 changed files with 63 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -799,7 +799,6 @@ static void client_process_packet(NETPACKET *packet)
/* apply snapshot, cycle pointers */
recived_snapshots++;
if(current_recv_tick > 0)
snaploss += game_tick-current_recv_tick-1;
@ -1098,6 +1097,12 @@ static void client_run()
/* be nice */
if(config.cl_cpu_throttle || !gfx_window_active())
thread_sleep(1);
if(config.dbg_hitch)
{
thread_sleep(config.dbg_hitch);
config.dbg_hitch = 0;
}
if(reporttime < time_get())
{

2
src/engine/e_config_variables.h
View file

@ -54,5 +54,7 @@ MACRO_CONFIG_INT(sv_bandwidth_mode, 0, 0, 2)
MACRO_CONFIG_INT(debug, 0, 0, 1)
MACRO_CONFIG_INT(dbg_stress, 0, 0, 0)
MACRO_CONFIG_INT(dbg_pref, 0, 0, 1)
MACRO_CONFIG_INT(dbg_hitch, 0, 0, 0)
MACRO_CONFIG_STR(dbg_stress_server, 32, "localhost")

78
src/engine/server/es_server.c
View file

@ -63,7 +63,11 @@ enum
SRVCLIENT_STATE_EMPTY = 0,
SRVCLIENT_STATE_CONNECTING,
SRVCLIENT_STATE_READY,
SRVCLIENT_STATE_INGAME
SRVCLIENT_STATE_INGAME,
SRVCLIENT_SNAPRATE_INIT=0,
SRVCLIENT_SNAPRATE_FULL,
SRVCLIENT_SNAPRATE_RECOVER
};
typedef struct
@ -80,6 +84,7 @@ typedef struct
/* connection state info */
int state;
int latency;
int snap_rate;
int last_acked_snapshot;
SNAPSTORAGE snapshots;
@ -300,7 +305,18 @@ static void server_do_snap()
for(i = 0; i < MAX_CLIENTS; i++)
{
if(clients[i].state == SRVCLIENT_STATE_INGAME)
/* client must be ingame to recive snapshots */
if(clients[i].state != SRVCLIENT_STATE_INGAME)
continue;
/* this client is trying to recover, don't spam snapshots */
if(clients[i].snap_rate == SRVCLIENT_SNAPRATE_RECOVER && (server_tick()%50) != 0)
continue;
/* this client is trying to recover, don't spam snapshots */
if(clients[i].snap_rate == SRVCLIENT_SNAPRATE_INIT && (server_tick()%10) != 0)
continue;
{
char data[MAX_SNAPSHOT_SIZE];
char deltadata[MAX_SNAPSHOT_SIZE];
@ -345,6 +361,12 @@ static void server_do_snap()
deltashot_size = snapstorage_get(&clients[i].snapshots, clients[i].last_acked_snapshot, 0, &deltashot);
if(deltashot_size >= 0)
delta_tick = clients[i].last_acked_snapshot;
else
{
/* no acked package found, force client to recover rate */
if(clients[i].snap_rate == SRVCLIENT_SNAPRATE_FULL)
clients[i].snap_rate = SRVCLIENT_SNAPRATE_RECOVER;
}
}
for(k = 0; k < 200; k++) /* TODO: do this better */
@ -465,6 +487,7 @@ static int new_client_callback(int cid, void *user)
snapstorage_purge_all(&clients[cid].snapshots);
clients[cid].last_acked_snapshot = -1;
clients[cid].snap_rate = SRVCLIENT_SNAPRATE_INIT;
clients[cid].score = 0;
return 0;
}
@ -577,6 +600,9 @@ static void server_process_client_packet(NETPACKET *packet)
int64 tagtime;
clients[cid].last_acked_snapshot = msg_unpack_int();
if(clients[cid].last_acked_snapshot > 0)
clients[cid].snap_rate = SRVCLIENT_SNAPRATE_FULL;
if(snapstorage_get(&clients[cid].snapshots, clients[cid].last_acked_snapshot, &tagtime, 0) >= 0)
clients[cid].latency = (int)(((time_get()-tagtime)*1000)/time_freq());
@ -803,11 +829,6 @@ static int server_run()
int64 reporttime = time_get();
int reportinterval = 3;
int64 simulationtime = 0;
int64 snaptime = 0;
int64 networktime = 0;
int64 totaltime = 0;
lastheartbeat = 0;
game_start_time = time_get();
@ -818,6 +839,7 @@ static int server_run()
{
static PERFORMACE_INFO rootscope = {"root", 0};
int64 t = time_get();
int new_ticks = 0;
perf_start(&rootscope);
@ -842,6 +864,7 @@ static int server_run()
server_send_map(c);
clients[c].state = SRVCLIENT_STATE_CONNECTING;
clients[c].last_acked_snapshot = -1;
clients[c].snap_rate = SRVCLIENT_SNAPRATE_RECOVER;
snapstorage_purge_all(&clients[c].snapshots);
}
@ -856,9 +879,10 @@ static int server_run()
}
}
if(t > server_tick_start_time(current_tick+1))
while(t > server_tick_start_time(current_tick+1))
{
current_tick++;
new_ticks++;
/* apply new input */
{
@ -891,12 +915,12 @@ static int server_run()
mods_tick();
perf_end();
}
/* snap game */
if(config.sv_bandwidth_mode == 0 ||
(config.sv_bandwidth_mode == 1 && current_tick%2) ||
(config.sv_bandwidth_mode == 2 && (current_tick%3) == 0 ))
/* if(current_tick&1) */
}
/* snap game */
if(new_ticks)
{
if(config.sv_bandwidth_mode == 1 || (current_tick%2) == 0)
{
static PERFORMACE_INFO scope = {"snap", 0};
perf_start(&scope);
@ -932,15 +956,9 @@ static int server_run()
netserver_stats(net, &stats);
perf_next();
perf_dump(&rootscope);
/*
dbg_msg("server", "sim=%.02fms snap=%.02fms net=%.02fms tot=%.02fms load=%.02f%%",
(simulationtime/reportinterval)/(double)time_freq()*1000,
(snaptime/reportinterval)/(double)time_freq()*1000,
(networktime/reportinterval)/(double)time_freq()*1000,
(totaltime/reportinterval)/(double)time_freq()*1000,
(totaltime)/reportinterval/(double)time_freq()*100.0f);*/
if(config.dbg_pref)
perf_dump(&rootscope);
dbg_msg("server", "send=%8d recv=%8d",
(stats.send_bytes - prev_stats.send_bytes)/reportinterval,
@ -949,15 +967,17 @@ static int server_run()
prev_stats = stats;
}
simulationtime = 0;
snaptime = 0;
networktime = 0;
totaltime = 0;
reporttime += time_freq()*reportinterval;
}
totaltime += time_get()-t;
thread_sleep(1);
if(config.dbg_hitch)
{
thread_sleep(config.dbg_hitch);
config.dbg_hitch = 0;
}
else
thread_sleep(1);
}
}

8
src/game/client/gc_client.cpp
View file

@ -51,6 +51,7 @@ RECT *ui2_screen();
static int chat_mode = CHATMODE_NONE;
bool menu_active = false;
bool menu_game_active = false;
static int snapshot_count = 0;
static bool emoticon_selector_active = false;
static vec2 mouse_pos;
@ -878,6 +879,7 @@ static void clear_object_pointers()
extern "C" void modc_newsnapshot()
{
snapshot_count++;
process_events(SNAP_CURRENT);
if(config.dbg_stress)
@ -2930,7 +2932,7 @@ void render_game()
{
char buf[256];
float w = gfx_pretty_text_width(24, "Warmup", -1);
gfx_pretty_text(200+-w/2, 50, 24, "Warmup", -1);
gfx_pretty_text(150*gfx_screenaspect()+-w/2, 50, 24, "Warmup", -1);
int seconds = gameobj->warmup/SERVER_TICK_SPEED;
if(seconds < 5)
@ -2938,7 +2940,7 @@ void render_game()
else
sprintf(buf, "%d", seconds);
w = gfx_pretty_text_width(24, buf, -1);
gfx_pretty_text(200+-w/2, 75, 24, buf, -1);
gfx_pretty_text(150*gfx_screenaspect()+-w/2, 75, 24, buf, -1);
}
}
@ -3074,6 +3076,8 @@ extern "C" void modc_statechange(int state, int old)
{
menu_active = false;
menu_game_active = true;
snapshot_count = 0;
menu_do_connected();
}
}