This repository was archived by the owner on Jul 19, 2025. It is now read-only.

Commit 2974c08

committed

Merge pull request #69 from codeclimate/will/thread-pool-race

Address FileThreadPool race condition

2 parents 67b9919 + 625a2d6 commit 2974c08Copy full SHA for 2974c08

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,11 @@ def initialize(files, concurrency: DEFAULT_CONCURRENCY)`
`14`	`14`
`15`	`15`	`def run(&block)`
`16`	`16`	`queue = build_queue`
	`17`	`+ lock = Mutex.new`
`17`	`18`
`18`	`19`	`@workers = thread_count.times.map do`
`19`	`20`	`Thread.new do`
`20`		`- while !queue.empty? && (item = queue.pop(true))`
	`21`	`+ while (item = next_item(queue,lock))`
`21`	`22`	`yield item`
`22`	`23`	`end`
`23`	`24`	`end`
`@@ -32,6 +33,10 @@ def join`
`32`	`33`
`33`	`34`	`attr_reader :files, :concurrency, :workers`
`34`	`35`
	`36`	`+ def next_item(queue, lock)`
	`37`	`+ lock.synchronize { queue.pop(true) unless queue.empty? }`
	`38`	`+ end`
	`39`	`+`
`35`	`40`	`def build_queue`
`36`	`41`	`Queue.new.tap do \|queue\|`
`37`	`42`	`files.each do \|file\|`

Comments

(0)