From 398424e8b83eaf0ee91b1dbbead7fed4ab09c439 Mon Sep 17 00:00:00 2001 From: Christopher Dykes Date: Fri, 26 Feb 2016 09:28:51 -0800 Subject: [PATCH] Create the sys/time.h portability header Summary: Windows doesn't have it. Reviewed By: yfeldblum Differential Revision: D2979215 fb-gh-sync-id: 030bdcaa44deb18834903705a26369ce0b13abc6 shipit-source-id: 030bdcaa44deb18834903705a26369ce0b13abc6 --- folly/Makefile.am | 2 ++ folly/portability/SysTime.cpp | 36 +++++++++++++++++++++++++++++++++++ folly/portability/SysTime.h | 30 +++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100755 folly/portability/SysTime.cpp create mode 100755 folly/portability/SysTime.h diff --git a/folly/Makefile.am b/folly/Makefile.am index 569879db..f46b13ad 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -268,6 +268,7 @@ nobase_follyinclude_HEADERS = \ portability/Environment.h \ portability/GFlags.h \ portability/Syscall.h \ + portability/SysTime.h \ portability/SysUio.h \ Preprocessor.h \ ProducerConsumerQueue.h \ @@ -393,6 +394,7 @@ libfolly_la_SOURCES = \ MacAddress.cpp \ MemoryMapping.cpp \ portability/Environment.cpp \ + portability/SysTime.cpp \ Random.cpp \ SafeAssert.cpp \ SharedMutex.cpp \ diff --git a/folly/portability/SysTime.cpp b/folly/portability/SysTime.cpp new file mode 100755 index 00000000..9b46b711 --- /dev/null +++ b/folly/portability/SysTime.cpp @@ -0,0 +1,36 @@ +/* + * Copyright 2016 Facebook, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#ifdef _WIN32 +#include +#include + +extern "C" int gettimeofday(timeval* tv, timezone*) { + constexpr auto posixWinFtOffset = 116444736000000000ULL; + + if (tv) { + FILETIME ft; + GetSystemTimeAsFileTime(&ft); + uint64_t ns = *(uint64_t*)&ft; + tv->tv_usec = (long)((ns / 10ULL) % 1000000ULL); + tv->tv_sec = (long)((ns - posixWinFtOffset) / 10000000ULL); + } + + return 0; +} +#endif diff --git a/folly/portability/SysTime.h b/folly/portability/SysTime.h new file mode 100755 index 00000000..56b572f2 --- /dev/null +++ b/folly/portability/SysTime.h @@ -0,0 +1,30 @@ +/* + * Copyright 2016 Facebook, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once + +#ifndef _WIN32 +#include +#else +// Someone decided this was a good place to define timeval..... +#include +struct timezone { + int tz_minuteswest; + int tz_dsttime; +}; + +extern "C" int gettimeofday(timeval* tv, timezone*); +#endif -- 2.34.1