mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2024-12-22 11:41:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reduce mutex-contention in downloader.ReCalcStats (#9044)

Browse Source
This commit is contained in:
Alex Sharov 2023-12-21 11:00:03 +07:00 committed by GitHub
parent 56c5f656d0
commit 1499fbb582
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
erigon-lib/downloader/downloader.go
View File

@ -334,13 +334,13 @@ func (d *Downloader) mainLoop(silent bool) error {
func (d *Downloader) SnapDir() string { return d.cfg.Dirs.Snap }
func (d *Downloader) ReCalcStats(interval time.Duration) {
d.statsLock.Lock()
defer d.statsLock.Unlock()
//Call this methods outside of `statsLock` critical section, because they have own locks with contention
torrents := d.torrentClient.Torrents()
connStats := d.torrentClient.ConnStats()
peers := make(map[torrent.PeerID]struct{}, 16)
d.statsLock.Lock()
defer d.statsLock.Unlock()
prevStats, stats := d.stats, d.stats
stats.Completed = true
@ -356,25 +356,31 @@ func (d *Downloader) ReCalcStats(interval time.Duration) {
select {
case <-t.GotInfo():
stats.MetadataReady++
// call methods once - to reduce internal mutex contention
peersOfThisFile := t.PeerConns()
weebseedPeersOfThisFile := t.WebseedPeerConns()
bytesCompleted := t.BytesCompleted()
tLen := t.Length()
torrentName := t.Name()
for _, peer := range peersOfThisFile {
stats.ConnectionsTotal++
peers[peer.PeerID] = struct{}{}
}
stats.BytesCompleted += uint64(t.BytesCompleted())
stats.BytesTotal += uint64(t.Length())
stats.BytesCompleted += uint64(bytesCompleted)
stats.BytesTotal += uint64(tLen)
progress := float32(float64(100) * (float64(t.BytesCompleted()) / float64(t.Length())))
progress := float32(float64(100) * (float64(bytesCompleted) / float64(tLen)))
if progress == 0 {
zeroProgress = append(zeroProgress, t.Name())
zeroProgress = append(zeroProgress, torrentName)
}
webseedRates, websRates := getWebseedsRatesForlogs(weebseedPeersOfThisFile, t.Name())
rates, peersRates := getPeersRatesForlogs(peersOfThisFile, t.Name())
webseedRates, websRates := getWebseedsRatesForlogs(weebseedPeersOfThisFile, torrentName)
rates, peersRates := getPeersRatesForlogs(peersOfThisFile, torrentName)
// more detailed statistic: download rate of each peer (for each file)
if !t.Complete.Bool() && progress != 0 {
d.logger.Log(d.verbosity, "[snapshots] progress", "file", t.Name(), "progress", fmt.Sprintf("%.2f%%", progress), "peers", len(peersOfThisFile), "webseeds", len(weebseedPeersOfThisFile))
d.logger.Log(d.verbosity, "[snapshots] progress", "file", torrentName, "progress", fmt.Sprintf("%.2f%%", progress), "peers", len(peersOfThisFile), "webseeds", len(weebseedPeersOfThisFile))
d.logger.Log(d.verbosity, "[snapshots] webseed peers", webseedRates...)
d.logger.Log(d.verbosity, "[snapshots] bittorrent peers", rates...)
}
@ -382,9 +388,9 @@ func (d *Downloader) ReCalcStats(interval time.Duration) {
isDiagEnabled := diagnostics.TypeOf(diagnostics.SegmentDownloadStatistics{}).Enabled()
if isDiagEnabled {
diagnostics.Send(diagnostics.SegmentDownloadStatistics{
Name: t.Name(),
TotalBytes: uint64(t.Length()),
DownloadedBytes: uint64(t.BytesCompleted()),
Name: torrentName,
TotalBytes: uint64(tLen),
DownloadedBytes: uint64(bytesCompleted),
WebseedsCount: len(weebseedPeersOfThisFile),
PeersCount: len(peersOfThisFile),
WebseedsRate: websRates,