diff options
| author | Dion Ahmetaj <Dion Ahmetaj> | 2017-02-07 10:55:49 -0500 |
|---|---|---|
| committer | Dion Ahmetaj <Dion Ahmetaj> | 2017-02-10 18:07:42 -0500 |
| commit | e4dfd2fb6345c1d212ca3706254faa988948beb3 (patch) | |
| tree | c313ecfc19bee7950f5bca5c63eda1482cde04ac | |
| parent | Use defined directive to silence pre-proc warnings. (diff) | |
| download | monero-e4dfd2fb6345c1d212ca3706254faa988948beb3.tar.xz | |
Changed ac_line_status to on_battery_power.
| -rw-r--r-- | src/cryptonote_basic/miner.cpp | 10 | ||||
| -rw-r--r-- | src/cryptonote_basic/miner.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/cryptonote_basic/miner.cpp b/src/cryptonote_basic/miner.cpp index 92be4dfec..145cb185f 100644 --- a/src/cryptonote_basic/miner.cpp +++ b/src/cryptonote_basic/miner.cpp @@ -575,7 +575,7 @@ namespace cryptonote continue; // if interrupted because stop called, loop should end .. } - bool on_ac_power = ac_line_status(); + bool on_ac_power = !on_battery_power(); if( m_is_background_mining_started ) { @@ -642,7 +642,7 @@ namespace cryptonote uint64_t total_diff = (current_total_time - prev_total_time); uint64_t idle_diff = (current_idle_time - prev_idle_time); uint8_t idle_percentage = get_percent_of_total(idle_diff, total_diff); - bool on_ac_power = ac_line_status(); + MGINFO("idle percentage is " << unsigned(idle_percentage)); if( idle_percentage >= get_idle_threshold() && on_ac_power ) { @@ -763,14 +763,14 @@ namespace cryptonote return (uint8_t)( ceil( (other * 1.f / total * 1.f) * 100) ); } //----------------------------------------------------------------------------------------------------- - bool miner::ac_line_status() + bool miner::on_battery_power() { #ifdef _WIN32 SYSTEM_POWER_STATUS power_status; if ( GetSystemPowerStatus( &power_status ) != 0 ) { - return power_status.ACLineStatus == 1; + return power_status.ACLineStatus != 1; } #elif defined(__linux__) @@ -792,7 +792,7 @@ namespace cryptonote return false; } - return power_stream.get() == '1'; + return power_stream.get() != '1'; #endif diff --git a/src/cryptonote_basic/miner.h b/src/cryptonote_basic/miner.h index dae8b4b63..7c81f1be0 100644 --- a/src/cryptonote_basic/miner.h +++ b/src/cryptonote_basic/miner.h @@ -164,6 +164,6 @@ namespace cryptonote static bool get_system_times(uint64_t& total_time, uint64_t& idle_time); static bool get_process_time(uint64_t& total_time); static uint8_t get_percent_of_total(uint64_t some_time, uint64_t total_time); - static bool ac_line_status(); // true = plugged in, else nope + static bool on_battery_power(); }; } |