[NFC] Introduce a typedef for job delay in nanoseconds.

rjmccall · rjmccall · commit c45f2c433457 · 2021-11-16T01:50:52.000-05:00
diff --git a/include/swift/Runtime/Concurrency.h b/include/swift/Runtime/Concurrency.h
@@ -670,8 +670,11 @@ void swift_task_enqueue(Job *job, ExecutorRef executor);
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 void swift_task_enqueueGlobal(Job *job);
 
+/// A count in nanoseconds.
+using JobDelay = unsigned long long;
+
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
-void swift_task_enqueueGlobalWithDelay(unsigned long long delay, Job *job);
+void swift_task_enqueueGlobalWithDelay(JobDelay delay, Job *job);
 
 /// Enqueue the given job on the main executor.
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
diff --git a/stdlib/public/Concurrency/CooperativeGlobalExecutor.inc b/stdlib/public/Concurrency/CooperativeGlobalExecutor.inc
@@ -81,7 +81,7 @@ static unsigned long long currentNanos() {
 
 /// Insert a job into the cooperative global queue with a delay.
 SWIFT_CC(swift)
-static void swift_task_enqueueGlobalWithDelayImpl(unsigned long long delay,
+static void swift_task_enqueueGlobalWithDelayImpl(JobDelay delay,
                                                   Job *job) {
   assert(job && "no job provided");
 
diff --git a/stdlib/public/Concurrency/DispatchGlobalExecutor.inc b/stdlib/public/Concurrency/DispatchGlobalExecutor.inc
@@ -207,7 +207,7 @@ static void swift_task_enqueueGlobalImpl(Job *job) {
 
 
 SWIFT_CC(swift)
-static void swift_task_enqueueGlobalWithDelayImpl(unsigned long long delay,
+static void swift_task_enqueueGlobalWithDelayImpl(JobDelay delay,
                                                   Job *job) {
   assert(job && "no job provided");
 
diff --git a/stdlib/public/Concurrency/GlobalExecutor.cpp b/stdlib/public/Concurrency/GlobalExecutor.cpp
@@ -67,7 +67,7 @@ void (*swift::swift_task_enqueueGlobal_hook)(
 
 SWIFT_CC(swift)
 void (*swift::swift_task_enqueueGlobalWithDelay_hook)(
-    unsigned long long delay, Job *job,
+    JobDelay delay, Job *job,
     swift_task_enqueueGlobalWithDelay_original original) = nullptr;
 
 SWIFT_CC(swift)
@@ -91,8 +91,7 @@ void swift::swift_task_enqueueGlobal(Job *job) {
     swift_task_enqueueGlobalImpl(job);
 }
 
-void swift::swift_task_enqueueGlobalWithDelay(unsigned long long delay,
-                                              Job *job) {
+void swift::swift_task_enqueueGlobalWithDelay(JobDelay delay, Job *job) {
   if (swift_task_enqueueGlobalWithDelay_hook)
     swift_task_enqueueGlobalWithDelay_hook(
         delay, job, swift_task_enqueueGlobalWithDelayImpl);
diff --git a/stdlib/public/Concurrency/NonDispatchGlobalExecutor.inc b/stdlib/public/Concurrency/NonDispatchGlobalExecutor.inc
@@ -33,7 +33,7 @@ static void swift_task_enqueueGlobalImpl(Job *job) {
 }
 
 SWIFT_CC(swift)
-static void swift_task_enqueueGlobalWithDelayImpl(unsigned long long delay,
+static void swift_task_enqueueGlobalWithDelayImpl(JobDelay delay,
                                                   Job *job) {
   assert(job && "no job provided");
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ static void swift_task_enqueueGlobalImpl(Job *job) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`SWIFT_CC(swift)`
`36`		`-static void swift_task_enqueueGlobalWithDelayImpl(unsigned long long delay,`
	`36`	`+static void swift_task_enqueueGlobalWithDelayImpl(JobDelay delay,`
`37`	`37`	`Job *job) {`
`38`	`38`	`assert(job && "no job provided");`
`39`	`39`