Skip to content

Allow DbgCtl tag to be set after instance construction. #10375

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
ywkaras merged 1 commit into from
Sep 6, 2023
Merged

Allow DbgCtl tag to be set after instance construction. #10375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 28 additions & 6 deletions include/ts/DbgCtl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,31 @@ class DbgCtl
//
DbgCtl(char const *tag) : _ptr{_new_reference(tag)} {}

~DbgCtl() { _rm_reference(); }
// As instance with no tag will always be off.
//
DbgCtl() : _ptr{&_No_tag_dummy} {}

~DbgCtl()
{
if (_ptr != &_No_tag_dummy) {
_rm_reference();
}
}

// No copying. Only moving from a tagged to a tagless instance allowed.
//
DbgCtl(DbgCtl const &) = delete;
DbgCtl &operator=(DbgCtl const &) = delete;
DbgCtl(DbgCtl &&);
DbgCtl &operator=(DbgCtl &&);

// A shorthand.
//
void
set(char const *tag)
{
*this = DbgCtl{tag};
}

bool
tag_on() const
Expand Down Expand Up @@ -90,14 +114,12 @@ class DbgCtl
static void print(char const *tag, char const *file, char const *function, int line, char const *fmt_str, ...)
TS_PRINTFLIKE(5, 6);

// No copying/moving.
DbgCtl(DbgCtl const &) = delete;
DbgCtl &operator=(DbgCtl const &) = delete;

private:
using _TagData = std::pair<char const *const, bool>;

_TagData const *const _ptr;
_TagData const *_ptr;

static const _TagData _No_tag_dummy;

static const _TagData *_new_reference(char const *tag);

Expand Down
20 changes: 20 additions & 0 deletions src/tscore/DbgCtl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,24 @@
#include <tscore/ink_assert.h>
#include <tscore/Diags.h>

DbgCtl::DbgCtl(DbgCtl &&src)
{
ink_release_assert(src._ptr != &_No_tag_dummy);

_ptr = src._ptr;
src._ptr = &_No_tag_dummy;
}

DbgCtl &
DbgCtl::operator=(DbgCtl &&src)
{
ink_release_assert(&_No_tag_dummy == _ptr);

new (this) DbgCtl{std::move(src)};

return *this;
}

// The resistry of fast debug controllers has a ugly implementation to handle the whole-program initialization
// and destruction order problem with C++.
//
Expand Down Expand Up @@ -205,3 +223,5 @@ DbgCtl::_override_global_on()
{
return diags()->get_override();
}

DbgCtl::_TagData const DbgCtl::_No_tag_dummy{nullptr, false};