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

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

Merge "Atom: TemperatureReported"

parents f01ac95f 4029831e

cmds/statsd/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ statsd_common_src := \ 
    src/external/StatsCompanionServicePuller.cpp \

    src/external/SubsystemSleepStatePuller.cpp \

    src/external/ResourceHealthManagerPuller.cpp \

    src/external/ResourceThermalManagerPuller.cpp \

    src/external/CpuTimePerUidPuller.cpp \

    src/external/CpuTimePerUidFreqPuller.cpp \

    src/external/KernelUidCpuActiveTimeReader.cpp \
@@ -99,6 +100,7 @@ statsd_common_shared_libraries := \ 
    android.hardware.health@2.0 \

    android.hardware.power@1.0 \

    android.hardware.power@1.1 \

    android.hardware.thermal@1.0 \

    libmemunreachable



# =========

cmds/statsd/src/atoms.proto

+24 −15
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ message Atom { 
        BatteryLevelChanged battery_level_changed = 30;

        ChargingStateChanged charging_state_changed = 31;

        PluggedStateChanged plugged_state_changed = 32;

        DeviceTemperatureReported device_temperature_reported = 33;

        // TODO: 33 is blank, but is available for use.

        DeviceOnStatusChanged device_on_status_changed = 34;

        WakeupAlarmOccurred wakeup_alarm_occurred = 35;

        KernelWakeupReported kernel_wakeup_reported = 36;
@@ -105,7 +105,7 @@ message Atom { 
    }



    // Pulled events will start at field 10000.

    // Next: 10021

    // Next: 10022

    oneof pulled {

        WifiBytesTransfer wifi_bytes_transfer = 10000;

        WifiBytesTransferByFgBg wifi_bytes_transfer_by_fg_bg = 10001;
@@ -128,6 +128,7 @@ message Atom { 
        DiskSpace disk_space = 10018;

        RemainingBatteryCapacity remaining_battery_capacity = 10019;

        FullBatteryCapacity full_battery_capacity = 10020;

        Temperature temperature = 10021;

    }

}
@@ -536,17 +537,6 @@ message PluggedStateChanged { 
    optional android.os.BatteryPluggedStateEnum state = 1;

}



/**

 * Logs the temperature of the device, in tenths of a degree Celsius.

 *

 * Logged from:

 *   frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java

 */

message DeviceTemperatureReported {

    // Temperature in tenths of a degree C.

    optional int32 temperature = 1;

}



// TODO: Define this more precisely.

// TODO: Log the ON state somewhere. It isn't currently logged anywhere.

/**
@@ -1508,7 +1498,8 @@ message DiskSpace { 


/**

 * Pulls battery coulomb counter, which is the remaining battery charge in uAh.

 * Logged from: frameworks/base/cmds/statsd/src/external/ResourceHealthManagerPuller.cpp

 * Pulled from:

 *   frameworks/base/cmds/statsd/src/external/ResourceHealthManagerPuller.cpp

 */

message RemainingBatteryCapacity {

    optional int32 charge_uAh = 1;
@@ -1516,8 +1507,26 @@ message RemainingBatteryCapacity { 


/**

 * Pulls battery capacity, which is the battery capacity when full in uAh.

 * Logged from: frameworks/base/cmds/statsd/src/external/ResourceHealthManagerPuller.cpp

 * Pulled from:

 *   frameworks/base/cmds/statsd/src/external/ResourceHealthManagerPuller.cpp

 */

message FullBatteryCapacity {

    optional int32 capacity_uAh = 1;

}



/**

 * Pulls the temperature of various parts of the device, in Celsius.

 *

 * Pulled from:

 *   frameworks/base/cmds/statsd/src/external/ResourceThermalManagerPuller.cpp

 */

message Temperature {

    // The type of temperature being reported. Eg. CPU, GPU, SKIN, BATTERY.

    optional android.os.TemperatureTypeEnum sensor_location = 1;



    // The name of the temperature source. Eg. CPU0

    optional string sensor_name = 2;



    // Temperature in degrees C.

    optional float temperature_C = 3;

}
 
 No newline at end of file

cmds/statsd/src/external/ResourceHealthManagerPuller.cpp

+2 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 * Copyright (C) 2018 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define DEBUG true  // STOPSHIP if true

#define DEBUG false  // STOPSHIP if true

#include "Log.h"



#include <android/hardware/health/2.0/IHealth.h>
@@ -47,7 +47,6 @@ sp<android::hardware::health::V2_0::IHealth> gHealthHal = nullptr; 
bool getHealthHal() {

    if (gHealthHal == nullptr) {

        gHealthHal = get_health_service();



    }

    return gHealthHal != nullptr;

}

cmds/statsd/src/external/ResourceThermalManagerPuller.cpp

0 → 100644
+144 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 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.

 */



#define DEBUG false  // STOPSHIP if true

#include "Log.h"



#include <android/hardware/thermal/1.0/IThermal.h>

#include "external/ResourceThermalManagerPuller.h"

#include "external/StatsPuller.h"



#include "ResourceThermalManagerPuller.h"

#include "logd/LogEvent.h"

#include "statslog.h"

#include "stats_log_util.h"



#include <chrono>



using android::hardware::hidl_death_recipient;

using android::hardware::hidl_vec;

using android::hidl::base::V1_0::IBase;

using android::hardware::thermal::V1_0::IThermal;

using android::hardware::thermal::V1_0::Temperature;

using android::hardware::thermal::V1_0::ThermalStatus;

using android::hardware::thermal::V1_0::ThermalStatusCode;

using android::hardware::Return;

using android::hardware::Void;



using std::chrono::duration_cast;

using std::chrono::nanoseconds;

using std::chrono::system_clock;

using std::make_shared;

using std::shared_ptr;



namespace android {

namespace os {

namespace statsd {



bool getThermalHalLocked();

sp<android::hardware::thermal::V1_0::IThermal> gThermalHal = nullptr;

std::mutex gThermalHalMutex;



struct ThermalHalDeathRecipient : virtual public hidl_death_recipient {

      virtual void serviceDied(uint64_t cookie, const wp<IBase>& who) override {

          std::lock_guard<std::mutex> lock(gThermalHalMutex);

          ALOGE("ThermalHAL just died");

          gThermalHal = nullptr;

          getThermalHalLocked();

      }

};



sp<ThermalHalDeathRecipient> gThermalHalDeathRecipient = nullptr;



// The caller must be holding gThermalHalMutex.

bool getThermalHalLocked() {

    if (gThermalHal == nullptr) {

            gThermalHal = IThermal::getService();

            if (gThermalHal == nullptr) {

                ALOGE("Unable to get Thermal service.");

            } else {

                if (gThermalHalDeathRecipient == nullptr) {

                    gThermalHalDeathRecipient = new ThermalHalDeathRecipient();

                }

                hardware::Return<bool> linked = gThermalHal->linkToDeath(

                    gThermalHalDeathRecipient, 0x451F /* cookie */);

                if (!linked.isOk()) {

                    ALOGE("Transaction error in linking to ThermalHAL death: %s",

                            linked.description().c_str());

                    gThermalHal = nullptr;

                } else if (!linked) {

                    ALOGW("Unable to link to ThermalHal death notifications");

                    gThermalHal = nullptr;

                } else {

                    ALOGD("Link to death notification successful");

                }

            }

    }

    return gThermalHal != nullptr;

}



ResourceThermalManagerPuller::ResourceThermalManagerPuller() :

        StatsPuller(android::util::TEMPERATURE) {

}



bool ResourceThermalManagerPuller::PullInternal(vector<shared_ptr<LogEvent>>* data) {

    std::lock_guard<std::mutex> lock(gThermalHalMutex);

    if (!getThermalHalLocked()) {

        ALOGE("Thermal Hal not loaded");

        return false;

    }



    int64_t wallClockTimestampNs = getWallClockNs();

    int64_t elapsedTimestampNs = getElapsedRealtimeNs();



    data->clear();

    bool resultSuccess = true;



    Return<void> ret = gThermalHal->getTemperatures(

            [&](ThermalStatus status, const hidl_vec<Temperature>& temps) {

        if (status.code != ThermalStatusCode::SUCCESS) {

            ALOGE("Failed to get temperatures from ThermalHAL. Status: %d", status.code);

            resultSuccess = false;

            return;

        }

        if (mTagId == android::util::TEMPERATURE) {

            for (size_t i = 0; i < temps.size(); ++i) {

                auto ptr = make_shared<LogEvent>(android::util::TEMPERATURE,

                        wallClockTimestampNs, elapsedTimestampNs);

                ptr->write((static_cast<int>(temps[i].type)));

                ptr->write(temps[i].name);

                ptr->write(temps[i].currentValue);

                ptr->init();

                data->push_back(ptr);

            }

        } else {

            ALOGE("Unsupported tag in ResourceThermalManagerPuller: %d", mTagId);

        }

    });

    if (!ret.isOk()) {

        ALOGE("getThermalHalLocked() failed: thermal HAL service not available. Description: %s",

                ret.description().c_str());

        if (ret.isDeadObject()) {

            gThermalHal = nullptr;

        }

        return false;

    }

    return resultSuccess;

}



}  // namespace statsd

}  // namespace os

}  // namespace android

cmds/statsd/src/external/ResourceThermalManagerPuller.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 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.

 */



#pragma once



#include <utils/String16.h>

#include "StatsPuller.h"



namespace android {

namespace os {

namespace statsd {



/**

 * Reads IThermal.hal

 */

class ResourceThermalManagerPuller : public StatsPuller {

public:

    ResourceThermalManagerPuller();

    bool PullInternal(vector<std::shared_ptr<LogEvent>>* data) override;

};



}  // namespace statsd

}  // namespace os

}  // namespace android
 
 No newline at end of file