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

Commit 37ed703d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "resubmit_joeo_cl" 

* changes:
  Fix build error.
  Revert "Revert "Start auto-generating the stats log API.""
parents 50635493 70b98637

Android.mk

+11 −0
Original line number Diff line number Diff line
@@ -587,6 +587,17 @@ LOCAL_SRC_FILES += \ 
	lowpan/java/android/net/lowpan/ILowpanManagerListener.aidl \

	lowpan/java/android/net/lowpan/ILowpanManager.aidl



# StatsLog generated functions

statslog_src_dir := $(call intermediates-dir-for,JAVA_LIBRARIES,framework,,COMMON)/statslog

gen := $(statslog_src_dir)/android/util/StatsLog.java

$(gen): PRIVATE_PATH := $(LOCAL_PATH)

$(gen): PRIVATE_CUSTOM_TOOL = $(HOST_OUT_EXECUTABLES)/stats-log-api-gen --java $@

$(gen): $(HOST_OUT_EXECUTABLES)/stats-log-api-gen

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(gen)

statslog_src_dir:=

gen:=



# FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk

LOCAL_AIDL_INCLUDES += \

      $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) \

cmds/statsd/Android.bp

0 → 100644
+35 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2015 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



// ==========================================================

// Build the library for use on the host

// ==========================================================

cc_library_host_shared {

    name: "libstats_proto_host",

    srcs: [

        "src/stats_events.proto",

    ],



    shared_libs: [

        "libplatformprotos",

    ],



    proto: {

        type: "full",

        export_proto_headers: true,

    },

}

cmds/statsd/Android.mk

+67 −63
Original line number Diff line number Diff line
@@ -14,22 +14,51 @@ 


LOCAL_PATH:= $(call my-dir)



# ================

# proto static lib

# ================

include $(CLEAR_VARS)



LOCAL_MODULE := statsd_proto

LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-proto-files-under, src)

statsd_common_src := \

    ../../core/java/android/os/IStatsCompanionService.aidl \

    ../../core/java/android/os/IStatsManager.aidl \

    src/stats_log.proto \

    src/statsd_config.proto \

    src/stats_events_copy.proto \

    src/condition/CombinationConditionTracker.cpp \

    src/condition/condition_util.cpp \

    src/condition/SimpleConditionTracker.cpp \

    src/matchers/CombinationLogMatchingTracker.cpp \

    src/matchers/matcher_util.cpp \

    src/matchers/SimpleLogMatchingTracker.cpp \

    src/metrics/CountAnomalyTracker.cpp \

    src/metrics/CountMetricProducer.cpp \

    src/metrics/MetricsManager.cpp \

    src/metrics/metrics_manager_util.cpp \

    src/AnomalyMonitor.cpp \

    src/DropboxReader.cpp \

    src/DropboxWriter.cpp \

    src/KernelWakelockPuller.cpp \

    src/LogEntryPrinter.cpp \

    src/LogReader.cpp \

    src/StatsLogProcessor.cpp \

    src/StatsPullerManager.cpp \

    src/StatsService.cpp \

    src/stats_util.cpp \

    src/UidMap.cpp



LOCAL_PROTOC_FLAGS :=

LOCAL_PROTOC_OPTIMIZE_TYPE := lite-static

statsd_common_c_includes := \

    $(LOCAL_PATH)/src



include $(BUILD_STATIC_LIBRARY)

statsd_common_aidl_includes := \

    $(LOCAL_PATH)/../../core/java



STATSD_PROTO_INCLUDES := $(local-generated-sources-dir)/src/$(LOCAL_PATH)

statsd_common_shared_libraries := \

    libbase \

    libbinder \

    libcutils \

    libincident \

    liblog \

    libselinux \

    libutils \

    libservices \

    libandroidfw



# =========

# statsd
@@ -40,9 +69,8 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := statsd



LOCAL_SRC_FILES := \

    ../../core/java/android/os/IStatsCompanionService.aidl \

    ../../core/java/android/os/IStatsManager.aidl \

    $(call all-cpp-files-under,src) \

    $(statsd_common_src) \

    src/main.cpp



LOCAL_CFLAGS += \

    -Wall \
@@ -60,24 +88,12 @@ else 
    LOCAL_CFLAGS += \

            -Os

endif

LOCAL_PROTOC_OPTIMIZE_TYPE := lite-static



LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/../../core/java

LOCAL_C_INCLUDES += $(LOCAL_PATH)/src \

	STATSD_PROTO_INCLUDES

LOCAL_AIDL_INCLUDES := $(statsd_common_c_includes)

LOCAL_C_INCLUDES += $(statsd_common_c_includes)



LOCAL_STATIC_LIBRARIES := statsd_proto



LOCAL_SHARED_LIBRARIES := \

        libbase \

        libbinder \

        libcutils \

        libincident \

        liblog \

        libselinux \

        libutils \

        libservices \

        libandroidfw \

        libprotobuf-cpp-lite \

LOCAL_SHARED_LIBRARIES := $(statsd_common_shared_libraries)



LOCAL_MODULE_CLASS := EXECUTABLES
@@ -85,6 +101,7 @@ LOCAL_MODULE_CLASS := EXECUTABLES 


include $(BUILD_EXECUTABLE)





# ==============

# statsd_test

# ==============
@@ -95,8 +112,8 @@ LOCAL_MODULE := statsd_test 
LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_MODULE_TAGS := tests



LOCAL_C_INCLUDES += $(LOCAL_PATH)/src \

	STATSD_PROTO_INCLUDES

LOCAL_AIDL_INCLUDES := $(statsd_common_c_includes)

LOCAL_C_INCLUDES += $(statsd_common_c_includes)



LOCAL_CFLAGS += \

    -Wall \
@@ -107,38 +124,25 @@ LOCAL_CFLAGS += \ 
    -Wno-unused-parameter



LOCAL_SRC_FILES := \

    src/stats_log.proto \

    src/statsd_config.proto \

    ../../core/java/android/os/IStatsCompanionService.aidl \

    ../../core/java/android/os/IStatsManager.aidl \

    src/StatsService.cpp \

    src/AnomalyMonitor.cpp \

    src/stats_util.cpp \

    src/LogEntryPrinter.cpp \

    src/LogReader.cpp \

    src/matchers/matcher_util.cpp \

    src/condition/SimpleConditionTracker.cpp \

    src/condition/CombinationConditionTracker.cpp \

    src/matchers/SimpleLogMatchingTracker.cpp \

    src/matchers/CombinationLogMatchingTracker.cpp \

    src/metrics/metrics_manager_util.cpp \

    src/metrics/CountMetricProducer.cpp \

    src/metrics/CountAnomalyTracker.cpp \

    src/condition/condition_util.cpp \

    src/UidMap.cpp \

    $(call all-cpp-files-under, tests) \

    $(statsd_common_src) \

    tests/indexed_priority_queue_test.cpp \

    tests/LogReader_test.cpp \

    tests/MetricsManager_test.cpp \

    tests/UidMap_test.cpp \

    tests/LogEntryMatcher_test.cpp \

    tests/AnomalyMonitor_test.cpp \

    tests/ConditionTracker_test.cpp



LOCAL_STATIC_LIBRARIES := \

    libgmock \

    statsd_proto \

    libgmock



LOCAL_SHARED_LIBRARIES := \

    libbase \

    libbinder \

    libcutils \

    liblog \

    libselinux \

    libutils \

    libprotobuf-cpp-lite \

LOCAL_SHARED_LIBRARIES := $(statsd_common_shared_libraries)



LOCAL_PROTOC_OPTIMIZE_TYPE := lite



statsd_common_src:=

statsd_common_aidl_includes:=

statsd_common_c_includes:=



include $(BUILD_NATIVE_TEST)

cmds/statsd/src/LogEntryPrinter.cpp

+23 −10
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ 
#include <log/logprint.h>

#include <utils/Errors.h>



#include "matchers/matcher_util.h"



#define PRINT_WITH_LIBLOG 0

#define PRINT_WITH_LOG_EVENT_WRAPPER 1



using namespace android;



namespace android {
@@ -44,6 +49,7 @@ LogEntryPrinter::~LogEntryPrinter() { 
}



void LogEntryPrinter::OnLogEvent(const log_msg& msg) {

    if (PRINT_WITH_LIBLOG) {

        status_t err;

        AndroidLogEntry entry;

        char buf[1024];
@@ -58,6 +64,13 @@ void LogEntryPrinter::OnLogEvent(const log_msg& msg) { 
        }

    }



    if (PRINT_WITH_LOG_EVENT_WRAPPER) {

        LogEventWrapper event = parseLogEvent(msg);

        printf("event: %s\n", event.toString().c_str());

        fflush(stdout);

    }

}



}  // namespace statsd

}  // namespace os

}  // namespace android

cmds/statsd/src/matchers/matcher_util.cpp

+55 −26
Original line number Diff line number Diff line
@@ -26,8 +26,11 @@ 
#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"

#include "stats_util.h"



#include <sstream>



using std::set;

using std::string;

using std::ostringstream;

using std::unordered_map;

using std::vector;
@@ -35,6 +38,42 @@ namespace android { 
namespace os {

namespace statsd {



string LogEventWrapper::toString() const {

    std::ostringstream result;

    result << "{ " << timestamp_ns << " (" << tagId << ")";

    for (int index = 1; ; index++) {

        auto intVal = intMap.find(index);

        auto strVal = strMap.find(index);

        auto boolVal = boolMap.find(index);

        auto floatVal = floatMap.find(index);

        if (intVal != intMap.end()) {

            result << " ";

            result << std::to_string(index);

            result << "->";

            result << std::to_string(intVal->second);

        } else if (strVal != strMap.end()) {

            result << " ";

            result << std::to_string(index);

            result << "->";

            result << strVal->second;

        } else if (boolVal != boolMap.end()) {

            result << " ";

            result << std::to_string(index);

            result << "->";

            result << std::to_string(boolVal->second);

        } else if (floatVal != floatMap.end()) {

            result << " ";

            result << std::to_string(index);

            result << "->";

            result << std::to_string(floatVal->second);

        } else {

            break;

        }

    }

    result << " }";

    return result.str();

}



LogEventWrapper parseLogEvent(log_msg msg) {

    LogEventWrapper wrapper;

    wrapper.timestamp_ns = msg.entry_v1.sec * NS_PER_SEC + msg.entry_v1.nsec;
@@ -48,38 +87,32 @@ LogEventWrapper parseLogEvent(log_msg msg) { 


    if (context) {

        memset(&elem, 0, sizeof(elem));

        size_t index = 0;

        int32_t key = -1;

        // TODO: The log is actually structured inside one list.  This is convenient

        // because we'll be able to use it to put the attribution (WorkSource) block first

        // without doing our own tagging scheme.  Until that change is in, just drop the

        // list-related log elements and the order we get there is our index-keyed data

        // structure.

        int32_t key = 1;

        do {

            elem = android_log_read_next(context);

            switch ((int)elem.type) {

                case EVENT_TYPE_INT:

                    if (index % 2 == 0) {

                        key = elem.data.int32;

                    } else {

                    wrapper.intMap[key] = elem.data.int32;

                    }

                    index++;

                    key++;

                    break;

                case EVENT_TYPE_FLOAT:

                    if (index % 2 == 1) {

                    wrapper.floatMap[key] = elem.data.float32;

                    }

                    index++;

                    key++;

                    break;

                case EVENT_TYPE_STRING:

                    if (index % 2 == 1) {

                    // without explicit calling string() constructor, there will be an

                    // additional 0 in the end of the string.

                    wrapper.strMap[key] = string(elem.data.string);

                    }

                    index++;

                    key++;

                    break;

                case EVENT_TYPE_LONG:

                    if (index % 2 == 1) {

                    wrapper.intMap[key] = elem.data.int64;

                    }

                    index++;

                    key++;

                    break;

                case EVENT_TYPE_LIST:

                    break;
@@ -91,10 +124,6 @@ LogEventWrapper parseLogEvent(log_msg msg) { 
                    elem.complete = true;

                    break;

            }



            if (elem.complete) {

                break;

            }

        } while ((elem.type != EVENT_TYPE_UNKNOWN) && !elem.complete);



        android_log_destroy(&context);