commit e4efaaf0c56d8a5c6b5a21d2c73dbd933d5589cf
author Alex Vakulenko <avakulenko@chromium.org> Tue Jul 22 08:08:44 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Jul 22 22:03:15 2014 +0000
tree a54eecfaba72ea026f68e1328a89792fb6ddc491
parent fd44869303ab7b495572ed239c8f3cf37b982e78

buffet: GCD command manager to load command .json files at startup

buffet daemon now loads the base command definition file from
/etc/buffet/gcd.json at startup. Also, static device command
defintions are load from .json file from /etc/buffet/commands
(if found).

BUG=chromium:374861
TEST=USE=buffet P2_TEST_FILTER="buffet::*" FEATURES=test emerge-link platform2
TEST=Manually deployed test image and copied /etc/buffet/gcd.json to
     /etc/buffet/commands/gcd.json and verified in /var/log/buffet/*
     that the static command definition is loaded at startup.

Change-Id: I1e6b13cabe8cc2ba1a941cc05cb1d0cfeedda480
Reviewed-on: https://chromium-review.googlesource.com/209311
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

buffet/commands/command_manager.h

diff --git a/buffet/commands/command_manager.h b/buffet/commands/command_manager.h
index 64037b8..02d92fd 100644
--- a/buffet/commands/command_manager.h
+++ b/buffet/commands/command_manager.h
@@ -52,15 +52,28 @@
   bool LoadCommands(const base::FilePath& json_file_path,
                     ErrorPtr* error);
 
+  // Factory static method to get the global singleton instance of the object.
+  static CommandManager* GetInstance();
+  // Global startup method to be called by buffet daemon at startup.
+  // Initializes the global object singleton and loads the standard GCD command
+  // dictionary as well as static vendor-provided command definitions for
+  // the current device.
+  static void Startup();
+
  private:
   // Helper function to load a JSON file that is expected to be
   // an object/dictionary. In case of error, returns empty unique ptr and fills
   // in error details in |error|.
   std::unique_ptr<const base::DictionaryValue> LoadJsonDict(
       const base::FilePath& json_file_path, ErrorPtr* error);
+  // Helper method to be called at buffet shutdown to clean up the global
+  // singleton instance of this class.
+  static void Shutdown();
 
   CommandDictionary base_dictionary_;  // Base/std command definitions/schemas.
   CommandDictionary dictionary_;  // Command definitions/schemas.
+
+  static CommandManager* instance_;  // Global singleton instance of the object.
   DISALLOW_COPY_AND_ASSIGN(CommandManager);
 };