Shikong/Clash.Meta
1
0
Fork 0
mirror of https://gitclone.com/github.com/MetaCubeX/Clash.Meta synced 2024-11-14 21:31:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: adjust batch

Browse Source
This commit is contained in:
Dreamacro 2021-07-23 00:30:23 +08:00
parent 4578b2c826
commit 09697b7679
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adapter/provider/healthcheck.go
View File

@ -59,7 +59,7 @@ func (hc *HealthCheck) touch() {
}
func (hc *HealthCheck) check() {
b := batch.New(batch.WithConcurrencyNum(10))
b, _ := batch.New(context.Background(), batch.WithConcurrencyNum(10))
for _, proxy := range hc.proxies {
p := proxy
b.Go(p.Name(), func() (interface{}, error) {

12
common/batch/batch.go
View File

@ -89,7 +89,9 @@ func (b *Batch) Result() map[string]Result {
return copy
}
func New(opts ...Option) *Batch {
func New(ctx context.Context, opts ...Option) (*Batch, context.Context) {
ctx, cancel := context.WithCancel(ctx)
b := &Batch{
result: map[string]Result{},
}
@ -98,14 +100,6 @@ func New(opts ...Option) *Batch {
o(b)
}
return b
}
func WithContext(ctx context.Context, opts ...Option) (*Batch, context.Context) {
ctx, cancel := context.WithCancel(ctx)
b := New(opts...)
b.cancel = cancel
return b, ctx
}

7
common/batch/batch_test.go
View File

@ -11,7 +11,7 @@ import (
)
func TestBatch(t *testing.T) {
b := New()
b, _ := New(context.Background())
now := time.Now()
b.Go("foo", func() (interface{}, error) {
@ -37,7 +37,8 @@ func TestBatch(t *testing.T) {
}
func TestBatchWithConcurrencyNum(t *testing.T) {
b := New(
b, _ := New(
context.Background(),
WithConcurrencyNum(3),
)
@ -61,7 +62,7 @@ func TestBatchWithConcurrencyNum(t *testing.T) {
}
func TestBatchContext(t *testing.T) {
b, ctx := WithContext(context.Background())
b, ctx := New(context.Background())
b.Go("error", func() (interface{}, error) {
time.Sleep(time.Millisecond * 100)