Remove the need for ProcessSingletonStartupLock
This commit is contained in:
parent
70e74d05e0
commit
afc1fff792
5 changed files with 16 additions and 132 deletions
|
@ -1,53 +0,0 @@
|
|||
// Copyright (c) 2013 The Chromium Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "chrome/browser/process_singleton_startup_lock.h"
|
||||
|
||||
#include "base/bind.h"
|
||||
#include "base/logging.h"
|
||||
|
||||
ProcessSingletonStartupLock::ProcessSingletonStartupLock(
|
||||
const ProcessSingleton::NotificationCallback& original_callback)
|
||||
: locked_(true),
|
||||
original_callback_(original_callback) {}
|
||||
|
||||
ProcessSingletonStartupLock::~ProcessSingletonStartupLock() {}
|
||||
|
||||
ProcessSingleton::NotificationCallback
|
||||
ProcessSingletonStartupLock::AsNotificationCallback() {
|
||||
return base::Bind(&ProcessSingletonStartupLock::NotificationCallbackImpl,
|
||||
base::Unretained(this));
|
||||
}
|
||||
|
||||
void ProcessSingletonStartupLock::Unlock() {
|
||||
DCHECK(CalledOnValidThread());
|
||||
locked_ = false;
|
||||
|
||||
// Replay the command lines of the messages which were received while the
|
||||
// ProcessSingleton was locked. Only replay each message once.
|
||||
std::set<DelayedStartupMessage> replayed_messages;
|
||||
for (std::vector<DelayedStartupMessage>::const_iterator it =
|
||||
saved_startup_messages_.begin();
|
||||
it != saved_startup_messages_.end(); ++it) {
|
||||
if (replayed_messages.find(*it) != replayed_messages.end())
|
||||
continue;
|
||||
original_callback_.Run(base::CommandLine(it->first), it->second);
|
||||
replayed_messages.insert(*it);
|
||||
}
|
||||
saved_startup_messages_.clear();
|
||||
}
|
||||
|
||||
bool ProcessSingletonStartupLock::NotificationCallbackImpl(
|
||||
const base::CommandLine& command_line,
|
||||
const base::FilePath& current_directory) {
|
||||
if (locked_) {
|
||||
// If locked, it means we are not ready to process this message because
|
||||
// we are probably in a first run critical phase.
|
||||
saved_startup_messages_.push_back(
|
||||
std::make_pair(command_line.argv(), current_directory));
|
||||
return true;
|
||||
} else {
|
||||
return original_callback_.Run(command_line, current_directory);
|
||||
}
|
||||
}
|
|
@ -1,57 +0,0 @@
|
|||
// Copyright (c) 2013 The Chromium Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#ifndef CHROME_BROWSER_PROCESS_SINGLETON_STARTUP_LOCK_H_
|
||||
#define CHROME_BROWSER_PROCESS_SINGLETON_STARTUP_LOCK_H_
|
||||
|
||||
#include <set>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "base/basictypes.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/threading/non_thread_safe.h"
|
||||
#include "chrome/browser/process_singleton.h"
|
||||
|
||||
// Provides a ProcessSingleton::NotificationCallback that can queue up
|
||||
// command-line invocations during startup and execute them when startup
|
||||
// completes.
|
||||
//
|
||||
// The object starts in a locked state. |Unlock()| must be called
|
||||
// when the process is prepared to handle command-line invocations.
|
||||
//
|
||||
// Once unlocked, notifications are forwarded to a wrapped NotificationCallback.
|
||||
class ProcessSingletonStartupLock : public base::NonThreadSafe {
|
||||
public:
|
||||
explicit ProcessSingletonStartupLock(
|
||||
const ProcessSingleton::NotificationCallback& original_callback);
|
||||
~ProcessSingletonStartupLock();
|
||||
|
||||
// Returns the ProcessSingleton::NotificationCallback.
|
||||
// The callback is only valid during the lifetime of the
|
||||
// ProcessSingletonStartupLock instance.
|
||||
ProcessSingleton::NotificationCallback AsNotificationCallback();
|
||||
|
||||
// Executes previously queued command-line invocations and allows future
|
||||
// invocations to be executed immediately.
|
||||
void Unlock();
|
||||
|
||||
bool locked() { return locked_; }
|
||||
|
||||
private:
|
||||
typedef std::pair<base::CommandLine::StringVector, base::FilePath>
|
||||
DelayedStartupMessage;
|
||||
|
||||
bool NotificationCallbackImpl(const base::CommandLine& command_line,
|
||||
const base::FilePath& current_directory);
|
||||
|
||||
bool locked_;
|
||||
std::vector<DelayedStartupMessage> saved_startup_messages_;
|
||||
ProcessSingleton::NotificationCallback original_callback_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(ProcessSingletonStartupLock);
|
||||
};
|
||||
|
||||
#endif // CHROME_BROWSER_PROCESS_SINGLETON_STARTUP_LOCK_H_
|
Loading…
Add table
Add a link
Reference in a new issue