UsbDk: Make USB transfers execute at dispatch level

Change ExecutionLevel for redirector data queue to WdfExecutionLevelDispatch. There is no real reason to force USB transfers exection on PASSIVE_LEVEL and DISPATCH_LEVEL execution is definitely faster. Signed-off-by: Dmitry Fleytman <[email protected]>
netusb · Dec 24, 2015 · e46947d · e46947d
1 parent 3bca677
commit e46947d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/UsbDk/ControlDevice.h b/UsbDk/ControlDevice.h
@@ -62,7 +62,7 @@ class CUsbDkControlDeviceQueue : public CWdfDefaultQueue
 {
 public:
     CUsbDkControlDeviceQueue(WDF_IO_QUEUE_DISPATCH_TYPE DispatchType)
-        : CWdfDefaultQueue(DispatchType)
+        : CWdfDefaultQueue(DispatchType, WdfExecutionLevelPassive)
     {}
 
 private:

diff --git a/UsbDk/HiderDevice.h b/UsbDk/HiderDevice.h
@@ -32,7 +32,7 @@ class CUsbDkHiderDeviceQueue : public CWdfDefaultQueue
 {
 public:
     CUsbDkHiderDeviceQueue(WDF_IO_QUEUE_DISPATCH_TYPE DispatchType)
-        : CWdfDefaultQueue(DispatchType)
+        : CWdfDefaultQueue(DispatchType, WdfExecutionLevelPassive)
     {}
 
 private:

diff --git a/UsbDk/RedirectorStrategy.h b/UsbDk/RedirectorStrategy.h
@@ -34,7 +34,7 @@ class CUsbDkRedirectorQueueData : public CWdfDefaultQueue
 {
 public:
     CUsbDkRedirectorQueueData()
-        : CWdfDefaultQueue(WdfIoQueueDispatchParallel)
+        : CWdfDefaultQueue(WdfIoQueueDispatchParallel, WdfExecutionLevelDispatch)
     {}
 
 private:
@@ -47,7 +47,7 @@ class CUsbDkRedirectorQueueConfig : public CWdfSpecificQueue
 {
 public:
     CUsbDkRedirectorQueueConfig()
-        : CWdfSpecificQueue(WdfIoQueueDispatchSequential)
+        : CWdfSpecificQueue(WdfIoQueueDispatchSequential, WdfExecutionLevelPassive)
     {}
 
 private:

diff --git a/UsbDk/WdfDevice.cpp b/UsbDk/WdfDevice.cpp
@@ -137,7 +137,7 @@ NTSTATUS CWdfQueue::Create(CWdfDevice &Device)
     SetCallbacks(QueueConfig);
 
     WDF_OBJECT_ATTRIBUTES_INIT(&Attributes);
-    Attributes.ExecutionLevel = WdfExecutionLevelPassive;
+    Attributes.ExecutionLevel = m_ExecutionLevel;
 
     auto status = Device.AddQueue(QueueConfig, Attributes, m_Queue);
     if (!NT_SUCCESS(status)) {

diff --git a/UsbDk/WdfDevice.h b/UsbDk/WdfDevice.h
@@ -168,8 +168,9 @@ class CWdfControlDevice : public CWdfDevice
 class CWdfQueue
 {
 public:
-    CWdfQueue(WDF_IO_QUEUE_DISPATCH_TYPE DispatchType)
+    CWdfQueue(WDF_IO_QUEUE_DISPATCH_TYPE DispatchType, WDF_EXECUTION_LEVEL ExecutionLevel)
         : m_DispatchType(DispatchType)
+        , m_ExecutionLevel(ExecutionLevel)
     {}
 
     virtual NTSTATUS Create(CWdfDevice &Device);
@@ -187,6 +188,7 @@ class CWdfQueue
 
     WDFQUEUE m_Queue;
     WDF_IO_QUEUE_DISPATCH_TYPE m_DispatchType;
+    WDF_EXECUTION_LEVEL m_ExecutionLevel;
 
     CWdfQueue(const CWdfQueue&) = delete;
     CWdfQueue& operator= (const CWdfQueue&) = delete;
@@ -195,8 +197,8 @@ class CWdfQueue
 class CWdfDefaultQueue : public CWdfQueue
 {
 public:
-    CWdfDefaultQueue(WDF_IO_QUEUE_DISPATCH_TYPE DispatchType)
-        : CWdfQueue(DispatchType)
+    CWdfDefaultQueue(WDF_IO_QUEUE_DISPATCH_TYPE DispatchType, WDF_EXECUTION_LEVEL Executionlevel)
+        : CWdfQueue(DispatchType, Executionlevel)
     {}
 
 private:
@@ -209,8 +211,8 @@ class CWdfDefaultQueue : public CWdfQueue
 class CWdfSpecificQueue : public CWdfQueue
 {
 public:
-    CWdfSpecificQueue(WDF_IO_QUEUE_DISPATCH_TYPE DispatchType)
-        : CWdfQueue(DispatchType)
+    CWdfSpecificQueue(WDF_IO_QUEUE_DISPATCH_TYPE DispatchType, WDF_EXECUTION_LEVEL Executionlevel)
+        : CWdfQueue(DispatchType, Executionlevel)
     {}
 
 private: