Move ActionParser to its own file (0f6417f2) · Commits · e / os / android_system_core

init/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ cc_library_static {
		defaults: ["init_defaults"],
		srcs: [
		"action.cpp",
		"action_parser.cpp",
		"bootchart.cpp",
		"builtins.cpp",
		"capabilities.cpp",

init/action.cpp

+0 −39

Original line number	Diff line number	Diff line
		@@ -379,44 +379,5 @@ void ActionManager::ClearQueue() {
		current_command_ = 0;
		}

		Result<Success> ActionParser::ParseSection(std::vector<std::string>&& args,
		const std::string& filename, int line) {
		std::vector<std::string> triggers(args.begin() + 1, args.end());
		if (triggers.size() < 1) {
		return Error() << "Actions must have a trigger";
		}

		Subcontext* action_subcontext = nullptr;
		if (subcontexts_) {
		for (auto& subcontext : *subcontexts_) {
		if (StartsWith(filename, subcontext.path_prefix())) {
		action_subcontext = &subcontext;
		break;
		}
		}
		}

		auto action = std::make_unique<Action>(false, action_subcontext, filename, line);

		if (auto result = action->InitTriggers(triggers); !result) {
		return Error() << "InitTriggers() failed: " << result.error();
		}

		action_ = std::move(action);
		return Success();
		}

		Result<Success> ActionParser::ParseLineSection(std::vector<std::string>&& args, int line) {
		return action_ ? action_->AddCommand(std::move(args), line) : Success();
		}

		Result<Success> ActionParser::EndSection() {
		if (action_ && action_->NumCommands() > 0) {
		action_manager_->AddAction(std::move(action_));
		}

		return Success();
		}

		} // namespace init
		} // namespace android

init/action.h

+0 −16

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@

		#include "builtins.h"
		#include "keyword_map.h"
		#include "parser.h"
		#include "result.h"
		#include "subcontext.h"

		@@ -123,21 +122,6 @@ class ActionManager {
		std::size_t current_command_;
		};

		class ActionParser : public SectionParser {
		public:
		ActionParser(ActionManager* action_manager, std::vector<Subcontext>* subcontexts)
		: action_manager_(action_manager), subcontexts_(subcontexts), action_(nullptr) {}
		Result<Success> ParseSection(std::vector<std::string>&& args, const std::string& filename,
		int line) override;
		Result<Success> ParseLineSection(std::vector<std::string>&& args, int line) override;
		Result<Success> EndSection() override;

		private:
		ActionManager* action_manager_;
		std::vector<Subcontext>* subcontexts_;
		std::unique_ptr<Action> action_;
		};

		} // namespace init
		} // namespace android

init/action_parser.cpp

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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.
		*/

		#include "action_parser.h"

		#include <android-base/strings.h>

		using android::base::StartsWith;

		namespace android {
		namespace init {

		Result<Success> ActionParser::ParseSection(std::vector<std::string>&& args,
		const std::string& filename, int line) {
		std::vector<std::string> triggers(args.begin() + 1, args.end());
		if (triggers.size() < 1) {
		return Error() << "Actions must have a trigger";
		}

		Subcontext* action_subcontext = nullptr;
		if (subcontexts_) {
		for (auto& subcontext : *subcontexts_) {
		if (StartsWith(filename, subcontext.path_prefix())) {
		action_subcontext = &subcontext;
		break;
		}
		}
		}

		auto action = std::make_unique<Action>(false, action_subcontext, filename, line);

		if (auto result = action->InitTriggers(triggers); !result) {
		return Error() << "InitTriggers() failed: " << result.error();
		}

		action_ = std::move(action);
		return Success();
		}

		Result<Success> ActionParser::ParseLineSection(std::vector<std::string>&& args, int line) {
		return action_ ? action_->AddCommand(std::move(args), line) : Success();
		}

		Result<Success> ActionParser::EndSection() {
		if (action_ && action_->NumCommands() > 0) {
		action_manager_->AddAction(std::move(action_));
		}

		return Success();
		}

		} // namespace init
		} // namespace android

init/action_parser.h

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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_PARSER_H
		#define _INIT_ACTION_PARSER_H

		#include <string>
		#include <vector>

		#include "action.h"
		#include "parser.h"
		#include "subcontext.h"

		namespace android {
		namespace init {

		class ActionParser : public SectionParser {
		public:
		ActionParser(ActionManager* action_manager, std::vector<Subcontext>* subcontexts)
		: action_manager_(action_manager), subcontexts_(subcontexts), action_(nullptr) {}
		Result<Success> ParseSection(std::vector<std::string>&& args, const std::string& filename,
		int line) override;
		Result<Success> ParseLineSection(std::vector<std::string>&& args, int line) override;
		Result<Success> EndSection() override;

		private:
		ActionManager* action_manager_;
		std::vector<Subcontext>* subcontexts_;
		std::unique_ptr<Action> action_;
		};

		} // namespace init
		} // namespace android

		#endif