Changeset 846 for trunk/src/corelib/kernel/qeventdispatcher_symbian.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/kernel/qeventdispatcher_symbian.cpp (modified) (34 diffs)

trunk/src/corelib/kernel/qeventdispatcher_symbian.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -48 +48 @@
 #include <errno.h>
 
-#include <net/if.h>
-
 QT_BEGIN_NAMESPACE
 
@@ -101 +99 @@
 {
 public:
-    QSelectMutexGrabber(int fd, QMutex *threadMutex, QMutex *selectCallMutex)
-        : m_threadMutex(threadMutex), m_selectCallMutex(selectCallMutex), bHasThreadLock(false)
+    QSelectMutexGrabber(int utex)
+        : m_)
     {
-        // see if selectThread is waiting m_waitCond
-        // if yes ... dont write to pipe
-        if (m_threadMutex->tryLock()) {
-            bHasThreadLock = true;
+        if (m_mutex->tryLock())
             return;
-        }
-
-        // still check that SelectThread
-        // is in select call
-        if (m_selectCallMutex->tryLock()) {
-            m_selectCallMutex->unlock();
-            return;
-        }
 
         char dummy = 0;
-        qt_pipe_write(fd, &dummy, 1);
-
-        m_threadMutex->lock();
-        bHasThreadLock = true;
+        qt_pipe_write(writeFd, &dummy, 1);
+
+        m_mutex->lock();
+
+        char buffer;
+        while (::read(readFd, &buffer, 1) > 0) {}
     }
 
     ~QSelectMutexGrabber()
     {
-        if(bHasThreadLock)
-            m_threadMutex->unlock();
+        m_mutex->unlock();
     }
 
 private:
-    QMutex *m_threadMutex;
-    QMutex *m_selectCallMutex;
-    bool bHasThreadLock;
+    QMutex *m_mutex;
 };
 
@@ -142 +128 @@
  * this as a base class with convenience functions.
  *
- * Here is how it works: On every RunL, the deriving class should call okToRun(). This will allow
- * exactly one run of the active object, and mark it as such. If it is called again, it will return
- * false, and add the object to a queue so it can be run later.
+ * Here is how it works: On every RunL, the deriving class should call 
+ * 
+ * .
  *
  * The QCompleteDeferredAOs class is a special object that runs after all others, which will
@@ -164 +150 @@
 }
 
-bool QActiveObject::okToRun()
+bool QActiveObject::()
 {
     Q_ASSERT(!m_hasRunAgain);
@@ -172 +158 @@
         m_hasAlreadyRun = true;
         m_iterationCount = m_dispatcher->iterationCount();
-        return true;
+        return e;
     } else {
         // The event has already occurred.
         m_dispatcher->addDeferredActiveObject(this);
         m_hasRunAgain = true;
-        return false;
+        return e;
     }
 }
@@ -193 +179 @@
 
 QWakeUpActiveObject::QWakeUpActiveObject(QEventDispatcherSymbian *dispatcher)
-    : CActive(WAKE_UP_PRIORITY),
-      m_dispatcher(dispatcher)
+    : QActiveObject(WAKE_UP_PRIORITY, dispatcher)
 {
     CActiveScheduler::Add(this);
@@ -216 +201 @@
 void QWakeUpActiveObject::RunL()
 {
+
+
+
     iStatus = KRequestPending;
     SetActive();
@@ -230 +218 @@
 {
     Cancel();
+
 }
 
@@ -236 +225 @@
     if (m_timerInfo->interval > 0) {
         m_rTimer.Cancel();
-        m_rTimer.Close();
     } else {
         if (iStatus.Int() == KRequestPending) {
@@ -247 +235 @@
 void QTimerActiveObject::RunL()
 {
-    int error;
-    QT_TRYCATCH_ERROR(error, Run());
+    int error = KErrNone;
+    if (iStatus == KErrNone) {
+        QT_TRYCATCH_ERROR(error, Run());
+    } else {
+        error = iStatus.Int();
+    }
     // All Symbian error codes are negative.
     if (error < 0) {
@@ -281 +273 @@
     }
 
-    if (!okToRun())
+    if (())
         return;
 
@@ -311 +303 @@
     m_timerInfo->msLeft = m_timerInfo->interval;
     if (m_timerInfo->interval > 0) {
-        m_rTimer.CreateLocal();
+        if (!m_rTimer.Handle()) {
+            qt_symbian_throwIfError(m_rTimer.CreateLocal());
+        }
         StartTimer();
     } else {
@@ -416 +410 @@
         int ret;
         int savedSelectErrno;
-        {
-            // helps fighting the race condition between
-            // selctthread and new socket requests (cancel, restart ...)
-            QMutexLocker locker(&m_selectCallMutex);
-            ret = qt_socket_select(maxfd, &readfds, &writefds, &exceptionfds, 0);
-        }
+        ret = qt_socket_select(maxfd, &readfds, &writefds, &exceptionfds, 0);
         savedSelectErrno = errno;
-
-        char buffer;
-
-        while (::read(m_pipeEnds[0], &buffer, 1) > 0) {}
 
         if(ret == 0) {
@@ -447 +432 @@
                 // after loop update notifiers for all of them
 
-                // as we dont have "exception" notifier type
+                // as we dont have "exception" notifier type
                 // we should force monitoring fd_set of this
                 // type as well
@@ -502 +487 @@
         }
 
-        m_waitCond.wait(&m_mutex);
+        if (FD_ISSET(m_pipeEnds[0], &readfds))
+            m_waitCond.wait(&m_mutex);
     }
 
@@ -516 +502 @@
     }
 
-    QMutexLocker locker(&m_grabberMutex);
-
-    QSelectMutexGrabber lock(m_pipeEnds[1], &m_mutex, &m_selectCallMutex);
+    Q);
+
+    QSelectMutexGrabber lock(m_pipeEnds[1], utex);
 
     Q_ASSERT(!m_AOStatuses.contains(notifier));
@@ -529 +515 @@
 void QSelectThread::cancelSocketEvents ( QSocketNotifier *notifier )
 {
-    QMutexLocker locker(&m_grabberMutex);
-
-    QSelectMutexGrabber lock(m_pipeEnds[1], &m_mutex, &m_selectCallMutex);
+    Q);
+
+    QSelectMutexGrabber lock(m_pipeEnds[1], utex);
 
     m_AOStatuses.remove(notifier);
@@ -540 +526 @@
 void QSelectThread::restart()
 {
-    QMutexLocker locker(&m_grabberMutex);
-
-    QSelectMutexGrabber lock(m_pipeEnds[1], &m_mutex, &m_selectCallMutex);
+    Q);
+
+    QSelectMutexGrabber lock(m_pipeEnds[1], utex);
 
     m_waitCond.wakeAll();
@@ -598 +584 @@
              * then signal RequestComplete for it
              */
-            qWarning("exception on %d [will do setdefaultif(0) - hack]", i.key()->socket());
+            qWarning("exception on %d [will  - hack]", i.key()->socket());
             // quick fix; there is a bug
             // when doing read on socket
@@ -604 +590 @@
             // after offline-ing the device
             // on some devices we do get exception
-            // close all exiting sockets
-            // and reset default IAP
-            if(::setdefaultif(0) != KErrNone) // well we can't do much about it
-                qWarning("setdefaultif(0) failed");
-
+            ::close(i.key()->socket());
             toRemove.append(i.key());
             TRequestStatus *status = i.value();
@@ -653 +635 @@
 void QSocketActiveObject::RunL()
 {
-    if (!okToRun())
+    if (())
         return;
 
@@ -738 +720 @@
 QEventDispatcherSymbian::QEventDispatcherSymbian(QObject *parent)
     : QAbstractEventDispatcher(parent),
+
       m_activeScheduler(0),
       m_wakeUpAO(0),
@@ -744 +727 @@
       m_wakeUpDone(0),
       m_iterationCount(0),
+
       m_noSocketEvents(false)
 {
@@ -769 +753 @@
 }
 
+
+
+
+
+
+
 void QEventDispatcherSymbian::closingDown()
 {
-    if (m_selectThread.isRunning()) {
-        m_selectThread.stop();
-    }
+    if (m_selectThread && m_selectThread->isRunning()) {
+        m_selectThread->stop();
+    }
+    delete m_selectThread;
+    m_selectThread = 0;
 
     delete m_completeDeferredAOs;
@@ -786 +778 @@
     bool handledAnyEvent = false;
     bool oldNoSocketEventsValue = m_noSocketEvents;
+
+
+
 
     QT_TRY {
@@ -876 +871 @@
 
     m_noSocketEvents = oldNoSocketEventsValue;
+
 
     return handledAnyEvent;
@@ -896 +892 @@
 
     timerInfo->inTimerEvent = true;
+
+
 
     QTimerEvent event(timerInfo->timerId);
     QCoreApplication::sendEvent(timerInfo->receiver, &event);
 
+
     timerInfo->inTimerEvent = false;
 
@@ -979 +978 @@
 inline void QEventDispatcherSymbian::addDeferredActiveObject(QActiveObject *object)
 {
-    if (m_deferredActiveObjects.isEmpty()) {
-        m_completeDeferredAOs->complete();
-    }
+    queueDeferredActiveObjectsCompletion();
     m_deferredActiveObjects.append(object);
 }
@@ -988 +985 @@
 {
     m_deferredActiveObjects.removeAll(object);
+
+
+
+
+
 }
 
@@ -1029 +1031 @@
     QSocketActiveObject *socketAO = q_check_ptr(new QSocketActiveObject(this, notifier));
     m_notifiers.insert(notifier, socketAO);
-    m_selectThread.requestSocketEvents(notifier, &socketAO->iStatus);
+    .requestSocketEvents(notifier, &socketAO->iStatus);
 }
 
 void QEventDispatcherSymbian::unregisterSocketNotifier ( QSocketNotifier * notifier )
 {
-    m_selectThread.cancelSocketEvents(notifier);
+    if (m_selectThread)
+        m_selectThread->cancelSocketEvents(notifier);
     if (m_notifiers.contains(notifier)) {
         QSocketActiveObject *sockObj = *m_notifiers.find(notifier);
@@ -1045 +1048 @@
 void QEventDispatcherSymbian::reactivateSocketNotifier(QSocketNotifier *notifier)
 {
-    m_selectThread.requestSocketEvents(notifier, &m_notifiers[notifier]->iStatus);
+    .requestSocketEvents(notifier, &m_notifiers[notifier]->iStatus);
 }
 
@@ -1065 +1068 @@
 
     timer->timerAO->Start();
+
+
+
+
+
+
+
+
 }
 
@@ -1128 +1139 @@
 
 QT_END_NAMESPACE
+
+