012c573e26
In the past, I had thought it didn't make sense to have multiple Action classes with identical triggers within ActionManager::actions_, and opted to instead combine these into a single action. In theory, it should reduce memory overhead as only one copy of the triggers needs to be stored. In practice, this ends up not being a good idea. Most importantly, given a file with the below three sections in this same order: on boot setprop a b on boot && property:true=true setprop c d on boot setprop e f Assuming that property 'true' == 'true', when the `boot` event happens, the order of the setprop commands will actually be: setprop a b setprop e f setprop c d instead of the more intuitive order of: setprop a b setprop c d setprop e f This is a mistake and this CL fixes it. It also documents this order. Secondly, with a given 'Action' now spanning multiple files, in order to keep track of which file a command is run from, the 'Command' itself needs to store this. Ironically to the original intention, this increases total ram usage. This change now only stores the file name in each 'Action' instead of each 'Command'. All in all this is a negligible trade off of ram usage. Thirdly, this requires a bunch of extra code and assumptions that don't help anything else. In particular it forces to keep property triggers sorted for easy comparison, which I'm using an std::map for currently, but that is not the best data structure to contain them. Lastly, I added the filename and line number to the 'processing action' LOG(INFO) message. Test: Boot bullhead, observe above changes Test: Boot sailfish, observe no change in boot time Change-Id: I3fbcac4ee677351314e33012c758145be82346e9
130 lines
4 KiB
C++
130 lines
4 KiB
C++
/*
|
|
* Copyright (C) 2015 The Android Open Source Project
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef _INIT_ACTION_H
|
|
#define _INIT_ACTION_H
|
|
|
|
#include <map>
|
|
#include <queue>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "builtins.h"
|
|
#include "init_parser.h"
|
|
#include "keyword_map.h"
|
|
|
|
class Command {
|
|
public:
|
|
Command(BuiltinFunction f, const std::vector<std::string>& args, int line);
|
|
|
|
int InvokeFunc() const;
|
|
std::string BuildCommandString() const;
|
|
|
|
int line() const { return line_; }
|
|
|
|
private:
|
|
BuiltinFunction func_;
|
|
std::vector<std::string> args_;
|
|
int line_;
|
|
};
|
|
|
|
class Action {
|
|
public:
|
|
explicit Action(bool oneshot, const std::string& filename, int line);
|
|
|
|
bool AddCommand(const std::vector<std::string>& args, int line, std::string* err);
|
|
void AddCommand(BuiltinFunction f, const std::vector<std::string>& args, int line);
|
|
bool InitTriggers(const std::vector<std::string>& args, std::string* err);
|
|
bool InitSingleTrigger(const std::string& trigger);
|
|
std::size_t NumCommands() const;
|
|
void ExecuteOneCommand(std::size_t command) const;
|
|
void ExecuteAllCommands() const;
|
|
bool CheckEventTrigger(const std::string& trigger) const;
|
|
bool CheckPropertyTrigger(const std::string& name,
|
|
const std::string& value) const;
|
|
std::string BuildTriggersString() const;
|
|
void DumpState() const;
|
|
|
|
bool oneshot() const { return oneshot_; }
|
|
const std::string& filename() const { return filename_; }
|
|
int line() const { return line_; }
|
|
static void set_function_map(const KeywordMap<BuiltinFunction>* function_map) {
|
|
function_map_ = function_map;
|
|
}
|
|
|
|
|
|
private:
|
|
void ExecuteCommand(const Command& command) const;
|
|
bool CheckPropertyTriggers(const std::string& name = "",
|
|
const std::string& value = "") const;
|
|
bool ParsePropertyTrigger(const std::string& trigger, std::string* err);
|
|
|
|
std::map<std::string, std::string> property_triggers_;
|
|
std::string event_trigger_;
|
|
std::vector<Command> commands_;
|
|
bool oneshot_;
|
|
std::string filename_;
|
|
int line_;
|
|
static const KeywordMap<BuiltinFunction>* function_map_;
|
|
};
|
|
|
|
class Trigger {
|
|
public:
|
|
virtual ~Trigger() { }
|
|
virtual bool CheckTriggers(const Action& action) const = 0;
|
|
};
|
|
|
|
class ActionManager {
|
|
public:
|
|
static ActionManager& GetInstance();
|
|
|
|
void AddAction(std::unique_ptr<Action> action);
|
|
void QueueEventTrigger(const std::string& trigger);
|
|
void QueuePropertyTrigger(const std::string& name, const std::string& value);
|
|
void QueueAllPropertyTriggers();
|
|
void QueueBuiltinAction(BuiltinFunction func, const std::string& name);
|
|
void ExecuteOneCommand();
|
|
bool HasMoreCommands() const;
|
|
void DumpState() const;
|
|
|
|
private:
|
|
ActionManager();
|
|
|
|
ActionManager(ActionManager const&) = delete;
|
|
void operator=(ActionManager const&) = delete;
|
|
|
|
std::vector<std::unique_ptr<Action>> actions_;
|
|
std::queue<std::unique_ptr<Trigger>> trigger_queue_;
|
|
std::queue<const Action*> current_executing_actions_;
|
|
std::size_t current_command_;
|
|
};
|
|
|
|
class ActionParser : public SectionParser {
|
|
public:
|
|
ActionParser() : action_(nullptr) {
|
|
}
|
|
bool ParseSection(const std::vector<std::string>& args, const std::string& filename, int line,
|
|
std::string* err) override;
|
|
bool ParseLineSection(const std::vector<std::string>& args, int line, std::string* err) override;
|
|
void EndSection() override;
|
|
void EndFile(const std::string&) override {
|
|
}
|
|
|
|
private:
|
|
std::unique_ptr<Action> action_;
|
|
};
|
|
|
|
#endif
|