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

Commit 00a282ed authored by Jeremy Wu's avatar Jeremy Wu Committed by Automerger Merge Worker
Browse files

Merge "Floss: metrics: add transcode round-trip time metrics for MMC" into... 

Merge "Floss: metrics: add transcode round-trip time metrics for MMC" into main am: ac9bc7b5 am: 0af8c7a3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2732813



Change-Id: I400e623b29fe7fae65d47619a8422773f8687fc3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6c1c0d4 0af8c7a3

system/gd/os/chromeos/metrics.cc

+23 −0
Original line number Diff line number Diff line
@@ -111,6 +111,29 @@ void LogMetricHfpPacketLossStats( 
      .Record();

}



void LogMetricMmcTranscodeRttStats(

    int maximum_rtt, double mean_rtt, int num_requests, int codec_type) {

  std::string boot_id;



  if (!metrics::GetBootId(&boot_id)) return;



  LOG_DEBUG(

      "MmcTranscodeRttStats: %s, %d, %f, %d, %d",

      boot_id.c_str(),

      maximum_rtt,

      mean_rtt,

      num_requests,

      codec_type);



  ::metrics::structured::events::bluetooth::BluetoothMmcTranscodeRtt()

      .SetBootId(boot_id)

      .SetMaximumRtt(maximum_rtt)

      .SetMeanRtt(mean_rtt)

      .SetNumRequests(num_requests)

      .SetCodecType(codec_type)

      .Record();

}



void LogMetricReadRssiResult(

    const Address& address, uint16_t handle, uint32_t cmd_status, int8_t rssi) {}

system/gd/os/host/metrics.cc

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ void LogMetricHfpPacketLossStats( 
    const Address& address, int num_decoded_frames, double packet_loss_ratio, uint16_t codec_type) {

}



void LogMetricMmcTranscodeRttStats(

    int maximum_rtt, double mean_rtt, int num_requests, int codec_type) {}



void LogMetricReadRssiResult(const Address& address, uint16_t handle, uint32_t cmd_status, int8_t rssi) {}



void LogMetricReadFailedContactCounterResult(

system/gd/os/linux/metrics.cc

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ void LogMetricHfpPacketLossStats( 
    const Address& address, int num_decoded_frames, double packet_loss_ratio, uint16_t codec_type) {

}



void LogMetricMmcTranscodeRttStats(

    int maximum_rtt, double mean_rtt, int num_requests, int codec_type) {}



void LogMetricBluetoothHalCrashReason(

    const Address& address, uint32_t error_code, uint32_t vendor_error_code) {}

system/gd/os/metrics.h

+11 −0
Original line number Diff line number Diff line
@@ -135,6 +135,17 @@ void LogMetricHfpPacketLossStats( 
    double packet_loss_ratio,

    uint16_t codec_id);



/**

 * Log Mmc transcode round-trip time statistics

 *

 * @param maximum_rtt maximum round-trip time in this session

 * @param mean_rtt the average of round-trip time in this session

 * @param num_requests the number of transcoding requests in the session

 * @param codec_type codec type used in this session

 */

void LogMetricMmcTranscodeRttStats(

    int maximum_rtt, double mean_rtt, int num_requests, int codec_type);



/**

 * Log read RSSI result

 *

system/main/shim/metrics_api.cc

+6 −0
Original line number Diff line number Diff line
@@ -76,6 +76,12 @@ void LogMetricHfpPacketLossStats(const RawAddress& raw_address, 
                                             packet_loss_ratio, codec_type);

}



void LogMetricMmcTranscodeRttStats(int maximum_rtt, double mean_rtt,

                                   int num_requests, int codec_type) {

  bluetooth::os::LogMetricMmcTranscodeRttStats(maximum_rtt, mean_rtt,

                                               num_requests, codec_type);

}



void LogMetricReadRssiResult(const RawAddress& raw_address, uint16_t handle,

                             uint32_t cmd_status, int8_t rssi) {

  Address address = bluetooth::ToGdAddress(raw_address);