From d33a0f75a5c0c584fbb7cc0076da36d494f39494 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 22 Nov 2012 00:50:33 -0500 Subject: Pretty large coding style cleanup, in source doc cleanup, and allow protocol mods to depend on each other --- src/threadengine.cpp | 45 +++------------------------------------------ 1 file changed, 3 insertions(+), 42 deletions(-) (limited to 'src/threadengine.cpp') diff --git a/src/threadengine.cpp b/src/threadengine.cpp index c3ecdd1b5..12e14eb19 100644 --- a/src/threadengine.cpp +++ b/src/threadengine.cpp @@ -7,6 +7,7 @@ * * Based on the original code of Epona by Lara. * Based on the original code of Services by Andy Church. + * */ #include "services.h" @@ -35,9 +36,6 @@ static inline pthread_attr_t *get_engine_attr() return &attr; } -/** Entry point used for the threads - * @param parameter A Thread* cast to a void* - */ static void *entry_point(void *parameter) { Thread *thread = static_cast(parameter); @@ -47,129 +45,92 @@ static void *entry_point(void *parameter) return NULL; } -/** Threads constructor - */ Thread::Thread() : exit(false) { } -/** Threads destructor - */ Thread::~Thread() { } -/** Join to the thread, sets the exit state to true - */ void Thread::Join() { this->SetExitState(); - pthread_join(Handle, NULL); + pthread_join(handle, NULL); } -/** Sets the exit state as true informing the thread we want it to shut down - */ void Thread::SetExitState() { this->Notify(); exit = true; } -/** Exit the thread. Note that the thread still must be joined to free resources! - */ void Thread::Exit() { this->SetExitState(); pthread_exit(0); } -/** Launch the thread - */ void Thread::Start() { - if (pthread_create(&this->Handle, get_engine_attr(), entry_point, this)) + if (pthread_create(&this->handle, get_engine_attr(), entry_point, this)) { this->SetFlag(SF_DEAD); throw CoreException("Unable to create thread: " + Anope::LastError()); } } -/** Returns the exit state of the thread - * @return true if we want to exit - */ bool Thread::GetExitState() const { return exit; } -/** Called when this thread should be joined to - */ void Thread::OnNotify() { this->Join(); this->SetFlag(SF_DEAD); } -/** Constructor - */ Mutex::Mutex() { pthread_mutex_init(&mutex, NULL); } -/** Destructor - */ Mutex::~Mutex() { pthread_mutex_destroy(&mutex); } -/** Attempt to lock the mutex, will hang until a lock can be achieved - */ void Mutex::Lock() { pthread_mutex_lock(&mutex); } -/** Unlock the mutex, it must be locked first - */ void Mutex::Unlock() { pthread_mutex_unlock(&mutex); } -/** Attempt to lock the mutex, will return true on success and false on fail - * Does not block - * @return true or false - */ bool Mutex::TryLock() { return pthread_mutex_trylock(&mutex) == 0; } -/** Constructor - */ Condition::Condition() : Mutex() { pthread_cond_init(&cond, NULL); } -/** Destructor - */ Condition::~Condition() { pthread_cond_destroy(&cond); } -/** Called to wakeup the waiter - */ void Condition::Wakeup() { pthread_cond_signal(&cond); } -/** Called to wait for a Wakeup() call - */ void Condition::Wait() { pthread_cond_wait(&cond, &mutex); -- cgit