Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Dec 25, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d87d7ae
fix(system_monitor): move headers to a separate directory
esteve Dec 22, 2023
a350191
style(pre-commit): autofix
pre-commit-ci[bot] Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion system/system_monitor/include/system_monitor/hdd_monitor/hdd_monitor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions ...monitor/include/hdd_reader/hdd_reader.hpp → .../system_monitor/hdd_reader/hdd_reader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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_
6 changes: 3 additions & 3 deletions ...monitor/include/msr_reader/msr_reader.hpp → .../system_monitor/msr_reader/msr_reader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -48,4 +48,4 @@ struct MSRInfo
}
};

#endif // MSR_READER__MSR_READER_HPP_
#endif // SYSTEM_MONITOR__MSR_READER__MSR_READER_HPP_
2 changes: 1 addition & 1 deletion system/system_monitor/include/system_monitor/net_monitor/net_monitor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions .../traffic_reader/traffic_reader_common.hpp → .../traffic_reader/traffic_reader_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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_
8 changes: 4 additions & 4 deletions ...traffic_reader/traffic_reader_service.hpp → ...traffic_reader/traffic_reader_service.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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_
2 changes: 1 addition & 1 deletion system/system_monitor/reader/hdd_reader/hdd_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion system/system_monitor/reader/msr_reader/msr_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion system/system_monitor/reader/traffic_reader/traffic_reader_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion system/system_monitor/reader/traffic_reader/traffic_reader_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions system/system_monitor/src/cpu_monitor/intel_cpu_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions system/system_monitor/src/hdd_monitor/hdd_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions system/system_monitor/src/net_monitor/net_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions system/system_monitor/src/voltage_monitor/voltage_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion system/system_monitor/test/src/cpu_monitor/test_intel_cpu_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion system/system_monitor/test/src/hdd_monitor/test_hdd_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading