Changeset 14613 in vbox for trunk/src

Timestamp:

Nov 26, 2008 12:56:39 AM (16 years ago)

Author:

vboxsync

Message:

VBoxManage: the other problematic function is handleModifyVM, disabled global optimizations for it. Enabled the handleShowVMInfo optimization hack for x86 too, as it suffers (even if it's significantly less).

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (5 diffs)
• VBoxManageInfo.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -35 +35 @@
 
 #include <stdlib.h>
-#include <stdarg.h>
 
 #include <vector>
@@ -41 +40 @@
 #endif /* !VBOX_ONLY_DOCS */
 
-#include <iprt/runtime.h>
+#include <iprt/initterm.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
+#include <iprt/stdarg.h>
 #include <iprt/asm.h>
 #include <iprt/uuid.h>
@@ -74 +74 @@
 
 /** command handler type */
-typedef DECLCALLBACK(int) FNHANDLER(int argc, char *argv[], ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession);
-typedef FNHANDLER *PFNHANDLER;
+typedef int (*PFNHANDLER)(int argc, char *argv[], ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession);
 
 #ifdef USE_XPCOM_QUEUE
@@ -1446 +1445 @@
 }
 
+/** @todo refine this after HDD changes; MSC 8.0/64 has trouble with handleModifyVM.  */
+#if defined(_MSC_VER)
+# pragma optimize("g", off)
+#endif
+
 static int handleModifyVM(int argc, char *argv[],
                           ComPtr<IVirtualBox> virtualBox, ComPtr<ISession> session)
@@ -3255 +3259 @@
 }
 
+/** @todo refine this after HDD changes; MSC 8.0/64 has trouble with handleModifyVM.  */
+#if defined(_MSC_VER)
+# pragma optimize("", on)
+#endif
+
 static int handleStartVM(int argc, char *argv[],
                          ComPtr<IVirtualBox> virtualBox, ComPtr<ISession> session)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -107 +107 @@
 
 /* Disable global optimizations for MSC 8.0/64 to make it compile in reasonable
-   time. MSC 7.1/32 doesn't have any trouble with it. */
-#if defined(_MSC_VER) && defined(RT_ARCH_AMD64)
+   time. MSC 7.1/32 doesn't have quite as much trouble with it, but still
+   sufficient to qualify for this hack as well since this code isn't performance
+   critical and probably won't gain much from the extra optimizing in real life. */
+#if defined(_MSC_VER)
 # pragma optimize("g", off)
 #endif
@@ -1851 +1853 @@
 }
 
+#if defined(_MSC_VER)
+# pragma optimize("", on)
+#endif
+
 int handleShowVMInfo(int argc, char *argv[],
                      ComPtr<IVirtualBox> virtualBox, ComPtr<ISession> session)