Changeset 13680 in webkit for trunk/JavaScriptCore/kjs/testkjs.cpp

Timestamp:

Apr 4, 2006, 5:11:08 AM (19 years ago)

Author:

eseidel

Message:

2006-04-04 Bjrn Graf <​[email protected]>

Reviewed by ggaren & darin. Landed by eseidel.

Integrate CURL version of gettimeofday
​http://bugzilla.opendarwin.org/show_bug.cgi?id=7399
Disable crash report dialogs for testkjs.exe in Release mode
​http://bugzilla.opendarwin.org/show_bug.cgi?id=8113

• kjs/testkjs.cpp: (StopWatch::start): (StopWatch::stop): (StopWatch::getElapsedMS): (main): (kjsmain):

File:

• trunk/JavaScriptCore/kjs/testkjs.cpp (modified) (7 diffs)

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -3 +3 @@
  *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
- *  Copyright (C) 2004 Apple Computer, Inc.
+ *  Copyright (C) 2004-2006 Apple Computer, Inc.
+ *  Copyright (C) 2006 Björn Graf ([email protected])
  *
  *  This library is free software; you can redistribute it and/or
@@ -39 +40 @@
 #endif
 
+#if PLATFORM(WIN_OS)
+#include <windows.h>
+#endif
+
 using namespace KJS;
 using namespace KXMLCore;
@@ -53 +58 @@
     
 private:
-#if !PLATFORM(WIN_OS)
+#if PLATFORM(WIN_OS)
+    DWORD m_startTime;
+    DWORD m_stopTime;
+#else
     // Windows does not have timeval, disabling this class for now (bug 7399)
     timeval m_startTime;
@@ -62 +70 @@
 void StopWatch::start()
 {
-#if !PLATFORM(WIN_OS)
+#if PLATFORM(WIN_OS)
+    m_startTime = timeGetTime();
+#else
     gettimeofday(&m_startTime, 0);
 #endif
@@ -69 +79 @@
 void StopWatch::stop()
 {
-#if !PLATFORM(WIN_OS)
+#if PLATFORM(WIN_OS)
+    m_stopTime = timeGetTime();
+#else
     gettimeofday(&m_stopTime, 0);
 #endif
@@ -76 +88 @@
 long StopWatch::getElapsedMS()
 {
-#if !PLATFORM(WIN_OS)
+#if PLATFORM(WIN_OS)
+    return m_stopTime - m_startTime;
+#else
     timeval elapsedTime;
     timersub(&m_stopTime, &m_startTime, &elapsedTime);
     
     return elapsedTime.tv_sec * 1000 + lroundf(elapsedTime.tv_usec / 1000.0);
-#else
-    return 0;
 #endif
 }
@@ -152 +164 @@
 }
 
+#if PLATFORM(WIN_OS)
+
+// Use SEH for Release builds only to get rid of the crash report dialog
+// (luckyly the same tests fail in Release and Debug builds so far). Need to
+// be in a separate main function because the kjsmain function requires object
+// unwinding.
+
+#if defined(_DEBUG)
+#define TRY
+#define EXCEPT(x)
+#else
+#define TRY       __try {
+#define EXCEPT(x) } __except (EXCEPTION_EXECUTE_HANDLER) { x; }
+#endif
+
+#else
+
+#define TRY
+#define EXCEPT(x)
+
+#endif
+
+int kjsmain(int argc, char** argv);
+
 int main(int argc, char** argv)
+{
+    int res = 0;
+    TRY
+        res = kjsmain(argc, argv);
+    EXCEPT(res = 3)
+    return res;
+}
+
+int kjsmain(int argc, char** argv)
 {
   if (argc < 2) {