allow cliloader to proceed in more cases (#383)

If the child thread to replace functions cannot be created, we should still continue, since loading the right OpenCL.dll in the child process is usually enough to perform interception.
intel · Oct 26, 2024 · 51bc1ed · 51bc1ed
1 parent eedf0a4
commit 51bc1ed
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/cliloader/cliloader.cpp b/cliloader/cliloader.cpp
@@ -784,18 +784,21 @@ int main(int argc, char *argv[])
                 NULL );
             if( childThread == NULL )
             {
-                die("replacing functions in child thread");
+                DEBUG("couldn't create child thread to replace functions\n");
             }
-            DEBUG("created child thread to replace functions\n");
-
-            // Wait for child thread to complete:
-            if( WaitForSingleObject(childThread, INFINITE) != WAIT_OBJECT_0 )
+            else
             {
-                die("waiting for initialization thread");
+                DEBUG("created child thread to replace functions\n");
+
+                // Wait for child thread to complete:
+                if( WaitForSingleObject(childThread, INFINITE) != WAIT_OBJECT_0 )
+                {
+                    die("waiting for initialization thread");
+                }
+                DEBUG("child thread to replace functions completed\n");
+                CloseHandle(childThread);
+                DEBUG("cleaned up child thread to replace functions\n");
             }
-            DEBUG("child thread to replace functions completed\n");
-            CloseHandle(childThread);
-            DEBUG("cleaned up child thread to replace functions\n");
         }
     }
 

diff --git a/cliprof/cliprof.cpp b/cliprof/cliprof.cpp
@@ -432,18 +432,21 @@ int main(int argc, char *argv[])
             NULL );
         if( childThread == NULL )
         {
-            die("replacing functions in child thread");
+            DEBUG("couldn't create child thread to replace functions\n");
         }
-        DEBUG("created child thread to replace functions\n");
-
-        // Wait for child thread to complete:
-        if( WaitForSingleObject(childThread, INFINITE) != WAIT_OBJECT_0 )
+        else
         {
-            die("waiting for initialization thread");
+            DEBUG("created child thread to replace functions\n");
+
+            // Wait for child thread to complete:
+            if( WaitForSingleObject(childThread, INFINITE) != WAIT_OBJECT_0 )
+            {
+                die("waiting for initialization thread");
+            }
+            DEBUG("child thread to replace functions completed\n");
+            CloseHandle(childThread);
+            DEBUG("cleaned up child thread to replace functions\n");
         }
-        DEBUG("child thread to replace functions completed\n");
-        CloseHandle(childThread);
-        DEBUG("cleaned up child thread to replace functions\n");
     }
 
     // Resume child process: