Commit b116e3b7 authored by fdoray's avatar fdoray Committed by Commit bot

Remove usage of SequencedWorkerPool::GetNamedSequenceToken from debug_log_writer.cc.

SequencedWorkerPool is being deprecated in favor of TaskScheduler.

BUG=667892

Review-Url: https://codereview.chromium.org/2890583003
Cr-Commit-Position: refs/heads/master@{#473484}
parent a5508959
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/files/file.h" #include "base/files/file.h"
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/lazy_instance.h"
#include "base/process/kill.h" #include "base/process/kill.h"
#include "base/process/launch.h" #include "base/process/launch.h"
#include "base/sequenced_task_runner.h" #include "base/sequenced_task_runner.h"
#include "base/task_scheduler/post_task.h" #include "base/task_scheduler/post_task.h"
#include "base/threading/sequenced_worker_pool.h"
#include "chrome/common/logging_chrome.h" #include "chrome/common/logging_chrome.h"
#include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/debug_daemon_client.h" #include "chromeos/dbus/debug_daemon_client.h"
...@@ -33,13 +33,15 @@ typedef base::Callback<void(bool succeeded)> CommandCompletionCallback; ...@@ -33,13 +33,15 @@ typedef base::Callback<void(bool succeeded)> CommandCompletionCallback;
const char kGzipCommand[] = "/bin/gzip"; const char kGzipCommand[] = "/bin/gzip";
const char kTarCommand[] = "/bin/tar"; const char kTarCommand[] = "/bin/tar";
scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner( struct DebugLogWriterTaskRunner {
const std::string sequence_name) { const scoped_refptr<base::SequencedTaskRunner> task_runner =
base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); base::CreateSequencedTaskRunnerWithTraits(
return pool->GetSequencedTaskRunnerWithShutdownBehavior( {base::MayBlock(), base::TaskPriority::BACKGROUND,
pool->GetNamedSequenceToken(sequence_name), base::TaskShutdownBehavior::BLOCK_SHUTDOWN});
base::SequencedWorkerPool::BLOCK_SHUTDOWN); };
}
base::LazyInstance<DebugLogWriterTaskRunner>::Leaky g_sequenced_task_runner =
LAZY_INSTANCE_INITIALIZER;
// Called upon completion of |WriteDebugLogToFile|. Closes file // Called upon completion of |WriteDebugLogToFile|. Closes file
// descriptor, deletes log file in the case of failure and calls // descriptor, deletes log file in the case of failure and calls
...@@ -51,7 +53,7 @@ void WriteDebugLogToFileCompleted( ...@@ -51,7 +53,7 @@ void WriteDebugLogToFileCompleted(
bool succeeded) { bool succeeded) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
if (!succeeded) { if (!succeeded) {
bool posted = GetSequencedTaskRunner(sequence_token_name)->PostTaskAndReply( bool posted = g_sequenced_task_runner.Get().task_runner->PostTaskAndReply(
FROM_HERE, FROM_HERE,
base::Bind(base::IgnoreResult(&base::DeleteFile), file_path, false), base::Bind(base::IgnoreResult(&base::DeleteFile), file_path, false),
base::Bind(callback, file_path, false)); base::Bind(callback, file_path, false));
...@@ -82,9 +84,8 @@ void WriteDebugLogToFile(std::unique_ptr<base::File> file, ...@@ -82,9 +84,8 @@ void WriteDebugLogToFile(std::unique_ptr<base::File> file,
callback)); callback));
// Close the file on an IO-allowed thread. // Close the file on an IO-allowed thread.
GetSequencedTaskRunner(sequence_token_name) g_sequenced_task_runner.Get().task_runner->DeleteSoon(FROM_HERE,
->PostTask(FROM_HERE, file.release());
base::Bind(&base::DeletePointer<base::File>, file.release()));
} }
// Runs command with its parameters as defined in |argv|. // Runs command with its parameters as defined in |argv|.
...@@ -228,13 +229,12 @@ void StartLogRetrieval(const base::FilePath& file_name_template, ...@@ -228,13 +229,12 @@ void StartLogRetrieval(const base::FilePath& file_name_template,
int flags = base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE; int flags = base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE;
std::unique_ptr<base::File> file(new base::File); std::unique_ptr<base::File> file(new base::File);
base::File* file_ptr = file.get(); base::File* file_ptr = file.get();
GetSequencedTaskRunner(sequence_token_name) g_sequenced_task_runner.Get().task_runner->PostTaskAndReply(
->PostTaskAndReply( FROM_HERE,
FROM_HERE, base::Bind(&InitializeLogFile, base::Unretained(file_ptr), base::Bind(&InitializeLogFile, base::Unretained(file_ptr), file_path,
file_path, flags), flags),
base::Bind(&WriteDebugLogToFile, base::Passed(&file), base::Bind(&WriteDebugLogToFile, base::Passed(&file), sequence_token_name,
sequence_token_name, file_path, should_compress, file_path, should_compress, callback));
callback));
} }
const char kDefaultSequenceName[] = "DebugLogWriter"; const char kDefaultSequenceName[] = "DebugLogWriter";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment