cpp/openttd-patchpack/source Changeset - r14972:4feed15adf9f

Changeset - r14972:4feed15adf9f

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 14 years ago 2010-04-09 17:08:44
rubidium@openttd.org

(svn r19593) -Codechange: improve loading/executing the desync logs

3 files changed with 61 insertions and 11 deletions:

src/network/network.cpp

src/network/network_internal.h

src/video/dedicated_v.cpp

0 comments (0 inline, 0 general)

src/network/network.cpp

➞

Show inline comments

@@ @@ -35,10 +35,13 @@ @@
 #include "../rev.h"
 #include "../core/pool_func.hpp"
 #include "../gfx_func.h"
 #include "table/strings.h"
 #ifdef DEBUG_DUMP_COMMANDS
 	#include "../fileio_func.h"
 #include "../fileio_func.h"
 /** When running the server till the wait point, run as fast as we can! */
 bool _ddc_fastforward = true;
 #endif /* DEBUG_DUMP_COMMANDS */
 #include "table/strings.h"
 DECLARE_POSTFIX_INCREMENT(ClientID)
@@ @@ -1075,19 +1078,22 @@ void NetworkGameLoop() @@
 	if (_network_server) {
 #ifdef DEBUG_DUMP_COMMANDS
 		/* Loading of the debug commands from -ddesync>=1 */
 		static FILE *f = FioFOpenFile("commands.log", "rb", SAVE_DIR);
 		static Date next_date = 0;
 		static uint32 next_date_fract;
 		static CommandPacket *cp = NULL;
 		if (f == NULL && next_date == 0) {
-			printf("Cannot open commands.log\n");
+			DEBUG(net, 0, "Cannot open commands.log");
 			next_date = 1;
+		}
 		while (f != NULL && !feof(f)) {
 			if (cp != NULL && _date == next_date && _date_fract == next_date_fract) {
 				_current_company = cp->company;
 				DoCommandP(cp->tile, cp->p1, cp->p2, cp->cmd, NULL, cp->text);
 				bool ret = DoCommandP(cp->tile, cp->p1, cp->p2, cp->cmd, NULL, cp->text);
 				DEBUG(net, 0, "injecting: %08x; %02x; %02x; %06x; %08x; %08x; %08x; %s -> %i", _date, _date_fract, (int)_current_company, cp->tile, cp->p1, cp->p2, cp->cmd, cp->text, (int)ret);
 				assert(ret);
 				free(cp);
 				cp = NULL;
+			}
@@ @@ -1096,11 +1102,41 @@ void NetworkGameLoop() @@
 			char buff[4096];
 			if (fgets(buff, lengthof(buff), f) == NULL) break;
 			if (strncmp(buff, "cmd: ", 8) != 0) continue;
 			cp = MallocT<CommandPacket>(1);
 			int company;
 			sscanf(&buff[8], "%d; %d; %d; %d; %d; %d; %d; %s", &next_date, &next_date_fract, &company, &cp->tile, &cp->p1, &cp->p2, &cp->cmd, cp->text);
 			cp->company = (CompanyID)company;
 			char *p = buff;
 			/* Ignore the "[date time] " part of the message */
 			if (*p == '[') {
 				p = strchr(p, ']');
 				if (p == NULL) break;
 				p += 2;
+			}
 			if (strncmp(p, "cmd: ", 5) == 0) {
 				cp = MallocT<CommandPacket>(1);
 				int company;
 				int ret = sscanf(p + 5, "%x; %x; %x; %x; %x; %x; %x; %s", &next_date, &next_date_fract, &company, &cp->tile, &cp->p1, &cp->p2, &cp->cmd, cp->text);
 				/* There are 8 pieces of data to read, however the last is a
 				 * string that might or might not exist. Ignore it if that
 				 * string misses because in 99% of the time it's not used. */
 				assert(ret == 8 || ret == 7);
 				cp->company = (CompanyID)company;
 			} else if (strncmp(p, "join: ", 6) == 0) {
 				/* Manually insert a pause when joining; this way the client can join at the exact right time. */
 				int ret = sscanf(p + 6, "%x; %x", &next_date, &next_date_fract);
 				assert(ret == 2);
 				DEBUG(net, 0, "injecting pause for join at %08x:%02x; please join when paused", next_date, next_date_fract);
 				cp = MallocT<CommandPacket>(1);
 				cp->company = COMPANY_SPECTATOR;
 				cp->cmd = CMD_PAUSE;
 				cp->p1 = PM_PAUSED_NORMAL;
 				cp->p2 = 1;
 				_ddc_fastforward = false;
+			}
+		}
 		if (f != NULL && feof(f)) {
 			DEBUG(net, 0, "End of commands.log");
 			fclose(f);
 			f = NULL;
+		}
 #endif /* DEBUG_DUMP_COMMANDS */
 		if (_frame_counter >= _frame_counter_max) {

src/network/network_internal.h

➞

Show inline comments

@@ @@ -38,6 +38,18 @@ @@
 #define NETWORK_SEND_DOUBLE_SEED
 #endif /* RANDOM_DEBUG */
 /**
  * Helper variable to make the dedicated server go fast until the (first) join.
  * Used to load the desync debug logs, i.e. for reproducing a desync.
  * There's basically no need to ever enable this, unless you really know what
  * you are doing, i.e. debugging a desync.
  */
 #ifdef DEBUG_DUMP_COMMANDS
 extern bool _ddc_fastforward;
 #else
 #define _ddc_fastforward (true)
 #endif /* DEBUG_DUMP_COMMANDS */
 enum MapPacket {
 	MAP_PACKET_START,
 	MAP_PACKET_NORMAL,

src/video/dedicated_v.cpp

➞

Show inline comments

@@ @@ -300,13 +300,15 @@ void VideoDriver_Dedicated::MainLoop() @@
 		cur_ticks = GetTime();
 		_realtime_tick += cur_ticks - prev_cur_ticks;
 		if (cur_ticks >= next_tick || cur_ticks < prev_cur_ticks) {
+		if (cur_ticks >= next_tick || cur_ticks < prev_cur_ticks || _ddc_fastforward) {
 			next_tick = cur_ticks + 30;
 			GameLoop();
 			UpdateWindows();
+		}
 		CSleep(1);
 		/* Don't sleep when fast forwarding (for desync debugging) */
 		if (!_ddc_fastforward) CSleep(1);
+	}
+}

0 comments (0 inline, 0 general)