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

Commit 625a2d6

committed

Address FileThreadPool race condition

I saw a couple ThreadErrors around popping from an empty queue in bugsnag: this got introduced when I moved away from catching all ThreadErrors. There's a race condition between checking that the queue is empty & attempting to pop from it. This change locks the pop operation with a mutex to prevent the race.

1 parent 67b9919 commit 625a2d6Copy full SHA for 625a2d6

File tree

1 file changed

-1

lines changed

lib/cc/engine/analyzers
- file_thread_pool.rb

1 file changed

-1

lines changed

`‎lib/cc/engine/analyzers/file_thread_pool.rb‎`

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\|`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 625a2d6

File tree

1 file changed

1 file changed

`‎lib/cc/engine/analyzers/file_thread_pool.rb‎`

0 commit comments