diff --git a/Userland/DevTools/Profiler/DisassemblyModel.cpp b/Userland/DevTools/Profiler/DisassemblyModel.cpp index 9225df52aa..9a6f6bfdeb 100644 --- a/Userland/DevTools/Profiler/DisassemblyModel.cpp +++ b/Userland/DevTools/Profiler/DisassemblyModel.cpp @@ -14,6 +14,8 @@ #include #include +namespace Profiler { + static const Gfx::Bitmap& heat_gradient() { static RefPtr bitmap; @@ -185,3 +187,5 @@ void DisassemblyModel::update() { did_update(); } + +} diff --git a/Userland/DevTools/Profiler/DisassemblyModel.h b/Userland/DevTools/Profiler/DisassemblyModel.h index 382c384fde..6982d03d9f 100644 --- a/Userland/DevTools/Profiler/DisassemblyModel.h +++ b/Userland/DevTools/Profiler/DisassemblyModel.h @@ -9,6 +9,8 @@ #include #include +namespace Profiler { + class Profile; class ProfileNode; @@ -53,3 +55,5 @@ private: Vector m_instructions; }; + +} diff --git a/Userland/DevTools/Profiler/IndividualSampleModel.cpp b/Userland/DevTools/Profiler/IndividualSampleModel.cpp index d3e7823d45..386d559910 100644 --- a/Userland/DevTools/Profiler/IndividualSampleModel.cpp +++ b/Userland/DevTools/Profiler/IndividualSampleModel.cpp @@ -9,6 +9,8 @@ #include #include +namespace Profiler { + IndividualSampleModel::IndividualSampleModel(Profile& profile, size_t event_index) : m_profile(profile) , m_event_index(event_index) @@ -69,3 +71,5 @@ void IndividualSampleModel::update() { did_update(Model::InvalidateAllIndices); } + +} diff --git a/Userland/DevTools/Profiler/IndividualSampleModel.h b/Userland/DevTools/Profiler/IndividualSampleModel.h index 7ff5dacd73..95abc2541f 100644 --- a/Userland/DevTools/Profiler/IndividualSampleModel.h +++ b/Userland/DevTools/Profiler/IndividualSampleModel.h @@ -8,6 +8,8 @@ #include +namespace Profiler { + class Profile; class IndividualSampleModel final : public GUI::Model { @@ -38,3 +40,5 @@ private: Profile& m_profile; const size_t m_event_index { 0 }; }; + +} diff --git a/Userland/DevTools/Profiler/Process.cpp b/Userland/DevTools/Profiler/Process.cpp index ac03c69a44..9eee7d6489 100644 --- a/Userland/DevTools/Profiler/Process.cpp +++ b/Userland/DevTools/Profiler/Process.cpp @@ -6,6 +6,8 @@ #include "Process.h" +namespace Profiler { + Thread* Process::find_thread(pid_t tid, u64 timestamp) { auto it = threads.find(tid); @@ -115,3 +117,5 @@ const LibraryMetadata::Library* LibraryMetadata::library_containing(FlatPtr ptr) } return nullptr; } + +} diff --git a/Userland/DevTools/Profiler/Process.h b/Userland/DevTools/Profiler/Process.h index 3e7c6b131b..b928d7bc23 100644 --- a/Userland/DevTools/Profiler/Process.h +++ b/Userland/DevTools/Profiler/Process.h @@ -12,6 +12,8 @@ #include #include +namespace Profiler { + struct MappedObject { NonnullRefPtr file; ELF::Image elf; @@ -66,3 +68,5 @@ struct Process { return timestamp >= start_valid && (end_valid == 0 || timestamp <= end_valid); } }; + +} diff --git a/Userland/DevTools/Profiler/ProcessPickerWidget.cpp b/Userland/DevTools/Profiler/ProcessPickerWidget.cpp index ad78b1c989..2c34b149c8 100644 --- a/Userland/DevTools/Profiler/ProcessPickerWidget.cpp +++ b/Userland/DevTools/Profiler/ProcessPickerWidget.cpp @@ -10,6 +10,8 @@ #include #include +namespace Profiler { + ProcessPickerWidget::ProcessPickerWidget(Profile& profile) : m_profile(profile) { @@ -46,3 +48,5 @@ ProcessPickerWidget::ProcessPickerWidget(Profile& profile) ProcessPickerWidget::~ProcessPickerWidget() { } + +} diff --git a/Userland/DevTools/Profiler/ProcessPickerWidget.h b/Userland/DevTools/Profiler/ProcessPickerWidget.h index 85d8733a16..b1c64a374f 100644 --- a/Userland/DevTools/Profiler/ProcessPickerWidget.h +++ b/Userland/DevTools/Profiler/ProcessPickerWidget.h @@ -9,6 +9,8 @@ #include #include +namespace Profiler { + class Profile; class ProcessPickerWidget final : public GUI::Frame { @@ -29,3 +31,5 @@ private: RefPtr m_process_combo; }; + +} diff --git a/Userland/DevTools/Profiler/Profile.cpp b/Userland/DevTools/Profiler/Profile.cpp index 101f5ec598..76f3f8c764 100644 --- a/Userland/DevTools/Profiler/Profile.cpp +++ b/Userland/DevTools/Profiler/Profile.cpp @@ -18,6 +18,8 @@ #include #include +namespace Profiler { + static void sort_profile_nodes(Vector>& nodes) { quick_sort(nodes.begin(), nodes.end(), [](auto& a, auto& b) { @@ -459,3 +461,5 @@ const Process* ProfileNode::process(Profile& profile, u64 timestamp) const { return profile.find_process(m_pid, timestamp); } + +} diff --git a/Userland/DevTools/Profiler/Profile.h b/Userland/DevTools/Profiler/Profile.h index 661afd5c4b..64572d5b03 100644 --- a/Userland/DevTools/Profiler/Profile.h +++ b/Userland/DevTools/Profiler/Profile.h @@ -20,6 +20,8 @@ #include #include +namespace Profiler { + class DisassemblyModel; class Profile; class ProfileModel; @@ -229,3 +231,5 @@ private: bool m_show_top_functions { false }; bool m_show_percentages { false }; }; + +} diff --git a/Userland/DevTools/Profiler/ProfileModel.cpp b/Userland/DevTools/Profiler/ProfileModel.cpp index 2b77e38b75..f34f51722c 100644 --- a/Userland/DevTools/Profiler/ProfileModel.cpp +++ b/Userland/DevTools/Profiler/ProfileModel.cpp @@ -10,6 +10,8 @@ #include #include +namespace Profiler { + ProfileModel::ProfileModel(Profile& profile) : m_profile(profile) { @@ -129,3 +131,5 @@ void ProfileModel::update() { did_update(Model::InvalidateAllIndices); } + +} diff --git a/Userland/DevTools/Profiler/ProfileModel.h b/Userland/DevTools/Profiler/ProfileModel.h index b9612c2894..5678a077ca 100644 --- a/Userland/DevTools/Profiler/ProfileModel.h +++ b/Userland/DevTools/Profiler/ProfileModel.h @@ -8,6 +8,8 @@ #include +namespace Profiler { + class Profile; class ProfileModel final : public GUI::Model { @@ -44,3 +46,5 @@ private: GUI::Icon m_user_frame_icon; GUI::Icon m_kernel_frame_icon; }; + +} diff --git a/Userland/DevTools/Profiler/ProfileTimelineWidget.cpp b/Userland/DevTools/Profiler/ProfileTimelineWidget.cpp index ebc532e908..748f7e197a 100644 --- a/Userland/DevTools/Profiler/ProfileTimelineWidget.cpp +++ b/Userland/DevTools/Profiler/ProfileTimelineWidget.cpp @@ -9,6 +9,8 @@ #include #include +namespace Profiler { + ProfileTimelineWidget::ProfileTimelineWidget(Profile& profile) : m_profile(profile) { @@ -121,3 +123,5 @@ void ProfileTimelineWidget::mouseup_event(GUI::MouseEvent& event) if (m_select_start_time == m_select_end_time) m_profile.clear_timestamp_filter_range(); } + +} diff --git a/Userland/DevTools/Profiler/ProfileTimelineWidget.h b/Userland/DevTools/Profiler/ProfileTimelineWidget.h index 92e5b914b9..66dfebaec1 100644 --- a/Userland/DevTools/Profiler/ProfileTimelineWidget.h +++ b/Userland/DevTools/Profiler/ProfileTimelineWidget.h @@ -8,6 +8,8 @@ #include +namespace Profiler { + class Profile; class ProfileTimelineWidget final : public GUI::Frame { @@ -32,3 +34,5 @@ private: u64 m_select_end_time { 0 }; u64 m_hover_time { 0 }; }; + +} diff --git a/Userland/DevTools/Profiler/SamplesModel.cpp b/Userland/DevTools/Profiler/SamplesModel.cpp index e4cae4ab1b..ce8161d343 100644 --- a/Userland/DevTools/Profiler/SamplesModel.cpp +++ b/Userland/DevTools/Profiler/SamplesModel.cpp @@ -9,6 +9,8 @@ #include #include +namespace Profiler { + SamplesModel::SamplesModel(Profile& profile) : m_profile(profile) { @@ -91,3 +93,5 @@ void SamplesModel::update() { did_update(Model::InvalidateAllIndices); } + +} diff --git a/Userland/DevTools/Profiler/SamplesModel.h b/Userland/DevTools/Profiler/SamplesModel.h index e2a643f2ff..3488f1fce8 100644 --- a/Userland/DevTools/Profiler/SamplesModel.h +++ b/Userland/DevTools/Profiler/SamplesModel.h @@ -8,6 +8,8 @@ #include +namespace Profiler { + class Profile; class SamplesModel final : public GUI::Model { @@ -43,3 +45,5 @@ private: GUI::Icon m_user_frame_icon; GUI::Icon m_kernel_frame_icon; }; + +} diff --git a/Userland/DevTools/Profiler/main.cpp b/Userland/DevTools/Profiler/main.cpp index 219e929361..56a14d26a0 100644 --- a/Userland/DevTools/Profiler/main.cpp +++ b/Userland/DevTools/Profiler/main.cpp @@ -32,6 +32,8 @@ #include #include +using namespace Profiler; + static bool generate_profile(pid_t& pid); int main(int argc, char** argv)