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

Commit 775415bf authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge "Enable wildcard in the list of kernel functions" am: fda23631 am: ec3ae45d 

am: 2b71580f

* commit '2b71580f':
  Enable wildcard in the list of kernel functions
parents 010f15bb 2b71580f

cmds/atrace/atrace.cpp

+9 −7
Original line number Diff line number Diff line
@@ -550,11 +550,12 @@ static bool verifyKernelTraceFuncs(const char* funcs) 
    String8 funcList = String8::format("\n%s", buf);



    // Make sure that every function listed in funcs is in the list we just

    // read from the kernel.

    // read from the kernel, except for wildcard inputs.

    bool ok = true;

    char* myFuncs = strdup(funcs);

    char* func = strtok(myFuncs, ",");

    while (func) {

        if (!strchr(func, '*')) {

            String8 fancyFunc = String8::format("\n%s\n", func);

            bool found = funcList.find(fancyFunc.string(), 0) >= 0;

            if (!found || func[0] == '\0') {
@@ -562,6 +563,7 @@ static bool verifyKernelTraceFuncs(const char* funcs) 
                        "to trace.\n", func);

                ok = false;

            }

        }

        func = strtok(NULL, ",");

    }

    free(myFuncs);