Merge pull request #59349 from mikeash/concurrency-tracing-log-categories

[Concurrency] Set final subsystem/categories for concurrency tracing.

Author: mikeash

stdlib/public/Concurrency/TracingSignpost.cpp

@@ -19,15 +19,9 @@
 #include "TracingSignpost.h"
 #include <stdio.h>
 
-// Temporary until we work out what categories we should really use.
-#ifndef OS_LOG_CATEGORY_DYNAMIC_STACK_TRACING
-#define OS_LOG_CATEGORY_DYNAMIC_STACK_TRACING "DynamicStackTracing"
-#endif
-
-#define SWIFT_LOG_CONCURRENCY_ACTOR_SUBSYSTEM "com.apple.swift.actor"
-#define SWIFT_LOG_CONCURRENCY_TASK_SUBSYSTEM "com.apple.swift.task"
-#define SWIFT_LOG_ACTOR_CATEGORY OS_LOG_CATEGORY_DYNAMIC_STACK_TRACING
-#define SWIFT_LOG_TASK_CATEGORY OS_LOG_CATEGORY_DYNAMIC_STACK_TRACING
+#define SWIFT_LOG_CONCURRENCY_SUBSYSTEM "com.apple.swift.concurrency"
+#define SWIFT_LOG_ACTOR_CATEGORY "Actor"
+#define SWIFT_LOG_TASK_CATEGORY "Task"
 
 namespace swift {
 namespace concurrency {
@@ -38,9 +32,9 @@ os_log_t TaskLog;
 swift::once_t LogsToken;
 
 void setupLogs(void *unused) {
-  ActorLog = os_log_create(SWIFT_LOG_CONCURRENCY_ACTOR_SUBSYSTEM,
+  ActorLog = os_log_create(SWIFT_LOG_CONCURRENCY_SUBSYSTEM,
                            SWIFT_LOG_ACTOR_CATEGORY);
-  TaskLog = os_log_create(SWIFT_LOG_CONCURRENCY_TASK_SUBSYSTEM,
+  TaskLog = os_log_create(SWIFT_LOG_CONCURRENCY_SUBSYSTEM,
                           SWIFT_LOG_TASK_CATEGORY);
 }
 

unittests/runtime/Actor.cpp

@@ -99,7 +99,7 @@ static SWIFT_CC(swift)
 void destroyTestActor(SWIFT_CONTEXT HeapObject *_object) {
   delete static_cast<TestActor*>(_object);
 }
-static const FullMetadata<ClassMetadata> TestActorMetadata = {
+static FullMetadata<ClassMetadata> TestActorMetadata = {
   { { &destroyTestActor }, { &VALUE_WITNESS_SYM(Bo) } },
   { { nullptr }, ClassFlags::UsesSwiftRefcounting, 0, 0, 0, 0, 0, 0 }
 };
@@ -108,6 +108,15 @@ TestActor::TestActor() : DefaultActor(&TestActorMetadata) {
 }
 
 static TestActor *createActor() {
+  static ClassDescriptor *descriptor;
+  if (!descriptor) {
+    // Install a fake descriptor pointer into the actor metadata so that
+    // swift_getTypeName will tolerate it. Otherwise we crash when trying to
+    // signpost actor creation.
+    descriptor =
+        reinterpret_cast<ClassDescriptor *>(calloc(sizeof(*descriptor), 1));
+    TestActorMetadata.setDescription(descriptor);
+  }
   return new TestActor();
 }