maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SyncSource: flush map items less frequently 

The Synthesis API does not say explicitly, but in practice all map
items get updated in a tight loop. Rewriting the m_mappingNode (case
insensitive string comparisons) and serialization to disk
(std::ostrstream) consume a significant amount of CPU cycles and cause
extra disk writes.

It is better to allow changes to be cached in memory instead and only
flush to disk at the end. There is no explicit flush API, so we use
SaveAdminData as trigger for flushing instead.

In a refresh-from-remote local sync of 1000 contacts with photo data
using the file backend, this reduces the number of CPU cycles from
4138538276 to 2861476184 (measured with callgrind on x86_64).
This commit is contained in:
Patrick Ohly 2014-09-09 22:13:17 +02:00
parent e60e0d0955
commit f994f1efb2
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/syncevo/SyncSource.cpp
View File

@ -1544,9 +1544,11 @@ sysync::TSyError SyncSourceAdmin::saveAdminData(const char *adminData)
m_configNode->setProperty(m_adminPropertyName,
StringEscape::escape(adminData, '!', StringEscape::INI_VALUE));
// Flush here, because some calls to saveAdminData() happend
// after SyncSourceAdmin::flush() (= session end).
m_configNode->flush();
// The exact ordering of API calls is not defined. In practice, EndDataWrite is
// followed by Insert/Update/DeleteMapItem, finished by saveAdminData. Therefore
// we flush here.
flush();
return sysync::LOCERR_OK;
}
@ -1580,9 +1582,6 @@ sysync::TSyError SyncSourceAdmin::insertMapItem(sysync::cMapID mID)
}
#else
m_mapping[key] = value;
m_mappingNode->clear();
m_mappingNode->writeProperties(m_mapping);
m_mappingNode->flush();
return sysync::LOCERR_OK;
#endif
}
@ -1598,9 +1597,6 @@ sysync::TSyError SyncSourceAdmin::updateMapItem(sysync::cMapID mID)
return sysync::DB_Forbidden;
} else {
m_mapping[key] = value;
m_mappingNode->clear();
m_mappingNode->writeProperties(m_mapping);
m_mappingNode->flush();
return sysync::LOCERR_OK;
}
}
@ -1616,9 +1612,6 @@ sysync::TSyError SyncSourceAdmin::deleteMapItem(sysync::cMapID mID)
return sysync::DB_Forbidden;
} else {
m_mapping.erase(it);
m_mappingNode->clear();
m_mappingNode->writeProperties(m_mapping);
m_mappingNode->flush();
return sysync::LOCERR_OK;
}
}
@ -1713,7 +1706,6 @@ void SyncSourceAdmin::init(SyncSource::Operations &ops,
ops.m_deleteMapItem = boost::bind(&SyncSourceAdmin::deleteMapItem,
this, _1);
}
ops.m_endDataWrite.getPostSignal().connect(boost::bind(&SyncSourceAdmin::flush, this));
}
void SyncSourceAdmin::init(SyncSource::Operations &ops,