Commit2cc20dd

Alex Belozierov

committed

- refactor and fix bug with deinitiallization in PThreadPool

1 parentf2bd619 commit2cc20ddCopy full SHA for 2cc20dd

File tree

+10

-9

lines changed

+10

-9

lines changed

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,21 +16,18 @@ class PThreadPool {`
`16`	`16`	`privatevarqueue=FifoQueue<Block>()`
`17`	`17`
`18`	`18`	`init(count:Int){`
`19`		`-letgroup=PDispatchGroup(count: count)`
`20`	`19`	`weakvarpool:PThreadPool?`
`21`	`20`	`threads=(0..<count).map{ _in`
`22`	`21`	`PThread{`
`23`		`- group.leave()`
`24`		`- pool?.condition.lock()`
`25`		`-whilelet condition= pool?.condition{`
`26`		`- condition.wait()`
`27`		`- pool?.runloop()`
`28`		`-}`
	`22`	`+guardlet condition= pool?.conditionelse{return}`
	`23`	`+ condition.lock()`
	`24`	`+ condition.wait(while: pool?.runLoop()!=nil)`
	`25`	`+ condition.signal()`
	`26`	`+ condition.unlock()`
`29`	`27`	`}`
`30`	`28`	`}`
`31`	`29`	`pool=self`
`32`	`30`	`threads.forEach{ $0.start()}`
`33`		`- group.wait()`
`34`	`31`	`}`
`35`	`32`
`36`	`33`	`@inlinablevarthreadCount:Int{`
`@@ -39,7 +36,7 @@ class PThreadPool {`
`39`	`36`
`40`	`37`	`// MARK: - RunLoop`
`41`	`38`
`42`		`-privatefuncrunloop(){`
	`39`	`+privatefuncrunLoop(){`
`43`	`40`	`whilelet block= queue.pop(){`
`44`	`41`	`condition.unlock()`
`45`	`42`	`block()`
`@@ -67,4 +64,8 @@ class PThreadPool {`
`67`	`64`	`condition.unlock()`
`68`	`65`	`}`
`69`	`66`
	`67`	`+deinit{`
	`68`	`+ condition.broadcast()`
	`69`	`+}`
	`70`	`+`
`70`	`71`	`}`

Comments

(0)