Permalink
Browse files

Merge pull request #2397 from Subv/pulse

 Kernel: Implemented Pulse event and timers.
  • Loading branch information...
2 parents 0ae7092 + e52ca85 commit 84d72fd92fcd737566efde0cb324c48dcd689997 @bunnei bunnei committed on GitHub Jan 10, 2017
@@ -22,11 +22,6 @@ SharedPtr<Event> Event::Create(ResetType reset_type, std::string name) {
evt->reset_type = reset_type;
evt->name = std::move(name);
- if (reset_type == ResetType::Pulse) {
- LOG_ERROR(Kernel, "Unimplemented event reset type Pulse");
- UNIMPLEMENTED();
- }
-
return evt;
}
@@ -37,8 +32,7 @@ bool Event::ShouldWait(Thread* thread) const {
void Event::Acquire(Thread* thread) {
ASSERT_MSG(!ShouldWait(thread), "object unavailable!");
- // Release the event if it's not sticky...
- if (reset_type != ResetType::Sticky)
+ if (reset_type == ResetType::OneShot)
signaled = false;
}
@@ -51,4 +45,11 @@ void Event::Clear() {
signaled = false;
}
+void Event::WakeupAllWaitingThreads() {
+ WaitObject::WakeupAllWaitingThreads();
+
+ if (reset_type == ResetType::Pulse)
+ signaled = false;
+}
+
} // namespace
@@ -38,6 +38,8 @@ class Event final : public WaitObject {
bool ShouldWait(Thread* thread) const override;
void Acquire(Thread* thread) override;
+ void WakeupAllWaitingThreads() override;
+
void Signal();
void Clear();
@@ -157,7 +157,7 @@ class WaitObject : public Object {
* Wake up all threads waiting on this object that can be awoken, in priority order,
* and set the synchronization result and output of the thread.
*/
- void WakeupAllWaitingThreads();
+ virtual void WakeupAllWaitingThreads();
/// Obtains the highest priority thread that is ready to run from this object's waiting list.
SharedPtr<Thread> GetHighestPriorityReadyThread();
@@ -31,11 +31,6 @@ SharedPtr<Timer> Timer::Create(ResetType reset_type, std::string name) {
timer->interval_delay = 0;
timer->callback_handle = timer_callback_handle_table.Create(timer).MoveFrom();
- if (reset_type == ResetType::Pulse) {
- LOG_ERROR(Kernel, "Unimplemented timer reset type Pulse");
- UNIMPLEMENTED();
- }
-
return timer;
}
@@ -70,6 +65,13 @@ void Timer::Clear() {
signaled = false;
}
+void Timer::WakeupAllWaitingThreads() {
+ WaitObject::WakeupAllWaitingThreads();
+
+ if (reset_type == ResetType::Pulse)
+ signaled = false;
+}
+
/// The timer callback event, called when a timer is fired
static void TimerCallback(u64 timer_handle, int cycles_late) {
SharedPtr<Timer> timer =
@@ -42,6 +42,8 @@ class Timer final : public WaitObject {
bool ShouldWait(Thread* thread) const override;
void Acquire(Thread* thread) override;
+ void WakeupAllWaitingThreads() override;
+
/**
* Starts the timer, with the specified initial delay and interval.
* @param initial Delay until the timer is first fired

0 comments on commit 84d72fd

Please sign in to comment.