Skip to content

Remove unused log_msg message type #7224

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
eddyashton merged 2 commits into from
Aug 27, 2025
Merged

Remove unused log_msg message type #7224

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
956aa11
Remove unused log_msg message type
eddyashton Aug 26, 2025
b0efe42
Merge branch 'main' of github.com:microsoft/CCF into remove_unused_lo…
eddyashton Aug 26, 2025
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
12 changes: 0 additions & 12 deletions src/enclave/interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
/// General administrative messages
enum AdminMessage : ringbuffer::Message
{
/// Log message. Enclave -> Host
DEFINE_RINGBUFFER_MSG_TYPE(log_msg),

/// Fatal error message. Enclave -> Host
DEFINE_RINGBUFFER_MSG_TYPE(fatal_error_msg),

Expand All @@ -33,15 +30,6 @@ enum AdminMessage : ringbuffer::Message
DEFINE_RINGBUFFER_MSG_TYPE(work_stats)
};

DECLARE_RINGBUFFER_MESSAGE_PAYLOAD(
AdminMessage::log_msg,
std::chrono::microseconds::rep,
std::string,
size_t,
ccf::LoggerLevel,
std::string,
uint16_t,
std::string);
DECLARE_RINGBUFFER_MESSAGE_PAYLOAD(AdminMessage::fatal_error_msg, std::string);
DECLARE_RINGBUFFER_MESSAGE_NO_PAYLOAD(AdminMessage::stop);
DECLARE_RINGBUFFER_MESSAGE_NO_PAYLOAD(AdminMessage::stop_notice);
Expand Down
50 changes: 0 additions & 50 deletions src/enclave/ringbuffer_logger.h
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions src/host/handle_ring_buffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,52 +37,6 @@ namespace asynchost
r(r),
nbwf(nbwf)
{
// Register message handler for log message from enclave
DISPATCHER_SET_MESSAGE_HANDLER(
bp, AdminMessage::log_msg, [](const uint8_t* data, size_t size) {
auto
[log_time_us_count,
file_name,
line_number,
log_level,
tag,
thread_id,
msg] = ringbuffer::read_message<AdminMessage::log_msg>(data, size);

ccf::logger::LogLine ll(
log_level, tag, file_name.c_str(), line_number, thread_id);
ll.msg = msg;

// Represent offset as a real (counting seconds) to handle both small
// negative _and_ positive numbers. Since the system clock used is not
// monotonic, the offset we calculate could go in either direction,
// and tm can't represent small negative values.
std::optional<double> offset_time = std::nullopt;

// If enclave doesn't know the
// current time yet, don't try to produce an offset, just give them
// the host's time (producing offset of 0)
if (log_time_us_count != 0)
{
// Enclave time is recomputed every time. If multiple threads
// log inside the enclave, offsets may not always increase
const double enclave_time_s = log_time_us_count / 1'000'000.0;

::timespec ts;
::timespec_get(&ts, TIME_UTC);
const double host_time_s =
ts.tv_sec + (ts.tv_nsec / 1'000'000'000.0);

offset_time = enclave_time_s - host_time_s;
}

auto& loggers = ccf::logger::config::loggers();
for (auto const& logger : loggers)
{
logger->write(ll, offset_time);
}
});

DISPATCHER_SET_MESSAGE_HANDLER(
bp,
AdminMessage::fatal_error_msg,
Expand Down