Skip to content

Commit 6ca8e0d

Browse files
authored
[Concurrency] Change signposts to use decimal format for task ids (#80154)
Change task ids to be formatted using decimal instead of hex. An example of previous signposts: ``` task=e resumefn=0x2807722bc jobPriority=0 isChildTask=0, isFuture=1 isGroupChildTask=0 isAsyncLetTask=0 parent=0 group=0x0 asyncLet=0x0 ``` this will now show `task=14` instead of `task=e`
1 parent b467d84 commit 6ca8e0d

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

stdlib/public/Concurrency/TracingSignpost.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ inline void actor_enqueue(HeapObject *actor, Job *job) {
130130
ENSURE_LOGS();
131131
auto id = os_signpost_id_make_with_pointer(ActorLog, actor);
132132
os_signpost_event_emit(ActorLog, id, SWIFT_LOG_ACTOR_ENQUEUE_NAME,
133-
"actor=%p task=%" PRIx64, actor, task->getTaskId());
133+
"actor=%p task=%" PRId64, actor, task->getTaskId());
134134
}
135135
}
136136

@@ -139,7 +139,7 @@ inline void actor_dequeue(HeapObject *actor, Job *job) {
139139
ENSURE_LOGS();
140140
auto id = os_signpost_id_make_with_pointer(ActorLog, actor);
141141
os_signpost_event_emit(ActorLog, id, SWIFT_LOG_ACTOR_DEQUEUE_NAME,
142-
"actor=%p task=%" PRIx64, actor, task->getTaskId());
142+
"actor=%p task=%" PRId64, actor, task->getTaskId());
143143
}
144144
}
145145

@@ -190,9 +190,9 @@ inline void task_create(AsyncTask *task, AsyncTask *parent, TaskGroup *group,
190190
auto parentID = parent ? parent->getTaskId() : 0;
191191
os_signpost_interval_begin(
192192
TaskLog, id, SWIFT_LOG_TASK_LIFETIME_NAME,
193-
"task=%" PRIx64
193+
"task=%" PRId64
194194
" resumefn=%p jobPriority=%u isChildTask=%{bool}d, isFuture=%{bool}d "
195-
"isGroupChildTask=%{bool}d isAsyncLetTask=%{bool}d parent=%" PRIx64
195+
"isGroupChildTask=%{bool}d isAsyncLetTask=%{bool}d parent=%" PRId64
196196
" group=%p asyncLet=%p "
197197
"isDiscardingTask=%{bool}d hasInitialTaskExecutorPreference=%{bool}d "
198198
"taskName=%{public}s",
@@ -205,7 +205,7 @@ inline void task_destroy(AsyncTask *task) {
205205
ENSURE_LOGS();
206206
auto id = os_signpost_id_make_with_pointer(TaskLog, task);
207207
os_signpost_interval_end(TaskLog, id, SWIFT_LOG_TASK_LIFETIME_NAME,
208-
"task=%" PRIx64 "", task->getTaskId());
208+
"task=%" PRId64 "", task->getTaskId());
209209
}
210210

211211
inline void task_status_changed(AsyncTask *task, uint8_t maxPriority,
@@ -215,7 +215,7 @@ inline void task_status_changed(AsyncTask *task, uint8_t maxPriority,
215215
auto id = os_signpost_id_make_with_pointer(TaskLog, task);
216216
os_signpost_event_emit(
217217
TaskLog, id, SWIFT_LOG_TASK_STATUS_CHANGED_NAME,
218-
"task=%" PRIx64 " resumefn=%p "
218+
"task=%" PRId64 " resumefn=%p "
219219
"maxPriority=%u, isCancelled=%{bool}d "
220220
"isEscalated=%{bool}d, isRunning=%{bool}d, isEnqueued=%{bool}d",
221221
task->getTaskId(), task->getResumeFunctionForLogging(isStarting), maxPriority,
@@ -229,7 +229,7 @@ inline void task_flags_changed(AsyncTask *task, uint8_t jobPriority,
229229
auto id = os_signpost_id_make_with_pointer(TaskLog, task);
230230
os_signpost_event_emit(
231231
TaskLog, id, SWIFT_LOG_TASK_FLAGS_CHANGED_NAME,
232-
"task=%" PRIx64 " jobPriority=%u isChildTask=%{bool}d, isFuture=%{bool}d "
232+
"task=%" PRId64 " jobPriority=%u isChildTask=%{bool}d, isFuture=%{bool}d "
233233
"isGroupChildTask=%{bool}d isAsyncLetTask=%{bool}d",
234234
task->getTaskId(), jobPriority, isChildTask, isFuture, isGroupChildTask,
235235
isAsyncLetTask);
@@ -240,23 +240,23 @@ inline void task_wait(AsyncTask *task, AsyncTask *waitingOn, uintptr_t status) {
240240
auto id = os_signpost_id_make_with_pointer(TaskLog, task);
241241
auto waitingID = waitingOn ? waitingOn->getTaskId() : 0;
242242
os_signpost_interval_begin(TaskLog, id, SWIFT_LOG_TASK_WAIT_NAME,
243-
"task=%" PRIx64 " waitingOnTask=%" PRIx64
243+
"task=%" PRId64 " waitingOnTask=%" PRId64
244244
" status=0x%" PRIxPTR,
245245
task->getTaskId(), waitingID, status);
246246
}
247247

248248
inline void task_resume(AsyncTask *task) {
249249
auto id = os_signpost_id_make_with_pointer(TaskLog, task);
250250
os_signpost_interval_end(TaskLog, id, SWIFT_LOG_TASK_WAIT_NAME,
251-
"task=%" PRIx64, task->getTaskId());
251+
"task=%" PRId64, task->getTaskId());
252252
}
253253

254254
inline void task_continuation_init(AsyncTask *task,
255255
ContinuationAsyncContext *context) {
256256
ENSURE_LOGS();
257257
auto id = os_signpost_id_make_with_pointer(TaskLog, context);
258258
os_signpost_interval_begin(TaskLog, id, SWIFT_LOG_TASK_CONTINUATION,
259-
"task=%" PRIx64 " context=%p", task->getTaskId(),
259+
"task=%" PRId64 " context=%p", task->getTaskId(),
260260
context);
261261
}
262262

@@ -280,7 +280,7 @@ inline void job_enqueue_global(Job *job) {
280280
ENSURE_LOGS();
281281
auto id = os_signpost_id_make_with_pointer(TaskLog, job);
282282
os_signpost_event_emit(TaskLog, id, SWIFT_LOG_JOB_ENQUEUE_GLOBAL_NAME,
283-
"task=%" PRIx64, task->getTaskId());
283+
"task=%" PRId64, task->getTaskId());
284284
}
285285
}
286286

@@ -290,7 +290,7 @@ inline void job_enqueue_global_with_delay(unsigned long long delay, Job *job) {
290290
auto id = os_signpost_id_make_with_pointer(TaskLog, job);
291291
os_signpost_event_emit(
292292
TaskLog, id, SWIFT_LOG_JOB_ENQUEUE_GLOBAL_WITH_DELAY_NAME,
293-
"task=%" PRIx64 " delay=%llu", task->getTaskId(), delay);
293+
"task=%" PRId64 " delay=%llu", task->getTaskId(), delay);
294294
}
295295
}
296296

@@ -300,7 +300,7 @@ inline void job_enqueue_main_executor(Job *job) {
300300
auto id = os_signpost_id_make_with_pointer(TaskLog, job);
301301
os_signpost_event_emit(TaskLog, id,
302302
SWIFT_LOG_JOB_ENQUEUE_MAIN_EXECUTOR_NAME,
303-
"task=%" PRIx64, task->getTaskId());
303+
"task=%" PRId64, task->getTaskId());
304304
}
305305
}
306306

@@ -314,7 +314,7 @@ inline job_run_info job_run_begin(Job *job) {
314314
auto handle = os_signpost_id_generate(TaskLog);
315315
auto taskId = task->getTaskId();
316316
os_signpost_interval_begin(TaskLog, handle, SWIFT_LOG_JOB_RUN_NAME,
317-
"task=%" PRIx64, taskId);
317+
"task=%" PRId64, taskId);
318318
return { taskId, handle };
319319
}
320320
return invalidInfo();
@@ -324,7 +324,7 @@ inline void job_run_end(job_run_info info) {
324324
if (info.handle != OS_SIGNPOST_ID_INVALID) {
325325
ENSURE_LOGS();
326326
os_signpost_interval_end(TaskLog, info.handle, SWIFT_LOG_JOB_RUN_NAME,
327-
"task=%" PRIx64, info.taskId);
327+
"task=%" PRId64, info.taskId);
328328
}
329329
}
330330

0 commit comments

Comments
 (0)