Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

changed return value of locks, spelling

This commit is contained in:
Frank Celler 2011-12-22 15:39:19 +01:00
parent be39e1f6ed
commit aa1b29163f
4 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dispatcher/DispatcherImpl.h
View File

@ -29,7 +29,7 @@
#ifndef TRIAGENS_FYN_DISPATCHER_DISPATCHER_IMPL_H
#define TRIAGENS_FYN_DISPATCHER_DISPATCHER_IMPL_H 1
#include <BasicsC/Common.h>
#include <Basics/Common.h>
#include <Rest/Dispatcher.h>
#include <Basics/Mutex.h>

2
Dispatcher/DispatcherQueue.h
View File

@ -29,7 +29,7 @@
#ifndef TRIAGENS_FYN_DISPATCHER_DISPATCHER_QUEUE_H
#define TRIAGENS_FYN_DISPATCHER_DISPATCHER_QUEUE_H 1
#include <BasicsC/Common.h>
#include <Basics/Common.h>
#include <Basics/ConditionVariable.h>
#include <Rest/Dispatcher.h>

30
Dispatcher/DispatcherThread.cpp
View File

@ -69,10 +69,7 @@ namespace triagens {
// -----------------------------------------------------------------------------
void DispatcherThread::run () {
if (! queue->accessQueue.lock()) {
LOGGER_FATAL << "cannot lock in " << __FILE__ << "@" << __LINE__;
exit(EXIT_FAILURE);
}
queue->accessQueue.lock();
queue->nrStarted--;
queue->nrRunning++;
@ -115,10 +112,7 @@ namespace triagens {
}
// now release the queue lock (initialise is inside the lock, work outside)
if (! queue->accessQueue.unlock()) {
LOGGER_FATAL << "cannot unlock in " << __FILE__ << "@" << __LINE__;
exit(EXIT_FAILURE);
}
queue->accessQueue.unlock();
// do the work (this might change the job type)
Job::status_e status = Job::JOB_FAILED;
@ -191,10 +185,7 @@ namespace triagens {
status = Job::JOB_FAILED;
}
if (! queue->accessQueue.lock()) {
LOGGER_FATAL << "cannot lock in " << __FILE__ << "@" << __LINE__;
exit(EXIT_FAILURE);
}
queue->accessQueue.lock();
queue->monopolizer = 0;
@ -224,10 +215,7 @@ namespace triagens {
}
if (0 < queue->nrWaiting && ! queue->readyJobs.empty()) {
if (! queue->accessQueue.broadcast()) {
LOGGER_FATAL << "cannot broadcast in " << __FILE__ << "@" << __LINE__;
exit(EXIT_FAILURE);
}
queue->accessQueue.broadcast();
}
tick();
@ -238,10 +226,7 @@ namespace triagens {
tick();
if (! queue->accessQueue.wait()) {
LOGGER_FATAL << "cannot wait in " << __FILE__ << "@" << __LINE__;
exit(EXIT_FAILURE);
}
queue->accessQueue.wait();
tick();
@ -260,10 +245,7 @@ namespace triagens {
queue->nrSpecial--;
}
if (! queue->accessQueue.unlock()) {
LOGGER_FATAL << "cannot unlock in " << __FILE__ << "@" << __LINE__;
exit(EXIT_FAILURE);
}
queue->accessQueue.unlock();
LOGGER_TRACE << "dispatcher thread has finished";
}

2
Dispatcher/DispatcherThread.h
View File

@ -29,7 +29,7 @@
#ifndef TRIAGENS_FYN_DISPATCHER_DISPATCHER_THREAD_H
#define TRIAGENS_FYN_DISPATCHER_DISPATCHER_THREAD_H 1
#include <BasicsC/Common.h>
#include <Basics/Common.h>
#include <Basics/Thread.h>
#include <Rest/Job.h>