Bash scripts now call the watcher, but watcher still crashes when bui…

…lt with MSBuild...

src/native/watchdog/watchdog.cpp

@@ -1,15 +1,16 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdlib>
 #include <errno.h>
 #include <signal.h>
 
 #ifdef _WIN32
 #include <windows.h>
 #include <string>
 #else
-#include <unistd.h>
+#include <chrono>
 #include <sys/wait.h>
+#include <thread>
+#include <unistd.h>
 #endif
 
 int run_timed_process(const long, const int, const char *[]);
@@ -22,14 +23,14 @@ int main(const int argc, const char *argv[])
         return EXIT_FAILURE;
     }
 
-    const long timeout_ms = strtol(argv[1], nullptr, 10);
-    int exit_code = run_timed_process(timeout_ms, argc-2, &argv[2]);
+    const long timeout_sec = strtol(argv[1], nullptr, 10);
+    int exit_code = run_timed_process(timeout_sec * 1000L, argc-2, &argv[2]);
 
     printf("App Exit Code: %d\n", exit_code);
     return exit_code;
 }
 
-int run_timed_process(const long timeout, const int exe_argc, const char *exe_path_and_argv[])
+int run_timed_process(const long timeout_ms, const int proc_argc, const char *proc_argv[])
 {
 #ifdef _WIN32
     std::string cmdline(exe_path_and_argv[0]);
@@ -64,21 +65,24 @@ int run_timed_process(const long timeout, const int exe_argc, const char *exe_pa
     return exit_code;
 
 #else
-    const int check_interval = 1000;
+    // TODO: Describe what the 'ms_factor' is, and why it's being used here.
+    const int ms_factor = 40;
+    const int check_interval = 1000 / ms_factor;
+
     int check_count = 0;
-    char **args = new char *[exe_argc];
+    char *args[proc_argc];
 
     pid_t child_pid;
     int child_status;
-    int wait_code;
+    int w;
 
-    for (int i = 0; i < exe_argc; i++)
+    for (int i = 0; i < proc_argc; i++)
     {
-        args[i] = (char *) exe_path_and_argv[i];
+        args[i] = (char *) proc_argv[i];
     }
 
     // This is just for development. Will remove it when it's ready to be submitted :)
-    for (int j = 0; j < exe_argc; j++)
+    for (int j = 0; j < proc_argc; j++)
     {
         printf("[%d]: %s\n", j, args[j]);
     }
@@ -87,43 +91,41 @@ int run_timed_process(const long timeout, const int exe_argc, const char *exe_pa
 
     if (child_pid < 0)
     {
-        printf("Fork failed... No memory available.\n");
+        // Fork failed. No memory remaining available :(
+        printf("Fork failed... Returning ENOMEM.\n");
         return ENOMEM;
     }
     else if (child_pid == 0)
     {
+        // Instructions for child process!
         printf("Running child process...\n");
         execv(args[0], &args[0]);
     }
     else
     {
         do
         {
-            wait_code = waitpid(child_pid, &child_status, WNOHANG);
+            // Instructions for the parent process!
+            w = waitpid(child_pid, &child_status, WNOHANG);
 
-            // Something went terribly wrong.
-            if (wait_code == -1)
+            if (w == -1)
                 return EINVAL;
 
-            // TODO: Explain why we are multiplying by 25 here, and dividing
-            // by 40 in the while clause.
-            usleep(check_interval * 25);
+            std::this_thread::sleep_for(std::chrono::milliseconds(check_interval));
 
-            if (wait_code)
+            if (w)
             {
                 if (WIFEXITED(child_status))
-                {
-                    printf("Child process exited successfully with status %d.\n",
-                            WEXITSTATUS(child_status));
                     return WEXITSTATUS(child_status);
-                }
             }
-        } while (check_count++ < ((timeout / check_interval) * 40));
+            check_count += ms_factor;
+
+        } while (check_count < ((timeout_ms / check_interval) * ms_factor));
     }
 
-    printf("Child process took too long and timed out... Exiting it...\n");
+    printf("Child process took too long. Timed out... Exiting...\n");
     kill(child_pid, SIGKILL);
-    delete[] args; // Don't leak memory :)
+
 #endif
     return ETIMEDOUT;
 }

src/tests/Common/CLRTest.Execute.Bash.targets

@@ -172,14 +172,27 @@ fi
         <Description>Set CORE_ROOT to the specified value before running the test.</Description>
       </BashCLRTestExecutionScriptArgument>
 
+      <BashCLRTestExecutionScriptArgument Include="watcher">
+        <HasParam>true</HasParam>
+        <ParamText>=*</ParamText> <!-- Bash specific -->
+        <ParamName>watcherFullPath</ParamName>
+        <Command><![CDATA[        export _WatcherFullPath="${i#*=}"
+        if [ ! -f "$_WatcherFullPath" ]
+        then
+            echo "The Watcher FullPath %5C%22${_WatcherFullPath}%5C%22 does not exist"
+            usage
+        fi]]></Command>
+        <Description>Path to the test watcher that will look over the test.</Description>
+      </BashCLRTestExecutionScriptArgument>
+
       <BashCLRTestExecutionScriptArgument Include="e;env">
         <HasParam>true</HasParam>
         <ParamText>=*</ParamText> <!-- Bash specific -->
         <ParamName>dotenvFullPath</ParamName>
         <Command><![CDATA[        export __DotEnv="${i#*=}"
         if [ ! -f "$__DotEnv" ]
         then
-            echo "The Debugger FullPath %5C%22${__DotEnv}%5C%22 does not exist"
+            echo "The dotenv file FullPath %5C%22${__DotEnv}%5C%22 does not exist"
             usage
         fi
         export __DotEnvArg=-e ${__DotEnv}]]></Command>
@@ -242,10 +255,11 @@ then
     exit 1
   fi
 
-  # Copy CORECLR native binaries to $LinkBin,
+  # Copy CORECLR native binaries and the test watcher (if provided) to $LinkBin,
   # so that we can run the test based on that directory
   cp $CORE_ROOT/*.so $LinkBin/
   cp $CORE_ROOT/corerun $LinkBin/
+  cp $_WatcherFullPath/watchdog $LinkBin/
 
   # Copy some files that may be arguments
   for f in *.txt;
@@ -255,6 +269,7 @@ then
 
   ExePath=$LinkBin/$(InputAssemblyName)
   export CORE_ROOT=$PWD/$LinkBin
+  export _WatcherFullPath=$PWD/$LinkBin/watchdog
 fi
 ]]>
           </BashLinkerTestLaunchCmds>
@@ -275,6 +290,7 @@ fi
       </PropertyGroup>
       <PropertyGroup>
       <CLRTestRunFile Condition="'$(CLRTestIsHosted)'=='true'">"$CORE_ROOT/corerun" $(CoreRunArgs)  ${__DotEnvArg}</CLRTestRunFile>
+      <WatcherRunFile>"$_WatcherFullPath" 300</WatcherRunFile>
 
       <!-- Note that this overwrites CLRTestBashPreCommands rather than adding to it. -->
       <CLRTestBashPreCommands Condition="'$(CLRTestKind)' == 'BuildAndRun' and '$(TargetArchitecture)' == 'wasm'"><![CDATA[
@@ -311,7 +327,7 @@ if [ ! -z "$CLRCustomTestLauncher" ];
 then
     LAUNCHER="$CLRCustomTestLauncher $PWD/"
 else
-    LAUNCHER="$_DebuggerFullPath $_DebuggerArgsSeparator $(CLRTestRunFile)"
+    LAUNCHER="$_DebuggerFullPath $_DebuggerArgsSeparator $(WatcherRunFile) $(CLRTestRunFile)"
 fi
 
 $(BashIlrtTestLaunchCmds)
@@ -476,7 +492,7 @@ usage()
 for i in "$@"
     do
         case $i in
-        -?|-h|--help)
+          -?|-h|--help|/?|/h|/help)
         usage
         %3B%3B
 @(BashCLRTestExecutionScriptArgument -> '        -%(Identity)%(ParamText)|/%(Identity)%(ParamText))