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

Commit 7e31bb6c authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 0ead2a00: am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes" 

* commit '0ead2a00':
  Fix reading memory usage for 64-bit processes
parents 4961bc88 0ead2a00

core/jni/android_os_Debug.cpp

+8 −8
Original line number Original line Diff line number Diff line
@@ -174,21 +174,21 @@ static int read_memtrack_memory(struct memtrack_proc* p, int pid, 




    ssize_t pss = memtrack_proc_graphics_pss(p);

    ssize_t pss = memtrack_proc_graphics_pss(p);

    if (pss < 0) {

    if (pss < 0) {

        ALOGW("failed to get graphics pss: %d", pss);

        ALOGW("failed to get graphics pss: %zd", pss);

        return pss;

        return pss;

    }

    }

    graphics_mem->graphics = pss / 1024;

    graphics_mem->graphics = pss / 1024;





    pss = memtrack_proc_gl_pss(p);

    pss = memtrack_proc_gl_pss(p);

    if (pss < 0) {

    if (pss < 0) {

        ALOGW("failed to get gl pss: %d", pss);

        ALOGW("failed to get gl pss: %zd", pss);

        return pss;

        return pss;

    }

    }

    graphics_mem->gl = pss / 1024;

    graphics_mem->gl = pss / 1024;





    pss = memtrack_proc_other_pss(p);

    pss = memtrack_proc_other_pss(p);

    if (pss < 0) {

    if (pss < 0) {

        ALOGW("failed to get other pss: %d", pss);

        ALOGW("failed to get other pss: %zd", pss);

        return pss;

        return pss;

    }

    }

    graphics_mem->other = pss / 1024;

    graphics_mem->other = pss / 1024;
@@ -231,9 +231,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
    unsigned referenced = 0;

    unsigned referenced = 0;

    unsigned temp;

    unsigned temp;





    unsigned long int start;

    uint64_t start;

    unsigned long int end = 0;

    uint64_t end = 0;

    unsigned long int prevEnd = 0;

    uint64_t prevEnd = 0;

    char* name;

    char* name;

    int name_pos;

    int name_pos;
@@ -255,7 +255,7 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
        if (len < 1) return;

        if (len < 1) return;

        line[--len] = 0;

        line[--len] = 0;





        if (sscanf(line, "%lx-%lx %*s %*x %*x:%*x %*d%n", &start, &end, &name_pos) != 2) {

        if (sscanf(line, "%" SCNx64 "-%" SCNx64 " %*s %*x %*x:%*x %*d%n", &start, &end, &name_pos) != 2) {

            skip = true;

            skip = true;

        } else {

        } else {

            while (isspace(line[name_pos])) {

            while (isspace(line[name_pos])) {
@@ -371,7 +371,7 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
                referenced = temp;

                referenced = temp;

            } else if (line[0] == 'S' && sscanf(line, "Swap: %d kB", &temp) == 1) {

            } else if (line[0] == 'S' && sscanf(line, "Swap: %d kB", &temp) == 1) {

                swapped_out = temp;

                swapped_out = temp;

            } else if (strlen(line) > 30 && line[8] == '-' && line[17] == ' ') {

            } else if (sscanf(line, "%" SCNx64 "-%" SCNx64 " %*s %*x %*x:%*x %*d", &start, &end) == 2) {

                // looks like a new mapping

                // looks like a new mapping

                // example: "10000000-10001000 ---p 10000000 00:00 0"

                // example: "10000000-10001000 ---p 10000000 00:00 0"

                break;

                break;