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

Commit 830179fb authored by Li Li's avatar Li Li
Browse files

Optimize cgroupfs dumping 

Only dump frozen processes.

Bug: 193808643
Bug: 213190070
Test: adb bugreport
Change-Id: I9dbfce9fe76e80d9c6a842a4ebcfbedf09fbdc42
parent 8ea88c3a

cmds/dumpstate/dumpstate.cpp

+59 −2
Original line number Diff line number Diff line
@@ -1802,8 +1802,8 @@ static Dumpstate::RunStatus dumpstate() { 
    // Add linker configuration directory

    ds.AddDir(LINKERCONFIG_DIR, true);



    /* Dump cgroupfs */

    ds.AddDir(CGROUPFS_DIR, true);

    /* Dump frozen cgroupfs */

    dump_frozen_cgroupfs();



    if (ds.dump_pool_) {

        WAIT_TASK_WITH_CONSENT_CHECK(DUMP_INCIDENT_REPORT_TASK, ds.dump_pool_);
@@ -4169,6 +4169,63 @@ void dump_route_tables() { 
    fclose(fp);

}



void dump_frozen_cgroupfs(const char *dir, int level,

        int (*dump_from_fd)(const char* title, const char* path, int fd)) {

    DIR *dirp;

    struct dirent *d;

    char *newpath = nullptr;



    dirp = opendir(dir);

    if (dirp == nullptr) {

        MYLOGE("%s: %s\n", dir, strerror(errno));

        return;

    }



    for (; ((d = readdir(dirp))); free(newpath), newpath = nullptr) {

        if ((d->d_name[0] == '.')

         && (((d->d_name[1] == '.') && (d->d_name[2] == '\0'))

          || (d->d_name[1] == '\0'))) {

            continue;

        }

        if (d->d_type == DT_DIR) {

            asprintf(&newpath, "%s/%s/", dir, d->d_name);

            if (!newpath) {

                continue;

            }

            if (level == 0 && !strncmp(d->d_name, "uid_", 4)) {

                dump_frozen_cgroupfs(newpath, 1, dump_from_fd);

            } else if (level == 1 && !strncmp(d->d_name, "pid_", 4)) {

                char *freezer = nullptr;

                asprintf(&freezer, "%s/%s", newpath, "cgroup.freeze");

                if (freezer) {

                    FILE* fp = fopen(freezer, "r");

                    if (fp != NULL) {

                        int frozen;

                        fscanf(fp, "%d", &frozen);

                        if (frozen > 0) {

                            dump_files("", newpath, skip_none, dump_from_fd);

                        }

                        fclose(fp);

                    }

                    free(freezer);

                }

            }

        }

    }

    closedir(dirp);

}



void dump_frozen_cgroupfs() {

    if (!ds.IsZipping()) {

        MYLOGD("Not adding cgroupfs because it's not a zipped bugreport\n");

        return;

    }

    MYLOGD("Adding frozen processes from %s\n", CGROUPFS_DIR);

    DurationReporter duration_reporter("FROZEN CGROUPFS");

    if (PropertiesHelper::IsDryRun()) return;

    dump_frozen_cgroupfs(CGROUPFS_DIR, 0, _add_file_from_fd);

}



void Dumpstate::UpdateProgress(int32_t delta_sec) {

    if (progress_ == nullptr) {

        MYLOGE("UpdateProgress: progress_ not set\n");

cmds/dumpstate/dumpstate.h

+3 −0
Original line number Diff line number Diff line
@@ -637,6 +637,9 @@ void do_dmesg(); 
/* Prints the contents of all the routing tables, both IPv4 and IPv6. */

void dump_route_tables();



/* Dump subdirectories of cgroupfs if the corresponding process is frozen */

void dump_frozen_cgroupfs();



/* Play a sound via Stagefright */

void play_sound(const char *path);