Skip to content

[Concurrency] Change signposts to use decimal format for task ids #80154

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.

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

Merged
Changes from all commits
Commits
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
30 changes: 15 additions & 15 deletions stdlib/public/Concurrency/TracingSignpost.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ inline void actor_enqueue(HeapObject *actor, Job *job) {
ENSURE_LOGS();
auto id = os_signpost_id_make_with_pointer(ActorLog, actor);
os_signpost_event_emit(ActorLog, id, SWIFT_LOG_ACTOR_ENQUEUE_NAME,
"actor=%p task=%" PRIx64, actor, task->getTaskId());
"actor=%p task=%" PRId64, actor, task->getTaskId());
}
}

Expand All @@ -139,7 +139,7 @@ inline void actor_dequeue(HeapObject *actor, Job *job) {
ENSURE_LOGS();
auto id = os_signpost_id_make_with_pointer(ActorLog, actor);
os_signpost_event_emit(ActorLog, id, SWIFT_LOG_ACTOR_DEQUEUE_NAME,
"actor=%p task=%" PRIx64, actor, task->getTaskId());
"actor=%p task=%" PRId64, actor, task->getTaskId());
}
}

Expand Down Expand Up @@ -190,9 +190,9 @@ inline void task_create(AsyncTask *task, AsyncTask *parent, TaskGroup *group,
auto parentID = parent ? parent->getTaskId() : 0;
os_signpost_interval_begin(
TaskLog, id, SWIFT_LOG_TASK_LIFETIME_NAME,
"task=%" PRIx64
"task=%" PRId64
" resumefn=%p jobPriority=%u isChildTask=%{bool}d, isFuture=%{bool}d "
"isGroupChildTask=%{bool}d isAsyncLetTask=%{bool}d parent=%" PRIx64
"isGroupChildTask=%{bool}d isAsyncLetTask=%{bool}d parent=%" PRId64
" group=%p asyncLet=%p "
"isDiscardingTask=%{bool}d hasInitialTaskExecutorPreference=%{bool}d "
"taskName=%{public}s",
Expand All @@ -205,7 +205,7 @@ inline void task_destroy(AsyncTask *task) {
ENSURE_LOGS();
auto id = os_signpost_id_make_with_pointer(TaskLog, task);
os_signpost_interval_end(TaskLog, id, SWIFT_LOG_TASK_LIFETIME_NAME,
"task=%" PRIx64 "", task->getTaskId());
"task=%" PRId64 "", task->getTaskId());
}

inline void task_status_changed(AsyncTask *task, uint8_t maxPriority,
Expand All @@ -215,7 +215,7 @@ inline void task_status_changed(AsyncTask *task, uint8_t maxPriority,
auto id = os_signpost_id_make_with_pointer(TaskLog, task);
os_signpost_event_emit(
TaskLog, id, SWIFT_LOG_TASK_STATUS_CHANGED_NAME,
"task=%" PRIx64 " resumefn=%p "
"task=%" PRId64 " resumefn=%p "
"maxPriority=%u, isCancelled=%{bool}d "
"isEscalated=%{bool}d, isRunning=%{bool}d, isEnqueued=%{bool}d",
task->getTaskId(), task->getResumeFunctionForLogging(isStarting), maxPriority,
Expand All @@ -229,7 +229,7 @@ inline void task_flags_changed(AsyncTask *task, uint8_t jobPriority,
auto id = os_signpost_id_make_with_pointer(TaskLog, task);
os_signpost_event_emit(
TaskLog, id, SWIFT_LOG_TASK_FLAGS_CHANGED_NAME,
"task=%" PRIx64 " jobPriority=%u isChildTask=%{bool}d, isFuture=%{bool}d "
"task=%" PRId64 " jobPriority=%u isChildTask=%{bool}d, isFuture=%{bool}d "
"isGroupChildTask=%{bool}d isAsyncLetTask=%{bool}d",
task->getTaskId(), jobPriority, isChildTask, isFuture, isGroupChildTask,
isAsyncLetTask);
Expand All @@ -240,23 +240,23 @@ inline void task_wait(AsyncTask *task, AsyncTask *waitingOn, uintptr_t status) {
auto id = os_signpost_id_make_with_pointer(TaskLog, task);
auto waitingID = waitingOn ? waitingOn->getTaskId() : 0;
os_signpost_interval_begin(TaskLog, id, SWIFT_LOG_TASK_WAIT_NAME,
"task=%" PRIx64 " waitingOnTask=%" PRIx64
"task=%" PRId64 " waitingOnTask=%" PRId64
" status=0x%" PRIxPTR,
task->getTaskId(), waitingID, status);
}

inline void task_resume(AsyncTask *task) {
auto id = os_signpost_id_make_with_pointer(TaskLog, task);
os_signpost_interval_end(TaskLog, id, SWIFT_LOG_TASK_WAIT_NAME,
"task=%" PRIx64, task->getTaskId());
"task=%" PRId64, task->getTaskId());
}

inline void task_continuation_init(AsyncTask *task,
ContinuationAsyncContext *context) {
ENSURE_LOGS();
auto id = os_signpost_id_make_with_pointer(TaskLog, context);
os_signpost_interval_begin(TaskLog, id, SWIFT_LOG_TASK_CONTINUATION,
"task=%" PRIx64 " context=%p", task->getTaskId(),
"task=%" PRId64 " context=%p", task->getTaskId(),
context);
}

Expand All @@ -280,7 +280,7 @@ inline void job_enqueue_global(Job *job) {
ENSURE_LOGS();
auto id = os_signpost_id_make_with_pointer(TaskLog, job);
os_signpost_event_emit(TaskLog, id, SWIFT_LOG_JOB_ENQUEUE_GLOBAL_NAME,
"task=%" PRIx64, task->getTaskId());
"task=%" PRId64, task->getTaskId());
}
}

Expand All @@ -290,7 +290,7 @@ inline void job_enqueue_global_with_delay(unsigned long long delay, Job *job) {
auto id = os_signpost_id_make_with_pointer(TaskLog, job);
os_signpost_event_emit(
TaskLog, id, SWIFT_LOG_JOB_ENQUEUE_GLOBAL_WITH_DELAY_NAME,
"task=%" PRIx64 " delay=%llu", task->getTaskId(), delay);
"task=%" PRId64 " delay=%llu", task->getTaskId(), delay);
}
}

Expand All @@ -300,7 +300,7 @@ inline void job_enqueue_main_executor(Job *job) {
auto id = os_signpost_id_make_with_pointer(TaskLog, job);
os_signpost_event_emit(TaskLog, id,
SWIFT_LOG_JOB_ENQUEUE_MAIN_EXECUTOR_NAME,
"task=%" PRIx64, task->getTaskId());
"task=%" PRId64, task->getTaskId());
}
}

Expand All @@ -314,7 +314,7 @@ inline job_run_info job_run_begin(Job *job) {
auto handle = os_signpost_id_generate(TaskLog);
auto taskId = task->getTaskId();
os_signpost_interval_begin(TaskLog, handle, SWIFT_LOG_JOB_RUN_NAME,
"task=%" PRIx64, taskId);
"task=%" PRId64, taskId);
return { taskId, handle };
}
return invalidInfo();
Expand All @@ -324,7 +324,7 @@ inline void job_run_end(job_run_info info) {
if (info.handle != OS_SIGNPOST_ID_INVALID) {
ENSURE_LOGS();
os_signpost_interval_end(TaskLog, info.handle, SWIFT_LOG_JOB_RUN_NAME,
"task=%" PRIx64, info.taskId);
"task=%" PRId64, info.taskId);
}
}

Expand Down