i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-01 17:10:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tango: updated how memory used and database size are computed

Browse Source
This commit is contained in:
matlabbe
2017-10-09 18:04:54 -04:00
parent 66e79e23cb
commit 007d23308a
8 changed files with 60 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
corelib/src/DBDriver.cpp
View File

@@ -386,7 +386,7 @@ void DBDriver::asyncSave(VisualWord * vw)
}
}
void DBDriver::saveOrUpdate(const std::vector<Signature *> & signatures) const
void DBDriver::saveOrUpdate(const std::vector<Signature *> & signatures)
{
ULOGGER_DEBUG("");
std::list<Signature *> toSave;

28
corelib/src/DBDriverSqlite3.cpp
View File

@@ -42,6 +42,7 @@ namespace rtabmap {
DBDriverSqlite3::DBDriverSqlite3(const ParametersMap & parameters) :
DBDriver(parameters),
_ppDb(0),
_memoryUsedEstimate(0),
_version("0.0.0"),
_dbInMemory(Parameters::defaultDbSqlite3InMemory()),
_cacheSize(Parameters::defaultDbSqlite3CacheSize()),
@@ -313,6 +314,7 @@ bool DBDriverSqlite3::connectDatabaseQuery(const std::string & url, bool overwri
this->disconnectDatabaseQuery();
// Open a database connection
_ppDb = 0;
_memoryUsedEstimate = 0;
int rc = SQLITE_OK;
bool dbFileExist = false;
@@ -325,6 +327,10 @@ bool DBDriverSqlite3::connectDatabaseQuery(const std::string & url, bool overwri
UASSERT(UFile::erase(url.c_str()) == 0);
dbFileExist = false;
}
else if(dbFileExist)
{
_memoryUsedEstimate = UFile::length(this->getUrl());
}
}
if(_dbInMemory || url.empty())
@@ -481,14 +487,14 @@ void DBDriverSqlite3::executeNoResultQuery(const std::string & sql) const
long DBDriverSqlite3::getMemoryUsedQuery() const
{
//if(_dbInMemory)
//{
if(_dbInMemory)
{
return sqlite3_memory_used();
//}
//else // Commented because it can lag
//{
// return UFile::length(this->getUrl());
//}
}
else
{
return _memoryUsedEstimate;
}
}
long DBDriverSqlite3::getNodesMemoryUsedQuery() const
@@ -3395,7 +3401,7 @@ void DBDriverSqlite3::updateQuery(const std::list<VisualWord *> & words, bool up
}
}
void DBDriverSqlite3::saveQuery(const std::list<Signature *> & signatures) const
void DBDriverSqlite3::saveQuery(const std::list<Signature *> & signatures)
{
UDEBUG("");
if(_ppDb && signatures.size())
@@ -3413,6 +3419,12 @@ void DBDriverSqlite3::saveQuery(const std::list<Signature *> & signatures) const
for(std::list<Signature *>::const_iterator i=signatures.begin(); i!=signatures.end(); ++i)
{
_memoryUsedEstimate += (*i)->getMemoryUsed();
// raw data are not kept in database
_memoryUsedEstimate -= (*i)->sensorData().imageRaw().total() * (*i)->sensorData().imageRaw().elemSize();
_memoryUsedEstimate -= (*i)->sensorData().depthOrRightRaw().total() * (*i)->sensorData().depthOrRightRaw().elemSize();
_memoryUsedEstimate -= (*i)->sensorData().laserScanRaw().total() * (*i)->sensorData().laserScanRaw().elemSize();
stepNode(ppStmt, *i);
}
// Finalize (delete) the statement

3
corelib/src/DBDriverSqlite3.h
View File

@@ -76,7 +76,7 @@ private:
virtual void getWeightQuery(int signatureId, int & weight) const;
virtual void saveQuery(const std::list<Signature *> & signatures) const;
virtual void saveQuery(const std::list<Signature *> & signatures);
virtual void saveQuery(const std::list<VisualWord *> & words) const;
virtual void updateQuery(const std::list<Signature *> & signatures, bool updateTimestamp) const;
virtual void updateQuery(const std::list<VisualWord *> & words, bool updateTimestamp) const;
@@ -171,6 +171,7 @@ private:
private:
sqlite3 * _ppDb;
long _memoryUsedEstimate;
std::string _version;
bool _dbInMemory;
unsigned int _cacheSize;