Skip to content

Commit

Permalink
Format host tracing for deps parsing for easier reading (#82333)
Browse files Browse the repository at this point in the history
  • Loading branch information
@elinor-fung
elinor-fung authored Feb 22, 2023
1 parent 8c7615c commit c7ca00b
Showing 1 changed file with 35 additions and 27 deletions.
62 changes: 35 additions & 27 deletions src/native/corehost/hostpolicy/deps_format.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace
void deps_json_t::reconcile_libraries_with_targets(
const pal::string_t& deps_path,
const json_parser_t::value_t& json,
const std::function<bool(const pal::string_t&)>& library_exists_fn,
const std::function<bool(const pal::string_t&)>& library_has_assets_fn,
const std::function<const vec_asset_t&(const pal::string_t&, size_t, bool*)>& get_assets_fn)
{
pal::string_t deps_file = get_filename(deps_path);
Expand All @@ -54,9 +54,9 @@ void deps_json_t::reconcile_libraries_with_targets(
trace::info(_X("Reconciling library %s"), library.name.GetString());

pal::string_t lib_name{library.name.GetString()};
if (!library_exists_fn(lib_name))
if (!library_has_assets_fn(lib_name))
{
trace::info(_X("Library %s does not exist"), library.name.GetString());
trace::info(_X(" No assets for library %s"), library.name.GetString());
continue;
}

Expand All @@ -66,11 +66,21 @@ void deps_json_t::reconcile_libraries_with_targets(
pal::string_t library_path = get_optional_path(library.value, _X("path"));
pal::string_t library_hash_path = get_optional_path(library.value, _X("hashPath"));
pal::string_t runtime_store_manifest_list = get_optional_path(library.value, _X("runtimeStoreManifestName"));
pal::string_t library_type = to_lower(library.value[_X("type")].GetString());

size_t pos = lib_name.find(_X("/"));
pal::string_t library_name = lib_name.substr(0, pos);
pal::string_t library_version = lib_name.substr(pos + 1);

trace::info(_X(" %s: %s, version: %s"), library_type.c_str(), library_name.c_str(), library_version.c_str());
for (size_t i = 0; i < deps_entry_t::s_known_asset_types.size(); ++i)
{
bool rid_specific = false;
const vec_asset_t& assets = get_assets_fn(lib_name, i, &rid_specific);
if (assets.empty())
continue;

trace::info(_X(" Adding %s assets"), deps_entry_t::s_known_asset_types[i]);
m_deps_entries[i].reserve(assets.size());
for (const auto& asset : assets)
{
Expand All @@ -81,10 +91,9 @@ void deps_json_t::reconcile_libraries_with_targets(
}

deps_entry_t entry;
size_t pos = lib_name.find(_X("/"));
entry.library_name = lib_name.substr(0, pos);
entry.library_version = lib_name.substr(pos + 1);
entry.library_type = to_lower(library.value[_X("type")].GetString());
entry.library_name = library_name;
entry.library_version = library_version;
entry.library_type = library_type;
entry.library_hash = hash;
entry.library_path = library_path;
entry.library_hash_path = library_hash_path;
Expand All @@ -98,13 +107,9 @@ void deps_json_t::reconcile_libraries_with_targets(

if (trace::is_enabled())
{
trace::info(_X("Parsed %s deps entry %zu for asset name: %s from %s: %s, library version: %s, relpath: %s, assemblyVersion %s, fileVersion %s"),
deps_entry_t::s_known_asset_types[i],
m_deps_entries[i].size() - 1,
trace::info(_X(" Entry %zu for asset name: %s, relpath: %s, assemblyVersion %s, fileVersion %s"),
m_deps_entries[i].size(),
entry.asset.name.c_str(),
entry.library_type.c_str(),
entry.library_name.c_str(),
entry.library_version.c_str(),
entry.asset.relative_path.c_str(),
entry.asset.assembly_version.as_str().c_str(),
entry.asset.file_version.as_str().c_str());
Expand Down Expand Up @@ -144,9 +149,13 @@ void deps_json_t::perform_rid_fallback(rid_specific_assets_t* portable_assets, c

for (auto& package : portable_assets->libs)
{
trace::verbose(_X("Filtering RID assets for %s"), package.first.c_str());
for (size_t asset_type_index = 0; asset_type_index < deps_entry_t::asset_types::count; asset_type_index++)
{
auto& rid_assets = package.second[asset_type_index].rid_assets;
if (rid_assets.empty())
continue;

pal::string_t matched_rid = rid_assets.count(host_rid) ? host_rid : _X("");
if (matched_rid.empty())
{
Expand All @@ -170,20 +179,17 @@ void deps_json_t::perform_rid_fallback(rid_specific_assets_t* portable_assets, c

if (matched_rid.empty())
{
trace::verbose(_X(" No matching %s assets for package %s"), deps_entry_t::s_known_asset_types[asset_type_index], package.first.c_str());
rid_assets.clear();
continue;
}

trace::verbose(_X(" Matched RID %s for %s assets"), matched_rid.c_str(), deps_entry_t::s_known_asset_types[asset_type_index]);
for (auto iter = rid_assets.begin(); iter != rid_assets.end(); /* */)
{
if (iter->first != matched_rid)
{
trace::verbose(
_X("Chose %s, so removing rid (%s) specific assets for package %s and asset type %s"),
matched_rid.c_str(),
iter->first.c_str(),
package.first.c_str(),
deps_entry_t::s_known_asset_types[asset_type_index]);

trace::verbose(_X(" Removing %s assets"),iter->first.c_str(), package.first.c_str());
iter = rid_assets.erase(iter);
}
else
Expand All @@ -206,6 +212,8 @@ void deps_json_t::process_runtime_targets(const json_parser_t::value_t& json, co
continue;
}

trace::info(_X("Processing runtimeTargets for package %s"), package.name.GetString());

for (const auto& file : runtimeTargets->value.GetObject())
{
const auto& type = file.value[_X("assetType")].GetString();
Expand Down Expand Up @@ -238,13 +246,12 @@ void deps_json_t::process_runtime_targets(const json_parser_t::value_t& json, co

if (trace::is_enabled())
{
trace::info(_X("Adding runtimeTargets %s asset %s rid=%s assemblyVersion=%s fileVersion=%s from %s"),
trace::info(_X(" %s asset: %s rid=%s assemblyVersion=%s fileVersion=%s"),
deps_entry_t::s_known_asset_types[asset_type_index],
asset.relative_path.c_str(),
rid,
asset.assembly_version.as_str().c_str(),
asset.file_version.as_str().c_str(),
package.name.GetString());
asset.file_version.as_str().c_str());
}

assets.libs[package.name.GetString()][asset_type_index].rid_assets[rid].push_back(asset);
Expand All @@ -260,6 +267,8 @@ void deps_json_t::process_targets(const json_parser_t::value_t& json, const pal:
deps_assets_t& assets = *p_assets;
for (const auto& package : json[_X("targets")][target_name.c_str()].GetObject())
{
trace::info(_X("Processing package %s"), package.name.GetString());

const auto& asset_types = package.value.GetObject();
for (size_t i = 0; i < deps_entry_t::s_known_asset_types.size(); ++i)
{
Expand All @@ -269,6 +278,7 @@ void deps_json_t::process_targets(const json_parser_t::value_t& json, const pal:
continue;
}

trace::info(_X(" Adding %s assets"), deps_entry_t::s_known_asset_types[i]);
const auto& files = iter->value.GetObject();
vec_asset_t& asset_files = assets.libs[package.name.GetString()][i];
asset_files.reserve(files.MemberCount());
Expand All @@ -293,12 +303,10 @@ void deps_json_t::process_targets(const json_parser_t::value_t& json, const pal:

if (trace::is_enabled())
{
trace::info(_X("Adding %s asset %s assemblyVersion=%s fileVersion=%s from %s"),
deps_entry_t::s_known_asset_types[i],
trace::info(_X(" %s assemblyVersion=%s fileVersion=%s"),
asset.relative_path.c_str(),
asset.assembly_version.as_str().c_str(),
asset.file_version.as_str().c_str(),
package.name.GetString());
asset.file_version.as_str().c_str());
}

asset_files.push_back(std::move(asset));
Expand Down

0 comments on commit c7ca00b

Please sign in to comment.