Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Mono.Android/Java.Interop/TypeManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,10 @@ static Type monovm_typemap_java_to_managed (string java_type_name)
}
}

Logger.Log (LogLevel.Info, "monodroid", $"Loaded type: {ret}");
if (Logger.LogAssembly) {
Logger.Log (LogLevel.Info, "monodroid", $"Loaded type: {ret}");
}

return ret;
}

Expand Down
6 changes: 5 additions & 1 deletion src/native/clr/host/assembly-store.cc
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,11 @@ auto AssemblyStore::open_assembly (std::string_view const& name, int64_t &size)

const AssemblyStoreIndexEntry *hash_entry = find_assembly_store_entry (name_hash, assembly_store_hashes, assembly_store.index_entry_count);
if (hash_entry == nullptr) {
log_warn (LOG_ASSEMBLY, "Assembly '{}' (hash 0x{:x}) not found"sv, optional_string (name.data ()), name_hash);
// This message should really be `log_warn`, but since CoreCLR attempts to load `AssemblyName.ni.dll` for each
// `AssemblyName.dll`, it creates a lot of non-actionable noise.
// TODO (in separate PR): generate hashes for the .ni.dll names and ignore them at the top of the function. Then restore
// `log_warn` here.
log_debug (LOG_ASSEMBLY, "Assembly '{}' (hash 0x{:x}) not found"sv, optional_string (name.data ()), name_hash);
return nullptr;
}

Expand Down
2 changes: 0 additions & 2 deletions src/native/clr/host/host-jni.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ using namespace xamarin::android;
JNIEXPORT jint JNICALL
JNI_OnLoad (JavaVM *vm, void *reserved)
{
log_write (LOG_DEFAULT, LogLevel::Info, "JNI_OnLoad");

return Host::Java_JNI_OnLoad (vm, reserved);
}

Expand Down
1 change: 0 additions & 1 deletion src/native/clr/host/host.cc
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,6 @@ auto Host::get_java_class_name_for_TypeManager (jclass klass) noexcept -> char*

auto Host::Java_JNI_OnLoad (JavaVM *vm, [[maybe_unused]] void *reserved) noexcept -> jint
{
log_write (LOG_DEFAULT, LogLevel::Info, "Host OnLoad");
jvm = vm;

JNIEnv *env = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion src/native/clr/include/runtime-base/android-system.hh
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ namespace xamarin::android {
}
}

log_warn (LOG_DEFAULT, "Creating public update directory: `{}`", override_dir);
log_debug (LOG_DEFAULT, "Creating public update directory: `{}`", override_dir);
Util::create_public_directory (override_dir);
}

Expand Down
2 changes: 1 addition & 1 deletion src/native/clr/runtime-base/util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void
Util::create_public_directory (std::string_view const& dir)
{
mode_t m = umask (0);
int ret = mkdir (dir.data (), 0777);
int ret = create_directory (dir.data (), 0777);
if (ret < 0) {
if (errno == EEXIST) {
// Try to change the mode, just in case
Expand Down
Loading