Commit dedd8118 authored by sgjesse@chromium.org's avatar sgjesse@chromium.org

Set svn:eol-style for platform-posix.cc to native.

The svn:eol-style property for platform-posix.cc is now set to native. This should get rid of the CR characters in the file added by comitting from Windows and make file lint again.

TBR=erik.corry@gmail.com
Review URL: http://codereview.chromium.org/42639

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1617 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 0e5999ef
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
#include <time.h> #include <time.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <arpa/inet.h> #include <arpa/inet.h>
...@@ -54,56 +54,56 @@ namespace v8 { namespace internal { ...@@ -54,56 +54,56 @@ namespace v8 { namespace internal {
// POSIX date/time support. // POSIX date/time support.
// //
int OS::GetUserTime(uint32_t* secs, uint32_t* usecs) { int OS::GetUserTime(uint32_t* secs, uint32_t* usecs) {
struct rusage usage; struct rusage usage;
if (getrusage(RUSAGE_SELF, &usage) < 0) return -1; if (getrusage(RUSAGE_SELF, &usage) < 0) return -1;
*secs = usage.ru_utime.tv_sec; *secs = usage.ru_utime.tv_sec;
*usecs = usage.ru_utime.tv_usec; *usecs = usage.ru_utime.tv_usec;
return 0; return 0;
} }
double OS::TimeCurrentMillis() { double OS::TimeCurrentMillis() {
struct timeval tv; struct timeval tv;
if (gettimeofday(&tv, NULL) < 0) return 0.0; if (gettimeofday(&tv, NULL) < 0) return 0.0;
return (static_cast<double>(tv.tv_sec) * 1000) + return (static_cast<double>(tv.tv_sec) * 1000) +
(static_cast<double>(tv.tv_usec) / 1000); (static_cast<double>(tv.tv_usec) / 1000);
} }
int64_t OS::Ticks() { int64_t OS::Ticks() {
// gettimeofday has microsecond resolution. // gettimeofday has microsecond resolution.
struct timeval tv; struct timeval tv;
if (gettimeofday(&tv, NULL) < 0) if (gettimeofday(&tv, NULL) < 0)
return 0; return 0;
return (static_cast<int64_t>(tv.tv_sec) * 1000000) + tv.tv_usec; return (static_cast<int64_t>(tv.tv_sec) * 1000000) + tv.tv_usec;
} }
char* OS::LocalTimezone(double time) { char* OS::LocalTimezone(double time) {
time_t tv = static_cast<time_t>(floor(time/msPerSecond)); time_t tv = static_cast<time_t>(floor(time/msPerSecond));
struct tm* t = localtime(&tv); struct tm* t = localtime(&tv);
return const_cast<char*>(t->tm_zone); return const_cast<char*>(t->tm_zone);
} }
double OS::DaylightSavingsOffset(double time) { double OS::DaylightSavingsOffset(double time) {
time_t tv = static_cast<time_t>(floor(time/msPerSecond)); time_t tv = static_cast<time_t>(floor(time/msPerSecond));
struct tm* t = localtime(&tv); struct tm* t = localtime(&tv);
return t->tm_isdst > 0 ? 3600 * msPerSecond : 0; return t->tm_isdst > 0 ? 3600 * msPerSecond : 0;
} }
double OS::LocalTimeOffset() { double OS::LocalTimeOffset() {
time_t tv = time(NULL); time_t tv = time(NULL);
struct tm* t = localtime(&tv); struct tm* t = localtime(&tv);
// tm_gmtoff includes any daylight savings offset, so subtract it. // tm_gmtoff includes any daylight savings offset, so subtract it.
return static_cast<double>(t->tm_gmtoff * msPerSecond - return static_cast<double>(t->tm_gmtoff * msPerSecond -
(t->tm_isdst > 0 ? 3600 * msPerSecond : 0)); (t->tm_isdst > 0 ? 3600 * msPerSecond : 0));
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// POSIX socket support. // POSIX socket support.
// //
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment