cryptonote-social/csminer
1
1
Fork 0
mirror of https://github.com/cryptonote-social/csminer.git synced 2024-09-11 05:35:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

make recent hashrate more accurate

Browse Source
This commit is contained in:
cryptonote-social 2020-08-16 11:54:06 -07:00
parent 3a15204dc0
commit 1803122a24
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
minerlib/minerlib.go
View File

@ -433,8 +433,8 @@ func GetMiningState() *GetMiningStateResponse {
if as > 0 {
isMining = true
}
s, recentSeconds := stats.GetSnapshot(isMining)
if recentSeconds > 10.0 && s.RecentHashrate < -1.0 {
s, secondsSinceReset := stats.GetSnapshot(isMining)
if secondsSinceReset > 10.0 && s.RecentHashrate < -1.0 {
// We have enough of a window to compute an accurate recent hashrate, so
// force the mining loop to do so for the next call.
pokeJobDispatcher(UPDATE_STATS_POKE)
@ -473,7 +473,8 @@ func pokeJobDispatcher(pokeMsg int) {
}
func printStats(isMining bool) {
s, _ := stats.GetSnapshot(isMining)
s, sec := stats.GetSnapshot(isMining)
crylog.Info("Recent hashrate computation window (seconds):", sec)
crylog.Info("=====================================")
//crylog.Info("Shares [accepted:rejected]:", s.SharesAccepted, ":", s.SharesRejected)
//crylog.Info("Hashes [client:pool]:", s.ClientSideHashes, ":", s.PoolSideHashes)

12
minerlib/stats/stats.go
View File

@ -43,6 +43,8 @@ func Init() {
lastUpdateTime = now
}
// Call whenever we're at at a point where recent hashrate calculation would be accurate,
// e.g. after all worker threads have been tallied.
func RecentStatsNowAccurate() {
lastUpdateTime = time.Now()
}
@ -93,7 +95,7 @@ type Snapshot struct {
SecondsOld int // how many seconds out of date the pool stats are
}
func GetSnapshot(isMining bool) (s *Snapshot, elapsedRecent float64) {
func GetSnapshot(isMining bool) (s *Snapshot, secondsSinceReset float64) {
mutex.Lock()
defer mutex.Unlock()
r := &Snapshot{}
@ -111,7 +113,7 @@ func GetSnapshot(isMining bool) (s *Snapshot, elapsedRecent float64) {
elapsedOverall = time.Now().Sub(startTime).Seconds()
}
// Recent stats are only accurate up to the last update time
elapsedRecent = lastUpdateTime.Sub(lastResetTime).Seconds()
elapsedRecent := lastUpdateTime.Sub(lastResetTime).Seconds()
if !isMining {
r.RecentHashrate = 0.0
@ -119,7 +121,9 @@ func GetSnapshot(isMining bool) (s *Snapshot, elapsedRecent float64) {
r.Hashrate = float64(clientSideHashes) / elapsedOverall
}
} else {
if elapsedRecent > 1.0 {
if elapsedRecent > 5.0 {
// For accurate results, we require at least 5 seconds of mining during the recent
// period in order to return a recent hashrate.
r.RecentHashrate = float64(recentHashes) / elapsedRecent
} else {
r.RecentHashrate = -1.0 // indicates not enough data
@ -140,7 +144,7 @@ func GetSnapshot(isMining bool) (s *Snapshot, elapsedRecent float64) {
r.TimeToReward = timeToReward
}
r.SecondsOld = int(time.Now().Sub(lastPoolUpdateTime).Seconds())
return r, elapsedRecent
return r, time.Now().Sub(lastResetTime).Seconds()
}
func RefreshPoolStats(username string) error {