luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apparently anonymous structs aren't allowed

Browse Source
This commit is contained in:
Jeremy 2024-05-22 23:50:57 -05:00
parent 837fbc742d
commit 2369aeb0b4
No known key found for this signature in database
GPG Key ID: BE03111EB7ED6E2E
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/symbols/symbols_with_addr2line.cpp
View File

@ -64,9 +64,9 @@ namespace addr2line {
struct pipe_t { struct pipe_t {
union { union {
struct { struct {
int read_end; int read;
int write_end; int write;
}; } end;
int data[2]; int data[2];
}; };
}; };
@ -80,12 +80,12 @@ namespace addr2line {
const pid_t pid = fork(); const pid_t pid = fork();
if(pid == -1) { return ""; } // error? TODO: Diagnostic if(pid == -1) { return ""; } // error? TODO: Diagnostic
if(pid == 0) { // child if(pid == 0) { // child
dup2(output_pipe.write_end, STDOUT_FILENO); dup2(output_pipe.end.write, STDOUT_FILENO);
dup2(input_pipe.read_end, STDIN_FILENO); dup2(input_pipe.end.read, STDIN_FILENO);
close(output_pipe.read_end); close(output_pipe.end.read);
close(output_pipe.write_end); close(output_pipe.end.write);
close(input_pipe.read_end); close(input_pipe.end.read);
close(input_pipe.write_end); close(input_pipe.end.write);
close(STDERR_FILENO); // TODO: Might be worth conditionally enabling or piping close(STDERR_FILENO); // TODO: Might be worth conditionally enabling or piping
#ifdef CPPTRACE_ADDR2LINE_SEARCH_SYSTEM_PATH #ifdef CPPTRACE_ADDR2LINE_SEARCH_SYSTEM_PATH
#if !IS_APPLE #if !IS_APPLE
@ -120,15 +120,15 @@ namespace addr2line {
#endif #endif
_exit(1); // TODO: Diagnostic? _exit(1); // TODO: Diagnostic?
} }
VERIFY(write(input_pipe.write_end, addresses.data(), addresses.size()) != -1); VERIFY(write(input_pipe.end.write, addresses.data(), addresses.size()) != -1);
close(input_pipe.read_end); close(input_pipe.end.read);
close(input_pipe.write_end); close(input_pipe.end.write);
close(output_pipe.write_end); close(output_pipe.end.write);
std::string output; std::string output;
constexpr int buffer_size = 4096; constexpr int buffer_size = 4096;
char buffer[buffer_size]; char buffer[buffer_size];
std::size_t count = 0; std::size_t count = 0;
while((count = read(output_pipe.read_end, buffer, buffer_size)) > 0) { while((count = read(output_pipe.end.read, buffer, buffer_size)) > 0) {
output.insert(output.end(), buffer, buffer + count); output.insert(output.end(), buffer, buffer + count);
} }
// TODO: check status from addr2line? // TODO: check status from addr2line?