Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Write annotations in native generated code." into rvc-dev am: 38bdeb5977

Browse Source 
Change-Id: Ifb364a8a2d541adbf96ed93ded86bb37394d3404
This commit is contained in:
Muhammad Qureshi
2020-03-19 17:26:26 +00:00
committed by Automerger Merge Worker
parent c5cab8fb4f 38bdeb5977
commit cfd5fad10b
1 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tools/stats_log_api_gen/native_writer.cpp
View File

@@ -20,12 +20,57 @@
namespace android { namespace android {
namespace stats_log_api_gen { namespace stats_log_api_gen {
static void write_annotations(
FILE* out, int argIndex,
const FieldNumberToAnnotations& fieldNumberToAnnotations,
const string& methodPrefix,
const string& methodSuffix) {
auto fieldNumberToAnnotationsIt = fieldNumberToAnnotations.find(argIndex);
if (fieldNumberToAnnotationsIt == fieldNumberToAnnotations.end()) {
return;
}
const set<shared_ptr<Annotation>>& annotations =
fieldNumberToAnnotationsIt->second;
for (const shared_ptr<Annotation>& annotation : annotations) {
// TODO(b/151744250): Group annotations for same atoms.
// TODO(b/151786433): Write atom constant name instead of atom id literal.
fprintf(out, " if (code == %d) {\n", annotation->atomId);
switch(annotation->type) {
// TODO(b/151776731): Check for reset state annotation and only include reset state
// when field value == default state annotation value.
case ANNOTATION_TYPE_INT:
// TODO(b/151786433): Write annotation constant name instead of
// annotation id literal.
fprintf(out, " %saddInt32Annotation(%s%d, %d);\n",
methodPrefix.c_str(),
methodSuffix.c_str(),
annotation->annotationId,
annotation->value.intValue);
break;
case ANNOTATION_TYPE_BOOL:
// TODO(b/151786433): Write annotation constant name instead of
// annotation id literal.
fprintf(out, " %saddBoolAnnotation(%s%d, %s);\n",
methodPrefix.c_str(),
methodSuffix.c_str(),
annotation->annotationId,
annotation->value.boolValue ? "true" : "false");
break;
default:
break;
}
fprintf(out, " }\n");
}
}
static int write_native_stats_write_methods(FILE* out, const Atoms& atoms, static int write_native_stats_write_methods(FILE* out, const Atoms& atoms,
const AtomDecl& attributionDecl, const bool supportQ) { const AtomDecl& attributionDecl, const bool supportQ) {
fprintf(out, "\n"); fprintf(out, "\n");
for (auto signatureInfoMapIt = atoms.signatureInfoMap.begin(); for (auto signatureInfoMapIt = atoms.signatureInfoMap.begin();
signatureInfoMapIt != atoms.signatureInfoMap.end(); signatureInfoMapIt++) { signatureInfoMapIt != atoms.signatureInfoMap.end(); signatureInfoMapIt++) {
vector<java_type_t> signature = signatureInfoMapIt->first; vector<java_type_t> signature = signatureInfoMapIt->first;
const FieldNumberToAnnotations& fieldNumberToAnnotations = signatureInfoMapIt->second;
// Key value pairs not supported in native. // Key value pairs not supported in native.
if (find(signature.begin(), signature.end(), JAVA_TYPE_KEY_VALUE_PAIR) != signature.end()) { if (find(signature.begin(), signature.end(), JAVA_TYPE_KEY_VALUE_PAIR) != signature.end()) {
continue; continue;
@@ -72,6 +117,7 @@ static int write_native_stats_write_methods(FILE* out, const Atoms& atoms,
fprintf(stderr, "Encountered unsupported type."); fprintf(stderr, "Encountered unsupported type.");
return 1; return 1;
} }
write_annotations(out, argIndex, fieldNumberToAnnotations, "event.", "");
argIndex++; argIndex++;
} }
fprintf(out, " return event.writeToSocket();\n"); fprintf(out, " return event.writeToSocket();\n");
@@ -118,6 +164,8 @@ static int write_native_stats_write_methods(FILE* out, const Atoms& atoms,
fprintf(stderr, "Encountered unsupported type."); fprintf(stderr, "Encountered unsupported type.");
return 1; return 1;
} }
write_annotations(out, argIndex, fieldNumberToAnnotations, "AStatsEvent_",
"event, ");
argIndex++; argIndex++;
} }
fprintf(out, " const int ret = AStatsEvent_write(event);\n"); fprintf(out, " const int ret = AStatsEvent_write(event);\n");