cpp/openttd-patchpack/source Changeset - r22787:1641b12be145

Changeset - r22787:1641b12be145

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

Patric Stout - 6 years ago 2018-04-11 20:07:21
truelight@openttd.org

Remove: NO_DEBUG_MESSAGES was only read and setting it broke compilation (#6703)

Given any speed issue cannot be attributed to checking for _debug_NNN_level, removing this is a safe action

This fixes #6652.

6 files changed with 23 insertions and 42 deletions:

src/debug.cpp

src/debug.h

src/music/dmusic.cpp

src/pathfinder/npf/npf.cpp

src/pathfinder/yapf/yapf_base.hpp

src/thread/thread_morphos.cpp

0 comments (0 inline, 0 general)

src/debug.cpp

➞

Show inline comments

@@ @@ -100,8 +100,6 @@ char *DumpDebugFacilityNames(char *buf, @@
 	return buf;
+}
 #if !defined(NO_DEBUG_MESSAGES)
 /**
  * Internal function for outputting the debug line.
  * @param dbg Debug category.
@@ @@ -168,7 +166,6 @@ void CDECL debug(const char *dbg, const @@
 	debug_print(dbg, buf);
+}
 #endif /* NO_DEBUG_MESSAGES */
 /**
  * Set debugging levels by parsing the text in \a s.

src/debug.h

➞

Show inline comments

@@ @@ -28,37 +28,33 @@ @@
  * 6.. - extremely detailed spamming
  */
 #ifdef NO_DEBUG_MESSAGES
 	#define DEBUG(name, level, ...) { }
 #else /* NO_DEBUG_MESSAGES */
 	/**
 	 * Output a line of debugging information.
 	 * @param name Category
 	 * @param level Debugging level, higher levels means more detailed information.
 	 */
 	#define DEBUG(name, level, ...) if ((level) == 0 || _debug_ ## name ## _level >= (level)) debug(#name, __VA_ARGS__)
 /**
  * Output a line of debugging information.
  * @param name Category
  * @param level Debugging level, higher levels means more detailed information.
  */
 #define DEBUG(name, level, ...) if ((level) == 0 || _debug_ ## name ## _level >= (level)) debug(#name, __VA_ARGS__)
 	extern int _debug_driver_level;
 	extern int _debug_grf_level;
 	extern int _debug_map_level;
 	extern int _debug_misc_level;
 	extern int _debug_net_level;
 	extern int _debug_sprite_level;
 	extern int _debug_oldloader_level;
 	extern int _debug_npf_level;
 	extern int _debug_yapf_level;
 	extern int _debug_freetype_level;
 	extern int _debug_script_level;
 	extern int _debug_sl_level;
 	extern int _debug_gamelog_level;
 	extern int _debug_desync_level;
 	extern int _debug_console_level;
 extern int _debug_driver_level;
 extern int _debug_grf_level;
 extern int _debug_map_level;
 extern int _debug_misc_level;
 extern int _debug_net_level;
 extern int _debug_sprite_level;
 extern int _debug_oldloader_level;
 extern int _debug_npf_level;
 extern int _debug_yapf_level;
 extern int _debug_freetype_level;
 extern int _debug_script_level;
 extern int _debug_sl_level;
 extern int _debug_gamelog_level;
 extern int _debug_desync_level;
 extern int _debug_console_level;
 #ifdef RANDOM_DEBUG
-	extern int _debug_random_level;
 extern int _debug_random_level;
 #endif
 	void CDECL debug(const char *dbg, const char *format, ...) WARN_FORMAT(2, 3);
 #endif /* NO_DEBUG_MESSAGES */
 void CDECL debug(const char *dbg, const char *format, ...) WARN_FORMAT(2, 3);
 char *DumpDebugFacilityNames(char *buf, char *last);
 void SetDebugString(const char *s);

src/music/dmusic.cpp

➞

Show inline comments

@@ @@ -99,7 +99,6 @@ const char *MusicDriver_DMusic::Start(co @@
 	int port = GetDriverParamInt(parm, "port", -1);
 #ifndef NO_DEBUG_MESSAGES
 	if (_debug_driver_level > 0) {
 		/* Print all valid output ports. */
 		char desc[DMUS_MAX_DESCRIPTION];
@@ @@ -116,7 +115,6 @@ const char *MusicDriver_DMusic::Start(co @@
+			}
+		}
+	}
 #endif
 	IDirectMusicPort *music_port = NULL; // NULL means 'use default port'.

src/pathfinder/npf/npf.cpp

➞

Show inline comments

@@ @@ -275,7 +275,6 @@ static uint NPFReservedTrackCost(AyStarN @@
  */
 static void NPFMarkTile(TileIndex tile)
+{
 #ifndef NO_DEBUG_MESSAGES
 	if (_debug_npf_level < 1 || _networking) return;
 	switch (GetTileType(tile)) {
 		case MP_RAILWAY:
@@ @@ -296,7 +295,6 @@ static void NPFMarkTile(TileIndex tile) @@
 		default:
 			break;
+	}
 #endif
+}
 static int32 NPFWaterPathCost(AyStar *as, AyStarNode *current, OpenListNode *parent)

src/pathfinder/yapf/yapf_base.hpp

➞

Show inline comments

@@ @@ -122,10 +122,8 @@ public: @@
+	{
 		m_veh = v;
 #ifndef NO_DEBUG_MESSAGES
 		CPerformanceTimer perf;
 		perf.Start();
 #endif /* !NO_DEBUG_MESSAGES */
 		Yapf().PfSetStartupNodes();
 		bool bDestFound = true;
@@ @@ -154,7 +152,6 @@ public: @@
 		bDestFound &= (m_pBestDestNode != NULL);
 #ifndef NO_DEBUG_MESSAGES
 		perf.Stop();
 		if (_debug_yapf_level >= 2) {
 			int t = perf.Get(1000000);
@@ @@ -174,7 +171,6 @@ public: @@
 				);
+			}
+		}
 #endif /* !NO_DEBUG_MESSAGES */
 		return bDestFound;
+	}

src/thread/thread_morphos.cpp

➞

Show inline comments

@@ @@ -50,14 +50,10 @@ struct OTTDThreadStartupMessage { @@
  *  Default OpenTTD STDIO/ERR debug output is not very useful for this, so we
  *  utilize serial/ramdebug instead.
  */
 #ifndef NO_DEBUG_MESSAGES
 void KPutStr(CONST_STRPTR format)
+{
 	RawDoFmt(format, NULL, (void (*)())RAWFMTFUNC_SERIAL, NULL);
+}
 #else
 #define KPutStr(x)
 #endif
 /**

0 comments (0 inline, 0 general)