Changeset 9206

Timestamp:

05/28/08 19:50:02 (6 months ago)

Author:

vboxsync

Message:

Fixed the console crash: setFocus was called from the console thread.

Files:

• trunk/src/VBox/Debugger/VBoxDbgBase.cpp (modified) (1 diff)
• trunk/src/VBox/Debugger/VBoxDbgBase.h (modified) (3 diffs)
• trunk/src/VBox/Debugger/VBoxDbgConsole.cpp (modified) (15 diffs)
• trunk/src/VBox/Debugger/VBoxDbgConsole.h (modified) (6 diffs)

trunk/src/VBox/Debugger/VBoxDbgBase.cpp

@@ -30 +30 @@
-
-
-
+, m_hGUIThread(RTThreadNativeSelf())
-{
-    /*

trunk/src/VBox/Debugger/VBoxDbgBase.h

@@ -28 +28 @@
-#include <VBox/vmapi.h>
-#include <VBox/dbg.h>
+#include <iprt/thread.h>
-
-
@@ -61 +62 @@
-    {
-        return m_pVM != NULL;
+    }
+
+    /**
+     * Checks if the current thread is the GUI thread or not.
+     * @return true/false accordingly.
+     */
+    bool isGUIThread() const
+    {
+        return m_hGUIThread == RTThreadNativeSelf();
-    }
-
@@ -107 +117 @@
-    /** The VM handle. */
-    PVM m_pVM;
+    /** The handle of the GUI thread. */
+    RTNATIVETHREAD m_hGUIThread;
-};
-

trunk/src/VBox/Debugger/VBoxDbgConsole.cpp

@@ -58 +58 @@
-
-VBoxDbgConsoleOutput::VBoxDbgConsoleOutput(QWidget *pParent/* = NULL*/, const char *pszName/* = NULL*/)
-
+, m_hGUIThread(RTThreadNativeSelf())
-{
-    setReadOnly(true);
@@ -69 +69 @@
-    Font.setFamily("Courier [Monotype]");
-    setFont(Font);
+
+    /* green on black */
+    setPaper(QBrush(Qt::black));
+    //setColor(Qt::green);
+    setColor(QColor(qRgb(0, 0xe0, 0)));
-}
-
-VBoxDbgConsoleOutput::~VBoxDbgConsoleOutput()
-{
+    Assert(m_hGUIThread == RTThreadNativeSelf());
-}
-
-void VBoxDbgConsoleOutput::appendText(const QString &rStr)
-{
+    Assert(m_hGUIThread == RTThreadNativeSelf());
+
-    if (rStr.isEmpty() || rStr.isNull() || !rStr.length())
-        return;
@@ -128 +136 @@
-
-VBoxDbgConsoleInput::VBoxDbgConsoleInput(QWidget *pParent/* = NULL*/, const char *pszName/* = NULL*/)
-
+, m_hGUIThread(RTThreadNativeSelf())
-{
-    insertItem("", m_iBlankItem);
@@ -141 +149 @@
-VBoxDbgConsoleInput::~VBoxDbgConsoleInput()
-{
+    Assert(m_hGUIThread == RTThreadNativeSelf());
-}
-
-void VBoxDbgConsoleInput::setLineEdit(QLineEdit *pEdit)
-{
+    Assert(m_hGUIThread == RTThreadNativeSelf());
-    QComboBox::setLineEdit(pEdit);
-    if (lineEdit() == pEdit && pEdit)
@@ -152 +162 @@
-void VBoxDbgConsoleInput::returnPressed()
-{
+    Assert(m_hGUIThread == RTThreadNativeSelf());
-    /* deal with the current command. */
-    QString Str = currentText();
@@ -187 +198 @@
-    m_pszInputBuf(NULL), m_cbInputBuf(0), m_cbInputBufAlloc(0),
-    m_pszOutputBuf(NULL), m_cbOutputBuf(0), m_cbOutputBufAlloc(0),
-Timer(
+pTimer(NULL
-{
-    setCaption("VBoxDbg - Console");
@@ -227 +238 @@
-
-    /*
+     * Setup the timer.
+     */
+    m_pTimer = new QTimer(this);
+    connect(m_pTimer, SIGNAL(timeout()), SLOT(updateOutput()));
+
+    /*
-     * Init the backend structure.
-     */
@@ -251 +268 @@
-VBoxDbgConsole::~VBoxDbgConsole()
-{
+    Assert(isGUIThread());
+
-    /*
-     * Wait for the thread.
@@ -266 +285 @@
-     * Free resources.
-     */
+    delete m_pTimer;
+    m_pTimer = NULL;
-    RTCritSectDelete(&m_Lock);
-    RTSemEventDestroy(m_EventSem);
@@ -282 +303 @@
-void VBoxDbgConsole::commandSubmitted(const QString &rCommand)
-{
+    Assert(isGUIThread());
+
-    lock();
-    RTSemEventSignal(m_EventSem);
@@ -322 +345 @@
-void VBoxDbgConsole::updateOutput()
-{
+    Assert(isGUIThread());
+
-    lock();
-    m_fUpdatePending = false;
@@ -368 +393 @@
-    /* dirty focus hack: */
-    if (pThis->m_fInputRestoreFocus)
-
-
-
-
-
+
-
-    bool fRc = true;
@@ -476 +497 @@
-     */
-    if (!pThis->m_fUpdatePending)
-QCustomEvent(QEvent::User, NULL
+VBoxDbgConsoleEvent(VBoxDbgConsoleEvent::kUpdate
-
-    pThis->unlock();
@@ -503 +524 @@
-    LogFlow(("backThread: returns %Vrc\n", rc));
-    if (!pThis->m_fTerminate)
-QCustomEvent(QEvent::User, (void *)1
+VBoxDbgConsoleEvent(VBoxDbgConsoleEvent::kTerminated
-    return rc;
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        {
-            /* make update pending. */
-0
+VBoxDbgConsoleEvent::kUpdate
-                if (!m_fUpdatePending)
-                {
-                    m_fUpdatePending = true;
-Timer.singleShot(10, this, SLOT(updateOutput())
+pTimer->start(10, true /* single shot */
-                }
-                break;
-
+            /* dirty hack: restores the focus */
+            case VBoxDbgConsoleEvent::kInputRestoreFocus:
+                if (m_fInputRestoreFocus)
+                {
+                    m_fInputRestoreFocus = false;
+                    if (!m_pInput->hasFocus())
+                        m_pInput->setFocus();
+                }
+                break;
+
-            /* the thread terminated */
-1
+VBoxDbgConsoleEvent::kTerminated
-                m_pInput->setEnabled(false);
-                break;
@@ -530 +563 @@
-            /* paranoia */
-            default:
-u=%d\n", u
+command=%d\n", pEvent->command()
-                break;
-        }
-
-
-
+
+
+
+
+
+

trunk/src/VBox/Debugger/VBoxDbgConsole.h

@@ -32 +32 @@
-#include <iprt/critsect.h>
-#include <iprt/semaphore.h>
+#include <iprt/thread.h>
-
-
@@ -66 +67 @@
-    /** The position in the current line. */
-    unsigned m_uCurPos;
+    /** The handle to the GUI thread. */
+    RTNATIVETHREAD m_hGUIThread;
-};
-
@@ -118 +121 @@
-    /** The current blank entry. */
-    int m_iBlankItem;
+    /** The handle to the GUI thread. */
+    RTNATIVETHREAD m_hGUIThread;
-};
-
@@ -224 +229 @@
-protected:
-    /**
-
-
-
+
+
+
+
+
+
+
-
-protected:
@@ -249 +258 @@
-    size_t m_cbOutputBufAlloc;
-    /** The timer object used to process output in a delayed fashion. */
-m_
+*m_p
-    /** Set when an output update is pending. */
-    bool volatile m_fUpdatePending;
@@ -278 +287 @@
-
-
+/**
+ * Simple event class for push certain operations over
+ * onto the GUI thread.
+ */
+class VBoxDbgConsoleEvent : public QEvent
+{
+public:
+    typedef enum  { kUpdate, kInputRestoreFocus, kTerminated } VBoxDbgConsoleEventType;
+    enum { kEventNumber = QEvent::User + 42 };
+
+    VBoxDbgConsoleEvent(VBoxDbgConsoleEventType enmCommand)
+        : QEvent((QEvent::Type)kEventNumber), m_enmCommand(enmCommand)
+    {
+    }
+
+    VBoxDbgConsoleEventType command() const
+    {
+        return m_enmCommand;
+    }
+
+private:
+    VBoxDbgConsoleEventType m_enmCommand;
+};
+
+
-#endif
+