Skip to content

Following changes in most recent FairLogger tag using string_view instead of string #95

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

Closed
ehellbar wants to merge 1 commit into from
Closed

Following changes in most recent FairLogger tag using string_view instead of string #95

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
7 changes: 2 additions & 5 deletions include/InfoLogger/InfoLogger.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,19 +242,16 @@ class InfoLogger
InfoLogger::Severity severity;
int level;
int errorCode;
const char* sourceFile;
std::string_view sourceFile;
int sourceLine;
};

// make sure options are a POD struct
static_assert(std::is_pod<InfoLoggerMessageOption>::value, "struct InfoLoggerMessageOption is not POD");

/// Definition of a constant, to be used for corresponding fields when not defined
static constexpr InfoLoggerMessageOption undefinedMessageOption = {
Severity::Undefined, // severity
-1, // level
-1, // errorCode
nullptr, // sourceFile
std::string_view(), // sourceFile
-1, // sourceLine
};

Expand Down
4 changes: 2 additions & 2 deletions include/InfoLogger/InfoLoggerFMQ.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ void setFMQLogsToInfoLogger(AliceO2::InfoLogger::InfoLogger* logPtr = nullptr)
severity,
level,
AliceO2::InfoLogger::InfoLogger::undefinedMessageOption.errorCode,
metadata.file.c_str(),
atoi(metadata.line.c_str())
metadata.file,
atoi(std::string(metadata.line.data(), metadata.line.size()).c_str())
};
if (prefix == NULL) {
theLogPtr->log(opt, ctx, "FMQ: %s", content.c_str());
Expand Down
8 changes: 1 addition & 7 deletions src/InfoLogger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,13 +629,7 @@ int InfoLogger::Impl::pushMessage(const InfoLoggerMessageOption& options, const
}
if (options.sourceFile != undefinedMessageOption.sourceFile) {
// trim directory path to keep it short
const char *shortName=options.sourceFile;
for (int i=(int)strlen(options.sourceFile)-1; i>=0; i--) {
if (options.sourceFile[i]=='/') {
shortName=&options.sourceFile[i+1];
break;
}
}
const char* shortName = &options.sourceFile[options.sourceFile.rfind('/') + 1];
InfoLoggerMessageHelperSetValue(msg, msgHelper.ix_errsource, String, shortName);
}
if (options.sourceLine != undefinedMessageOption.sourceLine) {
Expand Down