Changes to after rebase

Author: cpsughrue

clang/include/clang/Basic/DiagnosticFrontendKinds.td

@@ -268,23 +268,23 @@ def err_test_module_file_extension_version : Error<
   "(%3.%4)">;
 
 // Module Build Daemon
-def err_basepath_length :
-  Error<"BasePath '%0' is longer then the max length of %1">,
+def err_path_length :
+  Error<"path '%0' is longer then the max length of %1">,
   DefaultFatal;
 def err_mbd_handshake :
-  Error<"Attempt to handshake with module build daemon has failed: %0">,
+  Error<"attempt to handshake with module build daemon has failed: %0">,
   DefaultFatal;
 def err_mbd_connect :
-  Error<"Attempt to connect to module build daemon has failed: %0">,
+  Error<"attempt to connect to module build daemon has failed: %0">,
   DefaultFatal;
 def remark_mbd_spawn :
-  Remark<"Successfully spawned module build daemon">,
+  Remark<"successfully spawned module build daemon">,
   InGroup<ModuleBuildDaemon>;
 def remark_mbd_connection :
-  Remark<"Successfully connected to module build daemon at %0">,
+  Remark<"successfully connected to module build daemon at %0">,
   InGroup<ModuleBuildDaemon>;
 def remark_mbd_handshake :
-  Remark<"Clang invocation responsible for %0 successfully completed handshake "
+  Remark<"clang invocation responsible for %0 successfully completed handshake "
          "with module build daemon">,
   InGroup<ModuleBuildDaemon>;
 

clang/lib/Tooling/ModuleBuildDaemon/Frontend.cpp

@@ -127,7 +127,7 @@ void spawnModuleBuildDaemonAndHandshake(const CompilerInvocation &Clang,
     // Get user provided BasePath and confirm it is short enough
     BasePath = Clang.getFrontendOpts().ModuleBuildDaemonPath;
     if (!validBasePathLength(BasePath)) {
-      Diag.Report(diag::err_basepath_length) << BasePath << BasePathMaxLength;
+      Diag.Report(diag::err_path_length) << BasePath << BasePathMaxLength;
       return;
     }
   }

clang/lib/Tooling/ModuleBuildDaemon/SocketSupport.cpp

@@ -18,11 +18,12 @@ namespace clang::tooling::cc1modbuildd {
 llvm::Expected<std::string>
 readBufferFromSocket(llvm::raw_socket_stream &Socket) {
   constexpr unsigned short MAX_BUFFER = 4096;
+  constexpr std::chrono::milliseconds TIMEOUT(5000);
   char Buffer[MAX_BUFFER];
   std::string ReturnBuffer;
 
   ssize_t n = 0;
-  while ((n = Socket.read(Buffer, MAX_BUFFER)) > 0) {
+  while ((n = Socket.read(Buffer, MAX_BUFFER, TIMEOUT)) > 0) {
     ReturnBuffer.append(Buffer, n);
     // Read until \n... encountered which is the last line of a YAML document
     if (ReturnBuffer.find("\n...") != std::string::npos)

clang/test/ModuleBuildDaemon/daemon-crash.c

@@ -11,9 +11,9 @@
 // RUN: cat mbd-crash/mbd.out | sed 's:\\\\\?:/:g' | FileCheck %s
 
 // There should only be one shutdown log line due to the crash
-// CHECK: MBD created and binded to socket at: mbd-crash/mbd.sock
+// CHECK: MBD created and bound to socket at: mbd-crash/mbd.sock
 // CHECK-NEXT: Removing ineligible file: mbd-crash/mbd.sock
-// CHECK-NEXT: MBD created and binded to socket at: mbd-crash/mbd.sock
+// CHECK-NEXT: MBD created and bound to socket at: mbd-crash/mbd.sock
 // CHECK-NEXT: Signal received, shutting down
 
 // Make sure mbd.err is empty

clang/test/ModuleBuildDaemon/daemon-launch.c

@@ -4,12 +4,12 @@
 
 // timeout should exit with status 124 which is treated as a failure by lit on 
 // windows. Ideally we would like to check the exit code and only return true
-// if it equals 124 but lit does not support global bash sysmbols like $?
+// if it equals 124 but lit does not support global bash symbols like $?
 
 // RUN: timeout --signal=SIGTERM 2 %clang -cc1modbuildd mbd-launch -v || true
 // RUN: cat mbd-launch/mbd.out | sed 's:\\\\\?:/:g' | FileCheck %s
 
-// CHECK: MBD created and binded to socket at: mbd-launch/mbd.sock
+// CHECK: MBD created and bound to socket at: mbd-launch/mbd.sock
 // CHECK-NEXT: Signal received, shutting down
 
 // Make sure mbd.err is empty

clang/test/ModuleBuildDaemon/handshake.c

@@ -15,12 +15,12 @@ int main() {return 0;}
 // RUN: cat %t/output-new |  sed 's:\\\\\?:/:g' | FileCheck %s
 // RUN: cat %t/output-existing |  sed 's:\\\\\?:/:g' | FileCheck %s --check-prefix=CHECK-EXIST
 
-// CHECK: remark: Successfully spawned module build daemon [-Rmodule-build-daemon]
-// CHECK-NEXT: remark: Successfully connected to module build daemon at mbd-handshake/mbd.sock [-Rmodule-build-daemon]
-// CHECK-NEXT: remark: Clang invocation responsible for {{.*main.c}} successfully completed handshake with module build daemon [-Rmodule-build-daemon]
+// CHECK: remark: successfully spawned module build daemon [-Rmodule-build-daemon]
+// CHECK-NEXT: remark: successfully connected to module build daemon at mbd-handshake/mbd.sock [-Rmodule-build-daemon]
+// CHECK-NEXT: remark: clang invocation responsible for {{.*main.c}} successfully completed handshake with module build daemon [-Rmodule-build-daemon]
 
 // Check that a clang invocation can handshake with an existing module build daemon
-// CHECK-EXIST: remark: Clang invocation responsible for {{.*main.c}} successfully completed handshake with module build daemon [-Rmodule-build-daemon]
+// CHECK-EXIST: remark: clang invocation responsible for {{.*main.c}} successfully completed handshake with module build daemon [-Rmodule-build-daemon]
 
 // Make sure mbd.err is empty
 // RUN: [ ! -s "mbd-launch/mbd.err" ] && true || false

clang/test/ModuleBuildDaemon/multiple-tu.c

@@ -18,10 +18,10 @@ int main() {return foo();}
 
 // RUN: cat %t/output |  sed 's:\\\\\?:/:g' | FileCheck %s
 
-// CHECK: remark: Successfully spawned module build daemon [-Rmodule-build-daemon]
-// CHECK-NEXT: remark: Successfully connected to module build daemon at mbd-multiple-tu/mbd.sock [-Rmodule-build-daemon]
-// CHECK-DAG: remark: Clang invocation responsible for {{.*main.c}} successfully completed handshake with module build daemon [-Rmodule-build-daemon]
-// CHECK-DAG: remark: Clang invocation responsible for {{.*foo.c}} successfully completed handshake with module build daemon [-Rmodule-build-daemon]
+// CHECK: remark: successfully spawned module build daemon [-Rmodule-build-daemon]
+// CHECK-NEXT: remark: successfully connected to module build daemon at mbd-multiple-tu/mbd.sock [-Rmodule-build-daemon]
+// CHECK-DAG: remark: clang invocation responsible for {{.*main.c}} successfully completed handshake with module build daemon [-Rmodule-build-daemon]
+// CHECK-DAG: remark: clang invocation responsible for {{.*foo.c}} successfully completed handshake with module build daemon [-Rmodule-build-daemon]
 
 // Make sure mbd.err is empty
 // RUN: [ ! -s "mbd-launch/mbd.err" ] && true || false

clang/tools/driver/cc1modbuildd_main.cpp

@@ -154,7 +154,7 @@ void ModuleBuildDaemonServer::createDaemonSocket() {
             exit(EXIT_FAILURE);
           }
           // If a previous module build daemon invocation crashes, the socket
-          // file will need to be removed before the address can be binded to
+          // file will need to be removed before the address can be bound to
           logVerbose("Removing ineligible file: " + SocketPath);
         } else {
           llvm::errs() << "MBD failed to create unix socket: "
@@ -163,7 +163,7 @@ void ModuleBuildDaemonServer::createDaemonSocket() {
         }
       });
     } else {
-      logVerbose("MBD created and binded to socket at: " + SocketPath);
+      logVerbose("MBD created and bound to socket at: " + SocketPath);
       ServerListener.emplace(std::move(*MaybeServerListener));
       break;
     }
@@ -209,7 +209,7 @@ void ModuleBuildDaemonServer::listenForClients() {
         if (EC == std::errc::timed_out) {
           RunServiceLoop = false;
           logVerbose("ListeningServer::accept timed out, shutting down");
-        } else if (EC == std::errc::bad_file_descriptor &&
+        } else if (EC == std::errc::operation_canceled &&
                    RunServiceLoop == false) {
           logVerbose("Signal received, shutting down");
         } else

llvm/lib/Support/raw_socket_stream.cpp

@@ -184,7 +184,7 @@ Expected<ListeningSocket> ListeningSocket::createUnix(StringRef SocketPath,
 // that when written to will cause poll to return. Typically CancelFD is the
 // read end of a unidirectional pipe.
 //
-// Timeout should be -1 to block indefinitly
+// Timeout should be -1 to block indefinitely
 //
 // getActiveFD is a callback to handle ActiveFD's of std::atomic<int> and int
 static std::error_code
@@ -207,7 +207,7 @@ manageTimeout(const std::chrono::milliseconds &Timeout,
   }
 
   // Keep track of how much time has passed in case ::poll or WSAPoll are
-  // interupted by a signal and need to be recalled
+  // interrupted by a signal and need to be recalled
   auto Start = std::chrono::steady_clock::now();
   auto RemainingTimeout = Timeout;
   int PollStatus = 0;