mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-29 16:45:53 +08:00
3cc7ceaac5
* a thread blocked in an exception is technically not suspended on Fuchsia * this will take care of the spurious error message "thread failed to suspend: ZX_ERR_TIMED_OUT (-21)" introduced in https://chromium-review.googlesource.com/c/crashpad/crashpad/+/1536268 Bug: fuchsia/ZX-3772 Tested: `fx run-test crashpad_test` on Fuchsia; verified with `fx shell crasher` no error message Change-Id: I5306732ef7c5a4f2c0fe84bc072506d57a43931e Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/1538558 Reviewed-by: Joshua Peraza <jperaza@chromium.org> Commit-Queue: Francois Rousseau <frousseau@google.com>
61 lines
2.0 KiB
C++
61 lines
2.0 KiB
C++
// Copyright 2018 The Crashpad Authors. All rights reserved.
|
|
//
|
|
// 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.
|
|
|
|
#include "util/fuchsia/scoped_task_suspend.h"
|
|
|
|
#include <lib/zx/time.h>
|
|
#include <zircon/errors.h>
|
|
#include <zircon/status.h>
|
|
#include <zircon/syscalls/object.h>
|
|
|
|
#include <vector>
|
|
|
|
#include "base/fuchsia/fuchsia_logging.h"
|
|
#include "base/logging.h"
|
|
#include "util/fuchsia/koid_utilities.h"
|
|
|
|
namespace crashpad {
|
|
|
|
ScopedTaskSuspend::ScopedTaskSuspend(const zx::process& process) {
|
|
DCHECK_NE(process.get(), zx::process::self()->get());
|
|
|
|
const zx_status_t suspend_status = process.suspend(&suspend_token_);
|
|
if (suspend_status != ZX_OK) {
|
|
ZX_LOG(ERROR, suspend_status) << "zx_task_suspend";
|
|
return;
|
|
}
|
|
|
|
// suspend() is asynchronous so we now check that each thread is indeed
|
|
// suspended, up to some deadline.
|
|
for (const auto& thread : GetThreadHandles(process)) {
|
|
// We omit the crashed thread (blocked in an exception) as it is technically
|
|
// not suspended, cf. ZX-3772.
|
|
zx_info_thread info;
|
|
if (thread.get_info(
|
|
ZX_INFO_THREAD, &info, sizeof(info), nullptr, nullptr) == ZX_OK) {
|
|
if (info.state == ZX_THREAD_STATE_BLOCKED_EXCEPTION) {
|
|
continue;
|
|
}
|
|
}
|
|
|
|
zx_signals_t observed = 0u;
|
|
const zx_status_t wait_status = thread.wait_one(
|
|
ZX_THREAD_SUSPENDED, zx::deadline_after(zx::msec(50)), &observed);
|
|
ZX_LOG_IF(ERROR, wait_status != ZX_OK, wait_status)
|
|
<< "thread failed to suspend";
|
|
}
|
|
}
|
|
|
|
} // namespace crashpad
|