xi-editor/xi-mac
1
1
Fork 0
mirror of https://github.com/xi-editor/xi-mac.git synced 2024-10-05 19:49:12 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Retry semaphore wait when lines are still missing"

Browse Source 
This reverts commit 069a50b893.

As mentioned in PR review comments, this change adds to complexity
without noticeably improving results. It also matches my observation
that a second time through the loop is very rare.
This commit is contained in:
Raph Levien 2017-12-29 10:14:19 -08:00
parent 069a50b893
commit 5d1e4b5906
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
XiEditor/LineCache.swift
View File

@ -240,30 +240,20 @@ class LineCacheLocked {
}
func blockingGet(lines lineRange: LineRange) -> [Line?] {
var deadline: DispatchTime? = nil
var lines = inner.linesForRange(range: lineRange)
var count = 0
while true {
let missingLines = lineRange.enumerated()
.filter( { lines.count > $0.offset && lines[$0.offset] == nil })
.map( { $0.element })
if missingLines.isEmpty {
break
}
if deadline == nil {
deadline = .now() + .milliseconds(MAX_BLOCK_MS)
} else if .now() > deadline! {
break
}
let lines = inner.linesForRange(range: lineRange)
let missingLines = lineRange.enumerated()
.filter( { lines.count > $0.offset && lines[$0.offset] == nil })
.map( { $0.element })
if !missingLines.isEmpty {
// TODO: should we send request to core?
print("waiting for lines: (\(missingLines.first!), \(missingLines.last!)) \(count)")
print("waiting for lines: (\(missingLines.first!), \(missingLines.last!))")
//TODO: this timing + printing code can come out
// when we're comfortable with the performance and
// the timeout duration
let blockTime = mach_absolute_time()
inner.isWaiting = true
inner.unlock()
let waitResult = inner.waitingForLines.wait(timeout: deadline!)
let waitResult = inner.waitingForLines.wait(timeout: .now() + .milliseconds(MAX_BLOCK_MS))
inner.lock()
let elapsed = mach_absolute_time() - blockTime
@ -279,11 +269,9 @@ class LineCacheLocked {
}
print("finished waiting: \(elapsed / 1000)us \(waitResult)")
}
lines = inner.linesForRange(range: lineRange)
count += 1
}
return lines
return inner.linesForRange(range: lineRange)
}
func applyUpdate(update: [String: AnyObject]) -> InvalSet {