[MemProf] Add interface for reseting the profile file descriptor (#73714)

Add __memprof_profile_reset() interface which can be used to facilitate
dumping multiple rounds of profiles from a single binary run. This
closes the current file descriptor and resets the internal file
descriptor to invalid (-1), which ensures the underlying writer reopens
the recorded profile filename. This can be used once the client is done
moving or copying a dumped profile, to prepare for reinvoking profile
dumping.
This commit is contained in:
Teresa Johnson 2023-11-28 19:35:25 -08:00 committed by GitHub
parent 4a294b5806
commit ae86239e86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 56 additions and 0 deletions

View File

@ -59,6 +59,12 @@ const char *SANITIZER_CDECL __memprof_default_options(void);
/// \returns 0 on success.
int SANITIZER_CDECL __memprof_profile_dump(void);
/// Closes the existing file descriptor, if it is valid and not stdout or
/// stderr, and resets the internal state such that the profile filename is
/// reopened on the next profile dump attempt. This can be used to enable
/// multiple rounds of profiling on the same binary.
void SANITIZER_CDECL __memprof_profile_reset(void);
#ifdef __cplusplus
} // extern "C"
#endif

View File

@ -738,3 +738,13 @@ int __memprof_profile_dump() {
// detected during the dumping process.
return 0;
}
void __memprof_profile_reset() {
if (report_file.fd != kInvalidFd && report_file.fd != kStdoutFd &&
report_file.fd != kStderrFd) {
CloseFile(report_file.fd);
// Setting the file descriptor to kInvalidFd ensures that we will reopen the
// file when invoking Write again.
report_file.fd = kInvalidFd;
}
}

View File

@ -49,6 +49,7 @@ extern uptr __memprof_shadow_memory_dynamic_address;
SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE extern char
__memprof_profile_filename[1];
SANITIZER_INTERFACE_ATTRIBUTE int __memprof_profile_dump();
SANITIZER_INTERFACE_ATTRIBUTE void __memprof_profile_reset();
SANITIZER_INTERFACE_ATTRIBUTE void __memprof_load(uptr p);
SANITIZER_INTERFACE_ATTRIBUTE void __memprof_store(uptr p);

View File

@ -0,0 +1,39 @@
// Test to ensure that multiple rounds of dumping, using the
// __memprof_profile_reset interface to close the initial file
// and cause the profile to be reopened, works as expected.
// RUN: %clangxx_memprof %s -o %t
// RUN: rm -f %t.log.*
// RUN: %env_memprof_opts=print_text=true:log_path=%t.log %run %t
// Check both outputs, starting with the renamed initial dump, then remove it so
// that the second glob matches a single file.
// RUN: FileCheck %s < %t.log.*.sv
// RUN: rm -f %t.log.*.sv
// RUN: FileCheck %s < %t.log.*
// CHECK: Memory allocation stack id
#include <sanitizer/memprof_interface.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <string>
int main(int argc, char **argv) {
char *x = (char *)malloc(10);
memset(x, 0, 10);
free(x);
__memprof_profile_dump();
// Save the initial dump in a different file.
std::string origname = __sanitizer_get_report_path();
std::string svname = origname + ".sv";
rename(origname.c_str(), svname.c_str());
// This should cause the current file descriptor to be closed and the
// the internal state reset so that the profile filename is reopened
// on the next write.
__memprof_profile_reset();
// This will dump to origname again.
__memprof_profile_dump();
return 0;
}