Changeset 79

Timestamp:

Apr 5, 2006, 9:18:34 PM (19 years ago)

Author:

dmik

Message:

Fixed QCriticalSection implementation on OS/2: it was really stupid to suppose that DosEnterCritSec = EnterCriticalSection w/o reading Win32 API docs and w/o searching for QCriticalSection usage within Qt; now mutex semaphores are used instead.

Location:

trunk/src/tools

Files:

• qcriticalsection_p.cpp (modified) (5 diffs)
• qcriticalsection_p.h (modified) (2 diffs)

trunk/src/tools/qcriticalsection_p.cpp

@@ -44 +44 @@
 #endif
 
-#if defined(Q_WS_WIN)
 class QCriticalSectionPrivate 
 {
@@ -50 +49 @@
     QCriticalSectionPrivate() {}
 
+#if defined(Q_WS_WIN)
     CRITICAL_SECTION section;
+#elif defined(Q_OS_OS2)
+    HMTX mutex;
+#endif
 };
-#endif
 
 QCriticalSection::QCriticalSection()
 {
+    d = new QCriticalSectionPrivate;
 #if defined(Q_WS_WIN)
-    d = new QCriticalSectionPrivate;
     InitializeCriticalSection( &d->section );
+#elif defined(Q_OS_OS2)
+    DosCreateMutexSem( NULL, &d->mutex, 0, FALSE );
 #endif
 }
@@ -66 +70 @@
 #if defined(Q_WS_WIN)
     DeleteCriticalSection( &d->section );
+#elif defined(Q_OS_OS2)
+    DosCloseMutexSem( d->mutex );
+#endif
     delete d;
-#endif
 }
 
@@ -75 +81 @@
     EnterCriticalSection( &d->section );
 #elif defined(Q_OS_OS2)
-    DosEnterCritSec();
+    DosRequestMutexSem( d->mutex, SEM_INDEFINITE_WAIT );
 #endif
 }
@@ -84 +90 @@
     LeaveCriticalSection( &d->section );
 #elif defined(Q_OS_OS2)
-    DosExitCritSec();
+    DosReleaseMutexSem( d->mutex );
 #endif
 }

trunk/src/tools/qcriticalsection_p.h

@@ -61 +61 @@
 */
 
-#if defined(Q_WS_WIN)
 class QCriticalSectionPrivate;
-#endif
 
 class QCriticalSection
@@ -73 +71 @@
     void leave();
 
-#if defined(Q_WS_WIN)
 private:
     QCriticalSectionPrivate *d;
-#endif    
 };