Merge branch 'crashlog_improvements' into jgrpp

src/command.cpp

@@ -531,7 +531,8 @@ CommandCost DoCommand(const CommandContainer *container, DoCommandFlag flags)
  */
 CommandCost DoCommand(TileIndex tile, uint32 p1, uint32 p2, DoCommandFlag flags, uint32 cmd, const char *text)
 {
-	SCOPE_INFO_FMT([=], "DoCommand: tile: %dx%d, p1: 0x%X, p2: 0x%X, flags: 0x%X, company: %s, cmd: 0x%X (%s)", TileX(tile), TileY(tile), p1, p2, flags, DumpCompanyInfo(_current_company), cmd, GetCommandName(cmd));
+	SCOPE_INFO_FMT([=], "DoCommand: tile: %dx%d, p1: 0x%X, p2: 0x%X, flags: 0x%X, company: %s, cmd: 0x%X (%s)",
+			TileX(tile), TileY(tile), p1, p2, flags, scope_dumper().CompanyInfo(_current_company), cmd, GetCommandName(cmd));
 
 	CommandCost res;
 
@@ -627,7 +628,8 @@ bool DoCommandP(const CommandContainer *container, bool my_cmd)
  */
 bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback, const char *text, bool my_cmd, uint32 binary_length)
 {
-	SCOPE_INFO_FMT([=], "DoCommandP: tile: %dx%d, p1: 0x%X, p2: 0x%X, company: %s, cmd: 0x%X (%s), my_cmd: %d", TileX(tile), TileY(tile), p1, p2, DumpCompanyInfo(_current_company), cmd, GetCommandName(cmd), my_cmd);
+	SCOPE_INFO_FMT([=], "DoCommandP: tile: %dx%d, p1: 0x%X, p2: 0x%X, company: %s, cmd: 0x%X (%s), my_cmd: %d",
+			TileX(tile), TileY(tile), p1, p2, scope_dumper().CompanyInfo(_current_company), cmd, GetCommandName(cmd), my_cmd);
 
 	/* Cost estimation is generally only done when the
 	 * local user presses shift while doing somthing.

src/crashlog.cpp

@@ -81,6 +81,13 @@ char *CrashLog::LogCompiler(char *buffer, const char *last) const
 	return buffer;
 }
 
+#ifdef USE_SCOPE_INFO
+/* virtual */ char *CrashLog::LogScopeInfo(char *buffer, const char *last) const
+{
+	return buffer + WriteScopeLog(buffer, last);
+}
+#endif
+
 /**
  * Writes OpenTTD's version to the buffer.
  * @param buffer The begin where to write at.

src/crashlog.h

@@ -80,6 +80,16 @@ protected:
 	 */
 	virtual char *LogModules(char *buffer, const char *last) const;
 
+#ifdef USE_SCOPE_INFO
+	/**
+	 * Writes the scope info log to the buffer.
+	 * This may only be called when IsMainThread() returns true
+	 * @param buffer The begin where to write at.
+	 * @param last   The last position in the buffer to write to.
+	 * @return the position of the \c '\0' character after the buffer.
+	 */
+	virtual char *LogScopeInfo(char *buffer, const char *last) const;
+#endif
 
 	char *LogOpenTTDVersion(char *buffer, const char *last) const;
 	char *LogConfiguration(char *buffer, const char *last) const;

src/os/unix/crashlog_unix.cpp

@@ -251,6 +251,38 @@ class CrashLogUnix : public CrashLog {
 #endif
 		return buffer + seprintf(buffer, last, "\n");
 	}
+
+#if defined(USE_SCOPE_INFO) && defined(__GLIBC__)
+	/**
+	 * This is a wrapper around the generic LogScopeInfo function which sets
+	 * up a signal handler to catch any SIGSEGVs which may occur due to invalid data
+	 */
+	/* virtual */ char *LogScopeInfo(char *buffer, const char *last) const
+	{
+		logStacktraceSavedBuffer = buffer;
+
+		if (setjmp(logStacktraceJmpBuf) != 0) {
+			buffer = logStacktraceSavedBuffer;
+			buffer += seprintf(buffer, last, "\nSomething went seriously wrong when attempting to dump the scope info (SIGSEGV in signal handler).\n");
+			buffer += seprintf(buffer, last, "This is probably due to an invalid pointer or other corrupt data.\n\n");
+			return buffer;
+		}
+
+		signal(SIGSEGV, LogStacktraceSigSegvHandler);
+		sigset_t sigs;
+		sigset_t oldsigs;
+		sigemptyset(&sigs);
+		sigaddset(&sigs, SIGSEGV);
+		sigprocmask(SIG_UNBLOCK, &sigs, &oldsigs);
+
+		buffer = this->CrashLog::LogScopeInfo(buffer, last);
+
+		signal(SIGSEGV, SIG_DFL);
+		sigprocmask(SIG_SETMASK, &oldsigs, NULL);
+		return buffer;
+	}
+#endif
+
 public:
 	/**
 	 * A crash log is always generated by signal.

src/scope_info.cpp

@@ -39,34 +39,43 @@ int WriteScopeLog(char *buf, const char *last)
 }
 
 // helper functions
-char *DumpCompanyInfo(int company_id)
+const char *scope_dumper::CompanyInfo(int company_id)
 {
-	char buf[256];
+	char *b = this->buffer;
-	char *b = buf + seprintf(buf, lastof(buf), "%d (", company_id);
+	const char *last = lastof(this->buffer);
+	b += seprintf(b, last, "%d (", company_id);
 	SetDParam(0, company_id);
-	b = GetString(b, STR_COMPANY_NAME, lastof(buf));
+	b = GetString(b, STR_COMPANY_NAME, last);
-	b += seprintf(b, lastof(buf), ")");
+	b += seprintf(b, last, ")");
-	return stredup(buf, lastof(buf));
+	return buffer;
 }
 
-char *DumpVehicleInfo(const Vehicle *v)
+const char *scope_dumper::VehicleInfo(const Vehicle *v)
 {
-	char buf[256];
+	char *b = this->buffer;
-	char *b = buf;
+	const char *last = lastof(this->buffer);
 	if (v) {
-		b += seprintf(b, lastof(buf), "veh: %u: (", v->index);
+		b += seprintf(b, last, "veh: %u: (", v->index);
+		if (Vehicle::GetIfValid(v->index) != v) {
+			b += seprintf(b, last, "INVALID PTR: %p)", v);
+			return this->buffer;
+		}
 		SetDParam(0, v->index);
-		b = GetString(b, STR_VEHICLE_NAME, lastof(buf));
+		b = GetString(b, STR_VEHICLE_NAME, last);
 		if (v->First() && v->First() != v) {
-			b += seprintf(b, lastof(buf), "), front: %u: (", v->First()->index);
+			b += seprintf(b, last, "), front: %u: (", v->First()->index);
+			if (Vehicle::GetIfValid(v->First()->index) != v->First()) {
+				b += seprintf(b, last, "INVALID PTR: %p)", v->First());
+				return this->buffer;
+			}
 			SetDParam(0, v->First()->index);
-			b = GetString(b, STR_VEHICLE_NAME, lastof(buf));
+			b = GetString(b, STR_VEHICLE_NAME, last);
 		}
-		b += seprintf(b, lastof(buf), ")");
+		b += seprintf(b, last, ")");
 	} else {
-		b += seprintf(b, lastof(buf), "veh: NULL");
+		b += seprintf(b, last, "veh: NULL");
 	}
-	return stredup(buf, lastof(buf));
+	return this->buffer;
 }
 
 #endif

src/scope_info.h

@@ -43,15 +43,32 @@ int WriteScopeLog(char *buf, const char *last);
  * This lambda is then captured by reference in a std::function which is pushed onto the scope stack
  * The scope stack is popped at the end of the scope
  */
-#define SCOPE_INFO_FMT(capture, ...) auto SCOPE_INFO_PASTE(_sc_lm_, __LINE__) = capture (char *buf, const char *last) { return seprintf(buf, last, __VA_ARGS__); }; scope_info_func_obj SCOPE_INFO_PASTE(_sc_obj_, __LINE__) ([&](char *buf, const char *last) -> int { return SCOPE_INFO_PASTE(_sc_lm_, __LINE__) (buf, last); });
+#define SCOPE_INFO_FMT(capture, ...) \
+	auto SCOPE_INFO_PASTE(_sc_lm_, __LINE__) = capture (char *buf, const char *last) { \
+		return seprintf(buf, last, __VA_ARGS__); \
+	}; \
+	scope_info_func_obj SCOPE_INFO_PASTE(_sc_obj_, __LINE__) ([&](char *buf, const char *last) -> int { \
+		return SCOPE_INFO_PASTE(_sc_lm_, __LINE__) (buf, last); \
+	});
 
-// helper functions
+/**
-char *DumpCompanyInfo(int company_id);
+ * This is a set of helper functions to print useful info from within a SCOPE_INFO_FMT statement.
-char *DumpVehicleInfo(const Vehicle *v);
+ * The use of a struct is so that when used as an argument to SCOPE_INFO_FMT/seprintf/etc, the buffer lives
+ * on the stack with a lifetime which lasts until the end of the statement.
+ * This avoids needing to call malloc(), which is technically unsafe within the crash logger signal handler,
+ * writing directly into the seprintf buffer, or the use of a separate static buffer.
+ */
+struct scope_dumper {
+	const char *CompanyInfo(int company_id);
+	const char *VehicleInfo(const Vehicle *v);
+
+private:
+	char buffer[256];
+};
 
 #else /* USE_SCOPE_INFO */
 
-#define SCOPE_INFO_FMT(...)
+#define SCOPE_INFO_FMT(...) { }
 
 #endif /* USE_SCOPE_INFO */
 

src/vehicle.cpp

@@ -947,7 +947,7 @@ static void RunVehicleDayProc()
 
 	/* Run the day_proc for every DAY_TICKS vehicle starting at _date_fract. */
 	Vehicle *v = NULL;
-	SCOPE_INFO_FMT([&v], "RunVehicleDayProc: %s", DumpVehicleInfo(v));
+	SCOPE_INFO_FMT([&v], "RunVehicleDayProc: %s", scope_dumper().VehicleInfo(v));
 	for (size_t i = _date_fract; i < Vehicle::GetPoolSize(); i += DAY_TICKS) {
 		v = Vehicle::Get(i);
 		if (v == NULL) continue;
@@ -1003,7 +1003,7 @@ void CallVehicleTicks()
 	FOR_ALL_STATIONS(st) LoadUnloadStation(st);
 
 	Vehicle *v = NULL;
-	SCOPE_INFO_FMT([&v], "CallVehicleTicks: %s", DumpVehicleInfo(v));
+	SCOPE_INFO_FMT([&v], "CallVehicleTicks: %s", scope_dumper().VehicleInfo(v));
 	FOR_ALL_VEHICLES(v) {
 		/* Vehicle could be deleted in this tick */
 		if (!v->Tick()) {
@@ -1121,7 +1121,7 @@ void CallVehicleTicks()
 	for (TemplateReplacementMap::iterator it = _vehicles_to_templatereplace.Begin(); it != _vehicles_to_templatereplace.End(); it++) {
 		Train *t = it->first;
 
-		SCOPE_INFO_FMT([t], "CallVehicleTicks: template replace: %s", DumpVehicleInfo(t));
+		SCOPE_INFO_FMT([t], "CallVehicleTicks: template replace: %s", scope_dumper().VehicleInfo(t));
 
 		/* Store the position of the effect as the vehicle pointer will become invalid later */
 		int x = t->x_pos;