aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/crypto/oaes_lib.c1
-rw-r--r--src/cryptonote_config.h2
-rw-r--r--src/cryptonote_core/cryptonote_format_utils.h2
-rw-r--r--src/cryptonote_core/miner.cpp11
-rw-r--r--src/cryptonote_core/miner.h2
-rw-r--r--src/daemon/daemon_commands_handler.h5
-rw-r--r--src/p2p/net_node.inl9
-rw-r--r--src/p2p/p2p_protocol_defs.h4
-rw-r--r--src/rpc/core_rpc_server.cpp7
-rw-r--r--src/simplewallet/simplewallet.cpp2
10 files changed, 31 insertions, 14 deletions
diff --git a/src/crypto/oaes_lib.c b/src/crypto/oaes_lib.c
index d77c52f11..126f0a2f6 100644
--- a/src/crypto/oaes_lib.c
+++ b/src/crypto/oaes_lib.c
@@ -37,6 +37,7 @@ static const char _NR[] = {
#include <malloc.h>
#include <string.h>
#include <stdlib.h>
+#include <stdio.h>
#ifdef WIN32
#include <process.h>
diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h
index b7c0170e3..34d053aa8 100644
--- a/src/cryptonote_config.h
+++ b/src/cryptonote_config.h
@@ -79,5 +79,5 @@
#define P2P_NET_DATA_FILENAME "p2pstate.bin"
#define MINER_CONFIG_FILE_NAME "miner_conf.json"
-
+#define THREAD_STACK_SIZE 5 * 1024 * 1024
diff --git a/src/cryptonote_core/cryptonote_format_utils.h b/src/cryptonote_core/cryptonote_format_utils.h
index 554e466cc..5873d2943 100644
--- a/src/cryptonote_core/cryptonote_format_utils.h
+++ b/src/cryptonote_core/cryptonote_format_utils.h
@@ -25,7 +25,7 @@ namespace cryptonote
typedef std::pair<uint64_t, crypto::public_key> output_entry;
std::vector<output_entry> outputs; //index + key
- uint64_t real_output; //index in outputs vector of real output_entry
+ size_t real_output; //index in outputs vector of real output_entry
crypto::public_key real_out_tx_key; //incoming real tx public key
size_t real_output_in_tx_index; //index in transaction outputs vector
uint64_t amount; //money
diff --git a/src/cryptonote_core/miner.cpp b/src/cryptonote_core/miner.cpp
index 142c81f68..56b459d6e 100644
--- a/src/cryptonote_core/miner.cpp
+++ b/src/cryptonote_core/miner.cpp
@@ -193,7 +193,7 @@ namespace cryptonote
return !m_stop;
}
//-----------------------------------------------------------------------------------------------------
- bool miner::start(const account_public_address& adr, size_t threads_count)
+ bool miner::start(const account_public_address& adr, size_t threads_count, const boost::thread::attributes& attrs)
{
m_mine_address = adr;
m_threads_total = static_cast<uint32_t>(threads_count);
@@ -218,7 +218,9 @@ namespace cryptonote
boost::interprocess::ipcdetail::atomic_write32(&m_thread_index, 0);
for(size_t i = 0; i != threads_count; i++)
- m_threads.push_back(boost::thread(boost::bind(&miner::worker_thread, this)));
+ {
+ m_threads.push_back(boost::thread(attrs, boost::bind(&miner::worker_thread, this)));
+ }
LOG_PRINT_L0("Mining has started with " << threads_count << " threads, good luck!" )
return true;
@@ -269,7 +271,10 @@ namespace cryptonote
{
if(m_do_mining)
{
- start(m_mine_address, m_threads_total);
+ boost::thread::attributes attrs;
+ attrs.set_stack_size(THREAD_STACK_SIZE);
+
+ start(m_mine_address, m_threads_total, attrs);
}
}
//-----------------------------------------------------------------------------------------------------
diff --git a/src/cryptonote_core/miner.h b/src/cryptonote_core/miner.h
index 03f09509e..da4578b06 100644
--- a/src/cryptonote_core/miner.h
+++ b/src/cryptonote_core/miner.h
@@ -35,7 +35,7 @@ namespace cryptonote
static void init_options(boost::program_options::options_description& desc);
bool set_block_template(const block& bl, const difficulty_type& diffic, uint64_t height);
bool on_block_chain_update();
- bool start(const account_public_address& adr, size_t threads_count);
+ bool start(const account_public_address& adr, size_t threads_count, const boost::thread::attributes& attrs);
uint64_t get_speed();
void send_stop_signal();
bool stop();
diff --git a/src/daemon/daemon_commands_handler.h b/src/daemon/daemon_commands_handler.h
index 7695508c9..dca524f77 100644
--- a/src/daemon/daemon_commands_handler.h
+++ b/src/daemon/daemon_commands_handler.h
@@ -291,7 +291,10 @@ private:
threads_count = (ok && 0 < threads_count) ? threads_count : 1;
}
- m_srv.get_payload_object().get_core().get_miner().start(adr, threads_count);
+ boost::thread::attributes attrs;
+ attrs.set_stack_size(THREAD_STACK_SIZE);
+
+ m_srv.get_payload_object().get_core().get_miner().start(adr, threads_count, attrs);
return true;
}
//--------------------------------------------------------------------------------
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index eeb3f6ffe..31d3e6597 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -278,9 +278,12 @@ namespace nodetool
m_net_server.add_idle_handler(boost::bind(&node_server<t_payload_net_handler>::idle_worker, this), 1000);
m_net_server.add_idle_handler(boost::bind(&t_payload_net_handler::on_idle, &m_payload_handler), 1000);
+ boost::thread::attributes attrs;
+ attrs.set_stack_size(THREAD_STACK_SIZE);
+
//go to loop
LOG_PRINT("Run net_service loop( " << thrds_count << " threads)...", LOG_LEVEL_0);
- if(!m_net_server.run_server(thrds_count))
+ if(!m_net_server.run_server(thrds_count, true, attrs))
{
LOG_ERROR("Failed to run net tcp server!");
}
@@ -745,7 +748,9 @@ namespace nodetool
template<class t_payload_net_handler>
bool node_server<t_payload_net_handler>::get_local_node_data(basic_node_data& node_data)
{
- time(&node_data.local_time);
+ time_t local_time;
+ time(&local_time);
+ node_data.local_time = local_time;
node_data.peer_id = m_config.m_peer_id;
if(!m_hide_my_port)
node_data.my_port = m_external_port ? m_external_port : m_listenning_port;
diff --git a/src/p2p/p2p_protocol_defs.h b/src/p2p/p2p_protocol_defs.h
index 9994dca4c..fdf784f49 100644
--- a/src/p2p/p2p_protocol_defs.h
+++ b/src/p2p/p2p_protocol_defs.h
@@ -86,7 +86,7 @@ namespace nodetool
struct basic_node_data
{
uuid network_id;
- time_t local_time;
+ uint64_t local_time;
uint32_t my_port;
peerid_type peer_id;
@@ -153,7 +153,7 @@ namespace nodetool
struct response
{
- time_t local_time;
+ uint64_t local_time;
t_playload_type payload_data;
std::list<peerlist_entry> local_peerlist;
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index bab373c86..4d78367b6 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -252,7 +252,10 @@ namespace cryptonote
return true;
}
- if(!m_core.get_miner().start(adr, static_cast<size_t>(req.threads_count)))
+ boost::thread::attributes attrs;
+ attrs.set_stack_size(THREAD_STACK_SIZE);
+
+ if(!m_core.get_miner().start(adr, static_cast<size_t>(req.threads_count), attrs))
{
res.status = "Failed, mining not started";
return true;
@@ -536,7 +539,7 @@ namespace cryptonote
if (!have_block)
{
error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR;
- error_resp.message = "Internal error: can't get block by height. Height = " + req.height + '.';
+ error_resp.message = "Internal error: can't get block by height. Height = " + std::to_string(req.height) + '.';
return false;
}
bool responce_filled = fill_block_header_responce(blk, false, req.height, block_hash, res.block_header);
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index a4cae0480..a9c171f6b 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -469,7 +469,7 @@ bool simple_wallet::refresh(const std::vector<std::string>& args)
return true;
message_writer() << "Starting refresh...";
- uint64_t fetched_blocks = 0;
+ size_t fetched_blocks = 0;
bool ok = false;
std::ostringstream ss;
try
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-22 08:40:30 +0000