提交 502d41f1 编写于 作者: T Tomas Kolda

Making use of GetSystemTimePreciseAsFileTime dynamic to not

break compatibility with Windows 7. The issue with rotated logs
was fixed other way.
上级 9c2cf947
...@@ -32,8 +32,17 @@ Status AutoRollLogger::ResetLogger() { ...@@ -32,8 +32,17 @@ Status AutoRollLogger::ResetLogger() {
} }
void AutoRollLogger::RollLogFile() { void AutoRollLogger::RollLogFile() {
std::string old_fname = OldInfoLogFileName( uint64_t now = env_->NowMicros();
dbname_, env_->NowMicros(), db_absolute_path_, db_log_dir_); std::string old_fname;
// Try to check target name only 10 times at most
for (int i = 0; i < 10; i++) {
old_fname = OldInfoLogFileName(
dbname_, now, db_absolute_path_, db_log_dir_);
if (!env_->FileExists(old_fname).ok()) {
break;
}
now++;
};
env_->RenameFile(log_fname_, old_fname); env_->RenameFile(log_fname_, old_fname);
} }
......
...@@ -1138,6 +1138,8 @@ void WinthreadCall(const char* label, std::error_code result) { ...@@ -1138,6 +1138,8 @@ void WinthreadCall(const char* label, std::error_code result) {
} }
} }
typedef VOID(WINAPI * FnGetSystemTimePreciseAsFileTime)(LPFILETIME);
class WinEnv : public Env { class WinEnv : public Env {
public: public:
WinEnv(); WinEnv();
...@@ -1676,25 +1678,29 @@ class WinEnv : public Env { ...@@ -1676,25 +1678,29 @@ class WinEnv : public Env {
} }
virtual uint64_t NowMicros() override { virtual uint64_t NowMicros() override {
// all std::chrono clocks on windows proved to return if (GetSystemTimePreciseAsFileTime_ != NULL) {
// values that may repeat that is not good enough for some uses. // all std::chrono clocks on windows proved to return
const int64_t c_UnixEpochStartTicks = 116444736000000000i64; // values that may repeat that is not good enough for some uses.
const int64_t c_FtToMicroSec = 10; const int64_t c_UnixEpochStartTicks = 116444736000000000i64;
const int64_t c_FtToMicroSec = 10;
// This interface needs to return system time and not
// just any microseconds because it is often used as an argument // This interface needs to return system time and not
// to TimedWait() on condition variable // just any microseconds because it is often used as an argument
FILETIME ftSystemTime; // to TimedWait() on condition variable
GetSystemTimePreciseAsFileTime(&ftSystemTime); FILETIME ftSystemTime;
GetSystemTimePreciseAsFileTime_(&ftSystemTime);
LARGE_INTEGER li;
li.LowPart = ftSystemTime.dwLowDateTime; LARGE_INTEGER li;
li.HighPart = ftSystemTime.dwHighDateTime; li.LowPart = ftSystemTime.dwLowDateTime;
// Subtract unix epoch start li.HighPart = ftSystemTime.dwHighDateTime;
li.QuadPart -= c_UnixEpochStartTicks; // Subtract unix epoch start
// Convert to microsecs li.QuadPart -= c_UnixEpochStartTicks;
li.QuadPart /= c_FtToMicroSec; // Convert to microsecs
return li.QuadPart; li.QuadPart /= c_FtToMicroSec;
return li.QuadPart;
}
using namespace std::chrono;
return duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
} }
virtual uint64_t NowNanos() override { virtual uint64_t NowNanos() override {
...@@ -2104,8 +2110,13 @@ class WinEnv : public Env { ...@@ -2104,8 +2110,13 @@ class WinEnv : public Env {
std::vector<ThreadPool> thread_pools_; std::vector<ThreadPool> thread_pools_;
mutable std::mutex mu_; mutable std::mutex mu_;
std::vector<std::thread> threads_to_join_; std::vector<std::thread> threads_to_join_;
static FnGetSystemTimePreciseAsFileTime GetSystemTimePreciseAsFileTime_;
static bool GetSystemTimePreciseAsFileTimeInitialized_;
}; };
FnGetSystemTimePreciseAsFileTime WinEnv::GetSystemTimePreciseAsFileTime_ = NULL;
bool WinEnv::GetSystemTimePreciseAsFileTimeInitialized_ = false;
WinEnv::WinEnv() WinEnv::WinEnv()
: checkedDiskForMmap_(false), : checkedDiskForMmap_(false),
forceMmapOff(false), forceMmapOff(false),
...@@ -2113,6 +2124,16 @@ WinEnv::WinEnv() ...@@ -2113,6 +2124,16 @@ WinEnv::WinEnv()
allocation_granularity_(page_size_), allocation_granularity_(page_size_),
perf_counter_frequency_(0), perf_counter_frequency_(0),
thread_pools_(Priority::TOTAL) { thread_pools_(Priority::TOTAL) {
if (!GetSystemTimePreciseAsFileTimeInitialized_) {
HMODULE module = GetModuleHandle("kernel32.dll");
if (module != NULL) {
GetSystemTimePreciseAsFileTime_ = (FnGetSystemTimePreciseAsFileTime)GetProcAddress(
module, "GetSystemTimePreciseAsFileTime");
}
GetSystemTimePreciseAsFileTimeInitialized_ = true;
}
SYSTEM_INFO sinfo; SYSTEM_INFO sinfo;
GetSystemInfo(&sinfo); GetSystemInfo(&sinfo);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册