Merge pull request #13147 from benlangmuir/sourcekitd-sema-delay-throttle

[sourcekitd] Be more aggresive with the semantic editor delay to avoid being throttled

Author: benlangmuir

tools/SourceKit/tools/sourcekitd/bin/XPC/Client/sourcekitd.cpp

@@ -409,6 +409,10 @@ static void updateSemanticEditorDelay() {
   using namespace std::chrono;
   using TimePoint = time_point<system_clock, nanoseconds>;
 
+  // This minimum is chosen to keep us from being throttled by XPC.
+  static const size_t MinDelaySeconds = 10;
+  static const size_t MaxDelaySeconds = 20;
+
   // Clear any previous setting.
   SemanticEditorDelaySecondsNum = 0;
 
@@ -417,16 +421,13 @@ static void updateSemanticEditorDelay() {
   TimePoint PrevTime = gPrevCrashTime;
   TimePoint CurrTime = system_clock::now();
   gPrevCrashTime = CurrTime;
-  if (PrevTime == TimePoint()) {
-    // First time that it crashed.
-    return;
-  }
 
   auto Diff = duration_cast<seconds>(CurrTime - PrevTime);
+  size_t Delay = Diff.count()*2 + 1;
   if (Diff.count() > 30)
-    return; // treat this as more likely unrelated to the previous crash.
+    Delay = 0; // Treat this as more likely unrelated to the previous crash.
+  Delay = std::min(std::max(Delay, MinDelaySeconds), MaxDelaySeconds);
 
-  size_t Delay = std::min(size_t(20), size_t(Diff.count()*2 + 1));
   LOG_WARN_FUNC("disabling semantic editor for " << Delay << " seconds");
   SemanticEditorDelaySecondsNum = Delay;
 

tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp

@@ -720,6 +720,9 @@ handleSemanticRequest(RequestDict Req,
 
   llvm::SmallString<64> ErrBuf;
 
+  if (isSemanticEditorDisabled())
+      return Rec(createErrorRequestFailed("semantic editor is disabled"));
+
   if (ReqUID == RequestCodeComplete) {
     std::unique_ptr<llvm::MemoryBuffer>
     InputBuf = getInputBufForRequest(SourceFile, SourceText, ErrBuf);
@@ -767,9 +770,6 @@ handleSemanticRequest(RequestDict Req,
     return Rec(indexSource(*SourceFile, Args, Hash));
   }
 
-  if (isSemanticEditorDisabled())
-      return Rec(createErrorRequestFailed("semantic editor is disabled"));
-
   if (ReqUID == RequestCursorInfo) {
     LangSupport &Lang = getGlobalContext().getSwiftLangSupport();