Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bbea7e4 authored by Deyao Ren's avatar Deyao Ren Committed by Automerger Merge Worker
Browse files

Merge "Add apex name to service" am: ec73481e am: aebf8819 am: 1c6e2cbc am: bb175517 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2155014



Change-Id: I3d71da7a3f0f8932e947b8aa12c842a5719b9243
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a063d643 bb175517

init/init.cpp

+2 −2
Original line number Diff line number Diff line
@@ -350,8 +350,8 @@ Parser CreateApexConfigParser(ActionManager& action_manager, ServiceList& servic 
    }

#endif  // RECOVERY

    parser.AddSectionParser("service",

                            std::make_unique<ServiceParser>(&service_list, subcontext, std::nullopt,

                                                            /*from_apex=*/true));

                            std::make_unique<ServiceParser>(&service_list, subcontext,

                            std::nullopt));

    parser.AddSectionParser("on", std::make_unique<ActionParser>(&action_manager, subcontext));



    return parser;

init/service.cpp

+5 −5
Original line number Diff line number Diff line
@@ -131,13 +131,13 @@ pid_t Service::exec_service_pid_ = -1; 
std::chrono::time_point<std::chrono::steady_clock> Service::exec_service_started_;



Service::Service(const std::string& name, Subcontext* subcontext_for_restart_commands,

                 const std::vector<std::string>& args, bool from_apex)

    : Service(name, 0, 0, 0, {}, 0, "", subcontext_for_restart_commands, args, from_apex) {}

                 const std::string& filename, const std::vector<std::string>& args)

    : Service(name, 0, 0, 0, {}, 0, "", subcontext_for_restart_commands, filename, args) {}



Service::Service(const std::string& name, unsigned flags, uid_t uid, gid_t gid,

                 const std::vector<gid_t>& supp_gids, int namespace_flags,

                 const std::string& seclabel, Subcontext* subcontext_for_restart_commands,

                 const std::vector<std::string>& args, bool from_apex)

                 const std::string& filename, const std::vector<std::string>& args)

    : name_(name),

      classnames_({"default"}),

      flags_(flags),
@@ -157,7 +157,7 @@ Service::Service(const std::string& name, unsigned flags, uid_t uid, gid_t gid, 
      oom_score_adjust_(DEFAULT_OOM_SCORE_ADJUST),

      start_order_(0),

      args_(args),

      from_apex_(from_apex) {}

      filename_(filename) {}



void Service::NotifyStateChange(const std::string& new_state) const {

    if ((flags_ & SVC_TEMPORARY) != 0) {
@@ -862,7 +862,7 @@ Result<std::unique_ptr<Service>> Service::MakeTemporaryOneshotService( 
    }



    return std::make_unique<Service>(name, flags, *uid, *gid, supp_gids, namespace_flags, seclabel,

                                     nullptr, str_args, false);

                                     nullptr, /*filename=*/"", str_args);

}



// This is used for snapuserd_proxy, which hands off a socket to snapuserd. It's

init/service.h

+5 −5
Original line number Diff line number Diff line
@@ -66,12 +66,12 @@ class Service { 


  public:

    Service(const std::string& name, Subcontext* subcontext_for_restart_commands,

            const std::vector<std::string>& args, bool from_apex = false);

            const std::string& filename, const std::vector<std::string>& args);



    Service(const std::string& name, unsigned flags, uid_t uid, gid_t gid,

            const std::vector<gid_t>& supp_gids, int namespace_flags, const std::string& seclabel,

            Subcontext* subcontext_for_restart_commands, const std::vector<std::string>& args,

            bool from_apex = false);

            Subcontext* subcontext_for_restart_commands, const std::string& filename,

            const std::vector<std::string>& args);



    static Result<std::unique_ptr<Service>> MakeTemporaryOneshotService(

            const std::vector<std::string>& args);
@@ -134,7 +134,7 @@ class Service { 
    const std::vector<std::string>& args() const { return args_; }

    bool is_updatable() const { return updatable_; }

    bool is_post_data() const { return post_data_; }

    bool is_from_apex() const { return from_apex_; }

    bool is_from_apex() const { return base::StartsWith(filename_, "/apex/"); }

    void set_oneshot(bool value) {

        if (value) {

            flags_ |= SVC_ONESHOT;
@@ -226,7 +226,7 @@ class Service { 


    std::optional<std::string> on_failure_reboot_target_;



    bool from_apex_ = false;

    std::string filename_;

};



}  // namespace init

init/service_parser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ Result<void> ServiceParser::ParseSection(std::vector<std::string>&& args, 
        }

    }



    service_ = std::make_unique<Service>(name, restart_action_subcontext, str_args, from_apex_);

    service_ = std::make_unique<Service>(name, restart_action_subcontext, filename, str_args);

    return {};

}

init/service_parser.h

+2 −5
Original line number Diff line number Diff line
@@ -31,13 +31,11 @@ class ServiceParser : public SectionParser { 
  public:

    ServiceParser(

            ServiceList* service_list, Subcontext* subcontext,

            const std::optional<InterfaceInheritanceHierarchyMap>& interface_inheritance_hierarchy,

            bool from_apex = false)

            const std::optional<InterfaceInheritanceHierarchyMap>& interface_inheritance_hierarchy)

        : service_list_(service_list),

          subcontext_(subcontext),

          interface_inheritance_hierarchy_(interface_inheritance_hierarchy),

          service_(nullptr),

          from_apex_(from_apex) {}

          service_(nullptr) {}

    Result<void> ParseSection(std::vector<std::string>&& args, const std::string& filename,

                              int line) override;

    Result<void> ParseLineSection(std::vector<std::string>&& args, int line) override;
@@ -92,7 +90,6 @@ class ServiceParser : public SectionParser { 
    std::optional<InterfaceInheritanceHierarchyMap> interface_inheritance_hierarchy_;

    std::unique_ptr<Service> service_;

    std::string filename_;

    bool from_apex_ = false;

};



}  // namespace init