X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Futil.h;h=6cf2070a86700bccab4f820f0d58aa73de455899;hb=63e4509c569f16145ab861717baf865fc6d05af1;hp=f4b872c791d61a8bf9c282dff55627b02a025d84;hpb=cb67af29e7fb760f2a521bd40ec5a3e0fb01b4d3;p=novacoin.git diff --git a/src/util.h b/src/util.h index f4b872c..6cf2070 100644 --- a/src/util.h +++ b/src/util.h @@ -37,6 +37,7 @@ static const int32_t nOneHour = 60 * 60; static const int32_t nOneDay = 24 * 60 * 60; +static const int64_t nOneWeek = 7 * 24 * 60 * 60; static const int64_t COIN = 1000000; static const int64_t CENT = 10000; @@ -237,7 +238,9 @@ int GetRandInt(int nMax); uint64_t GetRand(uint64_t nMax); uint256 GetRandHash(); int64_t GetTime(); -void SetMockTime(int64_t nMockTimeIn); +int64_t GetTimeMillis(); +int64_t GetTimeMicros(); + int64_t GetAdjustedTime(); int64_t GetTimeOffset(); int64_t GetNodesOffset(); @@ -386,6 +389,12 @@ inline int64_t GetTimeMillis() boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_milliseconds(); } +inline int64_t GetTimeMicros() +{ + return (boost::posix_time::microsec_clock::universal_time() - + boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_microseconds(); +} + std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime); static const std::string strTimestampFormat = "%Y-%m-%d %H:%M:%S UTC"; @@ -522,7 +531,7 @@ public: T median() const { - int size = vSorted.size(); + size_t size = vSorted.size(); assert(size>0); if(size & 1) // Odd number of elements {