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

Commit f6d2e118 authored by Chihhang Chuang's avatar Chihhang Chuang Committed by Automerger Merge Worker
Browse files

Merge "Fix zombie process issue caused by trace trigger" into main am: 81aff587 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2844982



Change-Id: Ieb105c67ba61d06c5acc4b40586161a7cd764baf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9b51b1f 81aff587

media/libstagefright/VideoRenderQualityTracker.cpp

+16 −6
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <cmath>

#include <stdio.h>

#include <sys/time.h>

#include <sys/wait.h>



#include <android-base/macros.h>

#include <android-base/parsebool.h>
@@ -833,19 +834,28 @@ void VideoRenderQualityTracker::triggerTraceWithThrottle(const TraceTriggerFn tr 
void VideoRenderQualityTracker::triggerTrace() {

    // Trigger perfetto to stop always-on-tracing (AOT) to collect trace into a file for video

    // freeze event, the collected trace categories are configured by AOT.

    const char* args[] = {"/system/bin/trigger_perfetto", "com.android.codec-video-freeze", NULL};

    static const char* args[] = {"/system/bin/trigger_perfetto",

                                 "com.android.codec-video-freeze", NULL};



    pid_t pid = fork();

    if (pid < 0) {

        ALOGI("Failed to fork for triggering trace");

        return;

    }

    if (pid == 0) {

        // child process.

    } else if (pid == 0) {

        // Child process.

        ALOGI("Trigger trace %s", args[1]);

        execvp(args[0], const_cast<char**>(args));

        ALOGW("Failed to trigger trace %s", args[1]);

        _exit(1);

    } else {

        // Parent process.

        int status;

        // Wait for the child process (pid) gets terminated, and allow the system to release

        // the resource associated with the child. Or the child process will remain in a

        // zombie state and get killed by llkd to cause foreground app crash.

        if (waitpid(pid, &status, 0) < 0) {

            ALOGW("Failed to waitpid for triggering trace");

        }

    }

    ALOGI("Triggered trace %s", args[1]);

}



} // namespace android