#include "databasesink.h"
#include "abstractroutingengine.h"
#include "listplusplus.h"
+#include "superptr.hpp"
+#include "uuidhelper.h"
+#include "ambplugin.h"
+
+#include <thread>
int bufferLength = 100;
+int timeout=1000;
-extern "C" AbstractSinkManager * create(AbstractRoutingEngine* routingengine, map<string, string> config)
+extern "C" void create(AbstractRoutingEngine* routingengine, map<string, string> config)
{
- return new DatabaseSinkManager(routingengine, config);
+ auto plugin = new AmbPlugin<DatabaseSink>(routingengine, config);
+ plugin->init();
}
-void * cbFunc(gpointer data)
+static void * cbFunc(Shared* shared)
{
- Shared *shared = static_cast<Shared*>(data);
-
if(!shared)
{
throw std::runtime_error("Could not cast shared object.");
}
+ ///new tripID:
+ shared->tripId = amb::createUuid();
+
vector<DictionaryList<string> > insertList;
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));
+ NameValuePair<string> six("tripId", boost::lexical_cast<string>(shared->tripId));
dict.push_back(one);
dict.push_back(two);
dict.push_back(three);
+ dict.push_back(zone);
dict.push_back(four);
dict.push_back(five);
+ dict.push_back(six);
insertList.push_back(dict);
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);
+ auto value = amb::make_unique(VehicleProperty::getPropertyTypeForPropertyNameValue(obj.key, obj.value));
if(value)
{
- pbshared->routingEngine->updateProperty(obj->key, value, pbshared->uuid);
- value->timestamp = obj->time;
- //value->sequence = obj->sequence;
+ value->priority = AbstractPropertyType::Instant;
+ value->timestamp = obj.time;
+ value->sequence = obj.sequence;
+ value->sourceUuid = obj.source;
+ value->zone = obj.zone;
+ pbshared->routingEngine->updateProperty(value.get(), pbshared->uuid);
}
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;
return 0;
}
-DatabaseSink::DatabaseSink(AbstractRoutingEngine *engine, map<std::string, std::string> config)
- :AbstractSource(engine,config),thread(NULL),shared(NULL),playback(false),playbackShared(NULL), playbackMultiplier(1)
+DatabaseSink::DatabaseSink(AbstractRoutingEngine *engine, map<std::string, std::string> config, AbstractSource &parent)
+ :AmbPluginImpl(engine, config, parent), shared(nullptr), playback(false), playbackShared(nullptr), playbackMultiplier(1)
{
- databaseName = "storage";
tablename = "data";
- tablecreate = "CREATE TABLE IF NOT EXISTS data (key TEXT, value BLOB, source TEXT, time REAL, sequence REAL)";
+ tablecreate = database_table_create;
- if(config.find("databaseFile") != config.end())
+ if(config.find("bufferLength") != config.end())
{
- setDatabaseFileName(config["databaseFile"]);
+ bufferLength = boost::lexical_cast<int>(config["bufferLength"]);
}
- if(config.find("bufferLength") != config.end())
+ if(config.find("frequency") != config.end())
{
- bufferLength = atoi(config["bufferLength"].c_str());
+ 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();
}
- for(auto itr=propertiesToSubscribeTo.begin();itr!=propertiesToSubscribeTo.end();itr++)
+ for(auto itr : propertiesToSubscribeTo)
{
- engine->subscribeToProperty(*itr,this);
+ engine->subscribeToProperty(itr, &parent);
}
- mSupported.push_back(DatabaseFile);
- mSupported.push_back(DatabaseLogging);
- mSupported.push_back(DatabasePlayback);
-
- routingEngine->setSupported(supported(), this);
+ databaseName = addPropertySupport(Zone::None, [](){ return new DatabaseFileType("storage"); });
+ playback = addPropertySupport(Zone::None, [](){ return new DatabasePlaybackType(false); });
+ databaseLogging = addPropertySupport(Zone::None, [](){ return new DatabaseLoggingType(false); });
if(config.find("startOnLoad")!= config.end())
{
- setLogging(true);
+ databaseLogging->setValue(config["startOnLoad"] == "true");
}
if(config.find("playbackMultiplier")!= config.end())
if(config.find("playbackOnLoad")!= config.end())
{
- setPlayback(true);
+ playback->setValue(config["playbackOnLoad"] == "true");
}
-
-
}
DatabaseSink::~DatabaseSink()
{
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)
}
-void DatabaseSink::supportedChanged(PropertyList supportedProperties)
+void DatabaseSink::supportedChanged(const PropertyList &supportedProperties)
{
}
-PropertyList DatabaseSink::supported()
-{
- return mSupported;
-}
-
-PropertyInfo DatabaseSink::getPropertyInfo(VehicleProperty::Property property)
-{
- /// TODO: Compute update frequency for properties in the database
- return PropertyInfo();
-}
-
void DatabaseSink::parseConfig()
{
json_object *rootobject;
{
//Should handle the extra data here sometime...
}
-
+
json_object *propobject = json_object_object_get(rootobject,"properties");
-
+
g_assert(json_object_get_type(propobject) == json_type_array);
array_list *proplist = json_object_get_array(propobject);
-
- for(int i=0; i < array_list_length(proplist); i++)
+
+ for(int i=0; i < array_list_length(proplist); i++)
{
json_object *idxobj = (json_object*)array_list_get_idx(proplist,i);
std::string prop = json_object_get_string(idxobj);
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);
+ if(thread && thread->joinable())
+ thread->join();
delete shared;
shared = NULL;
void DatabaseSink::startDb()
{
- if(playback)
+ if(playback->value<bool>())
{
DebugOut(0)<<"ERROR: tried to start logging during playback. Only logging or playback can be used at one time"<<endl;
return;
initDb();
- thread = g_thread_new("dbthread", cbFunc, shared);
+ if(thread && thread->joinable())
+ thread->detach();
+
+ thread = amb::make_unique(new std::thread(cbFunc, shared));
}
void DatabaseSink::startPlayback()
{
- if(playback)
+ if(playback->value<bool>())
return;
- playback = true;
+ playback->setValue(true);
initDb();
throw std::runtime_error("column mismatch in query");
}
- DBObject* obj = new DBObject();
-
- obj->key = results[i][0];
- obj->value = results[i][1];
- obj->source = results[i][2];
- obj->time = boost::lexical_cast<double>(results[i][3]);
+ DBObject obj;
- /// TODO: figure out why sequence is broken:
-
-// obj->sequence = boost::lexical_cast<int>(results[i][4]);
+ obj.key = results[i][0];
+ obj.value = results[i][1];
+ obj.source = results[i][2];
+ obj.zone = boost::lexical_cast<int>(results[i][3]);
+ obj.time = boost::lexical_cast<double>(results[i][4]);
+ obj.sequence = boost::lexical_cast<double>(results[i][5]);
playbackShared->playbackQueue.push_back(obj);
}
- g_timeout_add(0,getNextEvent,playbackShared);
+ g_timeout_add(0, getNextEvent, playbackShared);
}
void DatabaseSink::initDb()
if(shared) delete shared;
shared = new Shared;
- shared->db->init(databaseName, tablename, tablecreate);
-}
-
-void DatabaseSink::setPlayback(bool v)
-{
- AsyncSetPropertyRequest request;
- request.property = DatabasePlayback;
- request.value = new DatabasePlaybackType(v);
-
- setProperty(request);
-}
-
-void DatabaseSink::setLogging(bool b)
-{
- AsyncSetPropertyRequest request;
- request.property = DatabaseLogging;
- request.value = new DatabaseLoggingType(b);
-
- setProperty(request);
+ shared->db->init(databaseName->value<std::string>(), tablename, tablecreate);
}
void DatabaseSink::setDatabaseFileName(string filename)
{
- databaseName = filename;
-
initDb();
- vector<vector<string> > supportedStr = shared->db->select("SELECT DISTINCT key FROM "+tablename);
+ vector<vector<string> > supportedStr = shared->db->select("SELECT DISTINCT key, zone, source FROM " + tablename);
for(int i=0; i < supportedStr.size(); i++)
{
- if(!ListPlusPlus<VehicleProperty::Property>(&mSupported).contains(supportedStr[i][0]))
- mSupported.push_back(supportedStr[i][0]);
+ std::string name = supportedStr[i][0];
+
+ if(!contains(supported(), name))
+ {
+ std::string zoneStr = supportedStr[i][1];
+ std::string sourceStr = supportedStr[i][2];
+
+ DebugOut() << "adding property " << name << " in zone: " << zoneStr << "for source: " << sourceStr << endl;
+
+ Zone::Type zone = boost::lexical_cast<Zone::Type>(zoneStr);
+ auto property = addPropertySupport(zone, [name]() { return VehicleProperty::getPropertyTypeForPropertyNameValue(name); });
+ property->sourceUuid = sourceStr;
+ }
}
delete shared;
shared = NULL;
- routingEngine->setSupported(mSupported, this);
+ routingEngine->updateSupported(supported(), PropertyList(), &source);
}
-void DatabaseSink::propertyChanged(VehicleProperty::Property property, AbstractPropertyType *value, std::string uuid)
+void DatabaseSink::propertyChanged(AbstractPropertyType *value)
{
+ VehicleProperty::Property property = value->name;
+
if(!shared)
return;
- if(!ListPlusPlus<VehicleProperty::Property>(&mSupported).contains(property))
+ if(!contains(supported(), property))
{
- mSupported.push_back(property);
- routingEngine->setSupported(mSupported, this);
+ addPropertySupport(value->zone, [property]() { return VehicleProperty::getPropertyTypeForPropertyNameValue(property);});
+ routingEngine->updateSupported(supported(), PropertyList(), &source);
}
- 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 std::string DatabaseSink::uuid() const
{
return "9f88156e-cb92-4472-8775-9c08addf50d3";
}
-void DatabaseSink::getPropertyAsync(AsyncPropertyReply *reply)
+void DatabaseSink::init()
{
- reply->success = false;
-
- if(reply->property == DatabaseFile)
- {
- DatabaseFileType temp(databaseName);
- reply->value = &temp;
-
- reply->success = true;
- reply->completed(reply);
-
- return;
- }
- else if(reply->property == DatabaseLogging)
- {
- DatabaseLoggingType temp = shared;
-
- reply->value = &temp;
- reply->success = true;
- reply->completed(reply);
-
- return;
- }
-
- else if(reply->property == DatabasePlayback)
+ if(configuration.find("databaseFile") != configuration.end())
{
- DatabasePlaybackType temp = playback;
- reply->value = &temp;
- reply->success = true;
- reply->completed(reply);
-
- return;
+ databaseName->setValue(configuration["databaseFile"]);
+ setDatabaseFileName(configuration["databaseFile"]);
}
- reply->completed(reply);
+ routingEngine->updateSupported(supported(), PropertyList(), &source);
}
void DatabaseSink::getRangePropertyAsync(AsyncRangePropertyReply *reply)
{
BaseDB * db = new BaseDB();
- db->init(databaseName, tablename, tablecreate);
+ db->init(databaseName->value<std::string>(), tablename, tablecreate);
ostringstream query;
query.precision(15);
- query<<"SELECT * from "<<tablename<<" WHERE key='"<<reply->property<<"' AND";
+ query<<"SELECT * from "<<tablename<<" WHERE (";
- if(reply->timeBegin && reply->timeEnd)
+ for(auto itr = reply->properties.begin(); itr != reply->properties.end(); itr++)
{
- query<<" time BETWEEN "<<reply->timeBegin<<" AND "<<reply->timeEnd;
+ DebugOut() << "prop: " << (*itr) << endl;
+ if(itr != reply->properties.begin())
+ query<<" OR ";
+
+ query<<"key='"<<(*itr)<<"'";
+ }
+
+ query<<")";
+
+ if(reply->timeEnd)
+ {
+ query<<" AND time BETWEEN "<<reply->timeBegin<<" AND "<<reply->timeEnd;
}
if(reply->sequenceBegin >= 0 && reply->sequenceEnd >=0)
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.size())
+ {
+ reply->success = false;
+ reply->error = AsyncPropertyReply::InvalidOperation;
+ }
+ else
{
- if(data[i].size() != 5)
+ reply->success = true;
+ }
+
+ for(auto i=0; i<data.size(); i++)
+ {
+ if(data[i].size() != 7)
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]);
+ dbobj.tripId = data[i][6];
AbstractPropertyType* property = VehicleProperty::getPropertyTypeForPropertyNameValue(dbobj.key, dbobj.value);
if(property)
property->sequence = dbobj.sequence;
reply->values.push_back(property);
- cleanup.push_back(property);
}
}
- reply->success = true;
+
reply->completed(reply);
delete db;
AsyncPropertyReply *DatabaseSink::setProperty(AsyncSetPropertyRequest request)
{
- AsyncPropertyReply* reply = new AsyncPropertyReply(request);
- reply->success = false;
+ AsyncPropertyReply* reply = AmbPluginImpl::setProperty(request);
if(request.property == DatabaseLogging)
{
if(request.value->value<bool>())
{
- setPlayback(false);
startDb();
- reply->success = true;
- DatabaseLoggingType temp(true);
- routingEngine->updateProperty(DatabaseLogging,&temp,uuid());
}
else
{
stopDb();
- reply->success = true;
- DatabaseLoggingType temp(false);
- routingEngine->updateProperty(DatabaseLogging,&temp,uuid());
}
}
-
else if(request.property == DatabaseFile)
{
- std::string fname = request.value->toString();
-
- databaseName = fname;
-
- DatabaseFileType temp(databaseName);
-
- routingEngine->updateProperty(DatabaseFile,&temp,uuid());
-
- reply->success = true;
+ setDatabaseFileName(databaseName->value<std::string>());
}
else if( request.property == DatabasePlayback)
{
if(request.value->value<bool>())
{
- setLogging(false);
startPlayback();
-
- DatabasePlaybackType temp(playback);
-
- routingEngine->updateProperty(DatabasePlayback,&temp,uuid());
}
else
{
playbackShared->stop = true;
playback = false;
-
- DatabasePlaybackType temp(playback);
-
- routingEngine->updateProperty(DatabasePlayback, &temp, uuid());
}
-
- reply->success = true;
}
return reply;
void DatabaseSink::unsubscribeToPropertyChanges(VehicleProperty::Property )
{
}
+
projects / profile / ivi / automotive-message-broker.git / blobdiff