Skip to content

Add asserts in trace #9118

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

Open
Foxpunk wants to merge 9 commits into
base: master
Choose a base branch
from
+25 −5
Open

Add asserts in trace #9118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
39b5abd
Add fb_assert for time(&session.ses_start)
Foxpunk Jul 22, 2026
bd2710a
add [[maybe_unused]] and fb_assert for fseek
Foxpunk Jul 22, 2026
48f1804
add [[maybe_unused]] and fb_assert for snprintf
Foxpunk Jul 22, 2026
d7745f3
add fb_assert and [[maybe_unused]] for mutexBug
Foxpunk Jul 23, 2026
f7d6d41
add default: fb_assert(false) for switch action_sw->in_sw
Foxpunk Jul 23, 2026
d01d964
add default: fb_assert(false) to fetchPassword switch
Foxpunk Jul 23, 2026
d2ed4ff
add default fb_assert(false) for switch (action_sw->in_sw)
Foxpunk Jul 23, 2026
a5dbbce
Use static_cast and clarify fseek result variable names
Foxpunk Aug 1, 2026
2e8d5b9
do static_cast<size_t> for len
Foxpunk Aug 6, 2026
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: 16 additions & 0 deletions src/jrd/trace/TraceCmdLine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,9 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
case IN_SW_TRACE_LIST:
usage(uSvc, isc_trace_param_act_notcompat, sw->in_sw_name, action_sw->in_sw_name);
break;
default:
fb_assert(false);
break;
}

if (!session.ses_config.empty())
Expand All @@ -231,6 +234,9 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
case IN_SW_TRACE_LIST:
usage(uSvc, isc_trace_param_act_notcompat, sw->in_sw_name, action_sw->in_sw_name);
break;
default:
fb_assert(false);
break;
}

if (!session.ses_name.empty())
Expand All @@ -250,6 +256,9 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
case IN_SW_TRACE_LIST:
usage(uSvc, isc_trace_param_act_notcompat, sw->in_sw_name, action_sw->in_sw_name);
break;
default:
fb_assert(false);
break;
}

if (session.ses_id)
Expand All @@ -275,6 +284,9 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
case IN_SW_TRACE_LIST:
usage(uSvc, isc_trace_param_act_notcompat, sw->in_sw_name, action_sw->in_sw_name);
break;
default:
fb_assert(false);
break;
}

if (!session.ses_plugins.empty())
Expand Down Expand Up @@ -374,6 +386,8 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
(Arg::Gds(isc_io_error) << Arg::Str("read") << Arg::Str(fileName) <<
Arg::Gds(isc_io_read_err) << Arg::OsError()).raise();
break;
default:
fb_assert(false);
}
}
else
Expand Down Expand Up @@ -420,6 +434,8 @@ void fbtrace(UtilSvc* uSvc, TraceSvcIntf* traceSvc)
case IN_SW_TRACE_RESUME:
usage(uSvc, isc_trace_switch_param_miss, "ID", action_sw->in_sw_name);
break;
default:
fb_assert(false);
}
}

Expand Down
11 changes: 7 additions & 4 deletions src/jrd/trace/TraceConfigStorage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ void ConfigStorage::shutdown()
void ConfigStorage::mutexBug(int state, const char* string)
{
TEXT msg[BUFFER_TINY];
snprintf(msg, sizeof(msg), "ConfigStorage: mutex %s error, status = %d", string, state);
[[maybe_unused]] const int len = snprintf(msg, sizeof(msg), "ConfigStorage: mutex %s error, status = %d", string, state);
fb_assert(len >= 0 && static_cast<size_t>(len) < sizeof(msg));
fb_utils::logAndDie(msg);
}

Expand Down Expand Up @@ -243,11 +244,13 @@ void ConfigStorage::checkAudit()

TraceSession session(*getDefaultMemoryPool());

fseek(cfgFile, 0, SEEK_END);
[[maybe_unused]] const int resultEnd = fseek(cfgFile, 0, SEEK_END);
fb_assert(resultEnd == 0);
const long len = ftell(cfgFile);
if (len)
{
fseek(cfgFile, 0, SEEK_SET);
[[maybe_unused]] const int resultSet = fseek(cfgFile, 0, SEEK_SET);
fb_assert(resultSet == 0);
char* p = session.ses_config.getBuffer(len + 1);

if (fread(p, 1, len, cfgFile) != size_t(len)) {
Expand Down Expand Up @@ -716,7 +719,7 @@ void ConfigStorage::addSession(TraceSession& session)
session.ses_flags |= trs_active;
slot->ses_flags = session.ses_flags;
time(&session.ses_start);

fb_assert(session.ses_start != (time_t) -1);
char* p = reinterpret_cast<char*> (header) + slot->offset;
Writer writer(p, slot->size);

Expand Down
3 changes: 2 additions & 1 deletion src/jrd/trace/TraceLog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,8 @@ void TraceLog::setFullMsg(const char* str)
void TraceLog::mutexBug(int state, const char* string)
{
TEXT msg[BUFFER_TINY];
snprintf(msg, sizeof(msg), "TraceLog: mutex %s error, status = %d", string, state);
[[maybe_unused]] const int len = snprintf(msg, sizeof(msg), "TraceLog: mutex %s error, status = %d", string, state);
fb_assert(len >= 0 && static_cast<size_t>(len) < sizeof(msg));
fb_utils::logAndDie(msg);
}

Expand Down