Skip to content

Commit da67637

Browse files
authored
Revert "Add tracing to hostpolicy_init_t::init (#118973)" (#119552)
This reverts commit 28216ac. This extra logging was added for investigating #118904 because it was intermittent and we couldn't get dumps. We can remove it now.
1 parent 08aa6a2 commit da67637

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

src/native/corehost/hostpolicy/hostpolicy_init.cpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ void make_palstr_arr(size_t argc, const pal::char_t** argv, std::vector<pal::str
1010
out->reserve(argc);
1111
for (size_t i = 0; i < argc; ++i)
1212
{
13-
trace::verbose(_X(" [%zu]: %s"), i, argv[i]);
1413
out->push_back(argv[i]);
1514
}
1615
}
@@ -33,16 +32,12 @@ bool hostpolicy_init_t::init(const host_interface_t* input, hostpolicy_init_t* i
3332

3433
if (input->version_lo >= offsetof(host_interface_t, host_mode) + sizeof(input->host_mode))
3534
{
36-
trace::verbose(_X(" config keys [%zu], values: [%zu]"), input->config_keys.len, input->config_values.len);
3735
make_palstr_arr(input->config_keys.len, input->config_keys.arr, &init->cfg_keys);
3836
make_palstr_arr(input->config_values.len, input->config_values.arr, &init->cfg_values);
3937

4038
init->deps_file = input->deps_file;
4139
init->is_framework_dependent = input->is_framework_dependent;
42-
trace::verbose(_X(" deps_file: %s"), init->deps_file.c_str());
43-
trace::verbose(_X(" is_framework_dependent: %s"), init->is_framework_dependent ? _X("true") : _X("false"));
4440

45-
trace::verbose(_X(" probe paths [%zu]"), input->probe_paths.len);
4641
make_palstr_arr(input->probe_paths.len, input->probe_paths.arr, &init->probe_paths);
4742

4843
init->patch_roll_forward = input->patch_roll_forward;
@@ -61,22 +56,17 @@ bool hostpolicy_init_t::init(const host_interface_t* input, hostpolicy_init_t* i
6156
if (input->version_lo >= offsetof(host_interface_t, tfm) + sizeof(input->tfm))
6257
{
6358
init->tfm = input->tfm;
64-
trace::verbose(_X(" tfm: %s"), init->tfm.c_str());
6559
}
6660

6761
if (input->version_lo >= offsetof(host_interface_t, fx_ver) + sizeof(input->fx_ver))
6862
{
6963
init->additional_deps_serialized = input->additional_deps_serialized;
7064
fx_requested_ver = input->fx_ver;
71-
trace::verbose(_X(" additional_deps_serialized: %s"), init->additional_deps_serialized.c_str());
72-
trace::verbose(_X(" fx_requested_ver: %s"), fx_requested_ver.c_str());
7365
}
7466

7567
if (input->version_lo >= offsetof(host_interface_t, fx_names) + sizeof(input->fx_names))
7668
{
7769
size_t fx_count = input->fx_names.len;
78-
trace::verbose(_X(" frameworks [%zu]"), fx_count);
79-
8070
assert(fx_count > 0);
8171
assert(fx_count == input->fx_dirs.len);
8272
assert(fx_count == input->fx_requested_versions.len);
@@ -95,15 +85,12 @@ bool hostpolicy_init_t::init(const host_interface_t* input, hostpolicy_init_t* i
9585
init->fx_definitions.reserve(fx_count);
9686
for (size_t i = 0; i < fx_count; ++i)
9787
{
98-
trace::verbose(_X(" name='%s', dir='%s', requested_version='%s', found_version='%s'"),
99-
fx_names[i].c_str(), fx_dirs[i].c_str(), fx_requested_versions[i].c_str(), fx_found_versions[i].c_str());
10088
auto fx = new fx_definition_t(fx_names[i], fx_dirs[i], fx_requested_versions[i], fx_found_versions[i]);
10189
init->fx_definitions.push_back(std::unique_ptr<fx_definition_t>(fx));
10290
}
10391
}
10492
else
10593
{
106-
trace::verbose(_X(" older interface version: using fx_dir, fx_name, fx_requested_ver"));
10794
// Backward compat; create the fx_definitions[0] and [1] from the previous information
10895
init->fx_definitions.reserve(2);
10996

@@ -130,22 +117,17 @@ bool hostpolicy_init_t::init(const host_interface_t* input, hostpolicy_init_t* i
130117

131118
// Initialize the host command
132119
init_host_command(input, init);
133-
trace::verbose(_X(" host_command: %s"), init->host_command.c_str());
134120

135121
if (input->version_lo >= offsetof(host_interface_t, host_info_host_path) + sizeof(input->host_info_host_path))
136122
{
137123
init->host_info.host_path = input->host_info_host_path;
138124
init->host_info.dotnet_root = input->host_info_dotnet_root;
139125
init->host_info.app_path = input->host_info_app_path;
140126
// For the backwards compat case, this will be later initialized with argv[0]
141-
trace::verbose(_X(" host_path: %s"), init->host_info.host_path.c_str());
142-
trace::verbose(_X(" dotnet_root: %s"), init->host_info.dotnet_root.c_str());
143-
trace::verbose(_X(" app_path: %s"), init->host_info.app_path.c_str());
144127
}
145128

146129
if (input->version_lo >= offsetof(host_interface_t, single_file_bundle_header_offset) + sizeof(input->single_file_bundle_header_offset))
147130
{
148-
trace::verbose(_X(" single_file_bundle_header_offset: %zu"), input->single_file_bundle_header_offset);
149131
if (input->single_file_bundle_header_offset != 0)
150132
{
151133
static bundle::runner_t bundle_runner(input->host_info_host_path, input->host_info_app_path, input->single_file_bundle_header_offset);

0 commit comments

Comments
 (0)