aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile6
-rw-r--r--contrib/epee/include/console_handler.h6
-rw-r--r--contrib/epee/include/net/abstract_tcp_server2.inl6
-rw-r--r--contrib/epee/include/readline_buffer.h13
-rw-r--r--contrib/epee/src/mlog.cpp6
-rw-r--r--contrib/epee/src/readline_buffer.cpp72
-rw-r--r--src/common/dns_utils.cpp8
-rw-r--r--src/cryptonote_basic/miner.cpp4
-rw-r--r--src/cryptonote_core/cryptonote_core.cpp1
-rw-r--r--src/cryptonote_core/tx_pool.cpp2
-rw-r--r--src/daemon/rpc_command_executor.cpp11
-rw-r--r--src/daemonizer/posix_fork.cpp14
-rw-r--r--src/simplewallet/simplewallet.cpp6
13 files changed, 113 insertions, 42 deletions
diff --git a/Makefile b/Makefile
index 0f5ee5773..4f6e6465f 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,11 @@ debug-test:
debug-all:
mkdir -p build/debug
- cd build/debug && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=Debug ../.. && $(MAKE)
+ cd build/debug && cmake -D BUILD_TESTS=ON -D BUILD_SHARED_LIBS=OFF -D CMAKE_BUILD_TYPE=Debug ../.. && $(MAKE)
+
+debug-static-all:
+ mkdir -p build/debug
+ cd build/debug && cmake -D BUILD_TESTS=ON -D STATIC=ON -D CMAKE_BUILD_TYPE=Debug ../.. && $(MAKE)
cmake-release:
mkdir -p build/release
diff --git a/contrib/epee/include/console_handler.h b/contrib/epee/include/console_handler.h
index 6832f2ea1..e780ad4de 100644
--- a/contrib/epee/include/console_handler.h
+++ b/contrib/epee/include/console_handler.h
@@ -374,6 +374,9 @@ namespace epee
}
else
{
+#ifdef HAVE_READLINE
+ rdln::suspend_readline pause_readline;
+#endif
std::cout << "unknown command: " << command << std::endl;
std::cout << usage;
}
@@ -477,6 +480,9 @@ namespace epee
lookup::mapped_type & vt = m_command_handlers[cmd];
vt.first = hndlr;
vt.second = usage;
+#ifdef HAVE_READLINE
+ rdln::readline_buffer::add_completion(cmd);
+#endif
}
bool process_command_vec(const std::vector<std::string>& cmd)
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index 0fbd9ed28..61276e761 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -209,14 +209,14 @@ PRAGMA_WARNING_DISABLE_VS(4355)
bool connection<t_protocol_handler>::add_ref()
{
TRY_ENTRY();
- //_dbg3("[sock " << socket_.native_handle() << "] add_ref, m_peer_number=" << mI->m_peer_number);
- CRITICAL_REGION_LOCAL(m_self_refs_lock);
- //_dbg3("[sock " << socket_.native_handle() << "] add_ref 2, m_peer_number=" << mI->m_peer_number);
// Use safe_shared_from_this, because of this is public method and it can be called on the object being deleted
auto self = safe_shared_from_this();
if(!self)
return false;
+ //_dbg3("[sock " << socket_.native_handle() << "] add_ref, m_peer_number=" << mI->m_peer_number);
+ CRITICAL_REGION_LOCAL(self->m_self_refs_lock);
+ //_dbg3("[sock " << socket_.native_handle() << "] add_ref 2, m_peer_number=" << mI->m_peer_number);
if(m_was_shutdown)
return false;
m_self_refs.push_back(self);
diff --git a/contrib/epee/include/readline_buffer.h b/contrib/epee/include/readline_buffer.h
index 916d14f01..8dd082a70 100644
--- a/contrib/epee/include/readline_buffer.h
+++ b/contrib/epee/include/readline_buffer.h
@@ -3,6 +3,8 @@
#include <streambuf>
#include <sstream>
#include <iostream>
+#include <vector>
+#include <algorithm>
namespace rdln
{
@@ -19,12 +21,23 @@ namespace rdln
}
void get_line(std::string& line) const;
void set_prompt(const std::string& prompt);
+ static void add_completion(const std::string& command)
+ {
+ if(std::find(completion_commands.begin(), completion_commands.end(), command) != completion_commands.end())
+ return;
+ completion_commands.push_back(command);
+ }
+ static const std::vector<std::string>& get_completions()
+ {
+ return completion_commands;
+ }
protected:
virtual int sync();
private:
std::streambuf* m_cout_buf;
+ static std::vector<std::string> completion_commands;
};
class suspend_readline
diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp
index 3be992374..a51654d36 100644
--- a/contrib/epee/src/mlog.cpp
+++ b/contrib/epee/src/mlog.cpp
@@ -91,10 +91,10 @@ static const char *get_default_categories(int level)
switch (level)
{
case 0:
- categories = "*:WARNING,net:FATAL,net.p2p:FATAL,net.cn:FATAL,global:INFO,verify:FATAL,stacktrace:INFO,logging:INFO";
+ categories = "*:WARNING,net:FATAL,net.p2p:FATAL,net.cn:FATAL,global:INFO,verify:FATAL,stacktrace:INFO,logging:INFO,msgwriter:INFO";
break;
case 1:
- categories = "*:WARNING,global:INFO,stacktrace:INFO,logging:INFO";
+ categories = "*:WARNING,global:INFO,stacktrace:INFO,logging:INFO,msgwriter:INFO";
break;
case 2:
categories = "*:DEBUG";
@@ -139,7 +139,7 @@ void mlog_configure(const std::string &filename_base, bool console)
{
monero_log = get_default_categories(0);
}
- mlog_set_categories(monero_log);
+ mlog_set_log(monero_log);
}
void mlog_set_categories(const char *categories)
diff --git a/contrib/epee/src/readline_buffer.cpp b/contrib/epee/src/readline_buffer.cpp
index c846641bd..549f49d45 100644
--- a/contrib/epee/src/readline_buffer.cpp
+++ b/contrib/epee/src/readline_buffer.cpp
@@ -6,6 +6,7 @@
#include <mutex>
#include <condition_variable>
#include <boost/thread.hpp>
+#include <boost/algorithm/string.hpp>
static int process_input();
static void install_line_handler();
@@ -16,6 +17,8 @@ static std::string last_prompt;
std::mutex line_mutex, sync_mutex, process_mutex;
std::condition_variable have_line;
+std::vector<std::string> rdln::readline_buffer::completion_commands = {"exit"};
+
namespace
{
rdln::readline_buffer* current = NULL;
@@ -59,6 +62,7 @@ void rdln::readline_buffer::start()
void rdln::readline_buffer::stop()
{
std::unique_lock<std::mutex> lock(process_mutex);
+ have_line.notify_all();
if(m_cout_buf == NULL)
return;
std::cout.rdbuf(m_cout_buf);
@@ -78,6 +82,7 @@ void rdln::readline_buffer::set_prompt(const std::string& prompt)
last_prompt = prompt;
if(m_cout_buf == NULL)
return;
+ std::lock_guard<std::mutex> lock(sync_mutex);
rl_set_prompt(last_prompt.c_str());
rl_redisplay();
}
@@ -112,8 +117,7 @@ int rdln::readline_buffer::sync()
do
{
- char x = this->sgetc();
- m_cout_buf->sputc(x);
+ m_cout_buf->sputc( this->sgetc() );
}
while ( this->snextc() != EOF );
@@ -148,43 +152,44 @@ static int process_input()
static void handle_line(char* line)
{
- if (line != NULL)
+ if(last_line == "exit" || last_line == "q")
{
- std::lock_guard<std::mutex> lock(sync_mutex);
- rl_set_prompt(last_prompt.c_str());
- rl_already_prompted = 1;
return;
}
- rl_set_prompt("");
- rl_replace_line("", 0);
- rl_redisplay();
+ std::lock_guard<std::mutex> lock(sync_mutex);
rl_set_prompt(last_prompt.c_str());
+ rl_already_prompted = 1;
}
static int handle_enter(int x, int y)
{
std::lock_guard<std::mutex> lock(sync_mutex);
char* line = NULL;
-
+
line = rl_copy_text(0, rl_end);
+ rl_crlf();
+ rl_on_new_line();
rl_set_prompt("");
rl_replace_line("", 1);
rl_redisplay();
- if (strcmp(line, "") != 0)
+ std::string test_line = line;
+ boost::trim_right(test_line);
+ if (test_line.length() > 0)
{
- last_line = line;
- add_history(line);
+ last_line = test_line;
+ add_history(test_line.c_str());
have_line.notify_one();
}
free(line);
-
- if(last_line != "exit")
+
+ if(last_line != "exit" && last_line != "q")
{
rl_set_prompt(last_prompt.c_str());
+ rl_on_new_line_with_prompt();
rl_redisplay();
}
-
+
rl_done = 1;
return 0;
}
@@ -196,15 +201,50 @@ static int startup_hook()
return 0;
}
+static char* completion_matches(const char* text, int state)
+{
+ static size_t list_index;
+ static size_t len;
+
+ if(state == 0)
+ {
+ list_index = 0;
+ len = strlen(text);
+ }
+
+ const std::vector<std::string>& completions = rdln::readline_buffer::get_completions();
+ for(; list_index<completions.size(); )
+ {
+ const std::string& cmd = completions[list_index++];
+ if(cmd.compare(0, len, text) == 0)
+ {
+ return strdup(cmd.c_str());
+ }
+ }
+
+ return NULL;
+}
+
+static char** attempted_completion(const char* text, int start, int end)
+{
+ rl_attempted_completion_over = 1;
+ return rl_completion_matches(text, completion_matches);
+}
+
static void install_line_handler()
{
rl_startup_hook = startup_hook;
+ rl_attempted_completion_function = attempted_completion;
rl_callback_handler_install("", handle_line);
}
static void remove_line_handler()
{
+ rl_replace_line("", 0);
+ rl_set_prompt("");
+ rl_redisplay();
rl_unbind_key(RETURN);
+ rl_unbind_key(NEWLINE);
rl_callback_handler_remove();
}
diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
index ab38cbbae..979f34b3e 100644
--- a/src/common/dns_utils.cpp
+++ b/src/common/dns_utils.cpp
@@ -307,12 +307,8 @@ DNSResolver& DNSResolver::instance()
{
boost::lock_guard<boost::mutex> lock(instance_lock);
- static DNSResolver* staticInstance = NULL;
- if (staticInstance == NULL)
- {
- staticInstance = new DNSResolver();
- }
- return *staticInstance;
+ static DNSResolver staticInstance;
+ return staticInstance;
}
DNSResolver DNSResolver::create()
diff --git a/src/cryptonote_basic/miner.cpp b/src/cryptonote_basic/miner.cpp
index 49126d910..9248e2e1d 100644
--- a/src/cryptonote_basic/miner.cpp
+++ b/src/cryptonote_basic/miner.cpp
@@ -74,8 +74,8 @@ namespace cryptonote
const command_line::arg_descriptor<bool> arg_bg_mining_enable = {"bg-mining-enable", "enable/disable background mining", true, true};
const command_line::arg_descriptor<bool> arg_bg_mining_ignore_battery = {"bg-mining-ignore-battery", "if true, assumes plugged in when unable to query system power status", false, true};
const command_line::arg_descriptor<uint64_t> arg_bg_mining_min_idle_interval_seconds = {"bg-mining-min-idle-interval", "Specify min lookback interval in seconds for determining idle state", miner::BACKGROUND_MINING_DEFAULT_MIN_IDLE_INTERVAL_IN_SECONDS, true};
- const command_line::arg_descriptor<uint8_t> arg_bg_mining_idle_threshold_percentage = {"bg-mining-idle-threshold", "Specify minimum avg idle percentage over lookback interval", miner::BACKGROUND_MINING_DEFAULT_IDLE_THRESHOLD_PERCENTAGE, true};
- const command_line::arg_descriptor<uint8_t> arg_bg_mining_miner_target_percentage = {"bg-mining-miner-target", "Specificy maximum percentage cpu use by miner(s)", miner::BACKGROUND_MINING_DEFAULT_MINING_TARGET_PERCENTAGE, true};
+ const command_line::arg_descriptor<uint16_t> arg_bg_mining_idle_threshold_percentage = {"bg-mining-idle-threshold", "Specify minimum avg idle percentage over lookback interval", miner::BACKGROUND_MINING_DEFAULT_IDLE_THRESHOLD_PERCENTAGE, true};
+ const command_line::arg_descriptor<uint16_t> arg_bg_mining_miner_target_percentage = {"bg-mining-miner-target", "Specificy maximum percentage cpu use by miner(s)", miner::BACKGROUND_MINING_DEFAULT_MINING_TARGET_PERCENTAGE, true};
}
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index c601c066c..4cfa52441 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -78,6 +78,7 @@ namespace cryptonote
m_last_json_checkpoints_update(0),
m_update_download(0)
{
+ m_checkpoints_updating.clear();
set_cryptonote_protocol(pprotocol);
}
void core::set_cryptonote_protocol(i_cryptonote_protocol* pprotocol)
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index ffb5b478b..33b1d4101 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -225,6 +225,7 @@ namespace cryptonote
meta.last_relayed_time = time(NULL);
meta.relayed = relayed;
meta.do_not_relay = do_not_relay;
+ memset(meta.padding, 0, sizeof(meta.padding));
try
{
CRITICAL_REGION_LOCAL1(m_blockchain);
@@ -261,6 +262,7 @@ namespace cryptonote
meta.last_relayed_time = time(NULL);
meta.relayed = relayed;
meta.do_not_relay = do_not_relay;
+ memset(meta.padding, 0, sizeof(meta.padding));
try
{
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp
index 1c9cd714d..5d8d95b03 100644
--- a/src/daemon/rpc_command_executor.cpp
+++ b/src/daemon/rpc_command_executor.cpp
@@ -369,6 +369,7 @@ bool t_rpc_command_executor::show_status() {
cryptonote::COMMAND_RPC_MINING_STATUS::request mreq;
cryptonote::COMMAND_RPC_MINING_STATUS::response mres;
epee::json_rpc::error error_resp;
+ bool has_mining_info = true;
std::string fail_message = "Problem fetching info";
@@ -384,10 +385,8 @@ bool t_rpc_command_executor::show_status() {
{
return true;
}
- if (!m_rpc_client->rpc_request(mreq, mres, "/mining_status", fail_message.c_str()))
- {
- return true;
- }
+ // mining info is only available non unrestricted RPC mode
+ has_mining_info = m_rpc_client->rpc_request(mreq, mres, "/mining_status", fail_message.c_str());
}
else
{
@@ -425,7 +424,7 @@ bool t_rpc_command_executor::show_status() {
% (unsigned long long)(ires.target_height >= ires.height ? ires.target_height : ires.height)
% get_sync_percentage(ires)
% (ires.testnet ? "testnet" : "mainnet")
- % (mining_busy ? "syncing" : mres.active ? ( ( mres.is_background_mining_enabled ? "smart " : "" ) + std::string("mining at ") + get_mining_speed(mres.speed) ) : "not mining")
+ % (!has_mining_info ? "mining info unavailable" : mining_busy ? "syncing" : mres.active ? ( ( mres.is_background_mining_enabled ? "smart " : "" ) + std::string("mining at ") + get_mining_speed(mres.speed) ) : "not mining")
% get_mining_speed(ires.difficulty / ires.target)
% (unsigned)hfres.version
% get_fork_extra_info(hfres.earliest_height, ires.height, ires.target)
@@ -966,7 +965,7 @@ bool t_rpc_command_executor::print_transaction_pool_stats() {
denom = n-1;
for (i=0; i<denom; i++)
times[i] = i * numer / denom;
- times[i] = res.pool_stats.oldest;
+ times[i] = now - res.pool_stats.oldest;
} else
{
numer = now - res.pool_stats.oldest;
diff --git a/src/daemonizer/posix_fork.cpp b/src/daemonizer/posix_fork.cpp
index 949c0f593..d9b4a6d0e 100644
--- a/src/daemonizer/posix_fork.cpp
+++ b/src/daemonizer/posix_fork.cpp
@@ -14,6 +14,10 @@
#include <string>
#include <sys/stat.h>
+#ifndef TMPDIR
+#define TMPDIR "/tmp"
+#endif
+
namespace posix {
namespace {
@@ -76,12 +80,16 @@ void fork()
}
// Send standard output to a log file.
- const char* output = "/tmp/bitmonero.daemon.stdout.stderr";
+ const char *tmpdir = getenv("TMPDIR");
+ if (!tmpdir)
+ tmpdir = TMPDIR;
+ std::string output = tmpdir;
+ output += "/bitmonero.daemon.stdout.stderr";
const int flags = O_WRONLY | O_CREAT | O_APPEND;
const mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
- if (open(output, flags, mode) < 0)
+ if (open(output.c_str(), flags, mode) < 0)
{
- quit("Unable to open output file: " + std::string(output));
+ quit("Unable to open output file: " + output);
}
// Also send standard error to the same log file.
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 6d5ebc25a..adf2fde80 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -65,8 +65,7 @@
#ifdef HAVE_READLINE
#include "readline_buffer.h"
#define PAUSE_READLINE() \
- rdln::suspend_readline pause_readline; \
- std::cout << std::endl
+ rdln::suspend_readline pause_readline;
#else
#define PAUSE_READLINE()
#endif
@@ -195,6 +194,7 @@ namespace
}
else
{
+ PAUSE_READLINE();
set_console_color(m_color, m_bright);
std::cout << m_oss.str();
reset_console_color();
@@ -2752,6 +2752,8 @@ bool simple_wallet::sweep_main(uint64_t below, const std::vector<std::string> &a
}
}
+ LOCK_IDLE_SCOPE();
+
try
{
// figure out what tx will be necessary
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-17 07:33:50 +0000