bump up wait even more, move behind config flag

MikeHolman · MikeHolman · commit 401b8587a94c · 2017-02-15T13:27:03.000-08:00
diff --git a/lib/Backend/NativeCodeGenerator.cpp b/lib/Backend/NativeCodeGenerator.cpp
@@ -3673,7 +3673,7 @@ JITManager::HandleServerCallResult(HRESULT hr, RemoteCallType callType)
 
     // we should not have RPC failure if JIT process is still around
     // since this is going to be a failfast, lets wait a bit in case server is in process of terminating
-    if (WaitForSingleObject(GetJITManager()->GetServerHandle(), 1000) != WAIT_OBJECT_0)
+    if (WaitForSingleObject(GetJITManager()->GetServerHandle(), CONFIG_FLAG(RPCFailFastWait)) != WAIT_OBJECT_0)
     {
         RpcFailure_fatal_error(hr);
     }
diff --git a/lib/Common/ConfigFlagsList.h b/lib/Common/ConfigFlagsList.h
@@ -657,6 +657,7 @@ PHASE(All)
 #define DEFAULT_CONFIG_PerfHintLevel (1)
 #define DEFAULT_CONFIG_OOPJITMissingOpts (true)
 #define DEFAULT_CONFIG_OOPCFGRegistration (true)
+#define DEFAULT_CONFIG_RPCFailFastWait (3000)
 
 #define DEFAULT_CONFIG_FailFastIfDisconnectedDelegate    (false)
 
@@ -1207,6 +1208,7 @@ FLAGNR(Boolean, NoDeferParse          , "Disable deferred parsing", false)
 FLAGNR(Boolean, NoLogo                , "No logo, which we don't display anyways", false)
 FLAGNR(Boolean, OOPJITMissingOpts     , "Use optimizations that are missing from OOP JIT", DEFAULT_CONFIG_OOPJITMissingOpts)
 FLAGNR(Boolean, OOPCFGRegistration    , "Do CFG registration OOP (under OOP JIT)", DEFAULT_CONFIG_OOPCFGRegistration)
+FLAGNR(Number,  RPCFailFastWait       , "Wait time for JIT process termination before triggering failfast on RPC failure", DEFAULT_CONFIG_RPCFailFastWait)
 #ifdef _ARM64_
 FLAGR (Boolean, NoNative              , "Disable native codegen", true)
 #else

Original file line number	Diff line number	Diff line change
`@@ -3673,7 +3673,7 @@ JITManager::HandleServerCallResult(HRESULT hr, RemoteCallType callType)`
`3673`	`3673`
`3674`	`3674`	`// we should not have RPC failure if JIT process is still around`
`3675`	`3675`	`// since this is going to be a failfast, lets wait a bit in case server is in process of terminating`
`3676`		`- if (WaitForSingleObject(GetJITManager()->GetServerHandle(), 1000) != WAIT_OBJECT_0)`
	`3676`	`+ if (WaitForSingleObject(GetJITManager()->GetServerHandle(), CONFIG_FLAG(RPCFailFastWait)) != WAIT_OBJECT_0)`
`3677`	`3677`	`{`
`3678`	`3678`	`RpcFailure_fatal_error(hr);`
`3679`	`3679`	`}`