Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-30 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed dependencies on pthread from frcsim.

Browse Source 
Because we want to be able to compile/run wpilibC++Sim on
windows, we would prefer not to require a windows version
of pthread. This commit moves from pthread constructs to
standard library constructs.

Change-Id: I12392a8910189537dd067afdf017e4994d570a66
This commit is contained in:
James Kuszmaul
2015-07-02 14:33:24 -04:00
parent 3f59f3472a
commit 5712565068
17 changed files with 91 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wpilibc/wpilibC++Sim/src/Notifier.cpp
View File

@@ -11,8 +11,8 @@
Notifier *Notifier::timerQueueHead = nullptr;
priority_recursive_mutex Notifier::queueMutex;
Task* Notifier::task = nullptr;
int Notifier::refcount = 0;
::std::atomic<bool> Notifier::m_stopped(false);
/**
* Create a Notifier for timer event notification.
@@ -35,8 +35,7 @@ Notifier::Notifier(TimerEventHandler handler, void *param)
// do the first time intialization of static variables
if (refcount == 0)
{
task = new Task("NotifierTask", (FUNCPTR)Notifier::Run, Task::kDefaultPriority, 64000);
task->Start();
m_task = ::std::thread(Run);
}
refcount++;
}
@@ -56,12 +55,12 @@ Notifier::~Notifier()
// Delete the static variables when the last one is going away
if (!(--refcount))
{
task->Stop();
delete task;
m_stopped = true;
m_task.join();
}
}
// Acquire the semaphore; this makes certain that the handler is
// Acquire the semaphore; this makes certain that the handler is
// not being executed by the interrupt manager.
std::unique_lock<priority_mutex> lock(m_handlerMutex);
}
@@ -80,7 +79,7 @@ void Notifier::UpdateAlarm()
/**
* ProcessQueue is called whenever there is a timer interrupt.
* We need to wake up and process the current top item in the timer queue as long
* as its scheduled time is after the current time. Then the item is removed or
* as its scheduled time is after the current time. Then the item is removed or
* rescheduled (repetitive events) in the queue.
*/
void Notifier::ProcessQueue(uint32_t mask, void *params)
@@ -249,7 +248,7 @@ void Notifier::Stop()
}
void Notifier::Run() {
while (true) {
while (!m_stopped) {
Notifier::ProcessQueue(0, nullptr);
if (timerQueueHead != nullptr)
{