Merge pull request #57 from lrr-tum/mmbwmon_init_measurement

system_info message added to mmbwmon.

Author: Simon Pickartz

CMakeLists.txt

@@ -134,6 +134,7 @@ set(HEADERS
 	"${CMAKE_CURRENT_SOURCE_DIR}/include/fast-lib/message/agent/mmbwmon/reply.hpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/include/fast-lib/message/agent/mmbwmon/stop.hpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/include/fast-lib/message/agent/mmbwmon/restart.hpp"
+	"${CMAKE_CURRENT_SOURCE_DIR}/include/fast-lib/message/agent/mmbwmon/system_info.hpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/include/fast-lib/message/migfra/pci_id.hpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/include/fast-lib/message/migfra/ivshmem.hpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/include/fast-lib/message/migfra/time_measurement.hpp"
@@ -154,6 +155,7 @@ set(SRC
 	"${CMAKE_CURRENT_SOURCE_DIR}/src/message/agent/mmbwmon/reply.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/src/message/agent/mmbwmon/stop.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/src/message/agent/mmbwmon/restart.cpp"
+ 	"${CMAKE_CURRENT_SOURCE_DIR}/src/message/agent/mmbwmon/system_info.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/src/message/migfra/pci_id.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/src/message/migfra/ivshmem.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/src/message/migfra/time_measurement.cpp"

include/fast-lib/message/agent/mmbwmon/system_info.hpp

@@ -0,0 +1,54 @@
+/*
+ * This file is part of fast-lib.
+ * Copyright (C) 2017 Jens Breitbart
+ *
+ * This file is licensed under the GNU Lesser General Public License Version 3
+ * Version 3, 29 June 2007. For details see 'LICENSE.md' in the root directory.
+ */
+
+#ifndef FAST_LIB_MESSAGE_AGENT_MMBWMON_SYSTEM_INFO
+#define FAST_LIB_MESSAGE_AGENT_MMBWMON_SYSTEM_INFO
+
+#include <fast-lib/serializable.hpp>
+
+#include <map>
+#include <string>
+#include <vector>
+
+namespace fast {
+namespace msg {
+namespace agent {
+namespace mmbwmon {
+
+/**
+ * topic: fast/agent/<hostname>/task/mmbwmon/system_info
+ * Payload
+ * task: mmbwmon system info
+ * threads: <number of threads>
+ * smt: <smt factor> (eg 2 on normal Xeon)
+ * numa: <number of NUMA domains>
+ * bandwidth: <measured memory bandwidth in compact,1 mode> (in GBytes/s)
+ */
+
+struct system_info : public fast::Serializable
+{
+	system_info() = default;
+	system_info(const size_t _threads, const size_t _smt, const size_t _numa, const std::vector<double> &_membw);
+
+	YAML::Node emit() const override;
+	void load(const YAML::Node &node) override;
+
+	size_t threads;
+	size_t smt;
+	size_t numa;
+	std::vector<double> membw;
+};
+
+}
+}
+}
+}
+
+YAML_CONVERT_IMPL(fast::msg::agent::mmbwmon::system_info)
+
+#endif

src/message/agent/mmbwmon/ack.cpp

@@ -9,7 +9,6 @@ namespace mmbwmon {
 YAML::Node ack::emit() const
 {
 	YAML::Node node;
-	node["task"] = "mmbwmon ack";
 	return node;
 }
 

src/message/agent/mmbwmon/reply.cpp

@@ -12,9 +12,8 @@ reply::reply(const std::vector<size_t> &_cores, double _result) : cores(_cores),
 YAML::Node reply::emit() const
 {
 	YAML::Node node;
-	node["task"] = "mmbwmon response";
 	node["cores"] = cores;
-    node["result"] = result;
+	node["result"] = result;
 	return node;
 }
 

src/message/agent/mmbwmon/request.cpp

@@ -12,7 +12,6 @@ request::request(const std::vector<size_t> &_cores) : cores(_cores)
 YAML::Node request::emit() const
 {
 	YAML::Node node;
-	node["task"] = "mmbwmon request";
 	node["cores"] = cores;
 	return node;
 }

src/message/agent/mmbwmon/restart.cpp

@@ -12,8 +12,7 @@ restart::restart(const std::string _cgroup) : cgroup(_cgroup)
 YAML::Node restart::emit() const
 {
 	YAML::Node node;
-	node["task"] = "mmbwmon restart";
-    node["cgroup"] = cgroup;
+	node["cgroup"] = cgroup;
 	return node;
 }
 

src/message/agent/mmbwmon/stop.cpp

@@ -12,8 +12,7 @@ stop::stop(const std::string _cgroup) : cgroup(_cgroup)
 YAML::Node stop::emit() const
 {
 	YAML::Node node;
-	node["task"] = "mmbwmon stop";
-    node["cgroup"] = cgroup;
+	node["cgroup"] = cgroup;
 	return node;
 }
 

src/message/agent/mmbwmon/system_info.cpp

@@ -0,0 +1,33 @@
+#include <fast-lib/message/agent/mmbwmon/system_info.hpp>
+
+namespace fast {
+namespace msg {
+namespace agent {
+namespace mmbwmon {
+
+system_info::system_info(const size_t _threads, const size_t _smt, const size_t _numa, const std::vector<double> &_membw): threads(_threads), smt(_smt), numa(_numa), membw(_membw)
+{
+}
+
+YAML::Node system_info::emit() const
+{
+	YAML::Node node;
+	node["threads"] = threads;
+	node["smt"] = smt;
+	node["numa"] = numa;
+	node["bandwidth"] = membw;
+	return node;
+}
+
+void system_info::load(const YAML::Node &node)
+{
+	fast::load(threads, node["threads"]);
+	fast::load(smt, node["smt"]);
+	fast::load(numa, node["numa"]);
+	fast::load(membw, node["bandwidth"]);
+}
+
+}
+}
+}
+}