Commit9072c6f

committed

Fix join after task-done with no get

Also shut down before put-join in shutdown-put-join tests. Also remove indent

1 parent3570bd8 commit9072c6fCopy full SHA for 9072c6f

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ def shutdown(self, immediate=False):`
`241`	`241`	`n_items=self._qsize()`
`242`	`242`	`whileself._qsize():`
`243`	`243`	`self._get()`
`244`		`-self.unfinished_tasks-=n_items`
	`244`	`+self.unfinished_tasks=max(self.unfinished_tasks-n_items,0)`
`245`	`245`	`self.not_empty.notify_all()`
`246`	`246`	# release all blocked threads in `join()`
`247`	`247`	`self.all_tasks_done.notify_all()`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -575,14 +575,13 @@ def _shutdown_put_join(self, immediate):`
`575`	`575`	`forfunc,paramsinthrds:`
`576`	`576`	`threads.append(threading.Thread(target=func,args=params))`
`577`	`577`	`threads[-1].start()`
`578`		`-ifnotimmediateorimmediate:# TODO: dedent (minimising Git diff)`
`579`		`-self.assertEqual(q.unfinished_tasks,nb)`
`580`		`-foriinrange(nb):`
`581`		`-t=threading.Thread(target=q.task_done)`
`582`		`-t.start()`
`583`		`-threads.append(t)`
`584`		`-go.set()`
	`578`	`+self.assertEqual(q.unfinished_tasks,nb)`
	`579`	`+foriinrange(nb):`
	`580`	`+t=threading.Thread(target=q.task_done)`
	`581`	`+t.start()`
	`582`	`+threads.append(t)`
`585`	`583`	`q.shutdown(immediate)`
	`584`	`+go.set()`
`586`	`585`	`fortinthreads:`
`587`	`586`	`t.join()`
`588`	`587`

Comments

(0)