Changeset 81 for trunk/src

Timestamp:

Jul 10, 2009, 1:14:41 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

QThread: OS/2: move set priority stuff to a separate private function to avoid mutex recursion.

Location:

trunk/src/corelib/thread

Files:

• qthread_os2.cpp (modified) (3 diffs)
• qthread_p.h (modified) (1 diff)

trunk/src/corelib/thread/qthread_os2.cpp

@@ -322 +322 @@
 }
 
+void QThreadPrivate::setPriority(QThread::Priority priority)
+{
+    this->priority = priority;
+
+    ULONG prioClass = 0;
+    LONG prioDelta = 0;
+    switch (priority) {
+        case QThread::IdlePriority:
+            prioClass = PRTYC_IDLETIME;
+            prioDelta = PRTYD_MINIMUM;
+            break;
+
+        case QThread::LowestPriority:
+            prioClass = PRTYC_IDLETIME;
+            break;
+
+        case QThread::LowPriority:
+            prioClass = PRTYC_IDLETIME;
+            prioDelta = PRTYD_MAXIMUM;
+            break;
+
+        case QThread::NormalPriority:
+                prioClass = PRTYC_REGULAR;
+                break;
+
+        case QThread::HighPriority:
+            prioClass = PRTYC_REGULAR;
+            prioDelta = PRTYD_MAXIMUM;
+            break;
+
+        case QThread::HighestPriority:
+                prioClass = PRTYC_TIMECRITICAL;
+                break;
+
+        case QThread::TimeCriticalPriority:
+            prioClass = PRTYC_TIMECRITICAL;
+            prioDelta = PRTYD_MAXIMUM;
+            break;
+
+        case QThread::InheritPriority:
+        default:
+            PTIB ptib;
+            DosGetInfoBlocks(&ptib, NULL);
+            prioClass = (ptib->tib_ptib2->tib2_ulpri >> 8) & 0xFF;
+            prioDelta = (ptib->tib_ptib2->tib2_ulpri) & 0xFF;
+            break;
+    }
+
+    APIRET rc = DosSetPriority(PRTYS_THREAD, prioClass, prioDelta, tid);
+    if (rc != NO_ERROR)
+        qWarning("QThreadPrivate::setPriority: DosSetPriority returned %lu", rc);
+}
+
 void QThread::start(Priority priority)
 {
@@ -344 +397 @@
     }
 
-    setPriority(priority);
+    d->setPriority(priority);
 }
 
@@ -446 +499 @@
     }
 
-    d->priority = priority;
-
-    ULONG prioClass = 0;
-    LONG prioDelta = 0;
-    switch (priority) {
-        case IdlePriority:
-            prioClass = PRTYC_IDLETIME;
-            prioDelta = PRTYD_MINIMUM;
-        break;
-
-        case LowestPriority:
-            prioClass = PRTYC_IDLETIME;
-            break;
-
-        case LowPriority:
-            prioClass = PRTYC_IDLETIME;
-            prioDelta = PRTYD_MAXIMUM;
-            break;
-
-        case NormalPriority:
-                prioClass = PRTYC_REGULAR;
-                break;
-
-        case HighPriority:
-            prioClass = PRTYC_REGULAR;
-            prioDelta = PRTYD_MAXIMUM;
-            break;
-
-        case HighestPriority:
-                prioClass = PRTYC_TIMECRITICAL;
-                break;
-
-        case TimeCriticalPriority:
-            prioClass = PRTYC_TIMECRITICAL;
-            prioDelta = PRTYD_MAXIMUM;
-            break;
-
-        case InheritPriority:
-        default:
-            PTIB ptib;
-            DosGetInfoBlocks( &ptib, NULL );
-            prioClass = (ptib->tib_ptib2->tib2_ulpri >> 8) & 0xFF;
-            prioDelta = (ptib->tib_ptib2->tib2_ulpri) & 0xFF;
-            break;
-    }
-
-    APIRET rc = DosSetPriority(PRTYS_THREAD, prioClass, prioDelta, d->tid);
-    if (rc != NO_ERROR)
-        qWarning("QThread::setPriority: DosSetPriority returned %lu", rc);
+    d->setPriority(priority);
 }
 

trunk/src/corelib/thread/qthread_p.h

@@ -180 +180 @@
     bool terminationEnabled, terminatePending;
 
+    void setPriority(QThread::Priority priority);
+
     static void start(void *);
     static void finish(void *, bool lockAnyway=true);