fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-14 21:03:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Log initialization fix

Browse Source
This commit is contained in:
Pavel Kirienko
2015-05-05 11:31:55 +03:00
parent f11f49a7d2
commit 3af95e3dd4
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/src/protocol/uc_dynamic_node_id_allocation_server.cpp
+16 -10
View File
@@ -228,10 +228,24 @@ int Log::initEmptyLogStorage()
{
MarshallingStorageDecorator io(storage_);
// Initializing last index
/*
* Writing the zero entry - it must always be default-initialized
*/
entries_[0] = protocol::dynamic_node_id::server::Entry();
int res = writeEntryToStorage(0, entries_[0]);
if (res < 0)
{
return res;
}
/*
* Initializing last index
* Last index must be written AFTER the zero entry, otherwise if the write fails here the storage will be
* left in an inconsistent state.
*/
last_index_ = 0;
uint32_t stored_index = 0;
int res = io.setAndGetBack(getLastIndexKey(), stored_index);
res = io.setAndGetBack(getLastIndexKey(), stored_index);
if (res < 0)
{
return res;
@@ -241,14 +255,6 @@ int Log::initEmptyLogStorage()
return -ErrFailure;
}
// Writing the zero entry - it must always be default-initialized
entries_[0] = protocol::dynamic_node_id::server::Entry();
res = writeEntryToStorage(0, entries_[0]);
if (res < 0)
{
return res;
}
return 0;
}