yacloud/tunasync
1
0
Fork 0
mirror of https://github.com/tuna/tunasync.git synced 2025-04-21 04:42:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(worker): use write blocking for semaphore

Browse Source
This commit is contained in:
bigeagle 2016-04-24 17:02:49 +08:00
parent 6b05a5894e
commit 26b7ef9a9c
No known key found for this signature in database
GPG Key ID: 9171A4571C27920A
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worker/job.go
View File

@ -138,8 +138,8 @@ func runMirrorJob(provider mirrorProvider, ctrlChan <-chan ctrlAction, managerCh
runJob := func(kill <-chan empty, jobDone chan<- empty) { runJob := func(kill <-chan empty, jobDone chan<- empty) {
select { select {
case <-semaphore: case semaphore <- empty{}:
defer func() { semaphore <- empty{} }() defer func() { <-semaphore }()
runJobWrapper(kill, jobDone) runJobWrapper(kill, jobDone)
case <-kill: case <-kill:
jobDone <- empty{} jobDone <- empty{}

2
worker/job_test.go
View File

@ -66,7 +66,6 @@ func TestMirrorJob(t *testing.T) {
ctrlChan := make(chan ctrlAction) ctrlChan := make(chan ctrlAction)
managerChan := make(chan struct{}) managerChan := make(chan struct{})
semaphore := make(chan empty, 1) semaphore := make(chan empty, 1)
semaphore <- empty{}
go runMirrorJob(provider, ctrlChan, managerChan, semaphore) go runMirrorJob(provider, ctrlChan, managerChan, semaphore)
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {
@ -105,7 +104,6 @@ echo $TUNASYNC_WORKING_DIR
ctrlChan := make(chan ctrlAction) ctrlChan := make(chan ctrlAction)
managerChan := make(chan struct{}) managerChan := make(chan struct{})
semaphore := make(chan empty, 1) semaphore := make(chan empty, 1)
semaphore <- empty{}
Convey("If we kill it", func(ctx C) { Convey("If we kill it", func(ctx C) {
go runMirrorJob(provider, ctrlChan, managerChan, semaphore) go runMirrorJob(provider, ctrlChan, managerChan, semaphore)