christoph/lecture-operating-system-development
1
Fork 0
Code Activity

adapt to scheduler rework

Browse Source
This commit is contained in:
Christoph Urlacher
2022-07-21 20:36:12 +02:00
parent 2ac36cda83
commit 017f7de650
13 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c_os/user/event/KeyEventListener.h
View File

@ -10,9 +10,9 @@ private:
char lastChar = '\0';
public:
Thread& thread; // Thread which contains this listener, so the listener can block the thread
unsigned int tid; // Thread which contains this listener, so the listener can block the thread
KeyEventListener(Thread& thread) : thread(thread) {}
KeyEventListener(unsigned int tid) : tid(tid) {}
char waitForKeyEvent() const; // Blocks the thread until woken up by manager
void trigger(char c); // Gets called from KeyEventManager

21
c_os/user/event/KeyEventManager.cc
View File

@ -1,21 +1,26 @@
#include "user/event/KeyEventManager.h"
#include "kernel/Globals.h"
void KeyEventManager::subscribe(KeyEventListener& listener) {
log << DEBUG << "Subscribe, Thread ID: " << dec << listener.thread.tid << endl;
this->listeners.insert_last(&listener);
void KeyEventManager::subscribe(KeyEventListener& sub) {
log << DEBUG << "Subscribe, Thread ID: " << dec << sub.tid << endl;
this->listeners.push_back(&sub);
}
void KeyEventManager::unsubscribe(KeyEventListener& listener) {
log << DEBUG << "Unsubscribe, Thread ID: " << dec << listener.thread.tid << endl;
this->listeners.remove(&listener);
void KeyEventManager::unsubscribe(KeyEventListener& unsub) {
log << DEBUG << "Unsubscribe, Thread ID: " << dec << unsub.tid << endl;
for (bse::Vector<KeyEventListener*>::Iterator it = listeners.begin(); it != listeners.end(); ++it) {
if ((*it)->tid == unsub.tid) {
this->listeners.erase(it);
return;
}
}
}
void KeyEventManager::broadcast(char c) {
log << TRACE << "Beginning Broadcast" << endl;
for (KeyEventListener* listener : this->listeners) {
log << TRACE << "Broadcasting " << c << " to Thread ID: " << dec << listener->thread.tid << endl;
log << TRACE << "Broadcasting " << c << " to Thread ID: " << dec << listener->tid << endl;
listener->trigger(c);
scheduler.deblock(&listener->thread);
scheduler.deblock(listener->tid);
}
}

4
c_os/user/event/KeyEventManager.h
View File

@ -18,8 +18,8 @@ private:
public:
KeyEventManager() : log("KEvMan") {}
void subscribe(KeyEventListener& listener);
void unsubscribe(KeyEventListener& listener);
void subscribe(KeyEventListener& sub);
void unsubscribe(KeyEventListener& unsub);
void broadcast(char c); // Unblocks all input waiting threads, I don't have a method to direct input
};