NotificationsYou must be signed in to change notification settings
Fork4
Star23

Commitf2bd619

Alex Belozierov

committed

- refactor PThreadPool

- fix deinitialization of PThreadPool

1 parent8d2c7c4 commitf2bd619Copy full SHA for f2bd619

File tree

3 files changed

+23

-39

lines changed

PosixDispatch
- DispatchQueue
  - PDispatchConcurrentQueue.swift
  - PDispatchQueue.swift
- PThreadPool.swift

3 files changed

+23

-39

lines changed

`‎PosixDispatch/DispatchQueue/PDispatchConcurrentQueue.swift‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class PDispatchConcurrentQueue: PDispatchQueueBackend {`
`33`	`33`	`privateletthreadPool:PThreadPool`
`34`	`34`
`35`	`35`	`privatefunc performAsync(){`
`36`		`- threadPool.async(block: asyncBlock)`
	`36`	`+ threadPool.perform(block: asyncBlock)`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`privatefunc asyncBlock(){`

`‎PosixDispatch/DispatchQueue/PDispatchQueue.swift‎`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,9 @@ class PDispatchQueue: PDispatchQueueBackend {`
`53`	`53`
`54`	`54`	`staticfunc concurrentPerform(iterations:Int, execute work:@escaping(Int)->Void){`
`55`	`55`	`letgroup=PDispatchGroup(count: iterations)`
`56`		`-letblocks=(0..<iterations).map{ iin{work(i); group.leave()}}`
`57`	`56`	`letpool=PThreadPool(count:Sysconf.processorsNumber)`
`58`		`- pool.async(blocks:blocks)`
	`57`	`+ pool.perform(blocks:(0..<iterations).map{ iin{work(i); group.leave()}})`
`59`	`58`	`group.wait()`
`60`		`- // pool.deallocate() //fix crash`
`61`	`59`	`}`
`62`	`60`
`63`	`61`	`}`

`‎PosixDispatch/PThreadPool.swift‎`

Lines changed: 21 additions & 35 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,24 +8,29 @@`
`8`	`8`
`9`	`9`	`classPThreadPool{`
`10`	`10`
`11`		`-typealiasBlock=()->Void`
	`11`	`+typealiasBlock=PThread.Block`
`12`	`12`
`13`	`13`	`staticletglobal=PThreadPool(count:64)`
	`14`	`+`
`14`	`15`	`privateletthreads:[PThread],condition=PCondition()`
`15`	`16`	`privatevarqueue=FifoQueue<Block>()`
`16`		`-privatevarperform=true`
`17`	`17`
`18`	`18`	`init(count:Int){`
`19`		`- unownedvarpool:PThreadPool!`
`20`		`-varstarted=0`
`21`		`- threads=(0..<count).map{ _inPThread{ pool.threadBlock(started:&started)}}`
	`19`	`+letgroup=PDispatchGroup(count: count)`
	`20`	`+ weakvarpool:PThreadPool?`
	`21`	`+ threads=(0..<count).map{ _in`
	`22`	`+PThread{`
	`23`	`+ group.leave()`
	`24`	`+ pool?.condition.lock()`
	`25`	`+whilelet condition= pool?.condition{`
	`26`	`+ condition.wait()`
	`27`	`+ pool?.runloop()`
	`28`	`+}`
	`29`	`+}`
	`30`	`+}`
`22`	`31`	`pool=self`
`23`	`32`	`threads.forEach{ $0.start()}`
`24`		`-waitStart(started: started)`
`25`		`-}`
`26`		`-`
`27`		`-privatefunc waitStart(started:@autoclosure()->Int){`
`28`		`- condition.lockedPerform{ condition.wait(while:started()!= threads.count)}`
	`33`	`+ group.wait()`
`29`	`34`	`}`
`30`	`35`
`31`	`36`	`@inlinablevarthreadCount:Int{`
`@@ -34,36 +39,24 @@ class PThreadPool {`
`34`	`39`
`35`	`40`	`// MARK: - RunLoop`
`36`	`41`
`37`		`-privatefunc threadBlock(started:inoutInt){`
`38`		`- condition.lock()`
`39`		`- started+=1`
`40`		`- condition.broadcast()`
`41`		`- condition.wait(while: started!= threads.count)`
`42`		`-runloop()`
`43`		`-}`
`44`		`-`
`45`	`42`	`privatefunc runloop(){`
`46`		`-while perform{`
`47`		`- condition.wait()`
`48`		`-whilelet block= queue.pop(){`
`49`		`- condition.unlock()`
`50`		`-block()`
`51`		`- condition.lock()`
`52`		`-}`
	`43`	`+whilelet block= queue.pop(){`
	`44`	`+ condition.unlock()`
	`45`	`+block()`
	`46`	`+ condition.lock()`
`53`	`47`	`}`
`54`		`- condition.unlock()`
`55`	`48`	`}`
`56`	`49`
`57`	`50`	`// MARK: - Perfrom Block`
`58`	`51`
`59`		`-funcasync(blocks:[Block]){`
	`52`	`+funcperform(blocks:[Block]){`
`60`	`53`	`condition.lock()`
`61`	`54`	`queue.push(blocks)`
`62`	`55`	`condition.broadcast()`
`63`	`56`	`condition.unlock()`
`64`	`57`	`}`
`65`	`58`
`66`		`-funcasync(block:@escapingBlock){`
	`59`	`+funcperform(block:@escapingBlock){`
`67`	`60`	`condition.lock()`
`68`	`61`	`if queue.isEmpty{`
`69`	`62`	`queue.push(block)`
`@@ -74,11 +67,4 @@ class PThreadPool {`
`74`	`67`	`condition.unlock()`
`75`	`68`	`}`
`76`	`69`
`77`		`-func deallocate(){`
`78`		`- condition.lock()`
`79`		`- perform=false`
`80`		`- condition.broadcast()`
`81`		`- condition.unlock()`
`82`		`-}`
`83`		`-`
`84`	`70`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf2bd619

File tree

3 files changed

3 files changed

`‎PosixDispatch/DispatchQueue/PDispatchConcurrentQueue.swift‎`

`‎PosixDispatch/DispatchQueue/PDispatchQueue.swift‎`

`‎PosixDispatch/PThreadPool.swift‎`

0 commit comments