int bufferLength = 100;
int timeout=1000;
-extern "C" AbstractSource * create(AbstractRoutingEngine* routingengine, map<string, string> config)
+extern "C" void create(AbstractRoutingEngine* routingengine, map<string, string> config)
{
auto plugin = new AmbPlugin<DatabaseSink>(routingengine, config);
plugin->init();
-
- return plugin;
}
-void * cbFunc(Shared* shared)
+static void * cbFunc(Shared* shared)
{
if(!shared)
{
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, zone REAL, time REAL, sequence REAL, tripId TEXT)";
-
- if(config.find("databaseFile") != config.end())
- {
- setDatabaseFileName(config["databaseFile"]);
- }
+ tablecreate = database_table_create;
if(config.find("bufferLength") != config.end())
{
- bufferLength = atoi(config["bufferLength"].c_str());
+ bufferLength = boost::lexical_cast<int>(config["bufferLength"]);
}
if(config.find("frequency") != config.end())
{
DebugOut(DebugOut::Error)<<"Failed to parse frequency: Invalid value "<<config["frequency"]<<endl;
}
-
-
}
if(config.find("properties") != config.end())
engine->subscribeToProperty(itr, &parent);
}
- addPropertySupport(Zone::None, [](){return new DatabaseFileType("storage");});
- addPropertySupport(Zone::None, [](){return new DatabasePlaybackType(false);});
- addPropertySupport(Zone::None, [](){return new DatabaseLoggingType(false);});
-
- routingEngine->updateSupported(supported(), PropertyList(), &parent);
+ 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(config["startOnLoad"] == "true");
+ databaseLogging->setValue(config["startOnLoad"] == "true");
}
if(config.find("playbackMultiplier")!= config.end())
if(config.find("playbackOnLoad")!= config.end())
{
- setPlayback(config["playbackOnLoad"] == "true");
+ playback->setValue(config["playbackOnLoad"] == "true");
}
-
-
}
DatabaseSink::~DatabaseSink()
obj.quit = true;
shared->queue.append(obj);
- thread.join();
+ if(thread && thread->joinable())
+ thread->join();
delete shared;
shared = NULL;
void DatabaseSink::startDb()
{
- if(playback.basicValue())
+ 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 = std::thread(cbFunc, shared);
+ if(thread && thread->joinable())
+ thread->detach();
+
+ thread = amb::make_unique(new std::thread(cbFunc, shared));
}
void DatabaseSink::startPlayback()
{
- if(playback.basicValue())
+ if(playback->value<bool>())
return;
- playback = true;
+ playback->setValue(true);
initDb();
obj.key = results[i][0];
obj.value = results[i][1];
obj.source = results[i][2];
- obj.zone = boost::lexical_cast<double>(results[i][3]);
+ 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]);
if(shared) delete shared;
shared = new Shared;
- shared->db->init(databaseName.value<std::string>(), tablename, tablecreate);
-}
-
-void DatabaseSink::setPlayback(bool v)
-{
- AsyncSetPropertyRequest request;
- request.property = DatabasePlayback;
- request.value = new DatabasePlaybackType(v);
-
- setProperty(request);
-}
-
-void DatabaseSink::setLogging(bool b)
-{
- databaseLogging = b;
- AsyncSetPropertyRequest request;
- request.property = DatabaseLogging;
- request.value = &databaseLogging;
-
- 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(!contains(supported(), supportedStr[i][0]))
+ std::string name = supportedStr[i][0];
+
+ if(!contains(supported(), name))
{
- std::string name = supportedStr[i][0];
- Zone::Type zone = boost::lexical_cast<int, std::string>(supportedStr[i][3]);
- addPropertySupport(zone, [name]() { return VehicleProperty::getPropertyTypeForPropertyNameValue(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->updateSupported(mSupported, PropertyList(), &source);
+ routingEngine->updateSupported(supported(), PropertyList(), &source);
}
void DatabaseSink::propertyChanged(AbstractPropertyType *value)
if(!contains(supported(), property))
{
addPropertySupport(value->zone, [property]() { return VehicleProperty::getPropertyTypeForPropertyNameValue(property);});
- routingEngine->updateSupported(mSupported, PropertyList(), &source);
+ routingEngine->updateSupported(supported(), PropertyList(), &source);
}
DBObject obj;
return "9f88156e-cb92-4472-8775-9c08addf50d3";
}
-void DatabaseSink::getPropertyAsync(AsyncPropertyReply *reply)
+void DatabaseSink::init()
{
- reply->success = false;
-
- if(reply->property == DatabaseFile)
+ if(configuration.find("databaseFile") != configuration.end())
{
- DatabaseFileType temp(databaseName);
- reply->value = &temp;
-
- reply->success = true;
- reply->completed(reply);
-
- return;
+ databaseName->setValue(configuration["databaseFile"]);
+ setDatabaseFileName(configuration["databaseFile"]);
}
- else if(reply->property == DatabaseLogging)
- {
- databaseLogging = shared != nullptr;
- reply->value = &databaseLogging;
- reply->success = true;
- reply->completed(reply);
-
- return;
- }
-
- else if(reply->property == DatabasePlayback)
- {
- DatabasePlaybackType temp = playback;
- reply->value = &temp;
- reply->success = true;
- reply->completed(reply);
-
- return;
- }
-
- reply->completed(reply);
+ routingEngine->updateSupported(supported(), PropertyList(), &source);
}
void DatabaseSink::getRangePropertyAsync(AsyncRangePropertyReply *reply)
{
BaseDB * db = new BaseDB();
- db->init(databaseName.value<std::string>(), tablename, tablecreate);
+ db->init(databaseName->value<std::string>(), tablename, tablecreate);
ostringstream query;
query.precision(15);
for(auto itr = reply->properties.begin(); itr != reply->properties.end(); itr++)
{
+ DebugOut() << "prop: " << (*itr) << endl;
if(itr != reply->properties.begin())
query<<" OR ";
query<<"key='"<<(*itr)<<"'";
}
- query<<") AND";
+ query<<")";
- if(reply->timeBegin && reply->timeEnd)
+ if(reply->timeEnd)
{
- query<<" time BETWEEN "<<reply->timeBegin<<" AND "<<reply->timeEnd;
+ query<<" AND time BETWEEN "<<reply->timeBegin<<" AND "<<reply->timeEnd;
}
if(reply->sequenceBegin >= 0 && reply->sequenceEnd >=0)
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
+ {
+ reply->success = true;
+ }
+
+ for(auto i=0; i<data.size(); i++)
{
- if(data[i].size() != 6)
+ if(data[i].size() != 7)
continue;
DBObject dbobj;
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)
}
}
- 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;
- databaseLogging = true;
- routingEngine->updateProperty(&databaseLogging,uuid());
}
else
{
stopDb();
- reply->success = true;
- databaseLogging = false;
- routingEngine->updateProperty(&databaseLogging,uuid());
}
}
-
else if(request.property == DatabaseFile)
{
- std::string fname = request.value->toString();
-
- databaseName = fname;
-
- routingEngine->updateProperty(&databaseName,uuid());
-
- reply->success = true;
+ setDatabaseFileName(databaseName->value<std::string>());
}
else if( request.property == DatabasePlayback)
{
if(request.value->value<bool>())
{
- setLogging(false);
startPlayback();
-
- routingEngine->updateProperty(&playback,uuid());
}
else
{
playbackShared->stop = true;
playback = false;
-
- routingEngine->updateProperty(&playback,uuid());
}
-
- reply->success = true;
}
return reply;
void DatabaseSink::unsubscribeToPropertyChanges(VehicleProperty::Property )
{
}
+
projects / profile / ivi / automotive-message-broker.git / blobdiff