fix(system_monitor): move headers to a separate directory (#5942)

* fix(system_monitor): move headers to a separate directory Signed-off-by: Esteve Fernandez <[email protected]> * style(pre-commit): autofix --------- Signed-off-by: Esteve Fernandez <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
autowarefoundation · Dec 25, 2023 · 9f656e3 · 9f656e3
1 parent 83d316c
commit 9f656e3
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 29 deletions.
diff --git a/system/system_monitor/include/system_monitor/hdd_monitor/hdd_monitor.hpp b/system/system_monitor/include/system_monitor/hdd_monitor/hdd_monitor.hpp
@@ -20,8 +20,9 @@
 #ifndef SYSTEM_MONITOR__HDD_MONITOR__HDD_MONITOR_HPP_
 #define SYSTEM_MONITOR__HDD_MONITOR__HDD_MONITOR_HPP_
 
+#include "system_monitor/hdd_reader/hdd_reader.hpp"
+
 #include <diagnostic_updater/diagnostic_updater.hpp>
-#include <hdd_reader/hdd_reader.hpp>
 
 #include <climits>
 #include <map>

diff --git a/...monitor/include/hdd_reader/hdd_reader.hpp → .../system_monitor/hdd_reader/hdd_reader.hpp b/...monitor/include/hdd_reader/hdd_reader.hpp → .../system_monitor/hdd_reader/hdd_reader.hpp
@@ -17,8 +17,8 @@
  * @brief HDD reader definitions
  */
 
-#ifndef HDD_READER__HDD_READER_HPP_
-#define HDD_READER__HDD_READER_HPP_
+#ifndef SYSTEM_MONITOR__HDD_READER__HDD_READER_HPP_
+#define SYSTEM_MONITOR__HDD_READER__HDD_READER_HPP_
 
 #include <boost/serialization/map.hpp>
 #include <boost/serialization/serialization.hpp>
@@ -135,4 +135,4 @@ struct UnmountDeviceInfo
  */
 typedef std::map<std::string, HddInfo> HddInfoList;
 
-#endif  // HDD_READER__HDD_READER_HPP_
+#endif  // SYSTEM_MONITOR__HDD_READER__HDD_READER_HPP_
diff --git a/...monitor/include/msr_reader/msr_reader.hpp → .../system_monitor/msr_reader/msr_reader.hpp b/...monitor/include/msr_reader/msr_reader.hpp → .../system_monitor/msr_reader/msr_reader.hpp
@@ -17,8 +17,8 @@
  * @brief MSR reader definitions
  */
 
-#ifndef MSR_READER__MSR_READER_HPP_
-#define MSR_READER__MSR_READER_HPP_
+#ifndef SYSTEM_MONITOR__MSR_READER__MSR_READER_HPP_
+#define SYSTEM_MONITOR__MSR_READER__MSR_READER_HPP_
 
 #include <boost/serialization/serialization.hpp>
 #include <boost/serialization/vector.hpp>
@@ -48,4 +48,4 @@ struct MSRInfo
   }
 };
 
-#endif  // MSR_READER__MSR_READER_HPP_
+#endif  // SYSTEM_MONITOR__MSR_READER__MSR_READER_HPP_
diff --git a/system/system_monitor/include/system_monitor/net_monitor/net_monitor.hpp b/system/system_monitor/include/system_monitor/net_monitor/net_monitor.hpp
@@ -21,7 +21,7 @@
 #define SYSTEM_MONITOR__NET_MONITOR__NET_MONITOR_HPP_
 
 #include "system_monitor/net_monitor/nl80211.hpp"
-#include "traffic_reader/traffic_reader_common.hpp"
+#include "system_monitor/traffic_reader/traffic_reader_common.hpp"
 
 #include <diagnostic_updater/diagnostic_updater.hpp>
 

diff --git a/.../traffic_reader/traffic_reader_common.hpp → .../traffic_reader/traffic_reader_common.hpp b/.../traffic_reader/traffic_reader_common.hpp → .../traffic_reader/traffic_reader_common.hpp
@@ -17,8 +17,8 @@
  * @brief traffic reader definitions
  */
 
-#ifndef TRAFFIC_READER__TRAFFIC_READER_COMMON_HPP_
-#define TRAFFIC_READER__TRAFFIC_READER_COMMON_HPP_
+#ifndef SYSTEM_MONITOR__TRAFFIC_READER__TRAFFIC_READER_COMMON_HPP_
+#define SYSTEM_MONITOR__TRAFFIC_READER__TRAFFIC_READER_COMMON_HPP_
 
 #include <boost/serialization/serialization.hpp>
 #include <boost/serialization/string.hpp>
@@ -64,4 +64,4 @@ struct Result
 
 }  // namespace traffic_reader_service
 
-#endif  // TRAFFIC_READER__TRAFFIC_READER_COMMON_HPP_
+#endif  // SYSTEM_MONITOR__TRAFFIC_READER__TRAFFIC_READER_COMMON_HPP_
diff --git a/...traffic_reader/traffic_reader_service.hpp → ...traffic_reader/traffic_reader_service.hpp b/...traffic_reader/traffic_reader_service.hpp → ...traffic_reader/traffic_reader_service.hpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef TRAFFIC_READER__TRAFFIC_READER_SERVICE_HPP_
-#define TRAFFIC_READER__TRAFFIC_READER_SERVICE_HPP_
+#ifndef SYSTEM_MONITOR__TRAFFIC_READER__TRAFFIC_READER_SERVICE_HPP_
+#define SYSTEM_MONITOR__TRAFFIC_READER__TRAFFIC_READER_SERVICE_HPP_
 
-#include "traffic_reader/traffic_reader_common.hpp"
+#include "system_monitor/traffic_reader/traffic_reader_common.hpp"
 
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/asio.hpp>
@@ -107,4 +107,4 @@ class TrafficReaderService
 
 }  // namespace traffic_reader_service
 
-#endif  // TRAFFIC_READER__TRAFFIC_READER_SERVICE_HPP_
+#endif  // SYSTEM_MONITOR__TRAFFIC_READER__TRAFFIC_READER_SERVICE_HPP_
diff --git a/system/system_monitor/reader/hdd_reader/hdd_reader.cpp b/system/system_monitor/reader/hdd_reader/hdd_reader.cpp
@@ -17,7 +17,7 @@
  * @brief HDD information read class
  */
 
-#include <hdd_reader/hdd_reader.hpp>
+#include "system_monitor/hdd_reader/hdd_reader.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/archive/text_iarchive.hpp>

diff --git a/system/system_monitor/reader/msr_reader/msr_reader.cpp b/system/system_monitor/reader/msr_reader/msr_reader.cpp
@@ -17,7 +17,7 @@
  * @brief MSR read class
  */
 
-#include <msr_reader/msr_reader.hpp>
+#include "system_monitor/msr_reader/msr_reader.hpp"
 
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/filesystem.hpp>

diff --git a/system/system_monitor/reader/traffic_reader/traffic_reader_main.cpp b/system/system_monitor/reader/traffic_reader/traffic_reader_main.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <traffic_reader/traffic_reader_service.hpp>
+#include "system_monitor/traffic_reader/traffic_reader_service.hpp"
 
 #include <getopt.h>
 #include <syslog.h>

diff --git a/system/system_monitor/reader/traffic_reader/traffic_reader_service.cpp b/system/system_monitor/reader/traffic_reader/traffic_reader_service.cpp
@@ -17,7 +17,7 @@
  * @brief traffic information read class
  */
 
-#include <traffic_reader/traffic_reader_service.hpp>
+#include "system_monitor/traffic_reader/traffic_reader_service.hpp"
 
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/process.hpp>

diff --git a/system/system_monitor/src/cpu_monitor/intel_cpu_monitor.cpp b/system/system_monitor/src/cpu_monitor/intel_cpu_monitor.cpp
@@ -19,10 +19,9 @@
 
 #include "system_monitor/cpu_monitor/intel_cpu_monitor.hpp"
 
+#include "system_monitor/msr_reader/msr_reader.hpp"
 #include "system_monitor/system_monitor_utility.hpp"
 
-#include <msr_reader/msr_reader.hpp>
-
 #include <boost/algorithm/string.hpp>
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/filesystem.hpp>

diff --git a/system/system_monitor/src/hdd_monitor/hdd_monitor.cpp b/system/system_monitor/src/hdd_monitor/hdd_monitor.cpp
@@ -19,10 +19,9 @@
 
 #include "system_monitor/hdd_monitor/hdd_monitor.hpp"
 
+#include "system_monitor/hdd_reader/hdd_reader.hpp"
 #include "system_monitor/system_monitor_utility.hpp"
 
-#include <hdd_reader/hdd_reader.hpp>
-
 #include <boost/algorithm/string.hpp>
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/archive/text_oarchive.hpp>

diff --git a/system/system_monitor/src/net_monitor/net_monitor.cpp b/system/system_monitor/src/net_monitor/net_monitor.cpp
@@ -20,8 +20,7 @@
 #include "system_monitor/net_monitor/net_monitor.hpp"
 
 #include "system_monitor/system_monitor_utility.hpp"
-
-#include <traffic_reader/traffic_reader_common.hpp>
+#include "system_monitor/traffic_reader/traffic_reader_common.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/archive/text_iarchive.hpp>

diff --git a/system/system_monitor/src/voltage_monitor/voltage_monitor.cpp b/system/system_monitor/src/voltage_monitor/voltage_monitor.cpp
@@ -19,10 +19,9 @@
 
 #include "system_monitor/voltage_monitor/voltage_monitor.hpp"
 
+#include "system_monitor/msr_reader/msr_reader.hpp"
 #include "system_monitor/system_monitor_utility.hpp"
 
-#include <msr_reader/msr_reader.hpp>
-
 #include <boost/algorithm/string.hpp>
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/filesystem.hpp>

diff --git a/system/system_monitor/test/src/cpu_monitor/test_intel_cpu_monitor.cpp b/system/system_monitor/test/src/cpu_monitor/test_intel_cpu_monitor.cpp
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 #include "system_monitor/cpu_monitor/intel_cpu_monitor.hpp"
+#include "system_monitor/msr_reader/msr_reader.hpp"
 
-#include <msr_reader/msr_reader.hpp>
 #include <rclcpp/rclcpp.hpp>
 
 #include <boost/algorithm/string.hpp>

diff --git a/system/system_monitor/test/src/hdd_monitor/test_hdd_monitor.cpp b/system/system_monitor/test/src/hdd_monitor/test_hdd_monitor.cpp
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 #include "system_monitor/hdd_monitor/hdd_monitor.hpp"
+#include "system_monitor/hdd_reader/hdd_reader.hpp"
 
-#include <hdd_reader/hdd_reader.hpp>
 #include <rclcpp/rclcpp.hpp>
 
 #include <boost/algorithm/string.hpp>