nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blockchain_blackball: allow resumable interrupt with ^C

Browse Source
This commit is contained in:
moneromooo-monero 2018-07-30 11:14:02 +01:00
parent 0dddfeacc9
commit 5860611afa
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/blockchain_utilities/blockchain_blackball.cpp
View File

@ -404,6 +404,11 @@ int main(int argc, char* argv[])
cryptonote::block b = core_storage[0]->get_db().get_block_from_height(0); cryptonote::block b = core_storage[0]->get_db().get_block_from_height(0);
tools::ringdb ringdb(output_file_path.string(), epee::string_tools::pod_to_hex(get_block_hash(b))); tools::ringdb ringdb(output_file_path.string(), epee::string_tools::pod_to_hex(get_block_hash(b)));
bool stop_requested = false;
tools::signal_handler::install([&stop_requested](int type) {
stop_requested = true;
});
for (size_t n = 0; n < inputs.size(); ++n) for (size_t n = 0; n < inputs.size(); ++n)
{ {
const std::string canonical = boost::filesystem::canonical(inputs[n]).string(); const std::string canonical = boost::filesystem::canonical(inputs[n]).string();
@ -489,9 +494,17 @@ int main(int argc, char* argv[])
} }
state.relative_rings[txin.k_image] = new_ring; state.relative_rings[txin.k_image] = new_ring;
} }
if (stop_requested)
{
MINFO("Stopping scan, secondary passes will still happen...");
return false;
}
return true; return true;
}); });
LOG_PRINT_L0("blockchain from " << inputs[n] << " processed still height " << start_idx);
state.processed_heights[canonical] = start_idx; state.processed_heights[canonical] = start_idx;
if (stop_requested)
break;
} }
while (!newly_spent.empty()) while (!newly_spent.empty())