widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add logging to Usage Table Header

Browse Source 
[ Merge of http://go/wvgerrit/70227 ]

This logs additional information especially usage table entry numbers

Bug: 122829543
Test: WV unit/integration tests
Change-Id: I7ff5a0697f9c10daa30a13e5fa9c1641f0740b6e
This commit is contained in:
Rahul Frias
2019-01-14 11:29:30 -08:00
parent 5d6c12ff5d
commit 9df3421eea
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libwvdrmengine/cdm/core/src/usage_table_header.cpp
View File

@@ -35,7 +35,7 @@ UsageTableHeader::UsageTableHeader()
bool UsageTableHeader::Init(CdmSecurityLevel security_level, bool UsageTableHeader::Init(CdmSecurityLevel security_level,
CryptoSession* crypto_session) { CryptoSession* crypto_session) {
LOGV("UsageTableHeader::Init: security level: %d", security_level); LOGI("UsageTableHeader::Init: security level: %d", security_level);
if (crypto_session == NULL) { if (crypto_session == NULL) {
LOGE("UsageTableHeader::Init: no crypto session provided"); LOGE("UsageTableHeader::Init: no crypto session provided");
return false; return false;
@@ -66,6 +66,8 @@ bool UsageTableHeader::Init(CdmSecurityLevel security_level,
if (file_handle_->RetrieveUsageTableInfo(&usage_table_header_, if (file_handle_->RetrieveUsageTableInfo(&usage_table_header_,
&usage_entry_info_)) { &usage_entry_info_)) {
LOGI("UsageTableHeader::Init: number of usage entries: %d",
usage_entry_info_.size());
status = crypto_session->LoadUsageTableHeader(usage_table_header_); status = crypto_session->LoadUsageTableHeader(usage_table_header_);
// If the usage table header has been successfully loaded, and is at // If the usage table header has been successfully loaded, and is at
@@ -139,7 +141,7 @@ CdmResponseType UsageTableHeader::AddEntry(
CryptoSession* crypto_session, bool persistent_license, CryptoSession* crypto_session, bool persistent_license,
const CdmKeySetId& key_set_id, const std::string& usage_info_file_name, const CdmKeySetId& key_set_id, const std::string& usage_info_file_name,
uint32_t* usage_entry_number) { uint32_t* usage_entry_number) {
LOGV("UsageTableHeader::AddEntry: Lock"); LOGI("UsageTableHeader::AddEntry: Lock");
metrics::CryptoMetrics* metrics = crypto_session->GetCryptoMetrics(); metrics::CryptoMetrics* metrics = crypto_session->GetCryptoMetrics();
if (metrics == NULL) metrics = &alternate_crypto_metrics_; if (metrics == NULL) metrics = &alternate_crypto_metrics_;
@@ -189,6 +191,7 @@ CdmResponseType UsageTableHeader::AddEntry(
usage_entry_info_[*usage_entry_number].usage_info_file_name = usage_entry_info_[*usage_entry_number].usage_info_file_name =
usage_info_file_name; usage_info_file_name;
LOGI("UsageTableHeader::AddEntry: usage entry #: %d", *usage_entry_number);
file_handle_->StoreUsageTableInfo(usage_table_header_, usage_entry_info_); file_handle_->StoreUsageTableInfo(usage_table_header_, usage_entry_info_);
return NO_ERROR; return NO_ERROR;
} }
@@ -197,7 +200,8 @@ CdmResponseType UsageTableHeader::LoadEntry(CryptoSession* crypto_session,
const CdmUsageEntry& usage_entry, const CdmUsageEntry& usage_entry,
uint32_t usage_entry_number) { uint32_t usage_entry_number) {
{ {
LOGV("UsageTableHeader::LoadEntry: Lock"); LOGI("UsageTableHeader::LoadEntry: Lock: usage entry #: %d",
usage_entry_number);
std::unique_lock<std::mutex> auto_lock(usage_table_header_lock_); std::unique_lock<std::mutex> auto_lock(usage_table_header_lock_);
if (usage_entry_number >= usage_entry_info_.size()) { if (usage_entry_number >= usage_entry_info_.size()) {
@@ -233,7 +237,7 @@ CdmResponseType UsageTableHeader::LoadEntry(CryptoSession* crypto_session,
CdmResponseType UsageTableHeader::UpdateEntry(CryptoSession* crypto_session, CdmResponseType UsageTableHeader::UpdateEntry(CryptoSession* crypto_session,
CdmUsageEntry* usage_entry) { CdmUsageEntry* usage_entry) {
LOGV("UsageTableHeader::UpdateEntryL: Lock"); LOGI("UsageTableHeader::UpdateEntry: Lock");
std::unique_lock<std::mutex> auto_lock(usage_table_header_lock_); std::unique_lock<std::mutex> auto_lock(usage_table_header_lock_);
CdmResponseType status = CdmResponseType status =
crypto_session->UpdateUsageEntry(&usage_table_header_, usage_entry); crypto_session->UpdateUsageEntry(&usage_table_header_, usage_entry);
@@ -247,7 +251,8 @@ CdmResponseType UsageTableHeader::UpdateEntry(CryptoSession* crypto_session,
CdmResponseType UsageTableHeader::DeleteEntry(uint32_t usage_entry_number, CdmResponseType UsageTableHeader::DeleteEntry(uint32_t usage_entry_number,
DeviceFiles* handle, DeviceFiles* handle,
metrics::CryptoMetrics* metrics) { metrics::CryptoMetrics* metrics) {
LOGV("UsageTableHeader::DeleteEntry: Lock"); LOGI("UsageTableHeader::DeleteEntry: Lock: usage entry #: %d",
usage_entry_number);
std::unique_lock<std::mutex> auto_lock(usage_table_header_lock_); std::unique_lock<std::mutex> auto_lock(usage_table_header_lock_);
if (usage_entry_number >= usage_entry_info_.size()) { if (usage_entry_number >= usage_entry_info_.size()) {
LOGE("UsageTableHeader::DeleteEntry: usage entry number %d larger than " LOGE("UsageTableHeader::DeleteEntry: usage entry number %d larger than "
@@ -305,7 +310,8 @@ CdmResponseType UsageTableHeader::MoveEntry(
uint32_t from_usage_entry_number, const CdmUsageEntry& from_usage_entry, uint32_t from_usage_entry_number, const CdmUsageEntry& from_usage_entry,
uint32_t to_usage_entry_number, DeviceFiles* handle, uint32_t to_usage_entry_number, DeviceFiles* handle,
metrics::CryptoMetrics* metrics) { metrics::CryptoMetrics* metrics) {
LOGV("UsageTableHeader::MoveEntry"); LOGI("UsageTableHeader::MoveEntry: usage entry #: %d -> %d",
from_usage_entry_number, to_usage_entry_number);
// crypto_session points to an object whose scope is this method or a test // crypto_session points to an object whose scope is this method or a test
// object whose scope is the lifetime of this class // object whose scope is the lifetime of this class
@@ -357,6 +363,8 @@ CdmResponseType UsageTableHeader::MoveEntry(
CdmResponseType UsageTableHeader::GetEntry(uint32_t usage_entry_number, CdmResponseType UsageTableHeader::GetEntry(uint32_t usage_entry_number,
DeviceFiles* handle, DeviceFiles* handle,
CdmUsageEntry* usage_entry) { CdmUsageEntry* usage_entry) {
LOGI("UsageTableHeader::GetEntry: usage entry #: %d, storage type: %d",
usage_entry_number, usage_entry_info_[usage_entry_number].storage_type);
uint32_t entry_number; uint32_t entry_number;
switch (usage_entry_info_[usage_entry_number].storage_type) { switch (usage_entry_info_[usage_entry_number].storage_type) {
case kStorageLicense: { case kStorageLicense: {
@@ -413,6 +421,8 @@ CdmResponseType UsageTableHeader::GetEntry(uint32_t usage_entry_number,
CdmResponseType UsageTableHeader::StoreEntry(uint32_t usage_entry_number, CdmResponseType UsageTableHeader::StoreEntry(uint32_t usage_entry_number,
DeviceFiles* handle, DeviceFiles* handle,
const CdmUsageEntry& usage_entry) { const CdmUsageEntry& usage_entry) {
LOGI("UsageTableHeader::StoreEntry: usage entry #: %d, storage type: %d",
usage_entry_number, usage_entry_info_[usage_entry_number].storage_type);
uint32_t entry_number; uint32_t entry_number;
switch (usage_entry_info_[usage_entry_number].storage_type) { switch (usage_entry_info_[usage_entry_number].storage_type) {
case kStorageLicense: { case kStorageLicense: {
@@ -483,6 +493,7 @@ CdmResponseType UsageTableHeader::StoreEntry(uint32_t usage_entry_number,
CdmResponseType UsageTableHeader::Shrink( CdmResponseType UsageTableHeader::Shrink(
metrics::CryptoMetrics* metrics, metrics::CryptoMetrics* metrics,
uint32_t number_of_usage_entries_to_delete) { uint32_t number_of_usage_entries_to_delete) {
LOGI("UsageTableHeader::Shrink: %d", number_of_usage_entries_to_delete);
if (usage_entry_info_.empty()) { if (usage_entry_info_.empty()) {
LOGE("UsageTableHeader::Shrink: usage entry info table unexpectedly empty"); LOGE("UsageTableHeader::Shrink: usage entry info table unexpectedly empty");
return NO_USAGE_ENTRIES; return NO_USAGE_ENTRIES;