diff options
author | 2016-06-26 07:54:27 -0400 | |
---|---|---|
committer | 2016-06-26 08:12:07 -0400 | |
commit | 5009b55430ba99295c0d7a31b336c61795f6cec3 (patch) | |
tree | e1e22ab3e5ee9661e40a1549bd0030e07edb8232 | |
parent | 3232bfad8909240fe18a63fe1c5090efe09bf626 (diff) |
Introduced src/lib/util/timeconv.[c|h], moved code from un7z.cpp into it, and implemented win_time_point_from_filetime() in terms of it
-rw-r--r-- | scripts/src/lib.lua | 2 | ||||
-rw-r--r-- | src/lib/util/timeconv.cpp | 77 | ||||
-rw-r--r-- | src/lib/util/timeconv.h | 54 | ||||
-rw-r--r-- | src/lib/util/un7z.cpp | 46 | ||||
-rw-r--r-- | src/osd/windows/winutil.cpp | 9 |
5 files changed, 140 insertions, 48 deletions
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index 2352dd6a3a3..394fe189038 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -80,6 +80,8 @@ project "utils" MAME_DIR .. "src/lib/util/sha1.cpp", MAME_DIR .. "src/lib/util/sha1.h", MAME_DIR .. "src/lib/util/strformat.h", + MAME_DIR .. "src/lib/util/timeconv.cpp", + MAME_DIR .. "src/lib/util/timeconv.h", MAME_DIR .. "src/lib/util/unicode.cpp", MAME_DIR .. "src/lib/util/unicode.h", MAME_DIR .. "src/lib/util/unzip.cpp", diff --git a/src/lib/util/timeconv.cpp b/src/lib/util/timeconv.cpp new file mode 100644 index 00000000000..969c2c045af --- /dev/null +++ b/src/lib/util/timeconv.cpp @@ -0,0 +1,77 @@ +// license:BSD-3-Clause +// copyright-holders:Vas Crabb, Nathan Woods +/********************************************************************* + + timeconv.cpp + + Time conversion utility code + +***************************************************************************/ + +#include "timeconv.h" + +namespace util { + +/*************************************************************************** + PROTOTYPES +***************************************************************************/ + +static util::ntfs_duration calculate_ntfs_offset(); + + +/*************************************************************************** + GLOBAL VARIABLES +***************************************************************************/ + +static util::ntfs_duration s_ntfs_offset(calculate_ntfs_offset()); + + +/*************************************************************************** + IMPLEMENTATION +***************************************************************************/ + +static util::ntfs_duration calculate_ntfs_offset() +{ + constexpr auto days_in_year(365); + constexpr auto days_in_four_years((days_in_year * 4) + 1); + constexpr auto days_in_century((days_in_four_years * 25) - 1); + constexpr auto days_in_four_centuries((days_in_century * 4) + 1); + + constexpr ntfs_duration day(std::chrono::hours(24)); + constexpr ntfs_duration year(day * days_in_year); + constexpr ntfs_duration four_years(day * days_in_four_years); + constexpr ntfs_duration century(day * days_in_century); + constexpr ntfs_duration four_centuries(day * days_in_four_centuries); + + std::time_t const zero(0); + std::tm const epoch(*std::gmtime(&zero)); + + ntfs_duration result(day * epoch.tm_yday); + result += std::chrono::hours(epoch.tm_hour); + result += std::chrono::minutes(epoch.tm_min); + result += std::chrono::seconds(epoch.tm_sec); + + int years(1900 - 1601 + epoch.tm_year); + result += four_centuries * (years / 400); + years %= 400; + result += century * (years / 100); + years %= 100; + result += four_years * (years / 4); + years %= 4; + result += year * years; + + return result; +} + + +// ------------------------------------------------- +// system_clock_time_point_from_ntfs_duration +// ------------------------------------------------- + +std::chrono::system_clock::time_point system_clock_time_point_from_ntfs_duration(ntfs_duration d) +{ + return std::chrono::system_clock::from_time_t(0) + std::chrono::duration_cast<std::chrono::system_clock::duration>(d - s_ntfs_offset); +} + + +}; diff --git a/src/lib/util/timeconv.h b/src/lib/util/timeconv.h new file mode 100644 index 00000000000..7f6e5085fd4 --- /dev/null +++ b/src/lib/util/timeconv.h @@ -0,0 +1,54 @@ +// license:BSD-3-Clause +// copyright-holders:Vas Crabb, Nathan Woods +/*************************************************************************** + + timeconv.h + + Time conversion utility code + +***************************************************************************/ + +#pragma once + +#ifndef MAME_LIB_UTIL_TIMECONV_H +#define MAME_LIB_UTIL_TIMECONV_H + +#include "osdcore.h" + +#include <chrono> + + +namespace util { + +/*************************************************************************** + TYPE DEFINITIONS +***************************************************************************/ + +typedef std::chrono::duration<std::uint64_t, std::ratio<1, 10000000> > ntfs_duration; + + +/*************************************************************************** + INLINE FUNCTIONS +***************************************************************************/ + +// ------------------------------------------------- +// ntfs_duration_from_filetime +// ------------------------------------------------- + +inline ntfs_duration ntfs_duration_from_filetime(std::uint32_t high, std::uint32_t low) +{ + return ntfs_duration((std::uint64_t(high) << 32) | std::uint64_t(low)); +} + + +/*************************************************************************** + FUNCTION PROTOTYPES +***************************************************************************/ + +ntfs_duration ntfs_duration_from_filetime(std::uint32_t high, std::uint32_t low); +std::chrono::system_clock::time_point system_clock_time_point_from_ntfs_duration(ntfs_duration d); + + +} // namespace util + +#endif // MAME_LIB_UTIL_TIMECONV_H diff --git a/src/lib/util/un7z.cpp b/src/lib/util/un7z.cpp index 4fee8d156d8..33a9c3f51db 100644 --- a/src/lib/util/un7z.cpp +++ b/src/lib/util/un7z.cpp @@ -2,7 +2,7 @@ // copyright-holders:Aaron Giles, Vas Crabb /*************************************************************************** - un7z.c + un7z.cpp Functions to manipulate data within 7z files. @@ -14,6 +14,7 @@ #include "corestr.h" #include "unicode.h" +#include "timeconv.h" #include "lzma/C/7z.h" #include "lzma/C/7zAlloc.h" @@ -154,8 +155,6 @@ public: archive_file::error decompress(void *buffer, std::uint32_t length); private: - typedef std::chrono::duration<std::uint64_t, std::ratio<1, 10000000> > ntfs_duration; - m7z_file_impl(const m7z_file_impl &) = delete; m7z_file_impl(m7z_file_impl &&) = delete; m7z_file_impl &operator=(const m7z_file_impl &) = delete; @@ -171,10 +170,7 @@ private: void make_utf8_name(int index); void set_curr_modified(); - static ntfs_duration calculate_ntfs_offset(); - static constexpr std::size_t CACHE_SIZE = 8; - static const ntfs_duration s_ntfs_offset; static std::array<ptr, CACHE_SIZE> s_cache; static std::mutex s_cache_mutex; @@ -246,7 +242,6 @@ private: GLOBAL VARIABLES ***************************************************************************/ -const m7z_file_impl::ntfs_duration m7z_file_impl::s_ntfs_offset(calculate_ntfs_offset()); std::array<m7z_file_impl::ptr, m7z_file_impl::CACHE_SIZE> m7z_file_impl::s_cache; std::mutex m7z_file_impl::s_cache_mutex; @@ -520,8 +515,8 @@ void m7z_file_impl::set_curr_modified() if (SzBitWithVals_Check(&m_db.MTime, m_curr_file_idx)) { CNtfsFileTime const &file_time(m_db.MTime.Vals[m_curr_file_idx]); - ntfs_duration const ticks((std::uint64_t(file_time.High) << 32) | std::uint64_t(file_time.Low)); - m_curr_modified = std::chrono::system_clock::from_time_t(0) + (ticks - s_ntfs_offset); + auto ticks = ntfs_duration_from_filetime(file_time.High, file_time.Low); + m_curr_modified = system_clock_time_point_from_ntfs_duration(ticks); } else { @@ -530,39 +525,6 @@ void m7z_file_impl::set_curr_modified() } -m7z_file_impl::ntfs_duration m7z_file_impl::calculate_ntfs_offset() -{ - constexpr auto days_in_year(365); - constexpr auto days_in_four_years((days_in_year * 4) + 1); - constexpr auto days_in_century((days_in_four_years * 25) - 1); - constexpr auto days_in_four_centuries((days_in_century * 4) + 1); - - constexpr ntfs_duration day(std::chrono::hours(24)); - constexpr ntfs_duration year(day * days_in_year); - constexpr ntfs_duration four_years(day * days_in_four_years); - constexpr ntfs_duration century(day * days_in_century); - constexpr ntfs_duration four_centuries(day * days_in_four_centuries); - - std::time_t const zero(0); - std::tm const epoch(*std::gmtime(&zero)); - - ntfs_duration result(day * epoch.tm_yday); - result += std::chrono::hours(epoch.tm_hour); - result += std::chrono::minutes(epoch.tm_min); - result += std::chrono::seconds(epoch.tm_sec); - - int years(1900 - 1601 + epoch.tm_year); - result += four_centuries * (years / 400); - years %= 400; - result += century * (years / 100); - years %= 100; - result += four_years * (years / 4); - years %= 4; - result += year * years; - - return result; -} - } // anonymous namespace diff --git a/src/osd/windows/winutil.cpp b/src/osd/windows/winutil.cpp index 5be325e0fa6..23354bf0140 100644 --- a/src/osd/windows/winutil.cpp +++ b/src/osd/windows/winutil.cpp @@ -17,6 +17,7 @@ // MAMEOS headers #include "winutil.h" #include "strconv.h" +#include "timeconv.h" //============================================================ @@ -41,12 +42,8 @@ osd::directory::entry::entry_type win_attributes_to_entry_type(DWORD attributes) std::chrono::system_clock::time_point win_time_point_from_filetime(LPFILETIME file_time) { - ULARGE_INTEGER ull; - ull.LowPart = file_time->dwLowDateTime; - ull.HighPart = file_time->dwHighDateTime; - - time_t t = ull.QuadPart / 10000000ULL - 11644473600ULL; - return std::chrono::system_clock::from_time_t(t); + auto converted_file_time = util::ntfs_duration_from_filetime(file_time->dwHighDateTime, file_time->dwLowDateTime); + return util::system_clock_time_point_from_ntfs_duration(converted_file_time); } |