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

Commit 7ce3ac5e authored by Jin Qian's avatar Jin Qian
Browse files

resolve merge conflicts of 0b217a40 to master 

Change-Id: I0b564c70ef4d538aa676ad5eabf5f9667e4c8b3d
parents c32c2924 0b217a40

storaged/main.cpp

+4 −4
Original line number Diff line number Diff line
@@ -42,11 +42,11 @@ 
#include <storaged_service.h>

#include <storaged_utils.h>



storaged_t storaged;

sp<storaged_t> storaged;



// Function of storaged's main thread

void* storaged_main(void* s) {

    storaged_t* storaged = (storaged_t*)s;

void* storaged_main(void* /* unused */) {

    storaged = new storaged_t();



    storaged->init_battery_service();
@@ -116,7 +116,7 @@ int main(int argc, char** argv) { 
        report_storage_health();

        // Start the main thread of storaged

        pthread_t storaged_main_thread;

        errno = pthread_create(&storaged_main_thread, NULL, storaged_main, &storaged);

        errno = pthread_create(&storaged_main_thread, NULL, storaged_main, NULL);

        if (errno != 0) {

            PLOG_TO(SYSTEM, ERROR) << "Failed to create main thread";

            return -1;

storaged/storaged.cpp

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <android-base/logging.h>

#include <batteryservice/BatteryServiceConstants.h>

#include <batteryservice/IBatteryPropertiesRegistrar.h>

#include <binder/IPCThreadState.h>

#include <binder/IServiceManager.h>

#include <cutils/properties.h>

#include <log/log.h>
@@ -192,6 +193,7 @@ void storaged_t::binderDied(const wp<IBinder>& who) { 
    if (battery_properties != NULL &&

        IInterface::asBinder(battery_properties) == who) {

        LOG_TO(SYSTEM, ERROR) << "batteryproperties service died, exiting";

        IPCThreadState::self()->stopProcess();

        exit(1);

    } else {

        LOG_TO(SYSTEM, ERROR) << "unknown service died";

storaged/storaged_service.cpp

+4 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


using namespace android::base;



extern storaged_t storaged;

extern sp<storaged_t> storaged;



std::vector<struct uid_info> BpStoraged::dump_uids(const char* /*option*/) {

    Parcel data, reply;
@@ -74,7 +74,7 @@ status_t BnStoraged::onTransact(uint32_t code, const Parcel& data, Parcel* reply 


std::vector<struct uid_info> Storaged::dump_uids(const char* /* option */) {

    std::vector<struct uid_info> uids_v;

    std::unordered_map<uint32_t, struct uid_info> uids_m = storaged.get_uids();

    std::unordered_map<uint32_t, struct uid_info> uids_m = storaged->get_uids();



    for (const auto& it : uids_m) {

        uids_v.push_back(it.second);
@@ -127,7 +127,7 @@ status_t Storaged::dump(int fd, const Vector<String16>& args) { 


    uint64_t last_ts = 0;

    const std::map<uint64_t, struct uid_records>& records =

                storaged.get_uid_records(hours, threshold, force_report);

                storaged->get_uid_records(hours, threshold, force_report);

    for (const auto& it : records) {

        if (last_ts != it.second.start_ts) {

            dprintf(fd, "%llu", (unsigned long long)it.second.start_ts);
@@ -150,7 +150,7 @@ status_t Storaged::dump(int fd, const Vector<String16>& args) { 
    }



    if (time_window) {

        storaged.update_uid_io_interval(time_window);

        storaged->update_uid_io_interval(time_window);

    }



    return NO_ERROR;