From e0260720675c3742c044bb3b5d705bc428daadcc Mon Sep 17 00:00:00 2001 From: YouROK <8yourok8@mail.ru> Date: Mon, 28 Dec 2020 12:41:09 +0300 Subject: [PATCH] change sync to detect deadlock --- src/server/settings/torrent.go | 2 +- src/server/torr/btserver.go | 2 +- src/server/torr/storage/torrstor/buffer.go | 2 +- src/server/torr/storage/torrstor/cache.go | 2 +- src/server/torr/storage/torrstor/piece.go | 2 +- src/server/torr/storage/torrstor/reader.go | 2 +- src/server/torr/storage/torrstor/storage.go | 2 +- src/server/torr/torrent.go | 3 ++- src/server/utils/prallel.go | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/server/settings/torrent.go b/src/server/settings/torrent.go index 809bef1..a7fbcdf 100644 --- a/src/server/settings/torrent.go +++ b/src/server/settings/torrent.go @@ -2,8 +2,8 @@ package settings import ( "encoding/json" + sync "github.com/sasha-s/go-deadlock" "sort" - "sync" "github.com/anacrolix/torrent" "github.com/anacrolix/torrent/metainfo" diff --git a/src/server/torr/btserver.go b/src/server/torr/btserver.go index e06db6c..4241af8 100644 --- a/src/server/torr/btserver.go +++ b/src/server/torr/btserver.go @@ -1,8 +1,8 @@ package torr import ( + sync "github.com/sasha-s/go-deadlock" "log" - "sync" "time" "server/settings" diff --git a/src/server/torr/storage/torrstor/buffer.go b/src/server/torr/storage/torrstor/buffer.go index 8373c9f..2bb58ff 100644 --- a/src/server/torr/storage/torrstor/buffer.go +++ b/src/server/torr/storage/torrstor/buffer.go @@ -2,7 +2,7 @@ package torrstor import ( "fmt" - "sync" + sync "github.com/sasha-s/go-deadlock" ) type buffer struct { diff --git a/src/server/torr/storage/torrstor/cache.go b/src/server/torr/storage/torrstor/cache.go index 6b23a49..d451b39 100644 --- a/src/server/torr/storage/torrstor/cache.go +++ b/src/server/torr/storage/torrstor/cache.go @@ -1,8 +1,8 @@ package torrstor import ( + sync "github.com/sasha-s/go-deadlock" "sort" - "sync" "github.com/anacrolix/torrent" "server/log" diff --git a/src/server/torr/storage/torrstor/piece.go b/src/server/torr/storage/torrstor/piece.go index ec7b361..2bb6ac5 100644 --- a/src/server/torr/storage/torrstor/piece.go +++ b/src/server/torr/storage/torrstor/piece.go @@ -2,8 +2,8 @@ package torrstor import ( "errors" + sync "github.com/sasha-s/go-deadlock" "io" - "sync" "time" "github.com/anacrolix/torrent/storage" diff --git a/src/server/torr/storage/torrstor/reader.go b/src/server/torr/storage/torrstor/reader.go index dd6b803..5219859 100644 --- a/src/server/torr/storage/torrstor/reader.go +++ b/src/server/torr/storage/torrstor/reader.go @@ -1,8 +1,8 @@ package torrstor import ( + sync "github.com/sasha-s/go-deadlock" "io" - "sync" "github.com/anacrolix/torrent" "server/log" diff --git a/src/server/torr/storage/torrstor/storage.go b/src/server/torr/storage/torrstor/storage.go index a744715..1a1b379 100644 --- a/src/server/torr/storage/torrstor/storage.go +++ b/src/server/torr/storage/torrstor/storage.go @@ -1,7 +1,7 @@ package torrstor import ( - "sync" + sync "github.com/sasha-s/go-deadlock" "server/torr/storage" diff --git a/src/server/torr/torrent.go b/src/server/torr/torrent.go index 7463ca1..5e3b094 100644 --- a/src/server/torr/torrent.go +++ b/src/server/torr/torrent.go @@ -5,9 +5,10 @@ import ( "fmt" "io" "sort" - "sync" "time" + sync "github.com/sasha-s/go-deadlock" + "server/log" "server/settings" "server/torr/state" diff --git a/src/server/utils/prallel.go b/src/server/utils/prallel.go index bba4311..3a54752 100644 --- a/src/server/utils/prallel.go +++ b/src/server/utils/prallel.go @@ -1,7 +1,7 @@ package utils import ( - "sync" + sync "github.com/sasha-s/go-deadlock" ) func ParallelFor(begin, end int, fn func(i int)) {