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

Commit 9483be8a authored by Keun-young Park's avatar Keun-young Park Committed by android-build-merger
Browse files

Merge "combine wait for exec log with service exit log" am: 483d2f9a am:... 

Merge "combine wait for exec log with service exit log" am: 483d2f9a am: 010efc6a am: b85523e6
am: 58689cb4

Change-Id: If8e7055ef4f98c256a30d0719bcb157af0010e85
parents c9a8f9fb 58689cb4

init/service.cpp

+9 −9
Original line number Original line Diff line number Diff line
@@ -274,10 +274,6 @@ void Service::Reap() { 
    std::for_each(descriptors_.begin(), descriptors_.end(),

    std::for_each(descriptors_.begin(), descriptors_.end(),

                  std::bind(&DescriptorInfo::Clean, std::placeholders::_1));

                  std::bind(&DescriptorInfo::Clean, std::placeholders::_1));





    if (flags_ & SVC_EXEC) {

        LOG(INFO) << "SVC_EXEC pid " << pid_ << " finished...";

    }



    if (flags_ & SVC_TEMPORARY) {

    if (flags_ & SVC_TEMPORARY) {

        return;

        return;

    }

    }
@@ -1047,21 +1043,26 @@ bool ServiceManager::ReapOneProcess() { 
    Service* svc = FindServiceByPid(pid);

    Service* svc = FindServiceByPid(pid);





    std::string name;

    std::string name;

    std::string wait_string;

    if (svc) {

    if (svc) {

        name = android::base::StringPrintf("Service '%s' (pid %d)",

        name = android::base::StringPrintf("Service '%s' (pid %d)",

                                           svc->name().c_str(), pid);

                                           svc->name().c_str(), pid);

        if (svc->flags() & SVC_EXEC) {

            wait_string =

                android::base::StringPrintf(" waiting took %f seconds", exec_waiter_->duration_s());

        }

    } else {

    } else {

        name = android::base::StringPrintf("Untracked pid %d", pid);

        name = android::base::StringPrintf("Untracked pid %d", pid);

    }

    }





    if (WIFEXITED(status)) {

    if (WIFEXITED(status)) {

        LOG(INFO) << name << " exited with status " << WEXITSTATUS(status);

        LOG(INFO) << name << " exited with status " << WEXITSTATUS(status) << wait_string;

    } else if (WIFSIGNALED(status)) {

    } else if (WIFSIGNALED(status)) {

        LOG(INFO) << name << " killed by signal " << WTERMSIG(status);

        LOG(INFO) << name << " killed by signal " << WTERMSIG(status) << wait_string;

    } else if (WIFSTOPPED(status)) {

    } else if (WIFSTOPPED(status)) {

        LOG(INFO) << name << " stopped by signal " << WSTOPSIG(status);

        LOG(INFO) << name << " stopped by signal " << WSTOPSIG(status) << wait_string;

    } else {

    } else {

        LOG(INFO) << name << " state changed";

        LOG(INFO) << name << " state changed" << wait_string;

    }

    }





    if (!svc) {

    if (!svc) {
@@ -1071,7 +1072,6 @@ bool ServiceManager::ReapOneProcess() { 
    svc->Reap();

    svc->Reap();





    if (svc->flags() & SVC_EXEC) {

    if (svc->flags() & SVC_EXEC) {

        LOG(INFO) << "Wait for exec took " << *exec_waiter_;

        exec_waiter_.reset();

        exec_waiter_.reset();

    }

    }

    if (svc->flags() & SVC_TEMPORARY) {

    if (svc->flags() & SVC_TEMPORARY) {