#341 Added option --dry-run.
This commit is contained in:
parent
56ffa7af79
commit
631fd755c8
4 changed files with 34 additions and 9 deletions
26
src/App.cpp
26
src/App.cpp
|
@ -130,6 +130,13 @@ int App::exec()
|
||||||
Mem::allocate(m_options->algo(), m_options->threads(), m_options->doubleHash(), m_options->hugePages());
|
Mem::allocate(m_options->algo(), m_options->threads(), m_options->doubleHash(), m_options->hugePages());
|
||||||
Summary::print();
|
Summary::print();
|
||||||
|
|
||||||
|
if (m_options->dryRun()) {
|
||||||
|
LOG_NOTICE("OK");
|
||||||
|
release();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
# ifndef XMRIG_NO_API
|
# ifndef XMRIG_NO_API
|
||||||
Api::start();
|
Api::start();
|
||||||
# endif
|
# endif
|
||||||
|
@ -146,12 +153,7 @@ int App::exec()
|
||||||
const int r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
|
const int r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
|
||||||
uv_loop_close(uv_default_loop());
|
uv_loop_close(uv_default_loop());
|
||||||
|
|
||||||
delete m_network;
|
release();
|
||||||
|
|
||||||
Options::release();
|
|
||||||
Mem::release();
|
|
||||||
Platform::release();
|
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -200,6 +202,18 @@ void App::close()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void App::release()
|
||||||
|
{
|
||||||
|
if (m_network) {
|
||||||
|
delete m_network;
|
||||||
|
}
|
||||||
|
|
||||||
|
Options::release();
|
||||||
|
Mem::release();
|
||||||
|
Platform::release();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void App::onSignal(uv_signal_t *handle, int signum)
|
void App::onSignal(uv_signal_t *handle, int signum)
|
||||||
{
|
{
|
||||||
switch (signum)
|
switch (signum)
|
||||||
|
|
|
@ -51,6 +51,7 @@ protected:
|
||||||
private:
|
private:
|
||||||
void background();
|
void background();
|
||||||
void close();
|
void close();
|
||||||
|
void release();
|
||||||
|
|
||||||
static void onSignal(uv_signal_t *handle, int signum);
|
static void onSignal(uv_signal_t *handle, int signum);
|
||||||
|
|
||||||
|
|
|
@ -101,12 +101,16 @@ static char const short_options[] = "a:c:khBp:Px:r:R:s:t:T:o:u:O:v:Vl:S";
|
||||||
|
|
||||||
static struct option const options[] = {
|
static struct option const options[] = {
|
||||||
{ "algo", 1, nullptr, 'a' },
|
{ "algo", 1, nullptr, 'a' },
|
||||||
|
{ "api-access-token", 1, nullptr, 4001 },
|
||||||
|
{ "api-port", 1, nullptr, 4000 },
|
||||||
|
{ "api-worker-id", 1, nullptr, 4002 },
|
||||||
{ "av", 1, nullptr, 'v' },
|
{ "av", 1, nullptr, 'v' },
|
||||||
{ "background", 0, nullptr, 'B' },
|
{ "background", 0, nullptr, 'B' },
|
||||||
{ "config", 1, nullptr, 'c' },
|
{ "config", 1, nullptr, 'c' },
|
||||||
{ "cpu-affinity", 1, nullptr, 1020 },
|
{ "cpu-affinity", 1, nullptr, 1020 },
|
||||||
{ "cpu-priority", 1, nullptr, 1021 },
|
{ "cpu-priority", 1, nullptr, 1021 },
|
||||||
{ "donate-level", 1, nullptr, 1003 },
|
{ "donate-level", 1, nullptr, 1003 },
|
||||||
|
{ "dry-run", 0, nullptr, 5000 },
|
||||||
{ "help", 0, nullptr, 'h' },
|
{ "help", 0, nullptr, 'h' },
|
||||||
{ "keepalive", 0, nullptr ,'k' },
|
{ "keepalive", 0, nullptr ,'k' },
|
||||||
{ "log-file", 1, nullptr, 'l' },
|
{ "log-file", 1, nullptr, 'l' },
|
||||||
|
@ -126,9 +130,6 @@ static struct option const options[] = {
|
||||||
{ "user-agent", 1, nullptr, 1008 },
|
{ "user-agent", 1, nullptr, 1008 },
|
||||||
{ "userpass", 1, nullptr, 'O' },
|
{ "userpass", 1, nullptr, 'O' },
|
||||||
{ "version", 0, nullptr, 'V' },
|
{ "version", 0, nullptr, 'V' },
|
||||||
{ "api-port", 1, nullptr, 4000 },
|
|
||||||
{ "api-access-token", 1, nullptr, 4001 },
|
|
||||||
{ "api-worker-id", 1, nullptr, 4002 },
|
|
||||||
{ 0, 0, 0, 0 }
|
{ 0, 0, 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -141,6 +142,7 @@ static struct option const config_options[] = {
|
||||||
{ "cpu-affinity", 1, nullptr, 1020 },
|
{ "cpu-affinity", 1, nullptr, 1020 },
|
||||||
{ "cpu-priority", 1, nullptr, 1021 },
|
{ "cpu-priority", 1, nullptr, 1021 },
|
||||||
{ "donate-level", 1, nullptr, 1003 },
|
{ "donate-level", 1, nullptr, 1003 },
|
||||||
|
{ "dry-run", 0, nullptr, 5000 },
|
||||||
{ "huge-pages", 0, nullptr, 1009 },
|
{ "huge-pages", 0, nullptr, 1009 },
|
||||||
{ "log-file", 1, nullptr, 'l' },
|
{ "log-file", 1, nullptr, 'l' },
|
||||||
{ "max-cpu-usage", 1, nullptr, 1004 },
|
{ "max-cpu-usage", 1, nullptr, 1004 },
|
||||||
|
@ -205,6 +207,7 @@ Options::Options(int argc, char **argv) :
|
||||||
m_background(false),
|
m_background(false),
|
||||||
m_colors(true),
|
m_colors(true),
|
||||||
m_doubleHash(false),
|
m_doubleHash(false),
|
||||||
|
m_dryRun(false),
|
||||||
m_hugePages(true),
|
m_hugePages(true),
|
||||||
m_ready(false),
|
m_ready(false),
|
||||||
m_safe(false),
|
m_safe(false),
|
||||||
|
@ -384,6 +387,7 @@ bool Options::parseArg(int key, const char *arg)
|
||||||
case 'S': /* --syslog */
|
case 'S': /* --syslog */
|
||||||
case 1005: /* --safe */
|
case 1005: /* --safe */
|
||||||
case 1006: /* --nicehash */
|
case 1006: /* --nicehash */
|
||||||
|
case 5000: /* --dry-run */
|
||||||
return parseBoolean(key, true);
|
return parseBoolean(key, true);
|
||||||
|
|
||||||
case 1002: /* --no-color */
|
case 1002: /* --no-color */
|
||||||
|
@ -557,6 +561,10 @@ bool Options::parseBoolean(int key, bool enable)
|
||||||
m_colors = enable;
|
m_colors = enable;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 5000: /* --dry-run */
|
||||||
|
m_dryRun = enable;
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,6 +59,7 @@ public:
|
||||||
inline bool background() const { return m_background; }
|
inline bool background() const { return m_background; }
|
||||||
inline bool colors() const { return m_colors; }
|
inline bool colors() const { return m_colors; }
|
||||||
inline bool doubleHash() const { return m_doubleHash; }
|
inline bool doubleHash() const { return m_doubleHash; }
|
||||||
|
inline bool dryRun() const { return m_dryRun; }
|
||||||
inline bool hugePages() const { return m_hugePages; }
|
inline bool hugePages() const { return m_hugePages; }
|
||||||
inline bool syslog() const { return m_syslog; }
|
inline bool syslog() const { return m_syslog; }
|
||||||
inline const char *apiToken() const { return m_apiToken; }
|
inline const char *apiToken() const { return m_apiToken; }
|
||||||
|
@ -110,6 +111,7 @@ private:
|
||||||
bool m_background;
|
bool m_background;
|
||||||
bool m_colors;
|
bool m_colors;
|
||||||
bool m_doubleHash;
|
bool m_doubleHash;
|
||||||
|
bool m_dryRun;
|
||||||
bool m_hugePages;
|
bool m_hugePages;
|
||||||
bool m_ready;
|
bool m_ready;
|
||||||
bool m_safe;
|
bool m_safe;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue