Merge branch 'add_ioc_prefix_to_log' into 'master'

[Debug] prefix log messages from the I/O completer thread with "IOC"

See merge request i4/manycore/emper!216

emper/Debug.cpp

@@ -2,6 +2,8 @@
 // Copyright © 2020 Florian Schmaus
 #include "Debug.hpp"
 
+#include <pthread.h>
+
 #include <chrono>
 #include <ctime>		 // for localtime
 #include <iomanip>	 // for operator<<, setfill, setw
@@ -10,9 +12,13 @@
 
 #include "Common.hpp"
 #include "Emper.hpp"
-#include "Worker.hpp"			 // for Runtime
+#include "Runtime.hpp"
+#include "Worker.hpp"
 #include "emper-common.h"	 // for workerid_t
 #include "emper-config.h"	 // for EMPER_LOG_LEVEL
+#include "io/GlobalIoContext.hpp"
+
+using emper::io::GlobalIoContext;
 
 static std::mutex emper_log_mutex;
 
@@ -39,7 +45,14 @@ void emper_log(const std::string& prefix, const std::string& message) {
 		std::string workerIdAsString = std::to_string(workerId);
 		logMessage << std::setfill('0') << std::setw(3) << workerIdAsString << " ";
 	} else {
-		logMessage << "    ";
+		// Are we the global IO completer
+		Runtime* runtime = Runtime::getRuntime();
+		GlobalIoContext* gio = runtime ? runtime->globalIo : nullptr;
+		if (gio && pthread_self() == gio->globalCompleter) {
+			logMessage << "IOC ";
+		} else {
+			logMessage << "    ";
+		}
 	}
 
 	if constexpr (emper::LOG_TIMESTAMP) {

emper/Runtime.hpp

@@ -13,6 +13,7 @@
 #include <mutex>
 #include <optional>
 #include <random>
+#include <string>
 #include <vector>	 // for vector
 
 #include "CallerEnvironment.hpp"
@@ -194,4 +195,6 @@ class Runtime : public Logger<LogSubsystem::RUNTI> {
 	friend class MemoryManager;
 	template <typename>
 	friend class WorkerLocalData;
+
+	friend void emper_log(const std::string& prefix, const std::string& message);
 };

emper/io/GlobalIoContext.cpp

@@ -9,7 +9,6 @@
 #include <cassert>
 #include <cerrno>
 #include <cstdio>
-#include <memory>
 #include <mutex>
 
 #include "CallerEnvironment.hpp"

emper/io/GlobalIoContext.hpp

@@ -6,6 +6,7 @@
 
 #include <cstdint>
 #include <mutex>
+#include <string>
 
 #include "emper-common.h"
 #include "io/IoContext.hpp"
@@ -14,6 +15,7 @@ class Runtime;
 namespace emper::io {
 class GlobalIoContext : public IoContext {
 	friend Runtime;
+	friend void ::emper_log(const std::string& prefix, const std::string& message);
 	friend class Future;
 	friend class SendFuture;
 	friend class RecvFuture;