mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-26 20:47:08 +08:00
优化mktime性能问题
This commit is contained in:
parent
d541ed2572
commit
832c8d0d80
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
#include "HttpCookie.h"
|
#include "HttpCookie.h"
|
||||||
#include "Util/util.h"
|
#include "Util/util.h"
|
||||||
#include "Util/logger.h"
|
#include "Util/onceToken.h"
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
#include "Util/strptime_win.h"
|
#include "Util/strptime_win.h"
|
||||||
@ -24,24 +24,71 @@ namespace mediakit {
|
|||||||
void HttpCookie::setPath(const string &path) {
|
void HttpCookie::setPath(const string &path) {
|
||||||
_path = path;
|
_path = path;
|
||||||
}
|
}
|
||||||
|
|
||||||
void HttpCookie::setHost(const string &host) {
|
void HttpCookie::setHost(const string &host) {
|
||||||
_host = host;
|
_host = host;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static long s_gmtoff = 0; //时间差
|
||||||
|
static onceToken s_token([]() {
|
||||||
|
#ifdef _WIN32
|
||||||
|
TIME_ZONE_INFORMATION tzinfo;
|
||||||
|
DWORD dwStandardDaylight;
|
||||||
|
long bias;
|
||||||
|
dwStandardDaylight = GetTimeZoneInformation(&tzinfo);
|
||||||
|
bias = tzinfo.Bias;
|
||||||
|
if (dwStandardDaylight == TIME_ZONE_ID_STANDARD) {
|
||||||
|
bias += tzinfo.StandardBias;
|
||||||
|
}
|
||||||
|
if (dwStandardDaylight == TIME_ZONE_ID_DAYLIGHT) {
|
||||||
|
bias += tzinfo.DaylightBias;
|
||||||
|
}
|
||||||
|
s_gmtoff = -bias * 60; //时间差(分钟)
|
||||||
|
#else
|
||||||
|
s_gmtoff = getLocalTime(time(nullptr)).tm_gmtoff;
|
||||||
|
#endif // _WIN32
|
||||||
|
});
|
||||||
|
|
||||||
|
// from https://gmbabar.wordpress.com/2010/12/01/mktime-slow-use-custom-function/#comment-58
|
||||||
|
static time_t time_to_epoch(const struct tm *ltm, int utcdiff) {
|
||||||
|
const int mon_days[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
|
||||||
|
long tyears, tdays, leaps, utc_hrs;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
tyears = ltm->tm_year - 70; // tm->tm_year is from 1900.
|
||||||
|
leaps = (tyears + 2) / 4; // no of next two lines until year 2100.
|
||||||
|
// i = (ltm->tm_year – 100) / 100;
|
||||||
|
// leaps -= ( (i/4)*3 + i%4 );
|
||||||
|
tdays = 0;
|
||||||
|
for (i = 0; i < ltm->tm_mon; i++)
|
||||||
|
tdays += mon_days[i];
|
||||||
|
|
||||||
|
tdays += ltm->tm_mday - 1; // days of month passed.
|
||||||
|
tdays = tdays + (tyears * 365) + leaps;
|
||||||
|
|
||||||
|
utc_hrs = ltm->tm_hour + utcdiff; // for your time zone.
|
||||||
|
return (tdays * 86400) + (utc_hrs * 3600) + (ltm->tm_min * 60) + ltm->tm_sec;
|
||||||
|
}
|
||||||
|
|
||||||
static time_t timeStrToInt(const string &date) {
|
static time_t timeStrToInt(const string &date) {
|
||||||
struct tm tt;
|
struct tm tt;
|
||||||
strptime(date.data(), "%a, %b %d %Y %H:%M:%S %Z", &tt);
|
strptime(date.data(), "%a, %b %d %Y %H:%M:%S %Z", &tt);
|
||||||
return mktime(&tt);
|
// mktime内部有使用互斥锁,非常影响性能
|
||||||
|
return time_to_epoch(&tt, s_gmtoff / 3600); // mktime(&tt);
|
||||||
}
|
}
|
||||||
|
|
||||||
void HttpCookie::setExpires(const string &expires, const string &server_date) {
|
void HttpCookie::setExpires(const string &expires, const string &server_date) {
|
||||||
_expire = timeStrToInt(expires);
|
_expire = timeStrToInt(expires);
|
||||||
if (!server_date.empty()) {
|
if (!server_date.empty()) {
|
||||||
_expire = time(NULL) + (_expire - timeStrToInt(server_date));
|
_expire = time(NULL) + (_expire - timeStrToInt(server_date));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void HttpCookie::setKeyVal(const string &key, const string &val) {
|
void HttpCookie::setKeyVal(const string &key, const string &val) {
|
||||||
_key = key;
|
_key = key;
|
||||||
_val = val;
|
_val = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
HttpCookie::operator bool() {
|
HttpCookie::operator bool() {
|
||||||
return !_host.empty() && !_key.empty() && !_val.empty() && (_expire > time(NULL));
|
return !_host.empty() && !_key.empty() && !_val.empty() && (_expire > time(NULL));
|
||||||
}
|
}
|
||||||
@ -54,7 +101,6 @@ const string &HttpCookie::getKey() const{
|
|||||||
return _key;
|
return _key;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
HttpCookieStorage &HttpCookieStorage::Instance() {
|
HttpCookieStorage &HttpCookieStorage::Instance() {
|
||||||
static HttpCookieStorage instance;
|
static HttpCookieStorage instance;
|
||||||
return instance;
|
return instance;
|
||||||
@ -97,5 +143,4 @@ vector<HttpCookie::Ptr> HttpCookieStorage::get(const string &host, const string
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
} /* namespace mediakit */
|
} /* namespace mediakit */
|
||||||
|
Loading…
Reference in New Issue
Block a user