From fbaf5375c35d4b029db2e22faacd5f9f56018102 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Thu, 3 Aug 2017 16:18:24 +0100 Subject: cn_deserialize: move to new debug_utilities subdirectory --- src/CMakeLists.txt | 1 + src/blockchain_utilities/CMakeLists.txt | 23 ---- src/blockchain_utilities/cn_deserialize.cpp | 192 ---------------------------- src/debug_utilities/CMakeLists.txt | 50 ++++++++ src/debug_utilities/cn_deserialize.cpp | 191 +++++++++++++++++++++++++++ 5 files changed, 242 insertions(+), 215 deletions(-) delete mode 100644 src/blockchain_utilities/cn_deserialize.cpp create mode 100644 src/debug_utilities/CMakeLists.txt create mode 100644 src/debug_utilities/cn_deserialize.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d83242a3c..4b54c60fc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -118,6 +118,7 @@ if(NOT IOS) add_subdirectory(daemonizer) add_subdirectory(daemon) add_subdirectory(blockchain_utilities) + add_subdirectory(debug_utilities) endif() if(PER_BLOCK_CHECKPOINT) diff --git a/src/blockchain_utilities/CMakeLists.txt b/src/blockchain_utilities/CMakeLists.txt index bb23cdc8b..58d26832e 100644 --- a/src/blockchain_utilities/CMakeLists.txt +++ b/src/blockchain_utilities/CMakeLists.txt @@ -58,11 +58,6 @@ monero_private_headers(blockchain_export ${blockchain_export_private_headers}) -set(cn_deserialize_sources - cn_deserialize.cpp - ) - - monero_add_executable(blockchain_import ${blockchain_import_sources} ${blockchain_import_private_headers}) @@ -112,21 +107,3 @@ set_property(TARGET blockchain_export PROPERTY OUTPUT_NAME "monero-blockchain-export") -monero_add_executable(cn_deserialize - ${cn_deserialize_sources} - ${cn_deserialize_private_headers}) - -target_link_libraries(cn_deserialize - LINK_PRIVATE - cryptonote_core - blockchain_db - p2p - epee - ${CMAKE_THREAD_LIBS_INIT}) - -add_dependencies(cn_deserialize - version) -set_property(TARGET cn_deserialize - PROPERTY - OUTPUT_NAME "monero-utils-deserialize") - diff --git a/src/blockchain_utilities/cn_deserialize.cpp b/src/blockchain_utilities/cn_deserialize.cpp deleted file mode 100644 index b178e4e03..000000000 --- a/src/blockchain_utilities/cn_deserialize.cpp +++ /dev/null @@ -1,192 +0,0 @@ -// Copyright (c) 2014-2017, The Monero Project -// -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other -// materials provided with the distribution. -// -// 3. Neither the name of the copyright holder nor the names of its contributors may be -// used to endorse or promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF -// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#include "cryptonote_basic/cryptonote_basic.h" -#include "cryptonote_basic/tx_extra.h" -#include "cryptonote_core/blockchain.h" -#include "blockchain_utilities.h" -#include "common/command_line.h" -#include "version.h" - -#undef MONERO_DEFAULT_LOG_CATEGORY -#define MONERO_DEFAULT_LOG_CATEGORY "bcutil" - -namespace po = boost::program_options; -using namespace epee; - -using namespace cryptonote; - -int main(int argc, char* argv[]) -{ - uint32_t log_level = 0; - std::string input; - - tools::sanitize_locale(); - - boost::filesystem::path output_file_path; - - po::options_description desc_cmd_only("Command line options"); - po::options_description desc_cmd_sett("Command line options and settings options"); - const command_line::arg_descriptor arg_output_file = {"output-file", "Specify output file", "", true}; - const command_line::arg_descriptor arg_log_level = {"log-level", "", log_level}; - const command_line::arg_descriptor arg_input = {"input", "Specify input has a hexadecimal string", ""}; - - command_line::add_arg(desc_cmd_sett, arg_output_file); - command_line::add_arg(desc_cmd_sett, arg_log_level); - command_line::add_arg(desc_cmd_sett, arg_input); - - command_line::add_arg(desc_cmd_only, command_line::arg_help); - - po::options_description desc_options("Allowed options"); - desc_options.add(desc_cmd_only).add(desc_cmd_sett); - - po::variables_map vm; - bool r = command_line::handle_error_helper(desc_options, [&]() - { - po::store(po::parse_command_line(argc, argv, desc_options), vm); - po::notify(vm); - return true; - }); - if (! r) - return 1; - - if (command_line::get_arg(vm, command_line::arg_help)) - { - std::cout << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << ENDL << ENDL; - std::cout << desc_options << std::endl; - return 1; - } - - log_level = command_line::get_arg(vm, arg_log_level); - input = command_line::get_arg(vm, arg_input); - if (input.empty()) - { - std::cerr << "--input is mandatory" << std::endl; - return 1; - } - - mlog_configure("", true); - - std::string m_config_folder; - - std::ostream *output; - std::ofstream *raw_data_file = NULL; - if (command_line::has_arg(vm, arg_output_file)) - { - output_file_path = boost::filesystem::path(command_line::get_arg(vm, arg_output_file)); - - const boost::filesystem::path dir_path = output_file_path.parent_path(); - if (!dir_path.empty()) - { - if (boost::filesystem::exists(dir_path)) - { - if (!boost::filesystem::is_directory(dir_path)) - { - std::cerr << "output directory path is a file: " << dir_path << std::endl; - return 1; - } - } - else - { - if (!boost::filesystem::create_directory(dir_path)) - { - std::cerr << "Failed to create directory " << dir_path << std::endl; - return 1; - } - } - } - - raw_data_file = new std::ofstream(); - raw_data_file->open(output_file_path.string(), std::ios_base::out | std::ios::trunc); - if (raw_data_file->fail()) - return 1; - output = raw_data_file; - } - else - { - output_file_path = ""; - output = &std::cout; - } - - cryptonote::blobdata blob; - if (!epee::string_tools::parse_hexstr_to_binbuff(input, blob)) - { - std::cerr << "Invalid hex input" << std::endl; - std::cerr << "Invalid hex input: " << input << std::endl; - return 1; - } - - cryptonote::block block; - cryptonote::transaction tx; - std::vector fields; - if (cryptonote::parse_and_validate_block_from_blob(blob, block)) - { - std::cout << "Parsed block:" << std::endl; - std::cout << cryptonote::obj_to_json_str(block) << std::endl; - } - else if (cryptonote::parse_and_validate_tx_from_blob(blob, tx)) - { - std::cout << "Parsed transaction:" << std::endl; - std::cout << cryptonote::obj_to_json_str(tx) << std::endl; - - if (cryptonote::parse_tx_extra(tx.extra, fields)) - { - std::cout << "tx_extra has " << fields.size() << " field(s)" << std::endl; - for (size_t n = 0; n < fields.size(); ++n) - { - std::cout << "field " << n << ": "; - if (typeid(cryptonote::tx_extra_padding) == fields[n].type()) std::cout << "extra padding: " << boost::get(fields[n]).size << " bytes"; - else if (typeid(cryptonote::tx_extra_pub_key) == fields[n].type()) std::cout << "extra pub key: " << boost::get(fields[n]).pub_key; - else if (typeid(cryptonote::tx_extra_nonce) == fields[n].type()) std::cout << "extra nonce: " << epee::string_tools::buff_to_hex_nodelimer(boost::get(fields[n]).nonce); - else if (typeid(cryptonote::tx_extra_merge_mining_tag) == fields[n].type()) std::cout << "extra merge mining tag: depth " << boost::get(fields[n]).depth << ", merkle root " << boost::get(fields[n]).merkle_root; - else if (typeid(cryptonote::tx_extra_mysterious_minergate) == fields[n].type()) std::cout << "extra minergate custom: " << epee::string_tools::buff_to_hex_nodelimer(boost::get(fields[n]).data); - else std::cout << "unknown"; - std::cout << std::endl; - } - } - else - { - std::cout << "Failed to parse tx_extra" << std::endl; - } - } - else - { - std::cerr << "Not a recognized CN type" << std::endl; - return 1; - } - - - - if (output->fail()) - return 1; - output->flush(); - if (raw_data_file) - delete raw_data_file; - - return 0; -} diff --git a/src/debug_utilities/CMakeLists.txt b/src/debug_utilities/CMakeLists.txt new file mode 100644 index 000000000..233e6fd46 --- /dev/null +++ b/src/debug_utilities/CMakeLists.txt @@ -0,0 +1,50 @@ +# Copyright (c) 2014-2017, The Monero Project +# +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, are +# permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other +# materials provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be +# used to endorse or promote products derived from this software without specific +# prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +set(cn_deserialize_sources + cn_deserialize.cpp + ) + +monero_add_executable(cn_deserialize + ${cn_deserialize_sources} + ${cn_deserialize_private_headers}) + +target_link_libraries(cn_deserialize + LINK_PRIVATE + cryptonote_core + blockchain_db + p2p + epee + ${CMAKE_THREAD_LIBS_INIT}) + +add_dependencies(cn_deserialize + version) +set_property(TARGET cn_deserialize + PROPERTY + OUTPUT_NAME "monero-utils-deserialize") + diff --git a/src/debug_utilities/cn_deserialize.cpp b/src/debug_utilities/cn_deserialize.cpp new file mode 100644 index 000000000..a1b569554 --- /dev/null +++ b/src/debug_utilities/cn_deserialize.cpp @@ -0,0 +1,191 @@ +// Copyright (c) 2014-2017, The Monero Project +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this list of +// conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other +// materials provided with the distribution. +// +// 3. Neither the name of the copyright holder nor the names of its contributors may be +// used to endorse or promote products derived from this software without specific +// prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "cryptonote_basic/cryptonote_basic.h" +#include "cryptonote_basic/tx_extra.h" +#include "cryptonote_core/blockchain.h" +#include "common/command_line.h" +#include "version.h" + +#undef MONERO_DEFAULT_LOG_CATEGORY +#define MONERO_DEFAULT_LOG_CATEGORY "debugtools.deserialize" + +namespace po = boost::program_options; +using namespace epee; + +using namespace cryptonote; + +int main(int argc, char* argv[]) +{ + uint32_t log_level = 0; + std::string input; + + tools::sanitize_locale(); + + boost::filesystem::path output_file_path; + + po::options_description desc_cmd_only("Command line options"); + po::options_description desc_cmd_sett("Command line options and settings options"); + const command_line::arg_descriptor arg_output_file = {"output-file", "Specify output file", "", true}; + const command_line::arg_descriptor arg_log_level = {"log-level", "", log_level}; + const command_line::arg_descriptor arg_input = {"input", "Specify input has a hexadecimal string", ""}; + + command_line::add_arg(desc_cmd_sett, arg_output_file); + command_line::add_arg(desc_cmd_sett, arg_log_level); + command_line::add_arg(desc_cmd_sett, arg_input); + + command_line::add_arg(desc_cmd_only, command_line::arg_help); + + po::options_description desc_options("Allowed options"); + desc_options.add(desc_cmd_only).add(desc_cmd_sett); + + po::variables_map vm; + bool r = command_line::handle_error_helper(desc_options, [&]() + { + po::store(po::parse_command_line(argc, argv, desc_options), vm); + po::notify(vm); + return true; + }); + if (! r) + return 1; + + if (command_line::get_arg(vm, command_line::arg_help)) + { + std::cout << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << ENDL << ENDL; + std::cout << desc_options << std::endl; + return 1; + } + + log_level = command_line::get_arg(vm, arg_log_level); + input = command_line::get_arg(vm, arg_input); + if (input.empty()) + { + std::cerr << "--input is mandatory" << std::endl; + return 1; + } + + mlog_configure("", true); + + std::string m_config_folder; + + std::ostream *output; + std::ofstream *raw_data_file = NULL; + if (command_line::has_arg(vm, arg_output_file)) + { + output_file_path = boost::filesystem::path(command_line::get_arg(vm, arg_output_file)); + + const boost::filesystem::path dir_path = output_file_path.parent_path(); + if (!dir_path.empty()) + { + if (boost::filesystem::exists(dir_path)) + { + if (!boost::filesystem::is_directory(dir_path)) + { + std::cerr << "output directory path is a file: " << dir_path << std::endl; + return 1; + } + } + else + { + if (!boost::filesystem::create_directory(dir_path)) + { + std::cerr << "Failed to create directory " << dir_path << std::endl; + return 1; + } + } + } + + raw_data_file = new std::ofstream(); + raw_data_file->open(output_file_path.string(), std::ios_base::out | std::ios::trunc); + if (raw_data_file->fail()) + return 1; + output = raw_data_file; + } + else + { + output_file_path = ""; + output = &std::cout; + } + + cryptonote::blobdata blob; + if (!epee::string_tools::parse_hexstr_to_binbuff(input, blob)) + { + std::cerr << "Invalid hex input" << std::endl; + std::cerr << "Invalid hex input: " << input << std::endl; + return 1; + } + + cryptonote::block block; + cryptonote::transaction tx; + std::vector fields; + if (cryptonote::parse_and_validate_block_from_blob(blob, block)) + { + std::cout << "Parsed block:" << std::endl; + std::cout << cryptonote::obj_to_json_str(block) << std::endl; + } + else if (cryptonote::parse_and_validate_tx_from_blob(blob, tx)) + { + std::cout << "Parsed transaction:" << std::endl; + std::cout << cryptonote::obj_to_json_str(tx) << std::endl; + + if (cryptonote::parse_tx_extra(tx.extra, fields)) + { + std::cout << "tx_extra has " << fields.size() << " field(s)" << std::endl; + for (size_t n = 0; n < fields.size(); ++n) + { + std::cout << "field " << n << ": "; + if (typeid(cryptonote::tx_extra_padding) == fields[n].type()) std::cout << "extra padding: " << boost::get(fields[n]).size << " bytes"; + else if (typeid(cryptonote::tx_extra_pub_key) == fields[n].type()) std::cout << "extra pub key: " << boost::get(fields[n]).pub_key; + else if (typeid(cryptonote::tx_extra_nonce) == fields[n].type()) std::cout << "extra nonce: " << epee::string_tools::buff_to_hex_nodelimer(boost::get(fields[n]).nonce); + else if (typeid(cryptonote::tx_extra_merge_mining_tag) == fields[n].type()) std::cout << "extra merge mining tag: depth " << boost::get(fields[n]).depth << ", merkle root " << boost::get(fields[n]).merkle_root; + else if (typeid(cryptonote::tx_extra_mysterious_minergate) == fields[n].type()) std::cout << "extra minergate custom: " << epee::string_tools::buff_to_hex_nodelimer(boost::get(fields[n]).data); + else std::cout << "unknown"; + std::cout << std::endl; + } + } + else + { + std::cout << "Failed to parse tx_extra" << std::endl; + } + } + else + { + std::cerr << "Not a recognized CN type" << std::endl; + return 1; + } + + + + if (output->fail()) + return 1; + output->flush(); + if (raw_data_file) + delete raw_data_file; + + return 0; +} -- cgit v1.2.3 From 55e150ff8a420fc8d9aea65be32e6faa048a6dc6 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Thu, 3 Aug 2017 17:02:13 +0100 Subject: debug_utilities: new object-sizes debug tool It prints the size of various interesting types, to make it easier to match leaks to possible leaked object types --- src/debug_utilities/CMakeLists.txt | 23 +++++++ src/debug_utilities/object_sizes.cpp | 116 +++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 src/debug_utilities/object_sizes.cpp diff --git a/src/debug_utilities/CMakeLists.txt b/src/debug_utilities/CMakeLists.txt index 233e6fd46..99198dc57 100644 --- a/src/debug_utilities/CMakeLists.txt +++ b/src/debug_utilities/CMakeLists.txt @@ -48,3 +48,26 @@ set_property(TARGET cn_deserialize PROPERTY OUTPUT_NAME "monero-utils-deserialize") + +set(object_sizes_sources + object_sizes.cpp + ) + +monero_add_executable(object_sizes + ${object_sizes_sources} + ${object_sizes_private_headers}) + +target_link_libraries(object_sizes + LINK_PRIVATE + cryptonote_core + blockchain_db + p2p + epee + ${CMAKE_THREAD_LIBS_INIT}) + +add_dependencies(object_sizes + version) +set_property(TARGET object_sizes + PROPERTY + OUTPUT_NAME "monero-utils-object-sizes") + diff --git a/src/debug_utilities/object_sizes.cpp b/src/debug_utilities/object_sizes.cpp new file mode 100644 index 000000000..47ba5cf6c --- /dev/null +++ b/src/debug_utilities/object_sizes.cpp @@ -0,0 +1,116 @@ +// Copyright (c) 2017, The Monero Project +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this list of +// conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other +// materials provided with the distribution. +// +// 3. Neither the name of the copyright holder nor the names of its contributors may be +// used to endorse or promote products derived from this software without specific +// prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include +#include "cryptonote_basic/cryptonote_basic.h" +#include "cryptonote_basic/tx_extra.h" +#include "cryptonote_core/blockchain.h" +#include "p2p/p2p_protocol_defs.h" +#include "p2p/connection_basic.hpp" +#include "p2p/net_peerlist.h" +#include "p2p/net_node.h" +#include "cryptonote_protocol/cryptonote_protocol_handler.h" +#include "blockchain_db/lmdb/db_lmdb.h" +#include "wallet/wallet2.h" +#include "wallet/api/wallet.h" +#include "wallet/api/transaction_info.h" +#include "wallet/api/transaction_history.h" +#include "wallet/api/unsigned_transaction.h" +#include "wallet/api/pending_transaction.h" + +#undef MONERO_DEFAULT_LOG_CATEGORY +#define MONERO_DEFAULT_LOG_CATEGORY "debugtools.objectsizes" + +class size_logger +{ +public: + ~size_logger() + { + for (const auto i: types) + std::cout << std::to_string(i.first) << "\t" << i.second << std::endl; + } + void add(const char *type, size_t size) { types.insert(std::make_pair(size, type)); } +private: + std::multimap types; +}; +#define SL(type) sl.add(#type, sizeof(type)) + +int main(int argc, char* argv[]) +{ + size_logger sl; + + tools::sanitize_locale(); + + mlog_configure("", true); + + SL(boost::thread); + SL(boost::asio::io_service); + SL(boost::asio::io_service::work); + SL(boost::asio::deadline_timer); + + SL(cryptonote::DB_ERROR); + SL(cryptonote::mdb_txn_safe); + SL(cryptonote::mdb_threadinfo); + + SL(cryptonote::block_header); + SL(cryptonote::block); + SL(cryptonote::transaction_prefix); + SL(cryptonote::transaction); + + SL(cryptonote::txpool_tx_meta_t); + + SL(epee::net_utils::network_address_base); + SL(epee::net_utils::ipv4_network_address); + SL(epee::net_utils::network_address); + SL(epee::net_utils::connection_context_base); + SL(epee::net_utils::connection_basic); + + SL(nodetool::peerlist_entry); + SL(nodetool::anchor_peerlist_entry); + SL(nodetool::node_server>); + SL(nodetool::p2p_connection_context_t::connection_context>); + SL(nodetool::network_address_old); + + SL(tools::wallet2::transfer_details); + SL(tools::wallet2::payment_details); + SL(tools::wallet2::unconfirmed_transfer_details); + SL(tools::wallet2::confirmed_transfer_details); + SL(tools::wallet2::tx_construction_data); + SL(tools::wallet2::pending_tx); + SL(tools::wallet2::unsigned_tx_set); + SL(tools::wallet2::signed_tx_set); + + SL(Monero::WalletImpl); + SL(Monero::AddressBookRow); + SL(Monero::TransactionInfoImpl); + SL(Monero::TransactionHistoryImpl); + SL(Monero::PendingTransactionImpl); + SL(Monero::UnsignedTransactionImpl); + + return 0; +} -- cgit v1.2.3 From 71e2876033e0a5a814f464cad4b1f2459f3ec395 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Thu, 3 Aug 2017 20:36:21 +0100 Subject: debug_utilities: only build for debug builds --- src/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4b54c60fc..e473c2984 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -118,6 +118,9 @@ if(NOT IOS) add_subdirectory(daemonizer) add_subdirectory(daemon) add_subdirectory(blockchain_utilities) +endif() + +if(CMAKE_BUILD_TYPE STREQUAL Debug) add_subdirectory(debug_utilities) endif() -- cgit v1.2.3