Changeset 1812

Timestamp:

2/11/2010 2:15:09 AM (3 years ago)

Author:

lowjoel

Message:

• Move the contents of the OpenHandle::ResolveHandlePath? function to the ResolveHandleName? function in native code (we would have p/invoked quite a bit in that function)
• Move the global name resolution thread and it's task queue to native code and in a anonymous namespace

Location:

trunk/eraser6/Eraser.Util.Native

Files:

• OpenHandle.NameResolver.cpp (modified) (2 diffs)
• OpenHandle.NameResolver.h (modified) (1 diff)
• OpenHandle.cpp (modified) (1 diff)
• OpenHandle.h (modified) (1 diff)

trunk/eraser6/Eraser.Util.Native/OpenHandle.NameResolver.cpp

@@ -23 +23 @@
 #include "OpenHandle.h"
 
-#pragma managed(push)
 #pragma unmanaged
 
 namespace {
+    HANDLE NameResolutionThread;
+    NameResolutionThreadParams NameResolutionThreadParam;
+
     DWORD __stdcall nameResolutionThread(void* data)
     {
@@ -86 +88 @@
         return 0;
     }
+
+    void CreateNameThread(HANDLE& handle, NameResolutionThreadParams& params)
+    {
+        //If the handle is valid terminate the thread
+        if (handle)
+        {
+            TerminateThread(handle, 1);
+            CloseHandle(handle);
+        }
+
+        //Create the thread
+        handle = CreateThread(NULL, 0, nameResolutionThread, &params, 0, NULL);
+    }
+
 }
 
-void CreateNameThread(HANDLE& handle, NameResolutionThreadParams& params)
+std::wstring ResolveHandleName(HANDLE handle, int pid)
 {
-    //If the handle is valid terminate the thread
-    if (handle)
+    //Start a name resolution thread (in case one entry hangs)
+    if (NameResolutionThread == NULL)
+        CreateNameThread(NameResolutionThread, NameResolutionThreadParam);
+
+    //Create a duplicate handle
+    HANDLE localHandle;
+    HANDLE processHandle = OpenProcess(PROCESS_DUP_HANDLE, false, pid);
+    DuplicateHandle(processHandle, static_cast<void*>(handle), GetCurrentProcess(),
+        &localHandle, 0, false, DUPLICATE_SAME_ACCESS);
+    CloseHandle(processHandle);
+
+    //We need a handle
+    if (!localHandle)
+        return std::wstring();
+
+    //Send the handle to the secondary thread for name resolution
+    NameResult result(localHandle);
+    NameResolutionThreadParam.Input.push_back(&result);
+    ReleaseSemaphore(NameResolutionThreadParam.Semaphore, 1, NULL);
+
+    //Wait for the result
+    if (WaitForSingleObject(result.Event, 50) != WAIT_OBJECT_0)
     {
-        TerminateThread(handle, 1);
-        CloseHandle(handle);
+        //The wait failed. Terminate the thread and recreate another.
+        CreateNameThread(NameResolutionThread, NameResolutionThreadParam);
     }
 
-    //Create the thread
-    handle = CreateThread(NULL, 0, nameResolutionThread, &params, 0, NULL);
+    //Close the handle which we duplicated
+    CloseHandle(localHandle);
+
+    //Return the result
+    return result.Name;
 }

trunk/eraser6/Eraser.Util.Native/OpenHandle.NameResolver.h

@@ -81 +81 @@
 };
 
-void CreateNameThread(HANDLE& handle, NameResolutionThreadParams& params);
+std::wstring ResolveHandleName(HANDLE handle, int pid);

trunk/eraser6/Eraser.Util.Native/OpenHandle.cpp

@@ -73 +73 @@
     String^ OpenHandle::ResolveHandlePath(IntPtr handle, int pid)
     {
-        //Start a name resolution thread (in case one entry hangs)
-        if (NameResolutionThread == NULL)
-        {
-            NameResolutionThread = new HANDLE(0);
-            NameResolutionThreadParam = new NameResolutionThreadParams;
-            CreateNameThread(*NameResolutionThread, *NameResolutionThreadParam);
-        }
-
-        //Create a duplicate handle
-        HANDLE localHandle(NULL);
-        HANDLE processHandle = OpenProcess(PROCESS_DUP_HANDLE, false, pid);
-        DuplicateHandle(processHandle, static_cast<void*>(handle), GetCurrentProcess(),
-            &localHandle, 0, false, DUPLICATE_SAME_ACCESS);
-        CloseHandle(processHandle);
-
-        //We need a handle
-        if (!localHandle)
-            return nullptr;
-
-        //Send the handle to the secondary thread for name resolution
-        NameResult result(localHandle);
-        NameResolutionThreadParam->Input.push_back(&result);
-        ReleaseSemaphore(NameResolutionThreadParam->Semaphore, 1, NULL);
-
-        //Wait for the result
-        if (WaitForSingleObject(result.Event, 50) != WAIT_OBJECT_0)
-        {
-            //The wait failed. Terminate the thread and recreate another.
-            CreateNameThread(*NameResolutionThread, *NameResolutionThreadParam);
-        }
-
-        //Close the handle which we duplicated
-        CloseHandle(localHandle);
-
-        //Return the result
-        if (result.Name.empty())
-            return nullptr;
-        else
-            return gcnew String(result.Name.c_str(), 0,
-                static_cast<int>(result.Name.length()));
+        std::wstring result(ResolveHandleName(static_cast<void*>(handle), pid));
+        return result.empty() ? nullptr :
+            gcnew String(result.c_str(), 0, static_cast<int>(result.length()));
     }
 

trunk/eraser6/Eraser.Util.Native/OpenHandle.h

@@ -93 +93 @@
 
     private:
-        static HANDLE* NameResolutionThread;
-        static NameResolutionThreadParams* NameResolutionThreadParam;
-
         IntPtr handle;
         String^ path;