-
Notifications
You must be signed in to change notification settings - Fork 168
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.
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
RCORE-2242: Include pathname in exception thrown in File::rw_lock #8000
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1152,6 +1152,11 @@ bool File::rw_lock(bool exclusive, bool non_blocking) | |
// or the OS will deadlock when un-suspending the app. | ||
int mode = exclusive ? O_WRONLY | O_NONBLOCK : O_RDWR | O_NONBLOCK; | ||
|
||
auto report_err = [path = m_fifo_path](int err, const char* msg) { | ||
auto message = util::format("%1: %2, path = '%3'", msg, std::system_category().message(err), path); | ||
throw RuntimeError(ErrorCodes::FileOperationFailed, message); // LCOV_EXCL_LINE | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i think we probably shouldn't worry about the cost of copying the string here, but should There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think not. RuntimeError takes a std::string_view as parameter. |
||
}; | ||
|
||
// Optimistically try to open the fifo. This may fail due to the fifo not | ||
// existing, but since it usually exists this is faster than trying to create | ||
// it first. | ||
|
@@ -1168,7 +1173,7 @@ bool File::rw_lock(bool exclusive, bool non_blocking) | |
} | ||
|
||
// Otherwise we got an unexpected error | ||
throw std::system_error(err, std::system_category(), "opening lock fifo for writing failed"); | ||
report_err(err, "opening lock fifo for writing failed"); | ||
} | ||
|
||
if (err == ENOENT) { | ||
|
@@ -1178,15 +1183,15 @@ bool File::rw_lock(bool exclusive, bool non_blocking) | |
try_make_dir(m_fifo_dir_path); | ||
status = mkfifo(m_fifo_path.c_str(), 0666); | ||
if (status != 0) | ||
throw std::system_error(errno, std::system_category(), "creating lock fifo for reading failed"); | ||
report_err(errno, "creating lock fifo for reading failed"); | ||
|
||
// Try again to open the fifo now that it exists | ||
fd = ::open(m_fifo_path.c_str(), mode); | ||
err = errno; | ||
} | ||
|
||
if (fd == -1) | ||
throw std::system_error(err, std::system_category(), "opening lock fifo for reading failed"); | ||
report_err(err, "opening lock fifo for reading failed"); | ||
} | ||
|
||
// We successfully opened the pipe. If we're trying to acquire an exclusive | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we worry about the cost of copying this string here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see any reason for this to not just capture
[this]
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍