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

Commit 979bea2f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "init: Shutdown services and umount partitions" into main am: 8e185dd3 am: a30d951e 

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



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

init/reboot.cpp

+14 −0
Original line number Diff line number Diff line
@@ -268,6 +268,19 @@ static void DumpUmountDebuggingInfo() { 
}



static UmountStat UmountPartitions(std::chrono::milliseconds timeout) {

    // Terminate (SIGTERM) the services before unmounting partitions.

    // If the processes block the signal, then partitions will eventually fail

    // to unmount and then we fallback to SIGKILL the services.

    //

    // Hence, give the services a chance for a graceful shutdown before sending SIGKILL.

    for (const auto& s : ServiceList::GetInstance()) {

        if (s->IsShutdownCritical()) {

            LOG(INFO) << "Shutdown service: " << s->name();

            s->Terminate();

        }

    }

    ReapAnyOutstandingChildren();



    Timer t;

    /* data partition needs all pending writes to be completed and all emulated partitions

     * umounted.If the current waiting is not good enough, give
@@ -815,6 +828,7 @@ static void DoReboot(unsigned int cmd, const std::string& reason, const std::str 
    if (IsDataMounted("f2fs")) {

        uint32_t flag = F2FS_GOING_DOWN_FULLSYNC;

        unique_fd fd(TEMP_FAILURE_RETRY(open("/data", O_RDONLY)));

        LOG(INFO) << "Invoking F2FS_IOC_SHUTDOWN during shutdown";

        int ret = ioctl(fd.get(), F2FS_IOC_SHUTDOWN, &flag);

        if (ret) {

            PLOG(ERROR) << "Shutdown /data: ";