#include "listplusplus.h"
int bufferLength = 100;
+int timeout=1000;
extern "C" AbstractSinkManager * create(AbstractRoutingEngine* routingengine, map<string, string> config)
{
while(1)
{
- DBObject* obj = shared->queue.pop();
+ usleep(timeout*1000);
- if( obj->quit )
+ DBObject obj = shared->queue.pop();
+
+ if( obj.quit )
{
- delete obj;
break;
}
DictionaryList<string> dict;
- NameValuePair<string> one("key", obj->key);
- NameValuePair<string> two("value", obj->value);
- NameValuePair<string> three("source", obj->source);
- NameValuePair<string> four("time", boost::lexical_cast<string>(obj->time));
- NameValuePair<string> five("sequence", boost::lexical_cast<string>(obj->sequence));
+ NameValuePair<string> one("key", obj.key);
+ NameValuePair<string> two("value", obj.value);
+ NameValuePair<string> three("source", obj.source);
+ NameValuePair<string> zone("zone", boost::lexical_cast<string>(obj.zone));
+ NameValuePair<string> four("time", boost::lexical_cast<string>(obj.time));
+ NameValuePair<string> five("sequence", boost::lexical_cast<string>(obj.sequence));
dict.push_back(one);
dict.push_back(two);
dict.push_back(three);
+ dict.push_back(zone);
dict.push_back(four);
dict.push_back(five);
shared->db->exec("END TRANSACTION");
insertList.clear();
}
- delete obj;
+ //delete obj;
}
/// final flush of whatever is still in the queue:
return 0;
}
- DBObject* obj = *itr;
+ DBObject obj = *itr;
- AbstractPropertyType* value = VehicleProperty::getPropertyTypeForPropertyNameValue(obj->key,obj->value);
+ AbstractPropertyType* value = VehicleProperty::getPropertyTypeForPropertyNameValue(obj.key,obj.value);
if(value)
{
- pbshared->routingEngine->updateProperty(obj->key, value, pbshared->uuid);
- value->timestamp = obj->time;
- //value->sequence = obj->sequence;
+ pbshared->routingEngine->updateProperty(value, pbshared->uuid);
+ value->timestamp = obj.time;
+ value->sequence = obj.sequence;
+ value->sourceUuid = obj.source;
+ value->zone = obj.zone;
}
if(++itr != pbshared->playbackQueue.end())
{
- DBObject *o2 = *itr;
- double t = o2->time - obj->time;
+ DBObject o2 = *itr;
+ double t = o2.time - obj.time;
if(t > 0)
g_timeout_add((t*1000) / pbshared->playBackMultiplier, getNextEvent, pbshared);
pbshared->playbackQueue.remove(obj);
DebugOut()<<"playback Queue size: "<<pbshared->playbackQueue.size()<<endl;
- delete obj;
+ //delete obj;
return 0;
}
{
databaseName = "storage";
tablename = "data";
- tablecreate = "CREATE TABLE IF NOT EXISTS data (key TEXT, value BLOB, source TEXT, time REAL, sequence REAL)";
+ tablecreate = "CREATE TABLE IF NOT EXISTS data (key TEXT, value BLOB, source TEXT, zone REAL, time REAL, sequence REAL)";
if(config.find("databaseFile") != config.end())
{
bufferLength = atoi(config["bufferLength"].c_str());
}
+ if(config.find("frequency") != config.end())
+ {
+ try
+ {
+ int t = boost::lexical_cast<int>(config["frequency"]);
+ timeout = 1000 / t;
+ }catch(...)
+ {
+ DebugOut(DebugOut::Error)<<"Failed to parse frequency: Invalid value "<<config["frequency"]<<endl;
+ }
+
+
+ }
+
if(config.find("properties") != config.end())
{
parseConfig();
if(config.find("startOnLoad")!= config.end())
{
- setLogging(true);
+ setLogging(config["startOnLoad"] == "true");
}
if(config.find("playbackMultiplier")!= config.end())
if(config.find("playbackOnLoad")!= config.end())
{
- setPlayback(true);
+ setPlayback(config["playbackOnLoad"] == "true");
}
{
if(shared)
{
- DBObject* obj = new DBObject();
- obj->quit = true;
-
- shared->queue.append(obj);
-
- g_thread_join(thread);
- g_thread_unref(thread);
- delete shared;
+ stopDb();
}
if(playbackShared)
DebugOut()<<"DatabaseSink logging: "<<prop<<endl;
}
- json_object_put(propobject);
+ //json_object_put(propobject);
json_object_put(rootobject);
}
if(!shared)
return;
- DBObject *obj = new DBObject();
- obj->quit = true;
+ DBObject obj;
+ obj.quit = true;
shared->queue.append(obj);
g_thread_join(thread);
throw std::runtime_error("column mismatch in query");
}
- DBObject* obj = new DBObject();
+ DBObject obj;
- obj->key = results[i][0];
- obj->value = results[i][1];
- obj->source = results[i][2];
- obj->time = boost::lexical_cast<double>(results[i][3]);
+ obj.key = results[i][0];
+ obj.value = results[i][1];
+ obj.source = results[i][2];
+ obj.time = boost::lexical_cast<double>(results[i][3]);
/// TODO: figure out why sequence is broken:
request.value = new DatabaseLoggingType(b);
setProperty(request);
+
+ delete request.value;
}
void DatabaseSink::setDatabaseFileName(string filename)
routingEngine->setSupported(mSupported, this);
}
-void DatabaseSink::propertyChanged(VehicleProperty::Property property, AbstractPropertyType *value, std::string uuid)
+void DatabaseSink::propertyChanged(AbstractPropertyType *value)
{
+ VehicleProperty::Property property = value->name;
+
if(!shared)
return;
routingEngine->setSupported(mSupported, this);
}
- DBObject* obj = new DBObject;
- obj->key = property;
- obj->value = value->toString();
- obj->source = uuid;
- obj->time = value->timestamp;
- obj->sequence = value->sequence;
+ DBObject obj;
+ obj.key = property;
+ obj.value = value->toString();
+ obj.source = value->sourceUuid;
+ obj.time = value->timestamp;
+ obj.sequence = value->sequence;
+ obj.zone = value->zone;
shared->queue.append(obj);
}
-std::string DatabaseSink::uuid()
+const string DatabaseSink::uuid()
{
return "9f88156e-cb92-4472-8775-9c08addf50d3";
}
query<<" AND sequence BETWEEN "<<reply->sequenceBegin<<" AND "<<reply->sequenceEnd;
}
+ if(reply->sourceUuid != "")
+ query<<" AND source='"<<reply->sourceUuid<<"'";
+
+ query<<" AND zone="<<reply->zone;
+
std::vector<std::vector<string>> data = db->select(query.str());
- std::list<AbstractPropertyType*> cleanup;
+ DebugOut()<<"Dataset size "<<data.size()<<endl;
for(auto i=0;i<data.size();i++)
{
- if(data[i].size() != 5)
+ if(data[i].size() != 6)
continue;
DBObject dbobj;
dbobj.key = data[i][0];
dbobj.value = data[i][1];
dbobj.source = data[i][2];
- dbobj.time = boost::lexical_cast<double>(data[i][3]);
- dbobj.sequence = boost::lexical_cast<double>(data[i][4]);
+ dbobj.zone = boost::lexical_cast<double>(data[i][3]);
+ dbobj.time = boost::lexical_cast<double>(data[i][4]);
+ dbobj.sequence = boost::lexical_cast<double>(data[i][5]);
AbstractPropertyType* property = VehicleProperty::getPropertyTypeForPropertyNameValue(dbobj.key, dbobj.value);
if(property)
property->sequence = dbobj.sequence;
reply->values.push_back(property);
- cleanup.push_back(property);
}
}
startDb();
reply->success = true;
DatabaseLoggingType temp(true);
- routingEngine->updateProperty(DatabaseLogging,&temp,uuid());
+ routingEngine->updateProperty(&temp,uuid());
}
else
{
stopDb();
reply->success = true;
DatabaseLoggingType temp(false);
- routingEngine->updateProperty(DatabaseLogging,&temp,uuid());
+ routingEngine->updateProperty(&temp,uuid());
}
}
DatabaseFileType temp(databaseName);
- routingEngine->updateProperty(DatabaseFile,&temp,uuid());
+ routingEngine->updateProperty(&temp,uuid());
reply->success = true;
}
DatabasePlaybackType temp(playback);
- routingEngine->updateProperty(DatabasePlayback,&temp,uuid());
+ routingEngine->updateProperty(&temp,uuid());
}
else
{
DatabasePlaybackType temp(playback);
- routingEngine->updateProperty(DatabasePlayback, &temp, uuid());
+ routingEngine->updateProperty(&temp,uuid());
}
reply->success = true;
projects / profile / ivi / automotive-message-broker.git / blobdiff