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

Commit 380995ad authored by Sandeep Patil's avatar Sandeep Patil
Browse files

libmemtrack: Remove libpagemap dependency. 



While at it convert the old memtrack_test.c to cpp.
Bug: 111694435
Test: memtrack_test

Change-Id: If297d70cf05b330c578dfabc934fc368d362cc70
Signed-off-by: default avatarSandeep Patil <sspatil@google.com>
parent 763bac78

libmemtrack/.clang-format

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../.clang-format-4
 
 No newline at end of file

libmemtrack/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -28,10 +28,11 @@ cc_library_shared { 


cc_binary {

    name: "memtrack_test",

    srcs: ["memtrack_test.c"],

    srcs: ["memtrack_test.cpp"],

    static_libs: ["libc++fs"],

    shared_libs: [

        "libbase",

        "libmemtrack",

        "libpagemap",

    ],

    cflags: [

        "-Wall",

libmemtrack/memtrack_test.c→libmemtrack/memtrack_test.cpp

+97 −0
Original line number Diff line number Diff line
@@ -19,104 +19,62 @@ 
#include <string.h>

#include <sys/types.h>



#include <memtrack/memtrack.h>

#include <filesystem>

#include <vector>



#include <pagemap/pagemap.h>

#include <android-base/file.h>

#include <android-base/parseint.h>

#include <android-base/stringprintf.h>

#include <memtrack/memtrack.h>



#define DIV_ROUND_UP(x, y) (((x) + (y)-1) / (y))



static int getprocname(pid_t pid, char *buf, int len) {

    char *filename;

    FILE *f;

    int rc = 0;

    static const char* unknown_cmdline = "<unknown>";



    if (len <= 0) {

        return -1;

    }



    if (asprintf(&filename, "/proc/%d/cmdline", pid) < 0) {

        rc = 1;

        goto exit;

    }



    f = fopen(filename, "r");

    if (f == NULL) {

        rc = 2;

        goto releasefilename;

    }



    if (fgets(buf, len, f) == NULL) {

        rc = 3;

        goto closefile;

    }



closefile:

    (void) fclose(f);

releasefilename:

    free(filename);

exit:

    if (rc != 0) {

        /*

         * The process went away before we could read its process name. Try

         * to give the user "<unknown>" here, but otherwise they get to look

         * at a blank.

         */

        if (strlcpy(buf, unknown_cmdline, (size_t)len) >= (size_t)len) {

            rc = 4;

        }

static void getprocname(pid_t pid, std::string* name) {

    std::string fname = ::android::base::StringPrintf("/proc/%d/cmdline", pid);

    if (!::android::base::ReadFileToString(fname, name)) {

        fprintf(stderr, "Failed to read cmdline from: %s\n", fname.c_str());

        *name = "<unknown>";

    }



    return rc;

}



int main(int argc, char *argv[])

{

int main(int /* argc */, char** /* argv */) {

    int ret;

    pm_kernel_t *ker;

    size_t num_procs;

    pid_t *pids;

    struct memtrack_proc* p;

    size_t i;



    (void)argc;

    (void)argv;

    std::vector<pid_t> pids;



    ret = pm_kernel_create(&ker);

    if (ret) {

        fprintf(stderr, "Error creating kernel interface -- "

                        "does this kernel have pagemap?\n");

    p = memtrack_proc_new();

    if (p == nullptr) {

        fprintf(stderr, "failed to create memtrack process handle\n");

        exit(EXIT_FAILURE);

    }



    ret = pm_kernel_pids(ker, &pids, &num_procs);

    if (ret) {

        fprintf(stderr, "Error listing processes.\n");

        exit(EXIT_FAILURE);

    for (auto& de : std::filesystem::directory_iterator("/proc")) {

        if (!std::filesystem::is_directory(de.status())) {

            continue;

        }



    p = memtrack_proc_new();

    if (ret) {

        fprintf(stderr, "failed to create memtrack process handle\n");

        exit(EXIT_FAILURE);

        pid_t pid;

        if (!::android::base::ParseInt(de.path().filename().string(), &pid)) {

            continue;

        }

        pids.emplace_back(pid);

    }



    for (i = 0; i < num_procs; i++) {

        pid_t pid = pids[i];

        char cmdline[256];

    for (auto& pid : pids) {

        size_t v1;

        size_t v2;

        size_t v3;

        size_t v4;

        size_t v5;

        size_t v6;

        std::string cmdline;



        getprocname(pid, cmdline, (int)sizeof(cmdline));

        getprocname(pid, &cmdline);



        ret = memtrack_proc_get(p, pid);

        if (ret) {

            fprintf(stderr, "failed to get memory info for pid %d: %s (%d)\n",

                    pid, strerror(-ret), ret);

            fprintf(stderr, "failed to get memory info for pid %d: %s (%d)\n", pid, strerror(-ret),

                    ret);

            continue;

        }
@@ -128,12 +86,12 @@ int main(int argc, char *argv[]) 
        v6 = DIV_ROUND_UP(memtrack_proc_other_pss(p), 1024);



        if (v1 | v2 | v3 | v4 | v5 | v6) {

            printf("%5d %6zu %6zu %6zu %6zu %6zu %6zu %s\n", pid,

                   v1, v2, v3, v4, v5, v6, cmdline);

            fprintf(stdout, "%5d %6zu %6zu %6zu %6zu %6zu %6zu %s\n", pid, v1, v2, v3, v4, v5, v6,

                    cmdline.c_str());

        }

    }



    memtrack_proc_destroy(p);



    return 0;

    return ret;

}