Changeset 31057 in webkit for trunk/JavaScriptCore

Timestamp:

Mar 14, 2008, 7:59:38 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Get rid of a localime() call on platforms that have better alternatives.

• kjs/DateMath.h: Added getLocalTime();

• kjs/DateMath.cpp: (KJS::getLocalTime): (KJS::getDSTOffsetSimple): Implementation moved from getDSTOffsetSimple().

• kjs/date_object.cpp: (KJS::DateObjectImp::callAsFunction): Switched to getLocalTime().

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/DateMath.cpp (modified) (2 diffs)
• kjs/DateMath.h (modified) (1 diff)
• kjs/date_object.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-03-14  Alexey Proskuryakov  <[email protected]>
+
+        Reviewed by Darin.
+
+        Get rid of a localime() call on platforms that have better alternatives.
+
+        * kjs/DateMath.h: Added getLocalTime();
+
+        * kjs/DateMath.cpp:
+        (KJS::getLocalTime):
+        (KJS::getDSTOffsetSimple):
+        Implementation moved from getDSTOffsetSimple().
+
+        * kjs/date_object.cpp:
+        (KJS::DateObjectImp::callAsFunction): Switched to getLocalTime().
+
 2008-03-14  David D. Kilzer  <[email protected]>
 

trunk/JavaScriptCore/kjs/DateMath.cpp

@@ -293 +293 @@
 }
 
+void getLocalTime(const time_t* localTime, struct tm* localTM)
+{
+#if PLATFORM(QT)
+#if USE(MULTIPLE_THREADS)
+#error Mulitple threads are currently not supported in the Qt/mingw build
+#endif
+    *localTM = *localtime(localTime);
+#elif PLATFORM(WIN_OS)
+    #if COMPILER(MSVC7)
+    *localTM = *localtime(localTime);
+    #else
+    localtime_s(localTM, localTime);
+    #endif
+#else
+    localtime_r(localTime, localTM);
+#endif
+}
+
 // There is a hard limit at 2038 that we currently do not have a workaround
 // for (rdar://problem/5052975).
@@ -416 +434 @@
 
     tm localTM;
-#if PLATFORM(QT)
-    // ### this is not threadsafe but we don't use multiple threads anyway
-    // in the Qt build
-#if USE(MULTIPLE_THREADS)
-#error Mulitple threads are currently not supported in the Qt/mingw build
-#endif
-    localTM = *localtime(&localTime);
-#elif PLATFORM(WIN_OS)
-    #if COMPILER(MSVC7)
-    localTM = *localtime(&localTime);
-    #else
-    localtime_s(&localTM, &localTime);
-    #endif
-#else
-    localtime_r(&localTime, &localTM);
-#endif
+    getLocalTime(&localTime, &localTM);
 
     double diff = ((localTM.tm_hour - offsetHour) * secondsPerHour) + ((localTM.tm_min - offsetMinute) * 60);

trunk/JavaScriptCore/kjs/DateMath.h

@@ -55 +55 @@
 int equivalentYearForDST(int year);
 double getCurrentUTCTime();
+void getLocalTime(const time_t*, tm*);
+
 
 const char * const weekdayName[7] = { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" };

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -518 +518 @@
 JSValue *DateObjectImp::callAsFunction(ExecState * /*exec*/, JSObject * /*thisObj*/, const List &/*args*/)
 {
-    time_t t = time(0);
-    GregorianDateTime ts(*localtime(&t));
+    time_t localTime = time(0);
+    tm localTM;
+    getLocalTime(&localTime, &localTM);
+    GregorianDateTime ts(localTM);
     return jsString(formatDate(ts) + " " + formatTime(ts, false));
 }