wesley/swiftui-math
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consolidate to use threadSafeQueue only.

Browse Source
This commit is contained in:
Peter Tang
2023-09-19 09:21:07 +08:00
parent 024468cddd
commit 73a56c3d93
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/SwiftMath/MathBundle/MathFont.swift
View File

@@ -77,7 +77,6 @@ private class BundleManager {
private var rawMathTables = [MathFont: NSDictionary]() private var rawMathTables = [MathFont: NSDictionary]()
private let threadSafeQueue = DispatchQueue(label: "com.smartmath.mathfont.threadsafequeue", attributes: .concurrent) private let threadSafeQueue = DispatchQueue(label: "com.smartmath.mathfont.threadsafequeue", attributes: .concurrent)
private let resourceLoadingQueue = DispatchQueue(label: "com.smartmath.mathfont.resourceLoader")
private func registerCGFont(mathFont: MathFont) throws { private func registerCGFont(mathFont: MathFont) throws {
guard let frameworkBundleURL = Bundle.module.url(forResource: "mathFonts", withExtension: "bundle"), guard let frameworkBundleURL = Bundle.module.url(forResource: "mathFonts", withExtension: "bundle"),
@@ -126,7 +125,7 @@ private class BundleManager {
private func onDemandRegistration(mathFont: MathFont) { private func onDemandRegistration(mathFont: MathFont) {
guard threadSafeQueue.sync(execute: { cgFonts[mathFont] }) == nil else { return } guard threadSafeQueue.sync(execute: { cgFonts[mathFont] }) == nil else { return }
// Note: resourceLoading is now serialized. // Note: resourceLoading is now serialized.
resourceLoadingQueue.sync { [weak self] in threadSafeQueue.sync(flags: .barrier, execute: { [weak self] in
if self?.cgFonts[mathFont] == nil { if self?.cgFonts[mathFont] == nil {
do { do {
try BundleManager.manager.registerCGFont(mathFont: mathFont) try BundleManager.manager.registerCGFont(mathFont: mathFont)
@@ -136,7 +135,7 @@ private class BundleManager {
fatalError("MTMathFonts:\(#function) ondemand loading failed, mathFont \(mathFont.rawValue), reason \(error)") fatalError("MTMathFonts:\(#function) ondemand loading failed, mathFont \(mathFont.rawValue), reason \(error)")
} }
} }
} })
} }
fileprivate func obtainCGFont(font: MathFont) -> CGFont { fileprivate func obtainCGFont(font: MathFont) -> CGFont {
onDemandRegistration(mathFont: font) onDemandRegistration(mathFont: font)