diff options
| author | NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com> | 2014-06-16 03:32:09 -0700 |
|---|---|---|
| committer | NoodleDoodleNoodleDoodleNoodleDoodleNoo <xeven77@outlook.com> | 2014-06-16 03:32:09 -0700 |
| commit | 8fc42a21fc8ff4528c59e206b24d974982332964 (patch) | |
| tree | a0d9934ca8675afe4bbe5594f2b9694867eb73b6 /src/cryptonote_core/miner.cpp | |
| parent | 81cf5650c4c2576c74317b40a6ca57d07645a6f3 (diff) | |
| parent | 9853ba8e0636ba6f1043bb4f52caff19fe54c8ac (diff) | |
| download | monzero-core-8fc42a21fc8ff4528c59e206b24d974982332964.tar.gz monzero-core-8fc42a21fc8ff4528c59e206b24d974982332964.tar.xz monzero-core-8fc42a21fc8ff4528c59e206b24d974982332964.zip | |
Merge branch 'master' of https://github.com/monero-project/bitmonero
Diffstat (limited to 'src/cryptonote_core/miner.cpp')
| -rw-r--r-- | src/cryptonote_core/miner.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/cryptonote_core/miner.cpp b/src/cryptonote_core/miner.cpp index 56b459d6e..2055bb15d 100644 --- a/src/cryptonote_core/miner.cpp +++ b/src/cryptonote_core/miner.cpp @@ -188,10 +188,19 @@ namespace cryptonote return true; } //----------------------------------------------------------------------------------------------------- - bool miner::is_mining() + bool miner::is_mining() const { return !m_stop; } + //----------------------------------------------------------------------------------------------------- + const account_public_address& miner::get_mining_address() const + { + return m_mine_address; + } + //----------------------------------------------------------------------------------------------------- + uint32_t miner::get_threads_count() const { + return m_threads_total; + } //----------------------------------------------------------------------------------------------------- bool miner::start(const account_public_address& adr, size_t threads_count, const boost::thread::attributes& attrs) { @@ -226,12 +235,14 @@ namespace cryptonote return true; } //----------------------------------------------------------------------------------------------------- - uint64_t miner::get_speed() + uint64_t miner::get_speed() const { - if(is_mining()) + if(is_mining()) { return m_current_hash_rate; - else + } + else { return 0; + } } //----------------------------------------------------------------------------------------------------- void miner::send_stop_signal() |