Use #filePath instead of #file (#984)

Resolves #635

Author: yim-lee

Sources/DistributedActors/ActorContext.swift

@@ -102,15 +102,15 @@ public class _ActorContext<Message: Codable> /* TODO(sendable): NOTSendable*/ {
     public func watch<Watchee>(
         _ watchee: Watchee,
         with terminationMessage: Message? = nil,
-        file: String = #file, line: UInt = #line
+        file: String = #filePath, line: UInt = #line
     ) -> Watchee where Watchee: _DeathWatchable {
         _undefined()
     }
 
     @discardableResult
     public func unwatch<Watchee>(
         _ watchee: Watchee,
-        file: String = #file, line: UInt = #line
+        file: String = #filePath, line: UInt = #line
     ) -> Watchee where Watchee: _DeathWatchable {
         _undefined()
     }
@@ -123,7 +123,7 @@ public class _ActorContext<Message: Codable> /* TODO(sendable): NOTSendable*/ {
         _ naming: _ActorNaming,
         of type: M.Type = M.self,
         props: _Props = _Props(),
-        file: String = #file, line: UInt = #line,
+        file: String = #filePath, line: UInt = #line,
         _ behavior: _Behavior<M>
     ) throws -> _ActorRef<M>
         where M: Codable
@@ -142,7 +142,7 @@ public class _ActorContext<Message: Codable> /* TODO(sendable): NOTSendable*/ {
         _ naming: _ActorNaming,
         of type: M.Type = M.self,
         props: _Props = _Props(),
-        file: String = #file, line: UInt = #line,
+        file: String = #filePath, line: UInt = #line,
         _ behavior: _Behavior<M>
     ) throws -> _ActorRef<M>
         where M: Codable
@@ -192,7 +192,7 @@ public class _ActorContext<Message: Codable> /* TODO(sendable): NOTSendable*/ {
     /// - Parameter callback: the closure that should be executed in this actor's context
     /// - Returns: an `AsynchronousCallback` that is safe to call from outside of this actor
     @usableFromInline
-    internal func makeAsynchronousCallback<T>(file: String = #file, line: UInt = #line, _ callback: @escaping (T) throws -> Void) -> AsynchronousCallback<T> {
+    internal func makeAsynchronousCallback<T>(file: String = #filePath, line: UInt = #line, _ callback: @escaping (T) throws -> Void) -> AsynchronousCallback<T> {
         AsynchronousCallback(callback: callback) { [weak selfRef = self.myself._unsafeUnwrapCell] in
             selfRef?.sendClosure(file: file, line: line, $0)
         }
@@ -209,7 +209,7 @@ public class _ActorContext<Message: Codable> /* TODO(sendable): NOTSendable*/ {
     /// - Parameter callback: the closure that should be executed in this actor's context
     /// - Returns: an `AsynchronousCallback` that is safe to call from outside of this actor
     @usableFromInline
-    internal func makeAsynchronousCallback<T>(for type: T.Type, file: String = #file, line: UInt = #line, callback: @escaping (T) throws -> Void) -> AsynchronousCallback<T> {
+    internal func makeAsynchronousCallback<T>(for type: T.Type, file: String = #filePath, line: UInt = #line, callback: @escaping (T) throws -> Void) -> AsynchronousCallback<T> {
         AsynchronousCallback(callback: callback) { [weak selfRef = self.myself._unsafeUnwrapCell] in
             selfRef?.sendClosure(file: file, line: line, $0)
         }
@@ -280,7 +280,7 @@ public class _ActorContext<Message: Codable> /* TODO(sendable): NOTSendable*/ {
     ///   - timeout: time after which the _AsyncResult will be failed if it does not complete
     ///   - continuation: continuation to run after `_AsyncResult` completes.
     ///     It is safe to access and modify actor state from here.
-    internal func onResultAsync<AR: _AsyncResult>(of _AsyncResult: AR, timeout: Duration, file: String = #file, line: UInt = #line, _ continuation: @escaping (Result<AR.Value, Error>) throws -> _Behavior<Message>) {
+    internal func onResultAsync<AR: _AsyncResult>(of _AsyncResult: AR, timeout: Duration, file: String = #filePath, line: UInt = #line, _ continuation: @escaping (Result<AR.Value, Error>) throws -> _Behavior<Message>) {
         let asyncCallback = self.makeAsynchronousCallback(for: Result<AR.Value, Error>.self, file: file, line: line) {
             let nextBehavior = try continuation($0)
             let shell = self._downcastUnsafe

Sources/DistributedActors/ActorLogging.swift

@@ -357,7 +357,7 @@ extension Logger {
         level: Logger.Level?,
         _ message: @autoclosure () -> Logger.Message,
         metadata: @autoclosure () -> Logger.Metadata? = nil,
-        file: String = #file, function: String = #function, line: UInt = #line
+        file: String = #filePath, function: String = #function, line: UInt = #line
     ) {
         if let level = level {
             self.log(level: level, message(), metadata: metadata(), file: file, function: function, line: line)

Sources/DistributedActors/ActorRef+Ask.swift

@@ -67,7 +67,7 @@ extension _ActorRef: ReceivesQuestions {
     func ask<Answer>(
         for answerType: Answer.Type = Answer.self,
         timeout: Duration,
-        file: String = #file, function: String = #function, line: UInt = #line,
+        file: String = #filePath, function: String = #function, line: UInt = #line,
         _ makeQuestion: @escaping (_ActorRef<Answer>) -> Question
     ) -> AskResponse<Answer> {
         guard let system = self._system else {

Sources/DistributedActors/ActorShell+Children.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift Distributed Actors open source project
 //
-// Copyright (c) 2018-2019 Apple Inc. and the Swift Distributed Actors project authors
+// Copyright (c) 2018-2022 Apple Inc. and the Swift Distributed Actors project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -293,7 +293,7 @@ extension _Children {
         let childOpt = self.container[name]
         switch childOpt {
         case .some(.cell(let cell)) where self._markAsStoppingChild(identifiedBy: cell.receivesSystemMessages.id):
-            cell.receivesSystemMessages._sendSystemMessage(.stop, file: #file, line: #line)
+            cell.receivesSystemMessages._sendSystemMessage(.stop, file: #filePath, line: #line)
             return true
         case .some(.adapter(let ref)) where includeAdapters:
             ref.stop()

Sources/DistributedActors/Adapters.swift

@@ -68,7 +68,7 @@ internal final class _ActorRefAdapter<To: Codable>: _AbstractAdapter {
         self.target._system
     }
 
-    func sendSystemMessage(_ message: _SystemMessage, file: String = #file, line: UInt = #line) {
+    func sendSystemMessage(_ message: _SystemMessage, file: String = #filePath, line: UInt = #line) {
         switch message {
         case .watch(let watchee, let watcher):
             self.addWatcher(watchee: watchee, watcher: watcher)
@@ -82,7 +82,7 @@ internal final class _ActorRefAdapter<To: Codable>: _AbstractAdapter {
     }
 
     @usableFromInline
-    func trySendUserMessage(_ message: Any, file: String = #file, line: UInt = #line) {
+    func trySendUserMessage(_ message: Any, file: String = #filePath, line: UInt = #line) {
         self.target._unsafeUnwrapCell.sendAdaptedMessage(message, file: file, line: line)
     }
 
@@ -207,11 +207,11 @@ internal final class _DeadLetterAdapterPersonality: _AbstractAdapter {
         self.deadLetters._system
     }
 
-    func trySendUserMessage(_ message: Any, file: String = #file, line: UInt = #line) {
+    func trySendUserMessage(_ message: Any, file: String = #filePath, line: UInt = #line) {
         self.deadLetters.tell(DeadLetter(message, recipient: self.deadRecipient, sentAtFile: file, sentAtLine: line), file: file, line: line)
     }
 
-    func sendSystemMessage(_ message: _SystemMessage, file: String = #file, line: UInt = #line) {
+    func sendSystemMessage(_ message: _SystemMessage, file: String = #filePath, line: UInt = #line) {
         self.deadLetters._sendSystemMessage(message, file: file, line: line)
     }
 
@@ -270,7 +270,7 @@ internal final class SubReceiveAdapter<Message: Codable, OwnerMessage: Codable>:
         self.target._system
     }
 
-    func sendSystemMessage(_ message: _SystemMessage, file: String = #file, line: UInt = #line) {
+    func sendSystemMessage(_ message: _SystemMessage, file: String = #filePath, line: UInt = #line) {
         switch message {
         case .watch(let watchee, let watcher):
             self.addWatcher(watchee: watchee, watcher: watcher)
@@ -284,12 +284,12 @@ internal final class SubReceiveAdapter<Message: Codable, OwnerMessage: Codable>:
     }
 
     @usableFromInline
-    func _sendUserMessage(_ message: Message, file: String = #file, line: UInt = #line) {
+    func _sendUserMessage(_ message: Message, file: String = #filePath, line: UInt = #line) {
         self.target._unsafeUnwrapCell.sendSubMessage(message, identifier: self.identifier, subReceiveAddress: self.adapterAddress)
     }
 
     @usableFromInline
-    func trySendUserMessage(_ message: Any, file: String = #file, line: UInt = #line) {
+    func trySendUserMessage(_ message: Any, file: String = #filePath, line: UInt = #line) {
         if let message = message as? Message {
             self._sendUserMessage(message, file: file, line: line)
         } else {

Sources/DistributedActors/Behaviors.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift Distributed Actors open source project
 //
-// Copyright (c) 2018-2019 Apple Inc. and the Swift Distributed Actors project authors
+// Copyright (c) 2018-2022 Apple Inc. and the Swift Distributed Actors project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -599,7 +599,7 @@ extension _Behavior {
     ///
     /// Note: The returned behavior MUST be `_Behavior.canonicalize`-ed in the vast majority of cases.
     // Implementation note: We don't do so here automatically in order to keep interpretations transparent and testable.
-    public func interpretMessage(context: _ActorContext<Message>, message: Message, file: StaticString = #file, line: UInt = #line) throws -> _Behavior<Message> {
+    public func interpretMessage(context: _ActorContext<Message>, message: Message, file: StaticString = #filePath, line: UInt = #line) throws -> _Behavior<Message> {
         switch self.underlying {
         case .receiveMessage(let recv): return try recv(message)
         case .receiveMessageAsync(let recv): return self.receiveMessageAsync(recv, message)
@@ -709,7 +709,7 @@ extension _Behavior {
     internal func interpretOrElse(
         context: _ActorContext<Message>,
         first: _Behavior<Message>, orElse second: _Behavior<Message>, message: Message,
-        file: StaticString = #file, line: UInt = #line
+        file: StaticString = #filePath, line: UInt = #line
     ) throws -> _Behavior<Message> {
         var nextBehavior = try first.interpretMessage(context: context, message: message, file: file, line: line)
         if nextBehavior.isUnhandled {
@@ -749,7 +749,7 @@ extension _Behavior {
         return self
     }
 
-    internal func validateAsInitialFatal(file: String = #file, line: UInt = #line) {
+    internal func validateAsInitialFatal(file: String = #filePath, line: UInt = #line) {
         switch self.underlying {
         case .same, .unhandled: fatalError("Illegal initial behavior! Attempted to spawn(\(self)) at \(file):\(line)")
         default: return

Sources/DistributedActors/Cluster/Cluster+Event.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift Distributed Actors open source project
 //
-// Copyright (c) 2018-2019 Apple Inc. and the Swift Distributed Actors project authors
+// Copyright (c) 2018-2022 Apple Inc. and the Swift Distributed Actors project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -212,7 +212,7 @@ extension Cluster {
         #endif
 
         #if DEBUG
-        public init?(oldLeader: Cluster.Member?, newLeader: Cluster.Member?, file: String = #file, line: UInt = #line) {
+        public init?(oldLeader: Cluster.Member?, newLeader: Cluster.Member?, file: String = #filePath, line: UInt = #line) {
             guard oldLeader != newLeader else {
                 return nil
             }

Sources/DistributedActors/Cluster/ClusterShell+Logging.swift

@@ -25,7 +25,7 @@ extension ClusterShellState {
     /// Enabled with `-DSACT_TRACELOG_CLUSTER`
     func tracelog(
         _ type: TraceLogType, message: Any,
-        file: String = #file, function: String = #function, line: UInt = #line
+        file: String = #filePath, function: String = #function, line: UInt = #line
     ) {
         let level: Logger.Level?
         #if SACT_TRACELOG_CLUSTER
@@ -70,7 +70,7 @@ extension ClusterShell {
     /// Optional "dump all messages" logging.
     func tracelog(
         _ context: _ActorContext<ClusterShell.Message>, _ type: TraceLogType, message: Any,
-        file: String = #file, function: String = #function, line: UInt = #line
+        file: String = #filePath, function: String = #function, line: UInt = #line
     ) {
         if let level = context.system.settings.traceLogLevel {
             context.log.log(

Sources/DistributedActors/Cluster/ClusterShell.swift

@@ -72,7 +72,7 @@ internal class ClusterShell {
 
     /// Get an existing association or ensure that a new one shall be stored and joining kicked off if the target node was not known yet.
     /// Safe to concurrently access by privileged internals directly
-    internal func getEnsureAssociation(with node: UniqueNode, file: String = #file, line: UInt = #line) -> StoredAssociationState {
+    internal func getEnsureAssociation(with node: UniqueNode, file: String = #filePath, line: UInt = #line) -> StoredAssociationState {
         self._associationsLock.withLock {
             if let tombstone = self._associationTombstones[node] {
                 return .tombstone(tombstone)
@@ -106,7 +106,7 @@ internal class ClusterShell {
 
     /// To be invoked by cluster shell whenever handshake is accepted, creating a completed association.
     /// Causes messages to be flushed onto the new associated channel.
-    private func completeAssociation(_ associated: ClusterShellState.AssociatedDirective, file: String = #file, line: UInt = #line) throws {
+    private func completeAssociation(_ associated: ClusterShellState.AssociatedDirective, file: String = #filePath, line: UInt = #line) throws {
         // 1) Complete and store the association
         try self._associationsLock.withLockVoid {
             let node: UniqueNode = associated.handshake.remoteNode

Sources/DistributedActors/Cluster/ClusterShellState.swift

@@ -383,7 +383,7 @@ extension ClusterShellState {
     /// Does NOT by itself move the member to joining, but via the directive asks the outer to do this.
     mutating func completeHandshakeAssociate(
         _ clusterShell: ClusterShell, _ handshake: HandshakeStateMachine.CompletedState, channel: Channel,
-        file: String = #file, line: UInt = #line
+        file: String = #filePath, line: UInt = #line
     ) -> AssociatedDirective {
         guard self._handshakes.removeValue(forKey: handshake.remoteNode.node) != nil else {
             fatalError("Can not complete a handshake which was not in progress!")