CPunch/gopenfusion
1
0
Fork 0
mirror of https://github.com/CPunch/gopenfusion.git synced 2024-11-14 12:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

SelectWithTimeout && WaitWithTImeout now use time.Duration

Browse Source
This commit is contained in:
CPunch 2023-12-01 20:23:27 -06:00
parent e33b7c0556
commit 899b95b4e6
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cnet/service_test.go
View File

@ -8,6 +8,7 @@ import (
"os" "os"
"sync" "sync"
"testing" "testing"
"time"
"github.com/CPunch/gopenfusion/cnet" "github.com/CPunch/gopenfusion/cnet"
"github.com/CPunch/gopenfusion/cnet/protocol" "github.com/CPunch/gopenfusion/cnet/protocol"
@ -20,7 +21,7 @@ var (
) )
const ( const (
timeout = 2 timeout = 2 * time.Second
maxDummyPeers = 5 maxDummyPeers = 5
) )

8
util/util.go
View File

@ -9,21 +9,21 @@ func GetTime() uint64 {
return uint64(time.Now().UnixMilli()) return uint64(time.Now().UnixMilli())
} }
func SelectWithTimeout(ch <-chan struct{}, seconds int) bool { func SelectWithTimeout(ch <-chan struct{}, timeout time.Duration) bool {
select { select {
case <-ch: case <-ch:
return true return true
case <-time.After(time.Duration(seconds) * time.Second): case <-time.After(timeout):
return false return false
} }
} }
func WaitWithTimeout(wg *sync.WaitGroup, seconds int) bool { func WaitWithTimeout(wg *sync.WaitGroup, timeout time.Duration) bool {
done := make(chan struct{}) done := make(chan struct{})
go func() { go func() {
defer close(done) defer close(done)
wg.Wait() wg.Wait()
}() }()
return SelectWithTimeout(done, seconds) return SelectWithTimeout(done, timeout)
} }

12
util/util_test.go
View File

@ -13,23 +13,23 @@ func TestWaitWithTimeout(t *testing.T) {
is := is.New(t) is := is.New(t)
wg := &sync.WaitGroup{} wg := &sync.WaitGroup{}
go func() { go func() {
time.Sleep(2 * time.Second) time.Sleep(1 * time.Second)
wg.Done() wg.Done()
}() }()
wg.Add(1) wg.Add(1)
is.True(!util.WaitWithTimeout(wg, 1)) // timeout should occur is.True(!util.WaitWithTimeout(wg, 500*time.Millisecond)) // timeout should occur
is.True(util.WaitWithTimeout(wg, 2)) // timeout shouldn't occur is.True(util.WaitWithTimeout(wg, 750*time.Millisecond)) // timeout shouldn't occur
} }
func TestSelectWithTimeout(t *testing.T) { func TestSelectWithTimeout(t *testing.T) {
is := is.New(t) is := is.New(t)
ch := make(chan struct{}) ch := make(chan struct{})
go func() { go func() {
time.Sleep(2 * time.Second) time.Sleep(1 * time.Second)
close(ch) close(ch)
}() }()
is.True(!util.SelectWithTimeout(ch, 1)) // timeout should occur is.True(!util.SelectWithTimeout(ch, 500*time.Millisecond)) // timeout should occur
is.True(util.SelectWithTimeout(ch, 2)) // timeout shouldn't occur is.True(util.SelectWithTimeout(ch, 750*time.Millisecond)) // timeout shouldn't occur
} }