mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-27 15:32:10 +08:00
d98690a182
This patch also updates WorkerThread to execute DoWork() when DoWorkNow() has been called, which is relevant when DoWorkNow() and Stop() have both been called. This occurs regularly on Android where the handler's current normal mode is to dump a single process and exit. This change ensures the upload thread has a chance to upload the report before the handler exits. This change should not affect upload on Chrome/WebView/Chromecast which don't pass Crashpad a --url option and are still responsible for their own uploads. Change-Id: Ie5553eafc13714f0438b4b133a92516f7abec153 Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/1643710 Commit-Queue: Joshua Peraza <jperaza@chromium.org> Reviewed-by: Mark Mentovai <mark@chromium.org>
98 lines
2.3 KiB
C++
98 lines
2.3 KiB
C++
// Copyright 2015 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/thread/worker_thread.h"
|
|
|
|
#include "base/logging.h"
|
|
#include "util/thread/thread.h"
|
|
|
|
namespace crashpad {
|
|
|
|
namespace internal {
|
|
|
|
class WorkerThreadImpl final : public Thread {
|
|
public:
|
|
WorkerThreadImpl(WorkerThread* self, double initial_work_delay)
|
|
: semaphore_(0),
|
|
initial_work_delay_(initial_work_delay),
|
|
self_(self) {}
|
|
~WorkerThreadImpl() {}
|
|
|
|
void ThreadMain() override {
|
|
if (initial_work_delay_ > 0)
|
|
semaphore_.TimedWait(initial_work_delay_);
|
|
|
|
while (self_->running_ || self_->do_work_now_) {
|
|
self_->delegate_->DoWork(self_);
|
|
self_->do_work_now_ = false;
|
|
semaphore_.TimedWait(self_->work_interval_);
|
|
}
|
|
}
|
|
|
|
void SignalSemaphore() {
|
|
semaphore_.Signal();
|
|
}
|
|
|
|
private:
|
|
// TODO(mark): Use a condition variable instead?
|
|
Semaphore semaphore_;
|
|
double initial_work_delay_;
|
|
WorkerThread* self_; // Weak, owns this.
|
|
};
|
|
|
|
} // namespace internal
|
|
|
|
WorkerThread::WorkerThread(double work_interval,
|
|
WorkerThread::Delegate* delegate)
|
|
: work_interval_(work_interval),
|
|
delegate_(delegate),
|
|
impl_(),
|
|
running_(false),
|
|
do_work_now_(false) {}
|
|
|
|
WorkerThread::~WorkerThread() {
|
|
DCHECK(!running_);
|
|
}
|
|
|
|
void WorkerThread::Start(double initial_work_delay) {
|
|
DCHECK(!impl_);
|
|
DCHECK(!running_);
|
|
|
|
running_ = true;
|
|
impl_.reset(new internal::WorkerThreadImpl(this, initial_work_delay));
|
|
impl_->Start();
|
|
}
|
|
|
|
void WorkerThread::Stop() {
|
|
DCHECK(running_);
|
|
DCHECK(impl_);
|
|
|
|
if (!running_)
|
|
return;
|
|
|
|
running_ = false;
|
|
|
|
impl_->SignalSemaphore();
|
|
impl_->Join();
|
|
impl_.reset();
|
|
}
|
|
|
|
void WorkerThread::DoWorkNow() {
|
|
DCHECK(running_);
|
|
do_work_now_ = true;
|
|
impl_->SignalSemaphore();
|
|
}
|
|
|
|
} // namespace crashpad
|