cachetool: Implement batch mode to speed-up cache processing.

net/tools/cachetool/cachetool.cc

Index: net/tools/cachetool/cachetool.cc
diff --git a/net/tools/cachetool/cachetool.cc b/net/tools/cachetool/cachetool.cc
index fde1ffce112e31cb1922f40225aac700234073d7..3a161d5fb3a8342b680b276285ff6adae9f7f865 100644
--- a/net/tools/cachetool/cachetool.cc
+++ b/net/tools/cachetool/cachetool.cc
@@ -9,6 +9,7 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ -24,48 +25,293 @@ using disk_cache::Entry;
 
 namespace {
 
-int kResponseInfoIndex = 0;
+const int kResponseInfoIndex = 0;

[pasko, 2016/07/05 15:13:30]

constexpr is preferred now as of https://chromium-cpp.appspot.com/

[gabadie, 2016/07/06 09:25:53]

Done.

+
+const char* const kCommandNames[] = {
+    "stop",          "get_size",   "list_keys",          "get_stream_for_key",

[pasko, 2016/07/05 15:13:30]

any reason for these to be separated by multiple spaces? One column would be
preferable IMO

[gabadie, 2016/07/06 09:25:53]

looks like `git cl format net` did it by itself...

[pasko, 2016/07/06 15:18:55]

weird :) works for me then..

+    "delete_stream", "delete_key", "update_raw_headers",
+};
+
+// Print the command line help.

[pasko, 2016/07/05 15:13:31]

s/Print/Prints/

[gabadie, 2016/07/06 09:25:53]

No, Gavin wanted in the previous reviews the comments of the functions to be
infinitive. So I will keep. following his request.

More over this here I just moved the PrintHelp() up in the file to avoid a
declaration but with one change regarding the online and stop commands. So I
won't make any changes in this function if it is not on these commands' help to
preserve what Gavin originally wanted.

[pasko, 2016/07/06 15:18:55]

Ack, this goes back to Gavin. Though I am not sure why Gavin would propose
something against the style guide. Was it based on consistency within the file?
directory?

puzzled :)

+void PrintHelp() {
+  std::cout << "cachetool <cache_path> <cache_backend_type> <subcommand> ..."

[pasko, 2016/07/05 15:13:30]

The '...' is slightly confusing, maybe should be:

cachetool <cache_path> <cache_backend_type> <subcommand> [<subcommand>]...

[gabadie, 2016/07/06 09:25:53]

No. the ... stands for sub-command specific parameters. Have not been modified
since last CL therefore staying as is.

[pasko, 2016/07/06 15:18:55]

Then the description is still incorrect. Subcommands below are defined as things
with parameters. This would be fixed by removing the '...'.

[gabadie, 2016/07/06 16:45:32]

Done.

+            << std::endl
+            << std::endl;
+  std::cout << "Available cache backend types: simple, blockfile" << std::endl;
+  std::cout << "Available subcommands:" << std::endl;
+  std::cout << "  delete_key <key>: Delete key from cache." << std::endl;
+  std::cout << "  delete_stream <key> <index>: Delete a particular stream of a"
+            << " given key." << std::endl;
+  std::cout << "  get_size: Calculate the total size of the cache in bytes."
+            << std::endl;
+  std::cout << "  get_stream <key> <index>: Print a particular stream for a"
+            << " given key." << std::endl;
+  std::cout << "  list_keys: List all keys in the cache." << std::endl;
+  std::cout << "  online: Starts cachetool to process serialized commands "

[pasko, 2016/07/05 15:13:31]

Making "online" a subcommand is somewhat confusing, as it is not clear what
should happen with multiple "online" subcommands, should better be --online, and
an optional positional argument, like:

cachetool <cache_path> <cache_backend_type> [--online | <subcommand>
[<subcommand>]...]

This is unless one absolutely needs some commands executed prior to the online
commands start playing. I am not sure we have this usecase, probably not.

[gabadie, 2016/07/06 09:25:53]

Command line tool only have one subcommand. Either you do the the subcommand
directly, or you do the online subcommand to accept the multiple commands in the
stdin.

[pasko, 2016/07/06 15:18:55]

Ah, ok, thanks for explaining.

+            << "passed down by the standard input and return commands output "
+            << "in the stdout until the stop command is received." << std::endl;
+  std::cout << "  update_raw_headers <key>: Update stdin as the key's raw "
+            << "response headers." << std::endl;
+  std::cout << "  stop: Verify that the cache can be opened and return, "
+            << "confirming the cache exists and is of the right type."
+            << std::endl;
+  std::cout << "Expected values of <index> are:" << std::endl;
+  std::cout << "  0 (HTTP response headers)" << std::endl;
+  std::cout << "  1 (transport encoded content)" << std::endl;
+  std::cout << "  2 (compiled content)" << std::endl;

[pasko, 2016/07/05 15:13:31]

there can be other things in stream 2, so we can say: (metadata or compiled JS
code)

[gabadie, 2016/07/06 09:25:53]

Interesting, waiting for Gavin's opinion to change this.

+}
+
+// Generic command input/output.
+class CachetoolIOBase {

[pasko, 2016/07/05 15:13:30]

Ha, now I understand why you call it 'IO', basically you want the single class
to control how we read the subcommands and how they are output. This makes sense
because we want to pass the choice as a parameter to various functions.

On the other hand, is there value in making the streamed format to be different
from stdout? I imagine grabbing newlines and parsing ints from the python side
would not slow us down considerably.

Another use seems to be to do DCHECK on input when doing output. I am not sure
why this is essential, can you explain?

If we join the output format for the tool we would have two benefits:
1. less code
2. more intuitive naming of the classes

Naming that sounds more familiar to me (and I guess a general reader) is to have
a CommandParser, and ProgramArgumentCommandParser/StreamCommandParser to inherit
from it.

[gabadie, 2016/07/06 09:25:53]

This is not for speed, but rather for reliability. For instance the raw response
headers contains null chars. So I definitively want to by passs all the
null-ended assumed by non binary stream.
Have not understood.
Not conviced.
Why?

And would also be a non binary protocol that would need to support binary
passdown -> a pain. I definitely prefer the be full binary.
Nice names.

[pasko, 2016/07/06 15:18:55]

Oh, that's actually a very good point, which I totally missed. Yes, binary
format is preferable then.
yeah, but they would be incorrect if we combine parsing with producing the
output.

[gabadie, 2016/07/06 16:45:32]

Ok let's wait for Gavin's opinion. But your offline proposal for Marshal is a
nice idea in my mind.

+ public:
+  CachetoolIOBase(Backend* cache_backend)
+      : command_failed_(false), cache_backend_(cache_backend){};
+  virtual ~CachetoolIOBase(){};
+
+  // Reads the next command's name to execute.
+  virtual std::string ReadCommandName() = 0;
+
+  // Reads the next parameter as an integer.
+  virtual int ReadInt() = 0;
+
+  // Reads the next parameter as stream index.
+  int ReadStreamIndex() {
+    if (has_failed())
+      return -1;
+    int index = ReadInt();
+    if (index < 0 || index > 2) {
+      ReturnFailure("Invalid stream index.");
+      return -1;
+    }
+    return index;
+  }
+
+  // Reads the next parameter as an string.
+  virtual std::string ReadString() = 0;
+
+  // Reads the next parameter from stdin as string.
+  virtual std::string ReadBufferedString() = 0;
+
+  // Communicate back an integer.
+  virtual void ReturnInt(int integer) = 0;
+
+  // Communicate back a string.
+  virtual void ReturnString(const std::string& string) = 0;
+
+  // Communicate back a buffer.
+  virtual void ReturnBuffer(net::GrowableIOBuffer* buffer) = 0;
+
+  // Communicate back command failure.
+  virtual void ReturnFailure(const std::string& error_msg) = 0;
+
+  // Communicate back command success.
+  virtual void ReturnSuccess() { DCHECK(!command_failed_); };
+
+  // Returns weather the command has failed.

[pasko, 2016/07/05 15:13:31]

s/weather/whether/

[gabadie, 2016/07/06 09:25:53]

Done.

+  inline bool has_failed() { return command_failed_; }
+
+  // Returns the opened cache backend.
+  Backend* cache_backend() { return cache_backend_; }
+
+ protected:
+  bool command_failed_;
+  Backend* const cache_backend_;
+};
+
+// Command line input/output that is user readable.
+class CommandLineIO final : public CachetoolIOBase {
+ public:
+  CommandLineIO(Backend* cache_backend, base::CommandLine::StringVector args)
+      : CachetoolIOBase(cache_backend), command_line_args_(args), args_id_(0) {}
+
+  // Implements CachetoolIOBase.
+  std::string ReadCommandName() override {
+    if (args_id_ == 0)
+      return ReadString();
+    else if (args_id_ == command_line_args_.size())
+      return "stop";
+    else if (!has_failed())
+      ReturnFailure("Command line arguments to long.");
+    return "";
+  }
+
+  // Implements CachetoolIOBase.
+  int ReadInt() override {
+    std::string interger_str = ReadString();
+    int interger = -1;
+    if (!base::StringToInt(interger_str, &interger)) {
+      ReturnFailure("Couldn't parse integer.");
+      return 0;
+    }
+    return interger;
+  }
+
+  // Implements CachetoolIOBase.
+  std::string ReadString() override {
+    if (args_id_ < command_line_args_.size())
+      return command_line_args_[args_id_++];
+    if (!has_failed())
+      ReturnFailure("Command line arguments to short.");
+    return "";
+  }
+
+  // Implements CachetoolIOBase.
+  std::string ReadBufferedString() override {
+    std::ostringstream raw_headers_stream;
+    for (std::string line; std::getline(std::cin, line);)
+      raw_headers_stream << line << std::endl;
+    return raw_headers_stream.str();
+  }
+
+  // Implements CachetoolIOBase.
+  void ReturnInt(int integer) override {
+    DCHECK(!has_failed());
+    std::cout << integer << std::endl;
+  }
+
+  // Implements CachetoolIOBase.
+  void ReturnString(const std::string& string) override {
+    DCHECK(!has_failed());
+    std::cout << string << std::endl;
+  }
+
+  // Implements CachetoolIOBase.
+  void ReturnBuffer(net::GrowableIOBuffer* buffer) override {
+    DCHECK(!has_failed());
+    std::cout.write(buffer->data(), buffer->offset());
+  }
+
+  // Implements CachetoolIOBase.
+  void ReturnFailure(const std::string& error_msg) override {
+    DCHECK(!has_failed());
+    std::cerr << error_msg << std::endl;
+    command_failed_ = true;
+  }
+
+ private:
+  const base::CommandLine::StringVector command_line_args_;
+  size_t args_id_;
+};
+
+// Online command input/output that receives pickled commands from stdin and
+// returns their results back in stdout. Send the stop command to properly exit
+// cachetool's main loop.
+class OnlineCommandIO final : public CachetoolIOBase {
+ public:
+  OnlineCommandIO(Backend* cache_backend) : CachetoolIOBase(cache_backend) {}
+
+  // Implements CachetoolIOBase.
+  std::string ReadCommandName() override {
+    if (has_failed())
+      return "";
+    std::cout.flush();
+    size_t command_id = static_cast<size_t>(std::cin.get());
+    if (command_id >= arraysize(kCommandNames)) {
+      ReturnFailure("Unknown command.");
+      return "";
+    }
+    return kCommandNames[command_id];
+  }
+
+  // Implements CachetoolIOBase.
+  int ReadInt() override {
+    if (has_failed())
+      return -1;
+    int integer = -1;
+    std::cin.read(reinterpret_cast<char*>(&integer), sizeof(integer));

[pasko, 2016/07/05 15:13:30]

read 4 bytes? why?

why not std::cin >> integer?

[gabadie, 2016/07/06 09:25:53]

Because binary protocol, not ascii protocol.

+    return integer;
+  }
+
+  // Implements CachetoolIOBase.
+  std::string ReadString() override {
+    if (has_failed())
+      return "";
+    int string_size = ReadInt();
+    if (string_size <= 0) {
+      if (string_size < 0)
+        ReturnFailure("Size of string is negative.");
+      return "";
+    }
+    std::vector<char> tmp_buffer(string_size + 1);
+    std::cin.read(&tmp_buffer[0], string_size);
+    tmp_buffer[string_size] = 0;
+    return std::string(&tmp_buffer[0], string_size);
+  }
+
+  // Implements CachetoolIOBase.
+  std::string ReadBufferedString() override { return ReadString(); }
+
+  // Implements CachetoolIOBase.
+  void ReturnInt(int integer) override {
+    DCHECK(!command_failed_);
+    std::cout.write(reinterpret_cast<char*>(&integer), sizeof(integer));
+  }
+
+  // Implements CachetoolIOBase.
+  void ReturnString(const std::string& string) override {
+    ReturnInt(string.size());
+    std::cout.write(string.c_str(), string.size());
+  }
+
+  // Implements CachetoolIOBase.
+  void ReturnBuffer(net::GrowableIOBuffer* buffer) override {
+    ReturnInt(buffer->offset());
+    std::cout.write(buffer->StartOfBuffer(), buffer->offset());
+  }
+
+  // Implements CachetoolIOBase.
+  void ReturnFailure(const std::string& error_msg) override {
+    ReturnString(error_msg);
+    command_failed_ = true;
+  }
+
+  // Implements CachetoolIOBase.
+  void ReturnSuccess() override { ReturnInt(0); }
+};
 
 // Get the cache's size.
-bool GetSize(Backend* cache_backend) {
+void GetSize(CachetoolIOBase* cachetool_io) {
   net::TestCompletionCallback cb;
-  int rv = cache_backend->CalculateSizeOfAllEntries(cb.callback());
+  int rv =
+      cachetool_io->cache_backend()->CalculateSizeOfAllEntries(cb.callback());
   rv = cb.GetResult(rv);
-  if (rv < 0) {
-    std::cerr << "Couldn't get cache size." << std::endl;
-    return false;
-  }
-  std::cout << rv << std::endl;
-  return true;
+  if (rv < 0)
+    return cachetool_io->ReturnFailure("Couldn't get cache size.");
+  cachetool_io->ReturnSuccess();
+  cachetool_io->ReturnInt(rv);
 }
 
 // Print all of a cache's keys to stdout.
-bool ListKeys(Backend* cache_backend) {
+bool ListKeys(CachetoolIOBase* cachetool_io) {
   std::unique_ptr<Backend::Iterator> entry_iterator =
-      cache_backend->CreateIterator();
+      cachetool_io->cache_backend()->CreateIterator();
   Entry* entry = nullptr;
   net::TestCompletionCallback cb;
   int rv = entry_iterator->OpenNextEntry(&entry, cb.callback());
+  cachetool_io->ReturnSuccess();
   while (cb.GetResult(rv) == net::OK) {
     std::string url = entry->GetKey();
-    std::cout << url << std::endl;
+    cachetool_io->ReturnString(url);
     entry->Close();
     entry = nullptr;
     rv = entry_iterator->OpenNextEntry(&entry, cb.callback());
   }
+  cachetool_io->ReturnString("");
   return true;
 }
 
 // Get a key's stream to a buffer.
 scoped_refptr<net::GrowableIOBuffer> GetStreamForKeyBuffer(
-    Backend* cache_backend,
+    CachetoolIOBase* cachetool_io,
     const std::string& key,
     int index) {
+  DCHECK(!cachetool_io->has_failed());
   Entry* cache_entry;
   net::TestCompletionCallback cb;
-  int rv = cache_backend->OpenEntry(key, &cache_entry, cb.callback());
+  int rv = cachetool_io->cache_backend()->OpenEntry(key, &cache_entry,
+                                                    cb.callback());
   if (cb.GetResult(rv) != net::OK) {
-    std::cerr << "Couldn't find key's entry." << std::endl;
+    cachetool_io->ReturnFailure("Couldn't find key's entry.");
     return nullptr;
   }
 
@@ -79,7 +325,7 @@ scoped_refptr<net::GrowableIOBuffer> GetStreamForKeyBuffer(
     rv = cb.GetResult(rv);
     if (rv < 0) {
       cache_entry->Close();
-      std::cerr << "Stream read error." << std::endl;
+      cachetool_io->ReturnFailure("Stream read error.");
       return nullptr;
     }
     buffer->set_offset(buffer->offset() + rv);
@@ -92,137 +338,131 @@ scoped_refptr<net::GrowableIOBuffer> GetStreamForKeyBuffer(
 }
 
 // Print a key's stream to stdout.
-bool GetStreamForKey(Backend* cache_backend,
-                     const std::string& key,
-                     int index) {
+void GetStreamForKey(CachetoolIOBase* cachetool_io) {
+  std::string key = cachetool_io->ReadString();
+  int index = cachetool_io->ReadInt();
+  if (cachetool_io->has_failed())
+    return;
   scoped_refptr<net::GrowableIOBuffer> buffer(
-      GetStreamForKeyBuffer(cache_backend, key, index));
-  if (!buffer)
-    return false;
+      GetStreamForKeyBuffer(cachetool_io, key, index));
+  if (cachetool_io->has_failed())
+    return;
   if (index == kResponseInfoIndex) {
     net::HttpResponseInfo response_info;
     bool truncated_response_info = false;
     net::HttpCache::ParseResponseInfo(buffer->StartOfBuffer(), buffer->offset(),
                                       &response_info, &truncated_response_info);
-    if (truncated_response_info) {
-      std::cerr << "Truncated HTTP response." << std::endl;
-      return false;
-    }
-    std::cout << net::HttpUtil::ConvertHeadersBackToHTTPResponse(
-        response_info.headers->raw_headers());
+    if (truncated_response_info)
+      return cachetool_io->ReturnFailure("Truncated HTTP response.");
+    cachetool_io->ReturnSuccess();
+    cachetool_io->ReturnString(net::HttpUtil::ConvertHeadersBackToHTTPResponse(
+        response_info.headers->raw_headers()));
   } else {
-    std::cout.write(buffer->StartOfBuffer(), buffer->offset());
+    cachetool_io->ReturnSuccess();
+    cachetool_io->ReturnBuffer(buffer.get());
   }
-  return true;
 }
 
 // Set stdin as the key's raw response headers.
-bool UpdateRawResponseHeaders(Backend* cache_backend, const std::string& key) {
+void UpdateRawResponseHeaders(CachetoolIOBase* cachetool_io) {
+  std::string key = cachetool_io->ReadString();
+  std::string raw_headers = cachetool_io->ReadBufferedString();
+  if (cachetool_io->has_failed())
+    return;
   scoped_refptr<net::GrowableIOBuffer> buffer(
-      GetStreamForKeyBuffer(cache_backend, key, kResponseInfoIndex));
-  if (!buffer)
-    return false;
+      GetStreamForKeyBuffer(cachetool_io, key, kResponseInfoIndex));
+  if (cachetool_io->has_failed())
+    return;
   net::HttpResponseInfo response_info;
   bool truncated_response_info = false;
   net::HttpCache::ParseResponseInfo(buffer->StartOfBuffer(), buffer->offset(),
                                     &response_info, &truncated_response_info);
-  if (truncated_response_info) {
-    std::cerr << "Truncated HTTP response." << std::endl;
-    return false;
-  }
-  std::ostringstream raw_headers_stream;
-  for (std::string line; std::getline(std::cin, line);)
-    raw_headers_stream << line << std::endl;
-  response_info.headers =
-      new net::HttpResponseHeaders(raw_headers_stream.str());
+  if (truncated_response_info)
+    return cachetool_io->ReturnFailure("Truncated HTTP response.");
+
+  response_info.headers = new net::HttpResponseHeaders(raw_headers);
   scoped_refptr<net::PickledIOBuffer> data(new net::PickledIOBuffer());
   response_info.Persist(data->pickle(), false, false);
   data->Done();
   Entry* cache_entry;
   net::TestCompletionCallback cb;
-  int rv = cache_backend->OpenEntry(key, &cache_entry, cb.callback());
+  int rv = cachetool_io->cache_backend()->OpenEntry(key, &cache_entry,
+                                                    cb.callback());
   CHECK(cb.GetResult(rv) == net::OK);
   int data_len = data->pickle()->size();
   rv = cache_entry->WriteData(kResponseInfoIndex, 0, data.get(), data_len,
                               cb.callback(), true);
-  if (cb.GetResult(rv) != data_len) {
-    std::cerr << "Couldn't write headers." << std::endl;
-    return false;
-  }
+  if (cb.GetResult(rv) != data_len)
+    return cachetool_io->ReturnFailure("Couldn't write headers.");
+  cachetool_io->ReturnSuccess();
   cache_entry->Close();
-  return true;
 }
 
 // Delete a specified key stream from the cache.
-bool DeleteStreamForKey(Backend* cache_backend,
-                        const std::string& key,
-                        int index) {
+void DeleteStreamForKey(CachetoolIOBase* cachetool_io) {
+  std::string key = cachetool_io->ReadString();
+  int index = cachetool_io->ReadInt();
+  if (cachetool_io->has_failed())
+    return;
   Entry* cache_entry;
   net::TestCompletionCallback cb;
-  int rv = cache_backend->OpenEntry(key, &cache_entry, cb.callback());
-  if (cb.GetResult(rv) != net::OK) {
-    std::cerr << "Couldn't find key's entry." << std::endl;
-    return false;
-  }
+  int rv = cachetool_io->cache_backend()->OpenEntry(key, &cache_entry,
+                                                    cb.callback());
+  if (cb.GetResult(rv) != net::OK)
+    return cachetool_io->ReturnFailure("Couldn't find key's entry.");
 
   scoped_refptr<net::StringIOBuffer> buffer(new net::StringIOBuffer(""));
   rv = cache_entry->WriteData(index, 0, buffer.get(), 0, cb.callback(), true);
-  if (cb.GetResult(rv) != 0) {
-    std::cerr << "Couldn't delete key stream." << std::endl;
-    return false;
-  }
+  if (cb.GetResult(rv) != net::OK)
+    return cachetool_io->ReturnFailure("Couldn't delete key stream.");
+  cachetool_io->ReturnSuccess();
   cache_entry->Close();
-  return true;
 }
 
 // Delete a specified key from the cache.
-bool DeleteKey(Backend* cache_backend, const std::string& key) {
+void DeleteKey(CachetoolIOBase* cachetool_io) {
+  std::string key = cachetool_io->ReadString();
+  if (cachetool_io->has_failed())
+    return;
   net::TestCompletionCallback cb;
-  int rv = cache_backend->DoomEntry(key, cb.callback());
-  if (cb.GetResult(rv) != net::OK) {
-    std::cerr << "Couldn't delete key." << std::endl;
-    return false;
-  }
-  return true;
+  int rv = cachetool_io->cache_backend()->DoomEntry(key, cb.callback());
+  if (cb.GetResult(rv) != net::OK)
+    cachetool_io->ReturnFailure("Couldn't delete key.");
+  else
+    cachetool_io->ReturnSuccess();
 }
 
-// Parse stream index from command line argument string.
-int ParseStreamIndex(const std::string& index_arg) {
-  int index = -1;
-  if (!base::StringToInt(index_arg, &index)) {
-    std::cerr << "<index> must be an integer." << std::endl;
-    return -1;
-  } else if (index < 0 || index > 2) {
-    std::cerr << "Invalid stream index." << std::endl;
-    return -1;
+// Execute all command from the |common_input|.

[pasko, 2016/07/05 15:13:30]

what is |common_input|?

[gabadie, 2016/07/06 09:25:53]

Oups, variable renaming artifact.

+bool ExecuteCommands(CachetoolIOBase* cachetool_io) {
+  while (!cachetool_io->has_failed()) {
+    std::string subcommand(cachetool_io->ReadCommandName());
+    if (cachetool_io->has_failed())
+      break;
+    if (subcommand == "stop") {
+      cachetool_io->ReturnSuccess();
+      return true;
+    } else if (subcommand == "online") {
+      OnlineCommandIO online_command_io(cachetool_io->cache_backend());
+      return ExecuteCommands(&online_command_io);
+    } else if (subcommand == "delete_key") {
+      DeleteKey(cachetool_io);
+    } else if (subcommand == "delete_stream") {
+      DeleteStreamForKey(cachetool_io);
+    } else if (subcommand == "get_size") {
+      GetSize(cachetool_io);
+    } else if (subcommand == "get_stream") {
+      GetStreamForKey(cachetool_io);
+    } else if (subcommand == "list_keys") {
+      ListKeys(cachetool_io);
+    } else if (subcommand == "update_raw_headers") {
+      UpdateRawResponseHeaders(cachetool_io);
+    } else {
+      // The wrong subcommand is originated from the command line.
+      cachetool_io->ReturnFailure("Unknown command.");
+      PrintHelp();
+    }
   }
-  return index;
-}
-
-// Print the command line help.
-void PrintHelp() {
-  std::cout << "cachetool <cache_path> <cache_backend_type> <subcommand> ..."
-            << std::endl
-            << std::endl;
-  std::cout << "Available cache backend types: simple, blockfile" << std::endl;
-  std::cout << "Available subcommands:" << std::endl;
-  std::cout << "  delete_key <key>: Delete key from cache." << std::endl;
-  std::cout << "  delete_stream <key> <index>: Delete a particular stream of a"
-            << " given key." << std::endl;
-  std::cout << "  get_size: Calculate the total size of the cache in bytes."
-            << std::endl;
-  std::cout << "  get_stream <key> <index>: Print a particular stream for a"
-            << " given key." << std::endl;
-  std::cout << "  list_keys: List all keys in the cache." << std::endl;
-  std::cout << "  update_raw_headers <key>: Update stdin as the key's raw "
-            << "response headers." << std::endl;
-  std::cout << "  validate: Verify that the cache can be opened and return, "
-            << "confirming the cache exists and is of the right type."
-            << std::endl;
-  std::cout << "Expected values of <index> are:" << std::endl;
-  std::cout << "  0 (HTTP response headers)" << std::endl;
-  std::cout << "  1 (transport encoded content)" << std::endl;
-  std::cout << "  2 (compiled content)" << std::endl;
+  return false;
 }
 
 }  // namespace
@@ -242,7 +482,6 @@ int main(int argc, char* argv[]) {
 
   base::FilePath cache_path(args[0]);
   std::string cache_backend_type(args[1]);
-  std::string subcommand(args[2]);
 
   net::BackendType backend_type;
   if (cache_backend_type == "simple") {
@@ -265,34 +504,13 @@ int main(int argc, char* argv[]) {
     return 1;
   }
 
-  bool successful_command;
-  if (subcommand == "delete_key" && args.size() == 4) {
-    successful_command = DeleteKey(cache_backend.get(), args[3]);
-  } else if (subcommand == "delete_stream" && args.size() == 5) {
-    int index = ParseStreamIndex(args[4]);
-    if (index < 0)
-      return 1;
-    successful_command =
-        DeleteStreamForKey(cache_backend.get(), args[3], index);
-  } else if (subcommand == "get_size" && args.size() == 3) {
-    successful_command = GetSize(cache_backend.get());
-  } else if (subcommand == "get_stream" && args.size() == 5) {
-    int index = ParseStreamIndex(args[4]);
-    if (index < 0)
-      return 1;
-    successful_command = GetStreamForKey(cache_backend.get(), args[3], index);
-  } else if (subcommand == "list_keys" && args.size() == 3) {
-    successful_command = ListKeys(cache_backend.get());
-  } else if (subcommand == "update_raw_headers" && args.size() == 4) {
-    successful_command = UpdateRawResponseHeaders(cache_backend.get(), args[3]);
-  } else if (subcommand == "validate" && args.size() == 3) {
-    successful_command = true;
-  } else {
-    successful_command = false;
-    PrintHelp();
-  }
+  CommandLineIO command_line_io(
+      cache_backend.get(),
+      base::CommandLine::StringVector(args.begin() + 2, args.end()));
+  bool successful_commands = ExecuteCommands(&command_line_io);
+
   base::RunLoop().RunUntilIdle();
   cache_backend = nullptr;
   base::RunLoop().RunUntilIdle();
-  return !successful_command;
+  return !successful_commands;
 }