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

Commit e33bc3b9 authored by Chenjie Yu's avatar Chenjie Yu
Browse files

add CpuTimePerUidPuller and CpuTimePerUidFreqPuller 

Note: these pullers return monotonically increasing numbers.
The uids could include isolated uids that needs further translation in
statsd.

Test: manually tested on device and check print outs
Change-Id: I7097aec0417a3ac567b9b86149b757ac27cd58d8
parent 7f8def9d

cmds/statsd/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ statsd_common_src := \ 
    src/config/ConfigManager.cpp \

    src/external/StatsCompanionServicePuller.cpp \

    src/external/ResourcePowerManagerPuller.cpp \

    src/external/CpuTimePerUidPuller.cpp \

    src/external/CpuTimePerUidFreqPuller.cpp \

    src/external/StatsPullerManager.cpp \

    src/logd/LogEvent.cpp \

    src/logd/LogListener.cpp \

cmds/statsd/src/external/CpuTimePerUidFreqPuller.cpp

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

 * Copyright (C) 2017 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 true  // STOPSHIP if true

#include "Log.h"



#include <fstream>

#include "external/CpuTimePerUidFreqPuller.h"



#include "logd/LogEvent.h"

#include "statslog.h"



using std::make_shared;

using std::shared_ptr;

using std::ifstream;



namespace android {

namespace os {

namespace statsd {



static const string sProcFile = "/proc/uid_cputime/show_uid_stat";

static const int kLineBufferSize = 1024;



/**

 * Reads /proc/uid_time_in_state which has the format:

 *

 * uid: [freq1] [freq2] [freq3] ...

 * [uid1]: [time in freq1] [time in freq2] [time in freq3] ...

 * [uid2]: [time in freq1] [time in freq2] [time in freq3] ...

 * ...

 *

 * This provides the times a UID's processes spent executing at each different cpu frequency.

 * The file contains a monotonically increasing count of time for a single boot.

 */

bool CpuTimePerUidFreqPuller::Pull(const int tagId, vector<shared_ptr<LogEvent>>* data) {

  data->clear();



  ifstream fin;

  fin.open(sProcFile);

  if (!fin.good()) {

    VLOG("Failed to read pseudo file %s", sProcFile.c_str());

    return false;

  }



  uint64_t timestamp = time(nullptr) * NS_PER_SEC;

  char buf[kLineBufferSize];

  // first line prints the format and frequencies

  fin.getline(buf, kLineBufferSize);

  char * pch;

  while(!fin.eof()){

    fin.getline(buf, kLineBufferSize);

    pch = strtok (buf, " :");

    if (pch == NULL) break;

    uint64_t uid = std::stoull(pch);

    pch = strtok(NULL, " ");

    uint64_t timeMs;

    int idx = 0;

    do {

      timeMs = std::stoull(pch);

      auto ptr = make_shared<LogEvent>(android::util::CPU_TIME_PER_UID_FREQ_PULLED, timestamp);

      auto elemList = ptr->GetAndroidLogEventList();

      *elemList << uid;

      *elemList << idx;

      *elemList << timeMs;

      ptr->init();

      data->push_back(ptr);

      VLOG("uid %lld, freq idx %d, sys time %lld", (long long)uid, idx, (long long)timeMs);

      idx ++;

      pch = strtok(NULL, " ");

    } while (pch != NULL);

  }

  return true;

}



}  // namespace statsd

}  // namespace os

}  // namespace android

cmds/statsd/src/external/CpuTimePerUidFreqPuller.h

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

 * Copyright (C) 2017 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 /proc/uid_cputime/show_uid_stat which has the line format:

 *

 * uid: user_time_micro_seconds system_time_micro_seconds

 *

 * This provides the time a UID's processes spent executing in user-space and kernel-space.

 * The file contains a monotonically increasing count of time for a single boot.

 */

class CpuTimePerUidFreqPuller : public StatsPuller {

 public:

  bool Pull(const int tagId, vector<std::shared_ptr<LogEvent>>* data) override;

};



}  // namespace statsd

}  // namespace os

}  // namespace android

cmds/statsd/src/external/CpuTimePerUidPuller.cpp

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

 * Copyright (C) 2017 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 true  // STOPSHIP if true

#include "Log.h"



#include <fstream>

#include "external/CpuTimePerUidPuller.h"



#include "logd/LogEvent.h"

#include "statslog.h"



using std::make_shared;

using std::shared_ptr;

using std::ifstream;



namespace android {

namespace os {

namespace statsd {



static const string sProcFile = "/proc/uid_cputime/show_uid_stat";

static const int kLineBufferSize = 1024;



/**

 * Reads /proc/uid_cputime/show_uid_stat which has the line format:

 *

 * uid: user_time_micro_seconds system_time_micro_seconds power_in_milli-amp-micro_seconds

 *

 * This provides the time a UID's processes spent executing in user-space and kernel-space.

 * The file contains a monotonically increasing count of time for a single boot.

 */

bool CpuTimePerUidPuller::Pull(const int tagId, vector<shared_ptr<LogEvent>>* data) {

  data->clear();



  ifstream fin;

  fin.open(sProcFile);

  if (!fin.good()) {

    VLOG("Failed to read pseudo file %s", sProcFile.c_str());

    return false;

  }



  uint64_t timestamp = time(nullptr) * NS_PER_SEC;

  char buf[kLineBufferSize];

  char * pch;

  while(!fin.eof()){

    fin.getline(buf, kLineBufferSize);

    pch = strtok(buf, " :");

    if (pch == NULL) break;

    uint64_t uid = std::stoull(pch);

    pch = strtok(buf, " ");

    uint64_t userTimeMs = std::stoull(pch);

    pch = strtok(buf, " ");

    uint64_t sysTimeMs = std::stoull(pch);



    auto ptr = make_shared<LogEvent>(android::util::CPU_TIME_PER_UID_PULLED, timestamp);

    auto elemList = ptr->GetAndroidLogEventList();

    *elemList << uid;

    *elemList << userTimeMs;

    *elemList << sysTimeMs;

    ptr->init();

    data->push_back(ptr);

    VLOG("uid %lld, user time %lld, sys time %lld", (long long)uid, (long long)userTimeMs, (long long)sysTimeMs);

  }

  return true;

}



}  // namespace statsd

}  // namespace os

}  // namespace android

cmds/statsd/src/external/CpuTimePerUidPuller.h

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

 * Copyright (C) 2017 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 /proc/uid_cputime/show_uid_stat which has the line format:

 *

 * uid: user_time_micro_seconds system_time_micro_seconds

 *

 * This provides the time a UID's processes spent executing in user-space and kernel-space.

 * The file contains a monotonically increasing count of time for a single boot.

 */

class CpuTimePerUidPuller : public StatsPuller {

 public:

  bool Pull(const int tagId, vector<std::shared_ptr<LogEvent>>* data) override;

};



}  // namespace statsd

}  // namespace os

}  // namespace android