jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Added listlock for ControllerManager

Browse source
This commit is contained in:
Micke Prag 2010-10-15 12:37:16 +00:00
parent ac1ea0878e
commit 41ff18ca45
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
telldus-core/service/ControllerManager.cpp
View file

@ -1,5 +1,6 @@
#include "ControllerManager.h"
#include "Controller.h"
#include "Mutex.h"
#include "TellStick.h"
#include <map>
@ -10,7 +11,8 @@ typedef std::map<int, Controller *> ControllerMap;
class ControllerManager::PrivateData {
public:
int lastControllerId;
ControllerMap controllers; //TODO: Lock for this AND lock in controls, for send etc
ControllerMap controllers; //TODO: lock in controls, for send etc
TelldusCore::Mutex mutex;
};
ControllerManager::ControllerManager(){
@ -27,6 +29,7 @@ ControllerManager::~ControllerManager(void) {
}
Controller *ControllerManager::getBestControllerById(int id) {
TelldusCore::MutexLocker locker(&d->mutex);
if (!d->controllers.size()) {
return 0;
}
@ -39,6 +42,7 @@ Controller *ControllerManager::getBestControllerById(int id) {
}
void ControllerManager::loadControllers() {
TelldusCore::MutexLocker locker(&d->mutex);
std::list<TellStickDescriptor> list = TellStick::findAll();
std::list<TellStickDescriptor>::iterator it = list.begin();
for(; it != list.end(); ++it) {