Skip to content

Commit 9392c7b

Browse files
sbSteveKsbSteveK
authored
Task type_log logging (#726)
1 parent 7e75f17 commit 9392c7b

File tree

7 files changed

+26
-14
lines changed

7 files changed

+26
-14
lines changed

‎.github/workflows/proof-alarm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Check
1717
run: |
1818
TMPFILE=$(mktemp)
19-
echo "e857a2e5f72ab77a94e56372d89abf99 source/linux/epoll_event_loop.c" > $TMPFILE
19+
echo "64a05aa7dfecba86bf4296a08b4cdf3a source/linux/epoll_event_loop.c" > $TMPFILE
2020
md5sum --check $TMPFILE
2121
2222
# No further steps if successful

‎source/bsd/kqueue_event_loop.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,8 @@ static void s_schedule_task_future(struct aws_event_loop *event_loop, struct aws
532532

533533
static void s_cancel_task(struct aws_event_loop *event_loop, struct aws_task *task) {
534534
struct kqueue_loop *kqueue_loop = event_loop->impl_data;
535-
AWS_LOGF_TRACE(AWS_LS_IO_EVENT_LOOP, "id=%p: cancelling task %p", (void *)event_loop, (void *)task);
535+
AWS_LOGF_TRACE(
536+
AWS_LS_IO_EVENT_LOOP, "id=%p: cancelling %s task %p", (void *)event_loop, task->type_tag, (void *)task);
536537
aws_task_scheduler_cancel_task(&kqueue_loop->thread_data.scheduler, task);
537538
}
538539

‎source/darwin/dispatch_queue_event_loop.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -664,8 +664,9 @@ static void s_schedule_task_common(struct aws_event_loop *event_loop, struct aws
664664

665665
AWS_LOGF_TRACE(
666666
AWS_LS_IO_EVENT_LOOP,
667-
"id=%p: Scheduling task %p cross-thread for timestamp %llu",
667+
"id=%p: Scheduling %s task %p cross-thread for timestamp %llu",
668668
(void *)event_loop,
669+
task->type_tag,
669670
(void *)task,
670671
(unsigned long long)run_at_nanos);
671672

@@ -694,7 +695,8 @@ static void s_schedule_task_future(struct aws_event_loop *event_loop, struct aws
694695
}
695696

696697
static void s_cancel_task(struct aws_event_loop *event_loop, struct aws_task *task) {
697-
AWS_LOGF_TRACE(AWS_LS_IO_EVENT_LOOP, "id=%p: cancelling task %p", (void *)event_loop, (void *)task);
698+
AWS_LOGF_TRACE(
699+
AWS_LS_IO_EVENT_LOOP, "id=%p: cancelling %s task %p", (void *)event_loop, task->type_tag, (void *)task);
698700
struct aws_dispatch_loop *dispatch_loop = event_loop->impl_data;
699701

700702
/* First we move all cross thread tasks into the scheduler in case the task to be cancelled hasn't moved yet. */

‎source/linux/epoll_event_loop.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,9 @@ static void s_schedule_task_common(struct aws_event_loop *event_loop, struct aws
357357
if (s_is_on_callers_thread(event_loop)) {
358358
AWS_LOGF_TRACE(
359359
AWS_LS_IO_EVENT_LOOP,
360-
"id=%p: scheduling task %p in-thread for timestamp %llu",
360+
"id=%p: scheduling %s task %p in-thread for timestamp %llu",
361361
(void *)event_loop,
362+
task->type_tag,
362363
(void *)task,
363364
(unsigned long long)run_at_nanos);
364365
if (run_at_nanos == 0) {
@@ -372,8 +373,9 @@ static void s_schedule_task_common(struct aws_event_loop *event_loop, struct aws
372373

373374
AWS_LOGF_TRACE(
374375
AWS_LS_IO_EVENT_LOOP,
375-
"id=%p: Scheduling task %p cross-thread for timestamp %llu",
376+
"id=%p: Scheduling %s task %p cross-thread for timestamp %llu",
376377
(void *)event_loop,
378+
task->type_tag,
377379
(void *)task,
378380
(unsigned long long)run_at_nanos);
379381
task->timestamp = run_at_nanos;
@@ -407,7 +409,8 @@ static void s_schedule_task_future(struct aws_event_loop *event_loop, struct aws
407409
}
408410

409411
static void s_cancel_task(struct aws_event_loop *event_loop, struct aws_task *task) {
410-
AWS_LOGF_TRACE(AWS_LS_IO_EVENT_LOOP, "id=%p: cancelling task %p", (void *)event_loop, (void *)task);
412+
AWS_LOGF_TRACE(
413+
AWS_LS_IO_EVENT_LOOP, "id=%p: cancelling %s task %p", (void *)event_loop, task->type_tag, (void *)task);
411414
struct epoll_loop *epoll_loop = event_loop->impl_data;
412415
aws_task_scheduler_cancel_task(&epoll_loop->scheduler, task);
413416
}
@@ -563,8 +566,9 @@ static void s_process_task_pre_queue(struct aws_event_loop *event_loop) {
563566
struct aws_task *task = AWS_CONTAINER_OF(node, struct aws_task, node);
564567
AWS_LOGF_TRACE(
565568
AWS_LS_IO_EVENT_LOOP,
566-
"id=%p: task %p pulled to event-loop, scheduling now.",
569+
"id=%p: task %s %p pulled to event-loop, scheduling now.",
567570
(void *)event_loop,
571+
task->type_tag,
568572
(void *)task);
569573
/* Timestamp 0 is used to denote "now" tasks */
570574
if (task->timestamp == 0) {

‎source/windows/iocp/iocp_event_loop.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,8 +467,9 @@ static void s_schedule_task_common(struct aws_event_loop *event_loop, struct aws
467467
if (s_is_event_thread(event_loop)) {
468468
AWS_LOGF_TRACE(
469469
AWS_LS_IO_EVENT_LOOP,
470-
"id=%p: scheduling task %p in-thread for timestamp %llu",
470+
"id=%p: scheduling %s task %p in-thread for timestamp %llu",
471471
(void *)event_loop,
472+
task->type_tag,
472473
(void *)task,
473474
(unsigned long long)run_at_nanos);
474475
if (run_at_nanos == 0) {
@@ -481,8 +482,9 @@ static void s_schedule_task_common(struct aws_event_loop *event_loop, struct aws
481482

482483
AWS_LOGF_TRACE(
483484
AWS_LS_IO_EVENT_LOOP,
484-
"id=%p: Scheduling task %p cross-thread for timestamp %llu",
485+
"id=%p: Scheduling %s task %p cross-thread for timestamp %llu",
485486
(void *)event_loop,
487+
task->type_tag,
486488
(void *)task,
487489
(unsigned long long)run_at_nanos);
488490
/* Otherwise, add it to synced_data.tasks_to_schedule and signal the event-thread to process it */
@@ -519,7 +521,8 @@ static void s_schedule_task_future(struct aws_event_loop *event_loop, struct aws
519521
}
520522

521523
static void s_cancel_task(struct aws_event_loop *event_loop, struct aws_task *task) {
522-
AWS_LOGF_TRACE(AWS_LS_IO_EVENT_LOOP, "id=%p: cancelling task %p", (void *)event_loop, (void *)task);
524+
AWS_LOGF_TRACE(
525+
AWS_LS_IO_EVENT_LOOP, "id=%p: cancelling %s task %p", (void *)event_loop, task->type_tag, (void *)task);
523526
struct iocp_loop *iocp_loop = event_loop->impl_data;
524527
aws_task_scheduler_cancel_task(&iocp_loop->thread_data.scheduler, task);
525528
}

‎tests/vcc/cancel_task.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "preamble.h"
1818

1919
static void s_cancel_task(struct aws_event_loop *event_loop, struct aws_task *task) {
20-
AWS_LOGF_TRACE(AWS_LS_IO_EVENT_LOOP, "id=%p: cancelling task %p", (void *)event_loop, (void *)task);
20+
AWS_LOGF_TRACE(AWS_LS_IO_EVENT_LOOP, "id=%p: cancelling %s task %p", (void *)event_loop, task->type_tag, (void *)task);
2121
struct epoll_loop *epoll_loop = event_loop->impl_data;
2222
aws_task_scheduler_cancel_task(&epoll_loop->scheduler, task);
2323
}

‎tests/vcc/schedule.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ static void s_schedule_task_common(struct aws_event_loop *event_loop, struct aws
4949
if (s_is_on_callers_thread(event_loop _(ghost c_event_loop))) {
5050
AWS_LOGF_TRACE(
5151
AWS_LS_IO_EVENT_LOOP,
52-
"id=%p: scheduling task %p in-thread for timestamp %llu",
52+
"id=%p: scheduling %s task %p in-thread for timestamp %llu",
5353
(void *)event_loop,
54+
task->type_tag,
5455
(void *)task,
5556
(unsigned long long)run_at_nanos);
5657
if (run_at_nanos == 0) {
@@ -64,8 +65,9 @@ static void s_schedule_task_common(struct aws_event_loop *event_loop, struct aws
6465

6566
AWS_LOGF_TRACE(
6667
AWS_LS_IO_EVENT_LOOP,
67-
"id=%p: Scheduling task %p cross-thread for timestamp %llu",
68+
"id=%p: Scheduling %s task %p cross-thread for timestamp %llu",
6869
(void *)event_loop,
70+
task->type_tag,
6971
(void *)task,
7072
(unsigned long long)run_at_nanos);
7173
_(unwrap task)

0 commit comments

Comments
 (0)