Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Centralise thread name logic #8513

Merged
merged 2 commits into from
Nov 20, 2024
Merged

Centralise thread name logic #8513

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f70ccf6
Centralise thread name logic
yschimke Aug 17, 2024
b17cdbb
Merge branch 'master' into single_thread_name
yschimke Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions okhttp/src/main/kotlin/okhttp3/internal/concurrent/TaskRunner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import okhttp3.internal.connection.Locks.newLockCondition
import okhttp3.internal.connection.Locks.withLock
import okhttp3.internal.okHttpName
import okhttp3.internal.threadFactory
import okhttp3.internal.threadName

/**
* A set of worker threads that are shared among a set of task queues.
Expand Down Expand Up @@ -132,18 +133,15 @@ class TaskRunner(
}

private fun runTask(task: Task) {
val currentThread = Thread.currentThread()
val oldName = currentThread.name
currentThread.name = task.name

var delayNanos = -1L
try {
delayNanos = task.runOnce()
} finally {
this.withLock {
afterRun(task, delayNanos)
threadName(task.name) {
var delayNanos = -1L
try {
delayNanos = task.runOnce()
} finally {
this.withLock {
afterRun(task, delayNanos)
}
}
currentThread.name = oldName
}
}

Expand Down