diff options
Diffstat (limited to 'src/lib/util')
-rw-r--r-- | src/lib/util/timeconv.cpp | 82 | ||||
-rw-r--r-- | src/lib/util/timeconv.h | 53 | ||||
-rw-r--r-- | src/lib/util/un7z.cpp | 46 | ||||
-rw-r--r-- | src/lib/util/unzip.cpp | 44 |
4 files changed, 141 insertions, 84 deletions
diff --git a/src/lib/util/timeconv.cpp b/src/lib/util/timeconv.cpp new file mode 100644 index 00000000000..4511aa20d41 --- /dev/null +++ b/src/lib/util/timeconv.cpp @@ -0,0 +1,82 @@ +// license:BSD-3-Clause +// copyright-holders:Vas Crabb, Nathan Woods +/********************************************************************* + + timeconv.cpp + + Time conversion utility code + +***************************************************************************/ + +#include "timeconv.h" + +#include <ctime> + + +namespace util { +namespace { +/*************************************************************************** + PROTOTYPES +***************************************************************************/ + +util::ntfs_duration calculate_ntfs_offset(); + + +/*************************************************************************** + GLOBAL VARIABLES +***************************************************************************/ + +util::ntfs_duration f_ntfs_offset(calculate_ntfs_offset()); + + +/*************************************************************************** + IMPLEMENTATION +***************************************************************************/ + +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; +} + +} // anonymous namespace + + + +// ------------------------------------------------- +// 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 - f_ntfs_offset); +} + +} // namespace util diff --git a/src/lib/util/timeconv.h b/src/lib/util/timeconv.h new file mode 100644 index 00000000000..5d3d4d4905c --- /dev/null +++ b/src/lib/util/timeconv.h @@ -0,0 +1,53 @@ +// license:BSD-3-Clause +// copyright-holders:Vas Crabb, Nathan Woods +/*************************************************************************** + + timeconv.h + + Time conversion utility code + +***************************************************************************/ + +#ifndef MAME_LIB_UTIL_TIMECONV_H +#define MAME_LIB_UTIL_TIMECONV_H + +#pragma once + +#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 constexpr 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 +***************************************************************************/ + +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 2b0f6a84edb..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) + std::chrono::duration_cast<std::chrono::system_clock::duration>(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/lib/util/unzip.cpp b/src/lib/util/unzip.cpp index c11561e91e8..fe6ec9cb975 100644 --- a/src/lib/util/unzip.cpp +++ b/src/lib/util/unzip.cpp @@ -13,6 +13,7 @@ #include "corestr.h" #include "hashing.h" #include "osdcore.h" +#include "timeconv.h" #include "lzma/C/LzmaDec.h" @@ -173,8 +174,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; - zip_file_impl(const zip_file_impl &) = delete; zip_file_impl(zip_file_impl &&) = delete; zip_file_impl &operator=(const zip_file_impl &) = delete; @@ -228,9 +227,6 @@ private: archive_file::error decompress_data_type_8(std::uint64_t offset, void *buffer, std::uint32_t length); archive_file::error decompress_data_type_14(std::uint64_t offset, void *buffer, std::uint32_t length); - // precalculation - static ntfs_duration calculate_ntfs_offset(); - struct file_header { std::uint16_t version_created; // version made by @@ -259,7 +255,6 @@ private: static constexpr std::size_t DECOMPRESS_BUFSIZE = 16384; static constexpr std::size_t CACHE_SIZE = 8; // number of open files to cache - static const ntfs_duration s_ntfs_offset; static std::array<ptr, CACHE_SIZE> s_cache; static std::mutex s_cache_mutex; @@ -646,7 +641,6 @@ private: GLOBAL VARIABLES ***************************************************************************/ -const zip_file_impl::ntfs_duration zip_file_impl::s_ntfs_offset(calculate_ntfs_offset()); std::array<zip_file_impl::ptr, zip_file_impl::CACHE_SIZE> zip_file_impl::s_cache; std::mutex zip_file_impl::s_cache_mutex; @@ -768,7 +762,7 @@ int zip_file_impl::search(std::uint32_t search_crc, const std::string &search_fi { ntfs_times_reader const times(tag); ntfs_duration const ticks(times.mtime()); - m_header.modified = std::chrono::system_clock::from_time_t(0) + std::chrono::duration_cast<std::chrono::system_clock::duration>(ticks - s_ntfs_offset); + m_header.modified = system_clock_time_point_from_ntfs_duration(ticks); } } } @@ -1408,40 +1402,6 @@ archive_file::error zip_file_impl::decompress_data_type_14(std::uint64_t offset, } } - -zip_file_impl::ntfs_duration zip_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 |