Skip to content

Cleanup: remove ts::Buffer from LogField. #9665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SolidWallOfCode merged 2 commits into from
May 16, 2023
Merged

Cleanup: remove ts::Buffer from LogField. #9665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f1dc90
Cleanup: remove ts::Buffer from LogField.
SolidWallOfCode May 1, 2023
0e12e45
Fix strikng comparison functor.
SolidWallOfCode May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions proxy/logging/LogField.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
***************************************************************************/
#include "tscore/ink_platform.h"
#include "swoc/swoc_meta.h"
#include "swoc/TextView.h"
#include "swoc/string_view_util.h"

#include "MIME.h"
#include "LogUtils.h"
Expand Down Expand Up @@ -165,14 +167,14 @@ namespace
{
struct cmp_str {
bool
operator()(ts::ConstBuffer a, ts::ConstBuffer b) const
operator()(swoc::TextView const &a, swoc::TextView const &b) const
{
return ptr_len_casecmp(a._ptr, a._size, b._ptr, b._size) < 0;
return strcasecmp(a, b) < 0;
}
};
} // namespace

using milestone_map = std::map<ts::ConstBuffer, TSMilestonesType, cmp_str>;
using milestone_map = std::map<swoc::TextView, TSMilestonesType, cmp_str>;
static milestone_map m_milestone_map;

struct milestone {
Expand Down Expand Up @@ -213,7 +215,7 @@ LogField::init_milestone_container()
if (m_milestone_map.empty()) {
for (unsigned i = 0; i < countof(milestones); ++i) {
m_milestone_map.insert(
std::make_pair(ts::ConstBuffer(milestones[i].msname, strlen(milestones[i].msname)), milestones[i].mstype));
std::make_pair(swoc::TextView(milestones[i].msname, strlen(milestones[i].msname)), milestones[i].mstype));
}
}
}
Expand Down Expand Up @@ -283,7 +285,7 @@ LogField::milestone_from_m_name()
milestone_map::iterator it;
TSMilestonesType result = TS_MILESTONE_LAST_ENTRY;

it = m_milestone_map.find(ts::ConstBuffer(m_name, strlen(m_name)));
it = m_milestone_map.find(m_name);
if (it != m_milestone_map.end()) {
result = it->second;
}
Expand All @@ -295,9 +297,9 @@ int
LogField::milestones_from_m_name(TSMilestonesType *ms1, TSMilestonesType *ms2)
{
milestone_map::iterator it;
ts::ConstBuffer ms1_name, ms2_name(m_name, strlen(m_name));
swoc::TextView ms1_name, ms2_name(m_name);

ms1_name = ms2_name.splitOn('-');
ms1_name = ms2_name.take_prefix_at('-');

it = m_milestone_map.find(ms1_name);
if (it != m_milestone_map.end()) {
Expand Down
1 change: 0 additions & 1 deletion proxy/logging/LogField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

#include "tscore/ink_platform.h"
#include "tscore/List.h"
#include "tscore/TsBuffer.h"
#include "LogFieldAliasMap.h"
#include "Milestones.h"

Expand Down