kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2301

Browse source 
1249a2a5 Construct on first use for completion_commands (Jethro Grassie)
67dd4933 Add sync lock on stop (Jethro Grassie)
This commit is contained in:
Riccardo Spagni 2017-08-17 21:36:36 +02:00
parent 4859a00134 1249a2a550
commit 0d15fab49a
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
contrib/epee/include/readline_buffer.h
View file

@ -21,23 +21,15 @@ namespace rdln
} }
void get_line(std::string& line) const; void get_line(std::string& line) const;
void set_prompt(const std::string& prompt); void set_prompt(const std::string& prompt);
static void add_completion(const std::string& command) static void add_completion(const std::string& command);
{ static const std::vector<std::string>& get_completions();
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: protected:
virtual int sync(); virtual int sync();
private: private:
std::streambuf* m_cout_buf; std::streambuf* m_cout_buf;
static std::vector<std::string> completion_commands; static std::vector<std::string>& completion_commands();
}; };
class suspend_readline class suspend_readline

33
contrib/epee/src/readline_buffer.cpp
View file

@ -14,10 +14,8 @@ static void remove_line_handler();
static std::string last_line; static std::string last_line;
static std::string last_prompt; static std::string last_prompt;
std::mutex line_mutex, sync_mutex, process_mutex; static std::mutex line_mutex, sync_mutex, process_mutex;
std::condition_variable have_line; static std::condition_variable have_line;
std::vector<std::string> rdln::readline_buffer::completion_commands = {"exit"};
namespace namespace
{ {
@ -43,6 +41,12 @@ rdln::suspend_readline::~suspend_readline()
m_buffer->start(); m_buffer->start();
} }
std::vector<std::string>& rdln::readline_buffer::completion_commands()
{
static std::vector<std::string> commands = {"exit"};
return commands;
}
rdln::readline_buffer::readline_buffer() rdln::readline_buffer::readline_buffer()
: std::stringbuf(), m_cout_buf(NULL) : std::stringbuf(), m_cout_buf(NULL)
{ {
@ -61,7 +65,8 @@ void rdln::readline_buffer::start()
void rdln::readline_buffer::stop() void rdln::readline_buffer::stop()
{ {
std::unique_lock<std::mutex> lock(process_mutex); std::unique_lock<std::mutex> lock_process(process_mutex);
std::unique_lock<std::mutex> lock_sync(sync_mutex);
have_line.notify_all(); have_line.notify_all();
if(m_cout_buf == NULL) if(m_cout_buf == NULL)
return; return;
@ -87,6 +92,18 @@ void rdln::readline_buffer::set_prompt(const std::string& prompt)
rl_redisplay(); rl_redisplay();
} }
void rdln::readline_buffer::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);
}
const std::vector<std::string>& rdln::readline_buffer::get_completions()
{
return completion_commands();
}
int rdln::readline_buffer::process() int rdln::readline_buffer::process()
{ {
process_mutex.lock(); process_mutex.lock();
@ -152,9 +169,7 @@ static int process_input()
static void handle_line(char* line) static void handle_line(char* line)
{ {
// This function never gets called now as we are trapping newlines. free(line);
// However, it still needs to be present for readline to know we are
// manually handling lines.
rl_done = 1; rl_done = 1;
return; return;
} }
@ -166,6 +181,7 @@ static int handle_enter(int x, int y)
line = rl_copy_text(0, rl_end); line = rl_copy_text(0, rl_end);
std::string test_line = line; std::string test_line = line;
free(line);
boost::trim_right(test_line); boost::trim_right(test_line);
rl_crlf(); rl_crlf();
@ -191,7 +207,6 @@ static int handle_enter(int x, int y)
add_history(test_line.c_str()); add_history(test_line.c_str());
history_set_pos(history_length); history_set_pos(history_length);
} }
free(line);
if(last_line != "exit" && last_line != "q") if(last_line != "exit" && last_line != "q")
{ {