Prepare for new p/invoke code, step #3

Author: grendello

src/native/monodroid/pinvoke-override-api.cc

@@ -14,6 +14,7 @@
 #include "xxhash.hh"
 #include "startup-aware-lock.hh"
 #include "jni-remapping.hh"
+#include "internal-pinvokes.hh"
 
 extern "C" {
 	int _monodroid_getifaddrs (struct _monodroid_ifaddrs **ifap);
@@ -31,26 +32,26 @@ void* MonodroidRuntime::system_native_library_handle = nullptr;
 void* MonodroidRuntime::system_security_cryptography_native_android_library_handle = nullptr;
 void* MonodroidRuntime::system_io_compression_native_library_handle = nullptr;
 
-static unsigned int
+unsigned int
 monodroid_get_log_categories ()
 {
 	return log_categories;
 }
 
-static int
+int
 monodroid_get_system_property (const char *name, char **value)
 {
         return AndroidSystem::monodroid_get_system_property (name, value);
 }
 
-static int
+int
 monodroid_embedded_assemblies_set_assemblies_prefix (const char *prefix)
 {
         embeddedAssemblies.set_assemblies_prefix (prefix);
         return 0;
 }
 
-static void
+void
 monodroid_log (LogLevel level, LogCategories category, const char *message)
 {
 	switch (level) {
@@ -84,99 +85,99 @@ monodroid_log (LogLevel level, LogCategories category, const char *message)
 	}
 }
 
-static void
+void
 monodroid_free (void *ptr)
 {
         free (ptr);
 }
 
-static int
+int
 _monodroid_max_gref_get ()
 {
         return static_cast<int>(AndroidSystem::get_max_gref_count ());
 }
 
-static int
+int
 _monodroid_gref_get ()
 {
 	return osBridge.get_gc_gref_count ();
 }
 
 
-static void
+void
 _monodroid_gref_log (const char *message)
 {
         osBridge._monodroid_gref_log (message);
 }
 
-static int
+int
 _monodroid_gref_log_new (jobject curHandle, char curType, jobject newHandle, char newType, const char *threadName, int threadId, const char *from, int from_writable)
 {
         return osBridge._monodroid_gref_log_new (curHandle, curType, newHandle, newType, threadName, threadId, from, from_writable);
 }
 
-static void
+void
 _monodroid_gref_log_delete (jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable)
 {
         osBridge._monodroid_gref_log_delete (handle, type, threadName, threadId, from, from_writable);
 }
 
-static int
+int
 _monodroid_weak_gref_get ()
 {
 	return osBridge.get_gc_weak_gref_count ();
 }
 
-static void
+void
 _monodroid_weak_gref_new (jobject curHandle, char curType, jobject newHandle, char newType, const char *threadName, int threadId, const char *from, int from_writable)
 {
         osBridge._monodroid_weak_gref_new (curHandle, curType, newHandle, newType, threadName, threadId, from, from_writable);
 }
 
-static void
+void
 _monodroid_weak_gref_delete (jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable)
 {
         osBridge._monodroid_weak_gref_delete (handle, type, threadName, threadId, from, from_writable);
 }
 
-static void
+void
 _monodroid_lref_log_new (int lrefc, jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable)
 {
         osBridge._monodroid_lref_log_new (lrefc, handle, type, threadName, threadId, from, from_writable);
 }
 
-static void
+void
 _monodroid_lref_log_delete (int lrefc, jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable)
 {
         osBridge._monodroid_lref_log_delete (lrefc, handle, type, threadName, threadId, from, from_writable);
 }
 
-static void
+void
 _monodroid_gc_wait_for_bridge_processing ()
 {
         mono_gc_wait_for_bridge_processing ();
 }
 
-static int
+int
 _monodroid_get_android_api_level ()
 {
         return monodroidRuntime.get_android_api_level ();
 }
 
-static void
+void
 monodroid_clear_gdb_wait ()
 {
         monodroidRuntime.set_monodroid_gdb_wait (false);
 }
 
-static void*
+void*
 _monodroid_get_identity_hash_code (JNIEnv *env, void *v)
 {
         intptr_t rv = env->CallStaticIntMethod (monodroidRuntime.get_java_class_System (), monodroidRuntime.get_java_class_method_System_identityHashCode (), v);
         return (void*) rv;
 }
 
-static void*
+void*
 _monodroid_timezone_get_default_id ()
 {
 	JNIEnv *env          = osBridge.ensure_jnienv ();
@@ -202,15 +203,15 @@ _monodroid_timezone_get_default_id ()
 	return def_id;
 }
 
-static void
+void
 _monodroid_counters_dump ([[maybe_unused]] const char *format, [[maybe_unused]] va_list args)
 {
 #if !defined (NET)
 	monodroidRuntime.dump_counters_v (format, args);
 #endif // ndef NET
 }
 
-static managed_timing_sequence*
+managed_timing_sequence*
 monodroid_timing_start (const char *message)
 {
 	if (timing == nullptr)
@@ -225,7 +226,7 @@ monodroid_timing_start (const char *message)
 	return ret;
 }
 
-static void
+void
 monodroid_timing_stop (managed_timing_sequence *sequence, const char *message)
 {
 	static constexpr const char DEFAULT_MESSAGE[] = "Managed Timing";
@@ -238,19 +239,19 @@ monodroid_timing_stop (managed_timing_sequence *sequence, const char *message)
 	timing->release_sequence (sequence);
 }
 
-static char**
+char**
 monodroid_strsplit (const char *str, const char *delimiter, size_t max_tokens)
 {
 	return Util::monodroid_strsplit (str, delimiter, max_tokens);
 }
 
-static void
+void
 monodroid_strfreev (char **str_array)
 {
 	Util::monodroid_strfreev (str_array);
 }
 
-static char*
+char*
 monodroid_strdup_printf (const char *format, ...)
 {
 	va_list args;
@@ -262,65 +263,65 @@ monodroid_strdup_printf (const char *format, ...)
 	return ret;
 }
 
-static char*
+char*
 monodroid_TypeManager_get_java_class_name (jclass klass)
 {
 	return monodroidRuntime.get_java_class_name_for_TypeManager (klass);
 }
 
-static int
+int
 monodroid_get_namespaced_system_property (const char *name, char **value)
 {
 	return static_cast<int>(AndroidSystem::monodroid_get_system_property (name, value));
 }
 
-static FILE*
+FILE*
 monodroid_fopen (const char* filename, const char* mode)
 {
 	return Util::monodroid_fopen (filename, mode);
 }
 
-static int
+int
 send_uninterrupted (int fd, void *buf, int len)
 {
 	if (len < 0)
 		len = 0;
 	return Util::send_uninterrupted (fd, buf, static_cast<size_t>(len));
 }
 
-static int
+int
 recv_uninterrupted (int fd, void *buf, int len)
 {
 	if (len < 0)
 		len = 0;
 	return static_cast<int>(Util::recv_uninterrupted (fd, buf, static_cast<size_t>(len)));
 }
 
-static void
+void
 set_world_accessable (const char *path)
 {
 	Util::set_world_accessable (path);
 }
 
-static void
+void
 create_public_directory (const char *dir)
 {
 	Util::create_public_directory (dir);
 }
 
-static char*
+char*
 path_combine (const char *path1, const char *path2)
 {
 	return Util::path_combine (path1, path2);
 }
 
-static void*
+void*
 monodroid_dylib_mono_new ([[maybe_unused]] const char *libmono_path)
 {
 	return nullptr;
 }
 
-static void
+void
 monodroid_dylib_mono_free ([[maybe_unused]] void *mono_imports)
 {
 	// no-op
@@ -332,33 +333,33 @@ monodroid_dylib_mono_free ([[maybe_unused]] void *mono_imports)
 
   it should also accept libmono_path = nullptr parameter
 */
-static int
+int
 monodroid_dylib_mono_init (void *mono_imports, [[maybe_unused]] const char *libmono_path)
 {
 	if (mono_imports == nullptr)
 		return FALSE;
 	return TRUE;
 }
 
-static void*
-monodroid_get_dylib (void)
+void*
+monodroid_get_dylib ()
 {
 	return nullptr;
 }
 
-static const char*
+const char*
 _monodroid_lookup_replacement_type (const char *jniSimpleReference)
 {
 	return JniRemapping::lookup_replacement_type (jniSimpleReference);
 }
 
-static const JniRemappingReplacementMethod*
+const JniRemappingReplacementMethod*
 _monodroid_lookup_replacement_method_info (const char *jniSourceType, const char *jniMethodName, const char *jniMethodSignature)
 {
 	return JniRemapping::lookup_replacement_method_info (jniSourceType, jniMethodName, jniMethodSignature);
 }
 
-static void
+void
 monodroid_log_traces (uint32_t kind, const char *first_line)
 {
 	JNIEnv *env = osBridge.ensure_jnienv ();

src/native/runtime-base/internal-pinvokes.hh

@@ -0,0 +1,58 @@
+#pragma once
+
+#include <cstdio>
+
+#include <mono/utils/mono-publib.h>
+#include <java-interop-logger.h>
+#include <jni.h>
+
+#include "log_types.hh"
+
+// int _monodroid_getifaddrs (struct _monodroid_ifaddrs **ifap);
+// void _monodroid_freeifaddrs (struct _monodroid_ifaddrs *ifa);
+
+mono_bool _monodroid_get_network_interface_up_state (const char *ifname, mono_bool *is_up);
+mono_bool _monodroid_get_network_interface_supports_multicast (const char *ifname, mono_bool *supports_multicast);
+int _monodroid_get_dns_servers (void **dns_servers_array);
+
+unsigned int monodroid_get_log_categories ();
+int monodroid_get_system_property (const char *name, char **value);
+int monodroid_embedded_assemblies_set_assemblies_prefix (const char *prefix);
+void monodroid_log (xamarin::android::LogLevel level, LogCategories category, const char *message);
+void monodroid_free (void *ptr);
+int _monodroid_max_gref_get ();
+int _monodroid_gref_get ();
+void _monodroid_gref_log (const char *message);
+int _monodroid_gref_log_new (jobject curHandle, char curType, jobject newHandle, char newType, const char *threadName, int threadId, const char *from, int from_writable);
+void _monodroid_gref_log_delete (jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable);
+int _monodroid_weak_gref_get ();
+void _monodroid_weak_gref_new (jobject curHandle, char curType, jobject newHandle, char newType, const char *threadName, int threadId, const char *from, int from_writable);
+void _monodroid_weak_gref_delete (jobject handle, char type, const char *threadName, int threadId, const char *from, int from_writable);
+void _monodroid_lref_log_new (int lrefc, jobject handle, char type, const char *threadName, int threadId, const char  *from, int from_writable);
+void _monodroid_lref_log_delete (int lrefc, jobject handle, char type, const char *threadName, int threadId, const char  *from, int from_writable);
+void _monodroid_gc_wait_for_bridge_processing ();
+int _monodroid_get_android_api_level ();
+void monodroid_clear_gdb_wait ();
+void* _monodroid_get_identity_hash_code (JNIEnv *env, void *v);
+void* _monodroid_timezone_get_default_id ();
+void _monodroid_counters_dump ([[maybe_unused]] const char *format, [[maybe_unused]] va_list args);
+//managed_timing_sequence* monodroid_timing_start (const char *message);
+//void monodroid_timing_stop (managed_timing_sequence *sequence, const char *message)
+char** monodroid_strsplit (const char *str, const char *delimiter, size_t max_tokens);
+void monodroid_strfreev (char **str_array);
+char* monodroid_strdup_printf (const char *format, ...);
+char* monodroid_TypeManager_get_java_class_name (jclass klass);
+int monodroid_get_namespaced_system_property (const char *name, char **value);
+FILE* monodroid_fopen (const char* filename, const char* mode);
+int send_uninterrupted (int fd, void *buf, int len);
+int recv_uninterrupted (int fd, void *buf, int len);
+void set_world_accessable (const char *path);
+void create_public_directory (const char *dir);
+char* path_combine (const char *path1, const char *path2);
+void* monodroid_dylib_mono_new ([[maybe_unused]] const char *libmono_path);
+void monodroid_dylib_mono_free ([[maybe_unused]] void *mono_imports);
+int monodroid_dylib_mono_init (void *mono_imports, [[maybe_unused]] const char *libmono_path);
+void* monodroid_get_dylib ();
+const char* _monodroid_lookup_replacement_type (const char *jniSimpleReference);
+// const JniRemappingReplacementMethod* _monodroid_lookup_replacement_method_info (const char *jniSourceType, const char *jniMethodName, const char *jniMethodSignature);
+void monodroid_log_traces (uint32_t kind, const char *first_line);