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

Commit b11e00d6 authored by Muhammad Qureshi's avatar Muhammad Qureshi
Browse files

Add flag to stats-log-api-gen for WorkSource. 

As part of getting rid of StatsLogInternal and moving every atom to be
logged from a module, this CL addresses 2 issues:
1. Add WorkSource logging to modules.
2. Gate WorkSource logging via a CLI flag to prevent WorkSource methods
from being included in modules that are Mainline modules and can't have
@hide calls.

Bug: 147541828
Test: m
Test: atest android.cts.statsd.atom.UidAtomTests

Change-Id: Icce2f6ed7298be5e5ceebfb05d87e6fa7cd6bdbb
Merged-In: Icce2f6ed7298be5e5ceebfb05d87e6fa7cd6bdbb
parent 17c204de

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ java_library { 
genrule {

    name: "framework-statslog-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out)",

    cmd: "$(location stats-log-api-gen) --java $(out) --worksource",

    out: ["android/util/StatsLogInternal.java"],

}

tools/stats_log_api_gen/Collation.cpp

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ int collate_atoms(const Descriptor *descriptor, Atoms *atoms) { 
    AtomDecl nonChainedAtomDecl(atomField->number(), atomField->name(), atom->name());

    vector<java_type_t> nonChainedSignature;

    if (get_non_chained_node(atom, &nonChainedAtomDecl, &nonChainedSignature)) {

        auto it = atoms->non_chained_signatures_to_modules.find(signature);

        auto it = atoms->non_chained_signatures_to_modules.find(nonChainedSignature);

        if (it == atoms->non_chained_signatures_to_modules.end()) {

            set<string> modules_non_chained;

            if (atomDecl.hasModule) {

tools/stats_log_api_gen/java_writer.cpp

+12 −27
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int write_java_methods( 
                        java_type_name(chainField.javaType), chainField.name.c_str());

                }

            } else if (*arg == JAVA_TYPE_KEY_VALUE_PAIR) {

                fprintf(out, ", SparseArray<Object> valueMap");

                fprintf(out, ", android.util.SparseArray<Object> valueMap");

            } else {

                fprintf(out, ", %s arg%d", java_type_name(*arg), argIndex);

            }
@@ -142,16 +142,16 @@ static int write_java_methods( 
                fprintf(out,

                        "%s        final int count = valueMap.size();\n", indent.c_str());

                fprintf(out,

                        "%s        SparseIntArray intMap = null;\n",

                        "%s        android.util.SparseIntArray intMap = null;\n",

                        indent.c_str());

                fprintf(out,

                        "%s        SparseLongArray longMap = null;\n",

                        "%s        android.util.SparseLongArray longMap = null;\n",

                        indent.c_str());

                fprintf(out,

                        "%s        SparseArray<String> stringMap = null;\n",

                        "%s        android.util.SparseArray<String> stringMap = null;\n",

                        indent.c_str());

                fprintf(out,

                        "%s        SparseArray<Float> floatMap = null;\n",

                        "%s        android.util.SparseArray<Float> floatMap = null;\n",

                        indent.c_str());

                fprintf(out,

                        "%s        for (int i = 0; i < count; i++) {\n", indent.c_str());
@@ -165,7 +165,7 @@ static int write_java_methods( 
                fprintf(out,

                        "%s                if (null == intMap) {\n", indent.c_str());

                fprintf(out,

                        "%s                    intMap = new SparseIntArray();\n", indent.c_str());

                        "%s                    intMap = new android.util.SparseIntArray();\n", indent.c_str());

                fprintf(out,

                        "%s                }\n", indent.c_str());

                fprintf(out,
@@ -175,7 +175,7 @@ static int write_java_methods( 
                fprintf(out,

                        "%s                if (null == longMap) {\n", indent.c_str());

                fprintf(out,

                        "%s                    longMap = new SparseLongArray();\n", indent.c_str());

                        "%s                    longMap = new android.util.SparseLongArray();\n", indent.c_str());

                fprintf(out,

                        "%s                }\n", indent.c_str());

                fprintf(out,
@@ -185,7 +185,7 @@ static int write_java_methods( 
                fprintf(out,

                        "%s                if (null == stringMap) {\n", indent.c_str());

                fprintf(out,

                        "%s                    stringMap = new SparseArray<>();\n", indent.c_str());

                        "%s                    stringMap = new android.util.SparseArray<>();\n", indent.c_str());

                fprintf(out,

                        "%s                }\n", indent.c_str());

                fprintf(out,
@@ -195,7 +195,7 @@ static int write_java_methods( 
                fprintf(out,

                        "%s                if (null == floatMap) {\n", indent.c_str());

                fprintf(out,

                        "%s                    floatMap = new SparseArray<>();\n", indent.c_str());

                        "%s                    floatMap = new android.util.SparseArray<>();\n", indent.c_str());

                fprintf(out,

                        "%s                }\n", indent.c_str());

                fprintf(out,
@@ -253,7 +253,8 @@ static int write_java_methods( 


int write_stats_log_java(FILE* out, const Atoms& atoms, const AtomDecl &attributionDecl,

                                    const string& moduleName, const string& javaClass,

                                    const string& javaPackage, const bool supportQ) {

                                    const string& javaPackage, const bool supportQ,

                                    const bool supportWorkSource) {

    // Print prelude

    fprintf(out, "// This file is autogenerated\n");

    fprintf(out, "\n");
@@ -265,25 +266,9 @@ int write_stats_log_java(FILE* out, const Atoms& atoms, const AtomDecl &attribut 
        fprintf(out, "import android.os.SystemClock;\n");

    }



    if (DEFAULT_MODULE_NAME == moduleName) {

        // Mainline modules don't use WorkSource logging.

        fprintf(out, "import android.os.WorkSource;\n");



        // SparseArray is used for writing KeyValuePairs; not supported for Mainline modules.

        fprintf(out, "import android.util.SparseArray;\n");

        fprintf(out, "import android.util.SparseIntArray;\n");

        fprintf(out, "import android.util.SparseLongArray;\n");

    }



    fprintf(out, "import android.util.StatsEvent;\n");

    fprintf(out, "import android.util.StatsLog;\n");



    if (DEFAULT_MODULE_NAME == moduleName) {

        // List is used for WorkSource writing. Only needed for default module.

        fprintf(out, "\n");

        fprintf(out, "import java.util.ArrayList;\n");

    }



    fprintf(out, "\n");

    fprintf(out, "\n");

    fprintf(out, "/**\n");
@@ -305,7 +290,7 @@ int write_stats_log_java(FILE* out, const Atoms& atoms, const AtomDecl &attribut 
            out, atoms.signatures_to_modules, attributionDecl, moduleName, supportQ);

    errors += write_java_non_chained_methods(

            out, atoms.non_chained_signatures_to_modules, moduleName);

    if (DEFAULT_MODULE_NAME == moduleName) {

    if (supportWorkSource) {

        errors += write_java_work_source_methods(out, atoms.signatures_to_modules, moduleName);

    }

tools/stats_log_api_gen/java_writer.h

+3 −2
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ using namespace std; 


int write_stats_log_java(FILE* out, const Atoms& atoms, const AtomDecl &attributionDecl,

                         const string& moduleName, const string& javaClass,

                                    const string& javaPackage, const bool supportQ);

                         const string& javaPackage, const bool supportQ,

                         const bool supportWorkSource);



}  // namespace stats_log_api_gen

}  // namespace android

tools/stats_log_api_gen/java_writer_q.cpp

+13 −12
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static void write_java_method( 
                        java_type_name(chainField.javaType), chainField.name.c_str());

                }

            } else if (*arg == JAVA_TYPE_KEY_VALUE_PAIR) {

                fprintf(out, ", SparseArray<Object> value_map");

                fprintf(out, ", android.util.SparseArray<Object> value_map");

            } else {

                fprintf(out, ", %s arg%d", java_type_name(*arg), argIndex);

            }
@@ -393,16 +393,13 @@ static void write_java_method( 
    }

}



int write_stats_log_java_q(FILE* out, const Atoms& atoms, const AtomDecl &attributionDecl) {

int write_stats_log_java_q(FILE* out, const Atoms& atoms, const AtomDecl &attributionDecl,

                           const bool supportWorkSource) {

    // Print prelude

    fprintf(out, "// This file is autogenerated\n");

    fprintf(out, "\n");

    fprintf(out, "package android.util;\n");

    fprintf(out, "\n");

    fprintf(out, "import android.os.WorkSource;\n");

    fprintf(out, "import android.util.SparseArray;\n");

    fprintf(out, "import java.util.ArrayList;\n");

    fprintf(out, "\n");

    fprintf(out, "\n");

    fprintf(out, "/**\n");

    fprintf(out, " * API For logging statistics events.\n");
@@ -418,16 +415,19 @@ int write_stats_log_java_q(FILE* out, const Atoms& atoms, const AtomDecl &attrib 
    write_java_method(out, "write", atoms.signatures_to_modules, attributionDecl);

    write_java_method(out, "write_non_chained", atoms.non_chained_signatures_to_modules,

            attributionDecl);

    if (supportWorkSource) {

        write_java_work_source_methods(out, atoms.signatures_to_modules, DEFAULT_MODULE_NAME);

    }



    fprintf(out, "}\n");



    return 0;

}



int write_stats_log_java_q_for_module(FILE* out, const Atoms& atoms, const AtomDecl &attributionDecl,

                                    const string& moduleName, const string& javaClass,

                                    const string& javaPackage) {

int write_stats_log_java_q_for_module(FILE* out, const Atoms& atoms,

                                      const AtomDecl &attributionDecl, const string& moduleName,

                                      const string& javaClass, const string& javaPackage,

                                      const bool supportWorkSource) {

    // Print prelude

    fprintf(out, "// This file is autogenerated\n");

    fprintf(out, "\n");
@@ -438,8 +438,6 @@ int write_stats_log_java_q_for_module(FILE* out, const Atoms& atoms, const AtomD 
    fprintf(out, "import android.util.StatsLog;\n");

    fprintf(out, "import android.os.SystemClock;\n");

    fprintf(out, "\n");

    fprintf(out, "import java.util.ArrayList;\n");

    fprintf(out, "\n");

    fprintf(out, "\n");

    fprintf(out, "/**\n");

    fprintf(out, " * Utility class for logging statistics events.\n");
@@ -459,6 +457,9 @@ int write_stats_log_java_q_for_module(FILE* out, const Atoms& atoms, const AtomD 
            moduleName, "    ");

    errors += write_java_non_chained_methods(out, atoms.non_chained_signatures_to_modules,

            moduleName);

    if (supportWorkSource) {

        errors += write_java_work_source_methods(out, atoms.signatures_to_modules, moduleName);

    }



    fprintf(out, "}\n");