summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Kernel/PerformanceEventBuffer.cpp12
-rw-r--r--Kernel/PerformanceEventBuffer.h3
-rw-r--r--Kernel/PerformanceManager.h15
-rw-r--r--Userland/DevTools/Profiler/Profile.cpp1
-rw-r--r--Userland/DevTools/Profiler/Profile.h1
-rw-r--r--Userland/DevTools/Profiler/SamplesModel.cpp6
-rw-r--r--Userland/DevTools/Profiler/SamplesModel.h1
-rw-r--r--Userland/DevTools/Profiler/TimelineTrack.cpp2
8 files changed, 30 insertions, 11 deletions
diff --git a/Kernel/PerformanceEventBuffer.cpp b/Kernel/PerformanceEventBuffer.cpp
index 29ce426aec..343f3e6754 100644
--- a/Kernel/PerformanceEventBuffer.cpp
+++ b/Kernel/PerformanceEventBuffer.cpp
@@ -25,7 +25,7 @@ NEVER_INLINE KResult PerformanceEventBuffer::append(int type, FlatPtr arg1, Flat
FlatPtr ebp;
asm volatile("movl %%ebp, %%eax"
: "=a"(ebp));
- return append_with_eip_and_ebp(current_thread->pid(), current_thread->tid(), 0, ebp, type, arg1, arg2, arg3);
+ return append_with_eip_and_ebp(current_thread->pid(), current_thread->tid(), 0, ebp, type, 0, arg1, arg2, arg3);
}
static Vector<FlatPtr, PerformanceEvent::max_stack_frame_count> raw_backtrace(FlatPtr ebp, FlatPtr eip)
@@ -55,13 +55,14 @@ static Vector<FlatPtr, PerformanceEvent::max_stack_frame_count> raw_backtrace(Fl
}
KResult PerformanceEventBuffer::append_with_eip_and_ebp(ProcessID pid, ThreadID tid,
- u32 eip, u32 ebp, int type, FlatPtr arg1, FlatPtr arg2, const StringView& arg3)
+ u32 eip, u32 ebp, int type, u32 lost_samples, FlatPtr arg1, FlatPtr arg2, const StringView& arg3)
{
if (count() >= capacity())
return ENOBUFS;
PerformanceEvent event;
event.type = type;
+ event.lost_samples = lost_samples;
switch (type) {
case PERF_EVENT_SAMPLE:
@@ -182,6 +183,7 @@ bool PerformanceEventBuffer::to_json_impl(Serializer& object) const
event_object.add("pid", event.pid);
event_object.add("tid", event.tid);
event_object.add("timestamp", event.timestamp);
+ event_object.add("lost_samples", i != 0 ? event.lost_samples : 0);
auto stack_array = event_object.add_array("stack");
for (size_t j = 0; j < event.stack_size; ++j) {
stack_array.add(event.stack[j]);
@@ -220,17 +222,17 @@ void PerformanceEventBuffer::add_process(const Process& process, ProcessEventTyp
[[maybe_unused]] auto rc = append_with_eip_and_ebp(process.pid(), 0, 0, 0,
event_type == ProcessEventType::Create ? PERF_EVENT_PROCESS_CREATE : PERF_EVENT_PROCESS_EXEC,
- process.pid().value(), 0, executable);
+ 0, process.pid().value(), 0, executable);
process.for_each_thread([&](auto& thread) {
[[maybe_unused]] auto rc = append_with_eip_and_ebp(process.pid(), thread.tid().value(),
- 0, 0, PERF_EVENT_THREAD_CREATE, 0, 0, nullptr);
+ 0, 0, PERF_EVENT_THREAD_CREATE, 0, 0, 0, nullptr);
return IterationDecision::Continue;
});
for (auto& region : process.space().regions()) {
[[maybe_unused]] auto rc = append_with_eip_and_ebp(process.pid(), 0,
- 0, 0, PERF_EVENT_MMAP, region->range().base().get(), region->range().size(), region->name());
+ 0, 0, PERF_EVENT_MMAP, 0, region->range().base().get(), region->range().size(), region->name());
}
}
diff --git a/Kernel/PerformanceEventBuffer.h b/Kernel/PerformanceEventBuffer.h
index 61f1fd1cba..cfff3ac2e5 100644
--- a/Kernel/PerformanceEventBuffer.h
+++ b/Kernel/PerformanceEventBuffer.h
@@ -53,6 +53,7 @@ struct [[gnu::packed]] PerformanceEvent {
u32 pid { 0 };
u32 tid { 0 };
u64 timestamp;
+ u32 lost_samples;
union {
MallocPerformanceEvent malloc;
FreePerformanceEvent free;
@@ -77,7 +78,7 @@ public:
KResult append(int type, FlatPtr arg1, FlatPtr arg2, const StringView& arg3, Thread* current_thread = Thread::current());
KResult append_with_eip_and_ebp(ProcessID pid, ThreadID tid, u32 eip, u32 ebp,
- int type, FlatPtr arg1, FlatPtr arg2, const StringView& arg3);
+ int type, u32 lost_samples, FlatPtr arg1, FlatPtr arg2, const StringView& arg3);
void clear()
{
diff --git a/Kernel/PerformanceManager.h b/Kernel/PerformanceManager.h
index 00a21785ec..ddd21de248 100644
--- a/Kernel/PerformanceManager.h
+++ b/Kernel/PerformanceManager.h
@@ -34,7 +34,7 @@ public:
if (g_profiling_all_threads) {
VERIFY(g_global_perf_events);
[[maybe_unused]] auto rc = g_global_perf_events->append_with_eip_and_ebp(
- process.pid(), 0, 0, 0, PERF_EVENT_PROCESS_EXIT, 0, 0, nullptr);
+ process.pid(), 0, 0, 0, PERF_EVENT_PROCESS_EXIT, 0, 0, 0, nullptr);
}
}
@@ -52,7 +52,7 @@ public:
}
}
- inline static void add_cpu_sample_event(Thread& current_thread, const RegisterState& regs)
+ inline static void add_cpu_sample_event(Thread& current_thread, const RegisterState& regs, u32 lost_time)
{
PerformanceEventBuffer* perf_events = nullptr;
@@ -67,7 +67,7 @@ public:
if (perf_events) {
[[maybe_unused]] auto rc = perf_events->append_with_eip_and_ebp(
current_thread.pid(), current_thread.tid(),
- regs.eip, regs.ebp, PERF_EVENT_SAMPLE, 0, 0, nullptr);
+ regs.eip, regs.ebp, PERF_EVENT_SAMPLE, lost_time, 0, 0, nullptr);
}
}
@@ -87,13 +87,20 @@ public:
inline static void timer_tick(RegisterState const& regs)
{
+ static Time last_wakeup;
+ auto now = kgettimeofday();
+ constexpr auto ideal_interval = Time::from_microseconds(1000'000 / OPTIMAL_PROFILE_TICKS_PER_SECOND_RATE);
+ auto expected_wakeup = last_wakeup + ideal_interval;
+ auto delay = (now > expected_wakeup) ? now - expected_wakeup : Time::from_microseconds(0);
+ last_wakeup = now;
auto current_thread = Thread::current();
// FIXME: We currently don't collect samples while idle.
// That will be an interesting mode to add in the future. :^)
if (!current_thread || current_thread == Processor::current().idle_thread())
return;
- PerformanceManager::add_cpu_sample_event(*current_thread, regs);
+ auto lost_samples = delay.to_microseconds() / ideal_interval.to_microseconds();
+ PerformanceManager::add_cpu_sample_event(*current_thread, regs, lost_samples);
}
};
diff --git a/Userland/DevTools/Profiler/Profile.cpp b/Userland/DevTools/Profiler/Profile.cpp
index 35fb6814ff..0a7249dcee 100644
--- a/Userland/DevTools/Profiler/Profile.cpp
+++ b/Userland/DevTools/Profiler/Profile.cpp
@@ -228,6 +228,7 @@ Result<NonnullOwnPtr<Profile>, String> Profile::load_from_perfcore_file(const St
Event event;
event.timestamp = perf_event.get("timestamp").to_number<u64>();
+ event.lost_samples = perf_event.get("lost_samples").to_number<u32>();
event.type = perf_event.get("type").to_string();
event.pid = perf_event.get("pid").to_i32();
event.tid = perf_event.get("tid").to_i32();
diff --git a/Userland/DevTools/Profiler/Profile.h b/Userland/DevTools/Profiler/Profile.h
index 3aec06d1e8..05292dd87c 100644
--- a/Userland/DevTools/Profiler/Profile.h
+++ b/Userland/DevTools/Profiler/Profile.h
@@ -166,6 +166,7 @@ public:
String executable;
int pid { 0 };
int tid { 0 };
+ u32 lost_samples { 0 };
bool in_kernel { false };
Vector<Frame> frames;
};
diff --git a/Userland/DevTools/Profiler/SamplesModel.cpp b/Userland/DevTools/Profiler/SamplesModel.cpp
index ce8161d343..af23693c70 100644
--- a/Userland/DevTools/Profiler/SamplesModel.cpp
+++ b/Userland/DevTools/Profiler/SamplesModel.cpp
@@ -45,6 +45,8 @@ String SamplesModel::column_name(int column) const
return "TID";
case Column::ExecutableName:
return "Executable";
+ case Column::LostSamples:
+ return "Lost Samples";
case Column::InnermostStackFrame:
return "Innermost Frame";
default:
@@ -81,6 +83,10 @@ GUI::Variant SamplesModel::data(const GUI::ModelIndex& index, GUI::ModelRole rol
return (u32)event.timestamp;
}
+ if (index.column() == Column::LostSamples) {
+ return event.lost_samples;
+ }
+
if (index.column() == Column::InnermostStackFrame) {
return event.frames.last().symbol;
}
diff --git a/Userland/DevTools/Profiler/SamplesModel.h b/Userland/DevTools/Profiler/SamplesModel.h
index 3488f1fce8..30c594fcab 100644
--- a/Userland/DevTools/Profiler/SamplesModel.h
+++ b/Userland/DevTools/Profiler/SamplesModel.h
@@ -25,6 +25,7 @@ public:
ProcessID,
ThreadID,
ExecutableName,
+ LostSamples,
InnermostStackFrame,
__Count
};
diff --git a/Userland/DevTools/Profiler/TimelineTrack.cpp b/Userland/DevTools/Profiler/TimelineTrack.cpp
index 5b29bd66b0..ae096f23b1 100644
--- a/Userland/DevTools/Profiler/TimelineTrack.cpp
+++ b/Userland/DevTools/Profiler/TimelineTrack.cpp
@@ -78,7 +78,7 @@ void TimelineTrack::paint_event(GUI::PaintEvent& event)
}
auto& histogram = event.in_kernel ? kernel_histogram : usermode_histogram;
- histogram.insert(clamp_timestamp(event.timestamp), 1);
+ histogram.insert(clamp_timestamp(event.timestamp), 1 + event.lost_samples);
}
decltype(kernel_histogram.at(0)) max_value = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 05:42:17 +0000