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

12
c_os/lib/Semaphore.cc
View File

@ -11,7 +11,7 @@ void Semaphore::p() {
this->lock.release();
} else {
// Block and manage thread in semaphore queue until it's woken up by v() again
this->waitQueue.push_back(scheduler.get_active());
this->wait_queue.push_back(scheduler.get_active());
this->lock.release();
scheduler.block(); // Moves to next thread
}
@ -20,16 +20,16 @@ void Semaphore::p() {
void Semaphore::v() {
this->lock.acquire();
if (!this->waitQueue.empty()) {
if (!this->wait_queue.empty()) {
// Semaphore stays busy and unblocks next thread to work in critical section
if (this->waitQueue.empty()) {
if (this->wait_queue.empty()) {
this->lock.release();
return;
}
Thread* next = this->waitQueue[0];
this->waitQueue.erase(waitQueue.begin());
unsigned int tid = this->wait_queue.front();
this->wait_queue.erase(wait_queue.begin());
this->lock.release();
scheduler.deblock(next);
scheduler.deblock(tid);
} else {
// No more threads want to work so free semaphore
this->counter = this->counter + 1;