summaryrefslogtreecommitdiffstats
path: root/src/uscxml/concurrency
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-01-20 17:34:02 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-01-20 17:34:02 (GMT)
commita0666b3ab907c0036f5e3f036b32e9ec5a6e551d (patch)
treed3db8b6beb8622fa41b87b0934d4702cf0b61819 /src/uscxml/concurrency
parentf4f05b40c8c464daf1e11df6fcdb63d05766ed1f (diff)
downloaduscxml-a0666b3ab907c0036f5e3f036b32e9ec5a6e551d.zip
uscxml-a0666b3ab907c0036f5e3f036b32e9ec5a6e551d.tar.gz
uscxml-a0666b3ab907c0036f5e3f036b32e9ec5a6e551d.tar.bz2
Regenerated V8 DOM and beautified code
Diffstat (limited to 'src/uscxml/concurrency')
-rw-r--r--src/uscxml/concurrency/BlockingQueue.h10
-rw-r--r--src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp8
-rw-r--r--src/uscxml/concurrency/tinythread.cpp20
-rw-r--r--src/uscxml/concurrency/tinythread.h2
4 files changed, 20 insertions, 20 deletions
diff --git a/src/uscxml/concurrency/BlockingQueue.h b/src/uscxml/concurrency/BlockingQueue.h
index 81d082d..3d45720 100644
--- a/src/uscxml/concurrency/BlockingQueue.h
+++ b/src/uscxml/concurrency/BlockingQueue.h
@@ -30,11 +30,11 @@ public:
return ret;
}
- bool isEmpty() {
- tthread::lock_guard<tthread::mutex> lock(_mutex);
- return _queue.empty();
- }
-
+ bool isEmpty() {
+ tthread::lock_guard<tthread::mutex> lock(_mutex);
+ return _queue.empty();
+ }
+
tthread::mutex _mutex;
tthread::condition_variable _cond;
std::list<T> _queue;
diff --git a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp
index 5f2611f..4390927 100644
--- a/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp
+++ b/src/uscxml/concurrency/eventqueue/DelayedEventQueue.cpp
@@ -86,10 +86,10 @@ void DelayedEventQueue::timerCallback(evutil_socket_t fd, short what, void *arg)
std::string eventId = data->eventId; // copy eventId
data->callback(data->userData, eventId);
- if (!data->persist) {
- event_free(data->event);
- data->eventQueue->_callbackData.erase(data->eventId);
- }
+ if (!data->persist) {
+ event_free(data->event);
+ data->eventQueue->_callbackData.erase(data->eventId);
+ }
}
} \ No newline at end of file
diff --git a/src/uscxml/concurrency/tinythread.cpp b/src/uscxml/concurrency/tinythread.cpp
index 3733804..66e73c1 100644
--- a/src/uscxml/concurrency/tinythread.cpp
+++ b/src/uscxml/concurrency/tinythread.cpp
@@ -34,19 +34,19 @@ freely, subject to the following restrictions:
namespace tthread {
unsigned long long int timeStamp() {
- unsigned long long int time = 0;
+ unsigned long long int time = 0;
#ifdef WIN32
- FILETIME tv;
- GetSystemTimeAsFileTime(&tv);
- time = (((unsigned long long int) tv.dwHighDateTime) << 32) + tv.dwLowDateTime;
- time /= 10000;
+ FILETIME tv;
+ GetSystemTimeAsFileTime(&tv);
+ time = (((unsigned long long int) tv.dwHighDateTime) << 32) + tv.dwLowDateTime;
+ time /= 10000;
#else
- struct timeval tv;
- gettimeofday(&tv, NULL);
- time += tv.tv_sec * 1000;
- time += tv.tv_usec / 1000;
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ time += tv.tv_sec * 1000;
+ time += tv.tv_usec / 1000;
#endif
- return time;
+ return time;
}
//------------------------------------------------------------------------------
diff --git a/src/uscxml/concurrency/tinythread.h b/src/uscxml/concurrency/tinythread.h
index e5b2e4e..d824067 100644
--- a/src/uscxml/concurrency/tinythread.h
+++ b/src/uscxml/concurrency/tinythread.h
@@ -153,7 +153,7 @@ freely, subject to the following restrictions:
namespace tthread {
unsigned long long int timeStamp();
-
+
/// Mutex class.
/// This is a mutual exclusion object for synchronizing access to shared
/// memory areas for several threads. The mutex is non-recursive (i.e. a