iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:znc/znc

Browse Source
This commit is contained in:
Alexey Sokolov
2017-12-13 08:30:27 +00:00
parent 3b3a0ac291 bd51ebcdca
commit fd83bb3473
9 changed files with 134 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/znc/User.h
View File

@@ -110,6 +110,7 @@ class CUser {
CString AddTimestamp(const CString& sStr) const;
CString AddTimestamp(time_t tm, const CString& sStr) const;
CString AddTimestamp(timeval tv, const CString& sStr) const;
void CloneNetworks(const CUser& User);
bool Clone(const CUser& User, CString& sErrorRet,

15
include/znc/Utils.h
View File

@@ -79,6 +79,21 @@ class CUtils {
static CString CTime(time_t t, const CString& sTZ);
static CString FormatTime(time_t t, const CString& sFormat,
const CString& sTZ);
/** Supports an additional format specifier for formatting sub-second values:
*
* - %f - sub-second fraction
* - %3f - millisecond (default, if no width is specified)
* - %6f - microsecond
*
* However, note that timeval only supports microsecond precision
* (thus, formatting with higher-than-microsecond precision will
* always result in trailing zeroes), and IRC server-time is specified
* in millisecond precision (thus formatting received timestamps with
* higher-than-millisecond precision will always result in trailing
* zeroes).
*/
static CString FormatTime(const timeval& tv, const CString& sFormat,
const CString& sTZ);
static CString FormatServerTime(const timeval& tv);
static timeval ParseServerTime(const CString& sTime);
static SCString GetTimezones();

4
modules/awaystore.cpp
View File

@@ -58,8 +58,8 @@ class CAwayJob : public CTimer {
class CAway : public CModule {
void AwayCommand(const CString& sCommand) {
CString sReason;
time_t curtime;
time(&curtime);
timeval curtime;
gettimeofday(&curtime, nullptr);
if (sCommand.Token(1) != "-quiet") {
sReason = CUtils::FormatTime(curtime, sCommand.Token(1, true),

6
modules/listsockets.cpp
View File

@@ -154,8 +154,10 @@ class CListSockets : public CModule {
CString GetCreatedTime(Csock* pSocket) {
unsigned long long iStartTime = pSocket->GetStartTime();
time_t iTime = iStartTime / 1000;
return CUtils::FormatTime(iTime, "%Y-%m-%d %H:%M:%S",
timeval tv;
tv.tv_sec = iStartTime / 1000;
tv.tv_usec = iStartTime % 1000 * 1000;
return CUtils::FormatTime(tv, "%Y-%m-%d %H:%M:%S.%f",
GetUser()->GetTimezone());
}

4
modules/log.cpp
View File

@@ -271,9 +271,9 @@ void CLogMod::PutLog(const CString& sLine,
}
CString sPath;
time_t curtime;
timeval curtime;
time(&curtime);
gettimeofday(&curtime, nullptr);
// Generate file name
sPath = CUtils::FormatTime(curtime, m_sLogPath, GetUser()->GetTimezone());
if (sPath.empty()) {

2
src/Buffer.cpp
View File

@@ -52,7 +52,7 @@ CMessage CBufLine::ToMessage(const CClient& Client,
mssThisParams["text"] = m_sText;
} else {
mssThisParams["text"] =
Client.GetUser()->AddTimestamp(Line.GetTime().tv_sec, m_sText);
Client.GetUser()->AddTimestamp(Line.GetTime(), m_sText);
}
// make a copy of params, because the following loop modifies the original

14
src/User.cpp
View File

@@ -603,17 +603,25 @@ CString& CUser::ExpandString(const CString& sStr, CString& sRet) const {
}
CString CUser::AddTimestamp(const CString& sStr) const {
time_t tm;
return AddTimestamp(time(&tm), sStr);
timeval tv;
gettimeofday(&tv, nullptr);
return AddTimestamp(tv, sStr);
}
CString CUser::AddTimestamp(time_t tm, const CString& sStr) const {
timeval tv;
tv.tv_sec = tm;
tv.tv_usec = 0;
return AddTimestamp(tv, sStr);
}
CString CUser::AddTimestamp(timeval tv, const CString& sStr) const {
CString sRet = sStr;
if (!GetTimestampFormat().empty() &&
(m_bAppendTimestamp || m_bPrependTimestamp)) {
CString sTimestamp =
CUtils::FormatTime(tm, GetTimestampFormat(), m_sTimezone);
CUtils::FormatTime(tv, GetTimestampFormat(), m_sTimezone);
if (sTimestamp.empty()) {
return sRet;
}

58
src/Utils.cpp
View File

@@ -498,6 +498,64 @@ CString CUtils::FormatTime(time_t t, const CString& sFormat,
return s;
}
CString CUtils::FormatTime(const timeval& tv, const CString& sFormat,
const CString& sTimezone) {
// Parse additional format specifiers before passing them to
// strftime, since the way strftime treats unknown format
// specifiers is undefined.
CString sFormat2;
// Make sure %% is parsed correctly, i.e. %%f is passed through to
// strftime to become %f, and not 123.
bool bInFormat = false;
int iDigits;
CString::size_type uLastCopied = 0, uFormatStart;
for (CString::size_type i = 0; i < sFormat.length(); i++) {
if (!bInFormat) {
if (sFormat[i] == '%') {
uFormatStart = i;
bInFormat = true;
iDigits = 3;
}
} else {
switch (sFormat[i]) {
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
iDigits = sFormat[i] - '0';
break;
case 'f': {
int iVal = tv.tv_usec;
int iDigitDelta = iDigits - 6; // tv_user is in 10^-6 seconds
for (; iDigitDelta > 0; iDigitDelta--)
iVal *= 10;
for (; iDigitDelta < 0; iDigitDelta++)
iVal /= 10;
sFormat2 += sFormat.substr(uLastCopied,
uFormatStart - uLastCopied);
CString sVal = CString(iVal);
sFormat2 += CString(iDigits - sVal.length(), '0');
sFormat2 += sVal;
uLastCopied = i + 1;
bInFormat = false;
break;
}
default:
bInFormat = false;
}
}
}
if (uLastCopied) {
sFormat2 += sFormat.substr(uLastCopied);
return FormatTime(tv.tv_sec, sFormat2, sTimezone);
} else {
// If there are no extended format specifiers, avoid doing any
// memory allocations entirely.
return FormatTime(tv.tv_sec, sFormat, sTimezone);
}
}
CString CUtils::FormatServerTime(const timeval& tv) {
CString s_msec(tv.tv_usec / 1000);
while (s_msec.length() < 3) {

40
test/UtilsTest.cpp
View File

@@ -117,3 +117,43 @@ TEST(UtilsTest, ServerTime) {
}
tzset();
}
class TimeTest : public testing::TestWithParam<
std::tuple<timeval, CString, CString, CString>> {};
TEST_P(TimeTest, FormatTime) {
timeval tv = std::get<0>(GetParam());
EXPECT_EQ(std::get<1>(GetParam()), CUtils::FormatTime(tv, "%s.%f", "UTC"));
EXPECT_EQ(std::get<2>(GetParam()), CUtils::FormatTime(tv, "%s.%6f", "UTC"));
EXPECT_EQ(std::get<3>(GetParam()), CUtils::FormatTime(tv, "%s.%9f", "UTC"));
}
INSTANTIATE_TEST_CASE_P(
TimeTest, TimeTest,
testing::Values(
// leading zeroes
std::make_tuple(timeval{42, 12345}, "42.012", "42.012345", "42.012345000"),
// (no) rounding
std::make_tuple(timeval{42, 999999}, "42.999", "42.999999", "42.999999000"),
// no tv_usec part
std::make_tuple(timeval{42, 0}, "42.000", "42.000000", "42.000000000")));
TEST(UtilsTest, FormatTime) {
// Test passthrough
timeval tv1;
tv1.tv_sec = 42;
tv1.tv_usec = 123456;
CString str1 = CUtils::FormatTime(tv1, "%s", "UTC");
EXPECT_EQ("42", str1);
// Test escapes
timeval tv2;
tv2.tv_sec = 42;
tv2.tv_usec = 123456;
CString str2 = CUtils::FormatTime(tv2, "%%f", "UTC");
EXPECT_EQ("%f", str2);
// Test suffix
CString str3 = CUtils::FormatTime(tv2, "a%fb", "UTC");
EXPECT_EQ("a123b", str3);
}