system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 10:36:24 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Kernel: Do not try opening the same file when dumping perfcore

Browse source 
Dumping perfcore would always fail with EEXIST. This regressed in #10707
because of an incorrect indentation in the for loop.
This commit is contained in:
SeekingBlues 2021-10-31 15:07:15 -04:00 committed by Andreas Kling
parent f848d65fd9
commit b9da877941
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Kernel/Process.cpp
View file

@ -566,16 +566,20 @@ bool Process::dump_perfcore()
// Try to generate a filename which isn't already used.
auto base_filename = String::formatted("{}_{}", name(), pid().value());
auto perfcore_filename = String::formatted("{}.profile", base_filename);
auto description_or_error = VirtualFileSystem::the().open(perfcore_filename, O_CREAT | O_EXCL, 0400, current_directory(), UidAndGid { uid(), gid() });
for (size_t attempt = 1; attempt < 10 && description_or_error.is_error(); ++attempt)
RefPtr<OpenFileDescription> description;
for (size_t attempt = 1; attempt <= 10; ++attempt) {
auto description_or_error = VirtualFileSystem::the().open(perfcore_filename, O_CREAT | O_EXCL, 0400, current_directory(), UidAndGid { uid(), gid() });
if (!description_or_error.is_error()) {
description = description_or_error.release_value();
break;
}
perfcore_filename = String::formatted("{}.{}.profile", base_filename, attempt);
description_or_error = VirtualFileSystem::the().open(perfcore_filename, O_CREAT | O_EXCL, 0400, current_directory(), UidAndGid { uid(), gid() });
if (description_or_error.is_error()) {
}
if (!description) {
dbgln("Failed to generate perfcore for pid {}: Could not generate filename for the perfcore file.", pid().value());
return false;
}
auto& description = *description_or_error.value();
auto builder_or_error = KBufferBuilder::try_create();
if (builder_or_error.is_error()) {
dbgln("Failed to generate perfcore for pid {}: Could not allocate KBufferBuilder.", pid());
@ -593,7 +597,7 @@ bool Process::dump_perfcore()
return false;
}
auto json_buffer = UserOrKernelBuffer::for_kernel_buffer(json->data());
if (description.write(json_buffer, json->size()).is_error()) {
if (description->write(json_buffer, json->size()).is_error()) {
dbgln("Failed to generate perfcore for pid {}: Could not write to perfcore file.", pid().value());
return false;
}