mirror of
https://github.com/google/sandboxed-api.git
synced 2024-03-22 13:11:30 +08:00
eb62bae167
- Drop `delim` argument from the `GetStackTrace()` family of functions. We only ever used plain spaces. - Use an `std::vector<std::string>` for the symbolized stack frames and adjust the unwind proto accordingly. This change now prints each stack frame on its own line while skipping duplicate ones: ``` I20200717 11:47:16.811381 3636246 monitor.cc:326] Stack trace: [ I20200717 11:47:16.811415 3636246 monitor.cc:337] map:/lib/x86_64-linux-gnu/libc-2.30.so+0xceee7(0x7fb871602ee7) I20200717 11:47:16.811420 3636246 monitor.cc:337] Rot13File+0x130(0x55ed24615995) I20200717 11:47:16.811424 3636246 monitor.cc:337] ffi_call_unix64+0x55(0x55ed2461f2dd) I20200717 11:47:16.811429 3636246 monitor.cc:337] map:[stack]+0x1ec80(0x7ffee4257c80) I20200717 11:47:16.811455 3636246 monitor.cc:339] (last frame repeated 196 times) I20200717 11:47:16.811460 3636246 monitor.cc:347] ] ``` PiperOrigin-RevId: 322089140 Change-Id: I05b0de2f4118fed90fe920c06bbd70ea0d1119e2
38 lines
1.2 KiB
C++
38 lines
1.2 KiB
C++
// Copyright 2019 Google LLC
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#ifndef SANDBOXED_API_SANDBOX2_UNWIND_UNWIND_H_
|
|
#define SANDBOXED_API_SANDBOX2_UNWIND_UNWIND_H_
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <cstdint>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "sandboxed_api/sandbox2/comms.h"
|
|
|
|
namespace sandbox2 {
|
|
|
|
// Runs libunwind and the symbolizer and sends the results via comms.
|
|
bool RunLibUnwindAndSymbolizer(Comms* comms);
|
|
|
|
std::vector<std::string> RunLibUnwindAndSymbolizer(pid_t pid,
|
|
std::vector<uintptr_t>* ips,
|
|
int max_frames);
|
|
|
|
} // namespace sandbox2
|
|
|
|
#endif // SANDBOXED_API_SANDBOX2_UNWIND_UNWIND_H_
|