Changeset 14056 in vbox for trunk/src/VBox/Frontends/VirtualBox4/include

Timestamp:

Nov 10, 2008 10:58:05 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Removed some ancient VBOX_GUI_DEBUG stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox4/include

Files:

• VBoxDefs.h (modified) (3 diffs)
• VBoxFrameBuffer.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxDefs.h

@@ -33 +33 @@
 #include <iprt/alloc.h>
 
-#ifdef VBOX_GUI_DEBUG
+#ifdef DEBUG
 
 #define AssertWrapperOk(w)      \
@@ -40 +40 @@
     AssertMsg (w.isOk(), (#w ": " m " (RC=0x%08X)", w.lastRC()))
 
-#else // !VBOX_GUI_DEBUG
+#else /* #ifdef DEBUG */
 
 #define AssertWrapperOk(w)          do {} while (0)
 #define AssertWrapperOkMsg(w, m)    do {} while (0)
 
-#endif // !VBOX_GUI_DEBUG
+#endif /* #ifdef DEBUG */
 
 #ifndef SIZEOF_ARRAY
@@ -62 +62 @@
   #endif
 #endif
-
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined (VBOX_GUI_DEBUG)
-
-#include <QThread>
-#include <QDateTime>
-
-#include <VBox/types.h> // for uint64_t type
-
-/**
- * A class to measure intervals using rdtsc instruction.
- */
-class VMCPUTimer : public QThread // for crossplatform msleep()
-{
-public:
-    /* don't inline this function to not depend on iprt/asm.h here */
-    static uint64_t ticks();
-    inline static uint64_t msecs( uint64_t tcks ) {
-        return tcks / ticks_per_msec;
-    }
-    inline static uint64_t msecsSince( uint64_t tcks ) {
-        tcks = ticks() - tcks;
-        return tcks / ticks_per_msec;
-    }
-    inline static void calibrate( int ms )
-    {
-        QTime t;
-        uint64_t tcks = ticks();
-        t.start();
-        msleep( ms );
-        tcks = ticks() - tcks;
-        int msecs = t.elapsed();
-        ticks_per_msec = tcks / msecs;
-    }
-    inline static uint64_t ticksPerMsec() {
-        return ticks_per_msec;
-    }
-private:
-    static uint64_t ticks_per_msec;
-};
-
-#endif // VBOX_GUI_DEBUG
 
 /** Null UUID constant to be used as a default value for reference parameters */

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxFrameBuffer.h

@@ -46 +46 @@
 
 class VBoxConsoleView;
-
-//#define VBOX_GUI_FRAMEBUF_STAT
-
-#if defined (VBOX_GUI_DEBUG) && defined (VBOX_GUI_FRAMEBUF_STAT)
-#define FRAMEBUF_DEBUG_START(prefix) \
-    uint64_t prefix##elapsed = VMCPUTimer::ticks();
-#define FRAMEBUF_DEBUG_STOP(prefix,w,h) { \
-        prefix##elapsed = VMCPUTimer::ticks() - prefix##elapsed; \
-        V_DEBUG(( "Last update: %04d x %04d px, %03.3f ms, %.0f ticks", \
-            (w), (h), \
-            (double) prefix##elapsed / (double) VMCPUTimer::ticksPerMsec(), \
-            (double) prefix##elapsed \
-        )); \
-    }
-#else
-#define FRAMEBUF_DEBUG_START(prefix) {}
-#define FRAMEBUF_DEBUG_STOP(prefix,w,h) {}
-#endif
 
 /////////////////////////////////////////////////////////////////////////////