From fbaf5375c35d4b029db2e22faacd5f9f56018102 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Thu, 3 Aug 2017 16:18:24 +0100 Subject: [PATCH 1/3] cn_deserialize: move to new debug_utilities subdirectory --- src/CMakeLists.txt | 1 + src/blockchain_utilities/CMakeLists.txt | 23 --------- src/debug_utilities/CMakeLists.txt | 50 +++++++++++++++++++ .../cn_deserialize.cpp | 3 +- 4 files changed, 52 insertions(+), 25 deletions(-) create mode 100644 src/debug_utilities/CMakeLists.txt rename src/{blockchain_utilities => debug_utilities}/cn_deserialize.cpp (98%) 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/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/blockchain_utilities/cn_deserialize.cpp b/src/debug_utilities/cn_deserialize.cpp similarity index 98% rename from src/blockchain_utilities/cn_deserialize.cpp rename to src/debug_utilities/cn_deserialize.cpp index b178e4e03..a1b569554 100644 --- a/src/blockchain_utilities/cn_deserialize.cpp +++ b/src/debug_utilities/cn_deserialize.cpp @@ -29,12 +29,11 @@ #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" +#define MONERO_DEFAULT_LOG_CATEGORY "debugtools.deserialize" namespace po = boost::program_options; using namespace epee; From 55e150ff8a420fc8d9aea65be32e6faa048a6dc6 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Thu, 3 Aug 2017 17:02:13 +0100 Subject: [PATCH 2/3] 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; +} From 71e2876033e0a5a814f464cad4b1f2459f3ec395 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Thu, 3 Aug 2017 20:36:21 +0100 Subject: [PATCH 3/3] 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()