status-im/torrent
2
0
Fork 0
mirror of synced 2025-02-24 22:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix race reordering tracker tier

Browse Source
This commit is contained in:
Matt Joiner 2014-11-29 20:33:45 -06:00
parent d68664d6c8
commit 336715874f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client.go
View File

@ -1496,7 +1496,7 @@ func (me *Client) addTorrent(t *torrent) (err error) {
} }
me.torrents[t.InfoHash] = t me.torrents[t.InfoHash] = t
if !me.disableTrackers { if !me.disableTrackers {
go me.announceTorrent(t) go me.announceTorrentTrackers(t)
} }
if me.dHT != nil { if me.dHT != nil {
go me.announceTorrentDHT(t, true) go me.announceTorrentDHT(t, true)
@ -1614,7 +1614,8 @@ func (cl *Client) announceTorrentDHT(t *torrent, impliedPort bool) {
} }
} }
func (cl *Client) announceTorrent(t *torrent) { // Announce torrent to its trackers.
func (cl *Client) announceTorrentTrackers(t *torrent) {
req := tracker.AnnounceRequest{ req := tracker.AnnounceRequest{
Event: tracker.Started, Event: tracker.Started,
NumWant: -1, NumWant: -1,
@ -1624,10 +1625,10 @@ func (cl *Client) announceTorrent(t *torrent) {
} }
newAnnounce: newAnnounce:
for cl.waitWantPeers(t) { for cl.waitWantPeers(t) {
cl.mu.Lock() cl.mu.RLock()
req.Left = t.BytesLeft() req.Left = t.BytesLeft()
trackers := t.Trackers trackers := t.Trackers
cl.mu.Unlock() cl.mu.RUnlock()
for _, tier := range trackers { for _, tier := range trackers {
for trIndex, tr := range tier { for trIndex, tr := range tier {
if err := tr.Connect(); err != nil { if err := tr.Connect(); err != nil {
@ -1652,7 +1653,14 @@ newAnnounce:
} else { } else {
log.Printf("%s: %d new peers from %s", t, len(peers), tr) log.Printf("%s: %d new peers from %s", t, len(peers), tr)
} }
// If the trackers list hasn't been touched (a new array would
// have been assigned), then float this tracker to the top of
// the tier.
cl.mu.Lock()
tier[0], tier[trIndex] = tier[trIndex], tier[0] tier[0], tier[trIndex] = tier[trIndex], tier[0]
cl.mu.Unlock()
time.Sleep(time.Second * time.Duration(resp.Interval)) time.Sleep(time.Second * time.Duration(resp.Interval))
req.Event = tracker.None req.Event = tracker.None
continue newAnnounce continue newAnnounce