[mono] Make some API functions public and private#33736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lambdageek merged 7 commits into from
Mar 24, 2020
Merged

[mono] Make some API functions public and private #33736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
92290b1
[mini] Move mono_install_load_aot_data_hook to a public header
lambdageek Mar 18, 2020
f8f4419
[gc] Make mono_gc_init_finalizer_thread a public API
lambdageek Mar 18, 2020
a0cc087
[utils] Move mono_trace_init to a public header
lambdageek Mar 18, 2020
9b80efe
Update ios sample
lambdageek Mar 18, 2020
c7cf3af
Revert "[utils] Move mono_trace_init to a public header"
lambdageek Mar 24, 2020
6e3f02f
[utils] init mono_logger in all public API functions
lambdageek Mar 24, 2020
7dfc6ef
[jit] Move mono_install_load_aot_data_hook to mono-private-unstable.h
lambdageek Mar 24, 2020
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
27 changes: 21 additions & 6 deletions src/mono/mono/metadata/gc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -999,17 +999,32 @@ finalizer_thread (gpointer unused)
return 0;
}

#ifndef LAZY_GC_THREAD_CREATION
static
#endif
void
mono_gc_init_finalizer_thread (void)
static void
init_finalizer_thread (void)
{
ERROR_DECL (error);
gc_thread = mono_thread_create_internal (mono_domain_get (), (gpointer)finalizer_thread, NULL, MONO_THREAD_CREATE_FLAGS_NONE, error);
mono_error_assert_ok (error);
}

/**
* mono_gc_init_finalizer_thread:
*
* If the runtime is compiled with --with-lazy-gc-thread-creation, this
* function must be called by embedders to create the finalizer. Otherwise, the
* function does nothing and the runtime creates the finalizer thread
* automatically.
*/
void
mono_gc_init_finalizer_thread (void)
{
#ifndef LAZY_GC_THREAD_CREATION
/* do nothing */
#else
init_finalizer_thread ();
#endif
}

static void
reference_queue_mutex_init (void)
{
Expand DownExpand Up@@ -1048,7 +1063,7 @@ mono_gc_init (void)

#ifndef LAZY_GC_THREAD_CREATION
if (!mono_runtime_get_no_exec ())
mono_gc_init_finalizer_thread ();
init_finalizer_thread ();
#endif
}

Expand Down
3 changes: 3 additions & 0 deletions src/mono/mono/metadata/mono-gc.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ MONO_API int mono_gc_invoke_finalizers (void);
/* heap walking is only valid in the pre-stop-world event callback */
MONO_API int mono_gc_walk_heap (int flags, MonoGCReferences callback, void *data);

MONO_API MONO_RT_EXTERNAL_ONLY void
mono_gc_init_finalizer_thread (void);

MONO_END_DECLS

#endif /* __METADATA_MONO_GC_H__ */
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/mini/aot-runtime.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@
#include "aot-runtime.h"
#include "jit-icalls.h"
#include "mini-runtime.h"
#include "mono-private-unstable.h"
#include "llvmonly-runtime.h"

#ifndef DISABLE_AOT
Expand Down
10 changes: 0 additions & 10 deletions src/mono/mono/mini/aot-runtime.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -273,16 +273,6 @@ gboolean mono_aot_init_llvmonly_method (gpointer amodule, guint32 method_in
GHashTable *mono_aot_get_weak_field_indexes (MonoImage *image);
MonoAotMethodFlags mono_aot_get_method_flags (guint8 *code);

/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
* Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
* passed to the free function.
*/
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void *handle);
MONO_API void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, gpointer user_data);

#ifdef MONO_ARCH_CODE_EXEC_ONLY
typedef guint32 (*MonoAotResolvePltInfoOffset)(gpointer amodule, guint32 plt_entry_index);
#endif
Expand Down
1 change: 0 additions & 1 deletion src/mono/mono/mini/jit.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,6 @@ mono_aot_register_module (void **aot_info);
MONO_API MONO_RT_EXTERNAL_ONLY
MonoDomain* mono_jit_thread_attach (MonoDomain *domain);


MONO_END_DECLS

#endif
Expand Down
12 changes: 11 additions & 1 deletion src/mono/mono/mini/mono-private-unstable.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,17 @@
#define __MONO_JIT_MONO_PRIVATE_UNSTABLE_H__

#include <mono/utils/mono-publib.h>
#include <mono/metadata/image.h>


/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
* Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
* passed to the free function.
*/
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void *handle);
MONO_API MONO_RT_EXTERNAL_ONLY void
mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void* user_data);

#endif /*__MONO_JIT_MONO_PRIVATE_UNSTABLE_H__*/
7 changes: 7 additions & 0 deletions src/mono/mono/utils/mono-logger.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,9 @@ mono_trace_set_log_handler (MonoLogCallback callback, void *user_data)
{
g_assert (callback);

if (level_stack == NULL)
mono_trace_init ();

if (logCallback.closer != NULL)
logCallback.closer();
UserSuppliedLoggerUserData *ll = (UserSuppliedLoggerUserData*)g_malloc (sizeof (UserSuppliedLoggerUserData));
Expand DownExpand Up@@ -514,6 +517,8 @@ void
mono_trace_set_print_handler (MonoPrintCallback callback)
{
g_assert (callback);
if (level_stack == NULL)
mono_trace_init ();
print_callback = callback;
g_set_print_handler (print_handler);
}
Expand All@@ -527,6 +532,8 @@ void
mono_trace_set_printerr_handler (MonoPrintCallback callback)
{
g_assert (callback);
if (level_stack == NULL)
mono_trace_init ();
printerr_callback = callback;
g_set_printerr_handler (printerr_handler);
}
Expand Down
10 changes: 2 additions & 8 deletions src/mono/netcore/sample/iOS/runtime.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,22 +3,17 @@
#include <mono/utils/mono-logger.h>
#include <mono/metadata/assembly.h>
#include <mono/metadata/mono-debug.h>
#include <mono/metadata/mono-gc.h>
#include <mono/metadata/exception.h>
#include <mono/jit/jit.h>
#include <mono/jit/mono-private-unstable.h>

#import <os/log.h>
#include <sys/stat.h>
#include <sys/mman.h>

static os_log_t stdout_log;

/* These are not in public headers */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void **out_handle);
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void *handle);
void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void *user_data);
void mono_trace_init (void);
void mono_gc_init_finalizer_thread (void);

static char *bundle_path;

const char *
Expand DownExpand Up@@ -272,7 +267,6 @@ void mono_ios_setup_execution_mode (void)
mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
mono_install_load_aot_data_hook (load_aot_data, free_aot_data, NULL);
mono_install_unhandled_exception_hook (unhandled_exception_handler, NULL);
mono_trace_init ();
mono_trace_set_log_handler (log_callback, NULL);
mono_set_signal_chaining (TRUE);
mono_set_crash_chaining (TRUE);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[mono] Make some API functions public and private#33736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lambdageek
merged 7 commits into

from

Mar 24, 2020
 Merged


[mono] Make some API functions public and private
#33736
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
92290b1

[mini] Move mono_install_load_aot_data_hook to a public header


lambdageek Mar 18, 2020
f8f4419

[gc] Make mono_gc_init_finalizer_thread a public API


lambdageek Mar 18, 2020
a0cc087

[utils] Move mono_trace_init to a public header


lambdageek Mar 18, 2020
9b80efe

Update ios sample


lambdageek Mar 18, 2020
c7cf3af

Revert "[utils] Move mono_trace_init to a public header"


lambdageek Mar 24, 2020
6e3f02f

[utils] init mono_logger in all public API functions


lambdageek Mar 24, 2020
7dfc6ef

[jit] Move mono_install_load_aot_data_hook to mono-private-unstable.h


lambdageek Mar 24, 2020

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


27 changes: 21 additions & 6 deletions
src/mono/mono/metadata/gc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -999,17 +999,32 @@ finalizer_thread (gpointer unused)
	return 0;
}

#ifndef LAZY_GC_THREAD_CREATION
static
#endif
void
mono_gc_init_finalizer_thread (void)
static void
init_finalizer_thread (void)
{
	ERROR_DECL (error);
	gc_thread = mono_thread_create_internal (mono_domain_get (), (gpointer)finalizer_thread, NULL, MONO_THREAD_CREATE_FLAGS_NONE, error);
	mono_error_assert_ok (error);
}

/**
 * mono_gc_init_finalizer_thread:
 *
 * If the runtime is compiled with --with-lazy-gc-thread-creation, this
 * function must be called by embedders to create the finalizer. Otherwise, the
 * function does nothing and the runtime creates the finalizer thread
 * automatically.
 */
void
mono_gc_init_finalizer_thread (void)
{
#ifndef LAZY_GC_THREAD_CREATION
	/* do nothing */
#else
	init_finalizer_thread ();
#endif
}

static void
reference_queue_mutex_init (void)
{
Expand DownExpand Up@@ -1048,7 +1063,7 @@ mono_gc_init (void)

#ifndef LAZY_GC_THREAD_CREATION
	if (!mono_runtime_get_no_exec ())
mono_gc_init_finalizer_thread ();
init_finalizer_thread ();
#endif
}

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/mono-gc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ MONO_API int mono_gc_invoke_finalizers (void);
/* heap walking is only valid in the pre-stop-world event callback */
MONO_API int mono_gc_walk_heap (int flags, MonoGCReferences callback, void *data);

MONO_API MONO_RT_EXTERNAL_ONLY void
mono_gc_init_finalizer_thread (void);

MONO_END_DECLS

#endif /* __METADATA_MONO_GC_H__ */
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/aot-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@
#include "aot-runtime.h"
#include "jit-icalls.h"
#include "mini-runtime.h"
#include "mono-private-unstable.h"
#include "llvmonly-runtime.h"

#ifndef DISABLE_AOT
Expand Down

10 changes: 0 additions & 10 deletions
src/mono/mono/mini/aot-runtime.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,16 +273,6 @@ gboolean mono_aot_init_llvmonly_method (gpointer amodule, guint32 method_in
GHashTable *mono_aot_get_weak_field_indexes (MonoImage *image);
MonoAotMethodFlags mono_aot_get_method_flags (guint8 *code);

/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void *handle);
MONO_API void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, gpointer user_data);

#ifdef MONO_ARCH_CODE_EXEC_ONLY
typedef guint32 (*MonoAotResolvePltInfoOffset)(gpointer amodule, guint32 plt_entry_index);
#endif
Expand Down

1 change: 0 additions & 1 deletion
src/mono/mono/mini/jit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,6 @@ mono_aot_register_module (void **aot_info);
MONO_API MONO_RT_EXTERNAL_ONLY
MonoDomain* mono_jit_thread_attach (MonoDomain *domain);


MONO_END_DECLS

#endif
Expand Down

12 changes: 11 additions & 1 deletion
src/mono/mono/mini/mono-private-unstable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,17 @@
#define __MONO_JIT_MONO_PRIVATE_UNSTABLE_H__

#include <mono/utils/mono-publib.h>
#include <mono/metadata/image.h>


/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void *handle);
MONO_API MONO_RT_EXTERNAL_ONLY void
mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void* user_data);

#endif /*__MONO_JIT_MONO_PRIVATE_UNSTABLE_H__*/

7 changes: 7 additions & 0 deletions
src/mono/mono/utils/mono-logger.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,9 @@ mono_trace_set_log_handler (MonoLogCallback callback, void *user_data)
{
	g_assert (callback);

	if (level_stack == NULL)
 mono_trace_init ();

	if (logCallback.closer != NULL)
 logCallback.closer();
	UserSuppliedLoggerUserData *ll = (UserSuppliedLoggerUserData*)g_malloc (sizeof (UserSuppliedLoggerUserData));
Expand DownExpand Up@@ -514,6 +517,8 @@ void
mono_trace_set_print_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	print_callback = callback;
	g_set_print_handler (print_handler);
}
Expand All@@ -527,6 +532,8 @@ void
mono_trace_set_printerr_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	printerr_callback = callback;
	g_set_printerr_handler (printerr_handler);
}
Expand Down

10 changes: 2 additions & 8 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,22 +3,17 @@
#include <mono/utils/mono-logger.h>
#include <mono/metadata/assembly.h>
#include <mono/metadata/mono-debug.h>
#include <mono/metadata/mono-gc.h>
#include <mono/metadata/exception.h>
#include <mono/jit/jit.h>
#include <mono/jit/mono-private-unstable.h>

#import <os/log.h>
#include <sys/stat.h>
#include <sys/mman.h>

static os_log_t stdout_log;

/* These are not in public headers */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void **out_handle);
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void *handle);
void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void *user_data);
void mono_trace_init (void);
void mono_gc_init_finalizer_thread (void);

static char *bundle_path;

const char *
Expand DownExpand Up@@ -272,7 +267,6 @@ void mono_ios_setup_execution_mode (void)
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
 mono_install_load_aot_data_hook (load_aot_data, free_aot_data, NULL);
 mono_install_unhandled_exception_hook (unhandled_exception_handler, NULL);
 mono_trace_init ();
 mono_trace_set_log_handler (log_callback, NULL);
 mono_set_signal_chaining (TRUE);
 mono_set_crash_chaining (TRUE);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[mono] Make some API functions public and private#33736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lambdageek
merged 7 commits into

from

Mar 24, 2020
 Merged


[mono] Make some API functions public and private
#33736
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
92290b1

[mini] Move mono_install_load_aot_data_hook to a public header


lambdageek Mar 18, 2020
f8f4419

[gc] Make mono_gc_init_finalizer_thread a public API


lambdageek Mar 18, 2020
a0cc087

[utils] Move mono_trace_init to a public header


lambdageek Mar 18, 2020
9b80efe

Update ios sample


lambdageek Mar 18, 2020
c7cf3af

Revert "[utils] Move mono_trace_init to a public header"


lambdageek Mar 24, 2020
6e3f02f

[utils] init mono_logger in all public API functions


lambdageek Mar 24, 2020
7dfc6ef

[jit] Move mono_install_load_aot_data_hook to mono-private-unstable.h


lambdageek Mar 24, 2020

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


27 changes: 21 additions & 6 deletions
src/mono/mono/metadata/gc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -999,17 +999,32 @@ finalizer_thread (gpointer unused)
	return 0;
}

#ifndef LAZY_GC_THREAD_CREATION
static
#endif
void
mono_gc_init_finalizer_thread (void)
static void
init_finalizer_thread (void)
{
	ERROR_DECL (error);
	gc_thread = mono_thread_create_internal (mono_domain_get (), (gpointer)finalizer_thread, NULL, MONO_THREAD_CREATE_FLAGS_NONE, error);
	mono_error_assert_ok (error);
}

/**
 * mono_gc_init_finalizer_thread:
 *
 * If the runtime is compiled with --with-lazy-gc-thread-creation, this
 * function must be called by embedders to create the finalizer. Otherwise, the
 * function does nothing and the runtime creates the finalizer thread
 * automatically.
 */
void
mono_gc_init_finalizer_thread (void)
{
#ifndef LAZY_GC_THREAD_CREATION
	/* do nothing */
#else
	init_finalizer_thread ();
#endif
}

static void
reference_queue_mutex_init (void)
{
Expand DownExpand Up@@ -1048,7 +1063,7 @@ mono_gc_init (void)

#ifndef LAZY_GC_THREAD_CREATION
	if (!mono_runtime_get_no_exec ())
mono_gc_init_finalizer_thread ();
init_finalizer_thread ();
#endif
}

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/mono-gc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ MONO_API int mono_gc_invoke_finalizers (void);
/* heap walking is only valid in the pre-stop-world event callback */
MONO_API int mono_gc_walk_heap (int flags, MonoGCReferences callback, void *data);

MONO_API MONO_RT_EXTERNAL_ONLY void
mono_gc_init_finalizer_thread (void);

MONO_END_DECLS

#endif /* __METADATA_MONO_GC_H__ */
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/aot-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@
#include "aot-runtime.h"
#include "jit-icalls.h"
#include "mini-runtime.h"
#include "mono-private-unstable.h"
#include "llvmonly-runtime.h"

#ifndef DISABLE_AOT
Expand Down

10 changes: 0 additions & 10 deletions
src/mono/mono/mini/aot-runtime.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,16 +273,6 @@ gboolean mono_aot_init_llvmonly_method (gpointer amodule, guint32 method_in
GHashTable *mono_aot_get_weak_field_indexes (MonoImage *image);
MonoAotMethodFlags mono_aot_get_method_flags (guint8 *code);

/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void *handle);
MONO_API void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, gpointer user_data);

#ifdef MONO_ARCH_CODE_EXEC_ONLY
typedef guint32 (*MonoAotResolvePltInfoOffset)(gpointer amodule, guint32 plt_entry_index);
#endif
Expand Down

1 change: 0 additions & 1 deletion
src/mono/mono/mini/jit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,6 @@ mono_aot_register_module (void **aot_info);
MONO_API MONO_RT_EXTERNAL_ONLY
MonoDomain* mono_jit_thread_attach (MonoDomain *domain);


MONO_END_DECLS

#endif
Expand Down

12 changes: 11 additions & 1 deletion
src/mono/mono/mini/mono-private-unstable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,17 @@
#define __MONO_JIT_MONO_PRIVATE_UNSTABLE_H__

#include <mono/utils/mono-publib.h>
#include <mono/metadata/image.h>


/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void *handle);
MONO_API MONO_RT_EXTERNAL_ONLY void
mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void* user_data);

#endif /*__MONO_JIT_MONO_PRIVATE_UNSTABLE_H__*/

7 changes: 7 additions & 0 deletions
src/mono/mono/utils/mono-logger.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,9 @@ mono_trace_set_log_handler (MonoLogCallback callback, void *user_data)
{
	g_assert (callback);

	if (level_stack == NULL)
 mono_trace_init ();

	if (logCallback.closer != NULL)
 logCallback.closer();
	UserSuppliedLoggerUserData *ll = (UserSuppliedLoggerUserData*)g_malloc (sizeof (UserSuppliedLoggerUserData));
Expand DownExpand Up@@ -514,6 +517,8 @@ void
mono_trace_set_print_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	print_callback = callback;
	g_set_print_handler (print_handler);
}
Expand All@@ -527,6 +532,8 @@ void
mono_trace_set_printerr_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	printerr_callback = callback;
	g_set_printerr_handler (printerr_handler);
}
Expand Down

10 changes: 2 additions & 8 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,22 +3,17 @@
#include <mono/utils/mono-logger.h>
#include <mono/metadata/assembly.h>
#include <mono/metadata/mono-debug.h>
#include <mono/metadata/mono-gc.h>
#include <mono/metadata/exception.h>
#include <mono/jit/jit.h>
#include <mono/jit/mono-private-unstable.h>

#import <os/log.h>
#include <sys/stat.h>
#include <sys/mman.h>

static os_log_t stdout_log;

/* These are not in public headers */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void **out_handle);
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void *handle);
void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void *user_data);
void mono_trace_init (void);
void mono_gc_init_finalizer_thread (void);

static char *bundle_path;

const char *
Expand DownExpand Up@@ -272,7 +267,6 @@ void mono_ios_setup_execution_mode (void)
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
 mono_install_load_aot_data_hook (load_aot_data, free_aot_data, NULL);
 mono_install_unhandled_exception_hook (unhandled_exception_handler, NULL);
 mono_trace_init ();
 mono_trace_set_log_handler (log_callback, NULL);
 mono_set_signal_chaining (TRUE);
 mono_set_crash_chaining (TRUE);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[mono] Make some API functions public and private#33736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lambdageek
merged 7 commits into

from

Mar 24, 2020
 Merged


[mono] Make some API functions public and private
#33736
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
92290b1

[mini] Move mono_install_load_aot_data_hook to a public header


lambdageek Mar 18, 2020
f8f4419

[gc] Make mono_gc_init_finalizer_thread a public API


lambdageek Mar 18, 2020
a0cc087

[utils] Move mono_trace_init to a public header


lambdageek Mar 18, 2020
9b80efe

Update ios sample


lambdageek Mar 18, 2020
c7cf3af

Revert "[utils] Move mono_trace_init to a public header"


lambdageek Mar 24, 2020
6e3f02f

[utils] init mono_logger in all public API functions


lambdageek Mar 24, 2020
7dfc6ef

[jit] Move mono_install_load_aot_data_hook to mono-private-unstable.h


lambdageek Mar 24, 2020

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


27 changes: 21 additions & 6 deletions
src/mono/mono/metadata/gc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -999,17 +999,32 @@ finalizer_thread (gpointer unused)
	return 0;
}

#ifndef LAZY_GC_THREAD_CREATION
static
#endif
void
mono_gc_init_finalizer_thread (void)
static void
init_finalizer_thread (void)
{
	ERROR_DECL (error);
	gc_thread = mono_thread_create_internal (mono_domain_get (), (gpointer)finalizer_thread, NULL, MONO_THREAD_CREATE_FLAGS_NONE, error);
	mono_error_assert_ok (error);
}

/**
 * mono_gc_init_finalizer_thread:
 *
 * If the runtime is compiled with --with-lazy-gc-thread-creation, this
 * function must be called by embedders to create the finalizer. Otherwise, the
 * function does nothing and the runtime creates the finalizer thread
 * automatically.
 */
void
mono_gc_init_finalizer_thread (void)
{
#ifndef LAZY_GC_THREAD_CREATION
	/* do nothing */
#else
	init_finalizer_thread ();
#endif
}

static void
reference_queue_mutex_init (void)
{
Expand DownExpand Up@@ -1048,7 +1063,7 @@ mono_gc_init (void)

#ifndef LAZY_GC_THREAD_CREATION
	if (!mono_runtime_get_no_exec ())
mono_gc_init_finalizer_thread ();
init_finalizer_thread ();
#endif
}

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/mono-gc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ MONO_API int mono_gc_invoke_finalizers (void);
/* heap walking is only valid in the pre-stop-world event callback */
MONO_API int mono_gc_walk_heap (int flags, MonoGCReferences callback, void *data);

MONO_API MONO_RT_EXTERNAL_ONLY void
mono_gc_init_finalizer_thread (void);

MONO_END_DECLS

#endif /* __METADATA_MONO_GC_H__ */
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/aot-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@
#include "aot-runtime.h"
#include "jit-icalls.h"
#include "mini-runtime.h"
#include "mono-private-unstable.h"
#include "llvmonly-runtime.h"

#ifndef DISABLE_AOT
Expand Down

10 changes: 0 additions & 10 deletions
src/mono/mono/mini/aot-runtime.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,16 +273,6 @@ gboolean mono_aot_init_llvmonly_method (gpointer amodule, guint32 method_in
GHashTable *mono_aot_get_weak_field_indexes (MonoImage *image);
MonoAotMethodFlags mono_aot_get_method_flags (guint8 *code);

/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void *handle);
MONO_API void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, gpointer user_data);

#ifdef MONO_ARCH_CODE_EXEC_ONLY
typedef guint32 (*MonoAotResolvePltInfoOffset)(gpointer amodule, guint32 plt_entry_index);
#endif
Expand Down

1 change: 0 additions & 1 deletion
src/mono/mono/mini/jit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,6 @@ mono_aot_register_module (void **aot_info);
MONO_API MONO_RT_EXTERNAL_ONLY
MonoDomain* mono_jit_thread_attach (MonoDomain *domain);


MONO_END_DECLS

#endif
Expand Down

12 changes: 11 additions & 1 deletion
src/mono/mono/mini/mono-private-unstable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,17 @@
#define __MONO_JIT_MONO_PRIVATE_UNSTABLE_H__

#include <mono/utils/mono-publib.h>
#include <mono/metadata/image.h>


/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void *handle);
MONO_API MONO_RT_EXTERNAL_ONLY void
mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void* user_data);

#endif /*__MONO_JIT_MONO_PRIVATE_UNSTABLE_H__*/

7 changes: 7 additions & 0 deletions
src/mono/mono/utils/mono-logger.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,9 @@ mono_trace_set_log_handler (MonoLogCallback callback, void *user_data)
{
	g_assert (callback);

	if (level_stack == NULL)
 mono_trace_init ();

	if (logCallback.closer != NULL)
 logCallback.closer();
	UserSuppliedLoggerUserData *ll = (UserSuppliedLoggerUserData*)g_malloc (sizeof (UserSuppliedLoggerUserData));
Expand DownExpand Up@@ -514,6 +517,8 @@ void
mono_trace_set_print_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	print_callback = callback;
	g_set_print_handler (print_handler);
}
Expand All@@ -527,6 +532,8 @@ void
mono_trace_set_printerr_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	printerr_callback = callback;
	g_set_printerr_handler (printerr_handler);
}
Expand Down

10 changes: 2 additions & 8 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,22 +3,17 @@
#include <mono/utils/mono-logger.h>
#include <mono/metadata/assembly.h>
#include <mono/metadata/mono-debug.h>
#include <mono/metadata/mono-gc.h>
#include <mono/metadata/exception.h>
#include <mono/jit/jit.h>
#include <mono/jit/mono-private-unstable.h>

#import <os/log.h>
#include <sys/stat.h>
#include <sys/mman.h>

static os_log_t stdout_log;

/* These are not in public headers */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void **out_handle);
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void *handle);
void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void *user_data);
void mono_trace_init (void);
void mono_gc_init_finalizer_thread (void);

static char *bundle_path;

const char *
Expand DownExpand Up@@ -272,7 +267,6 @@ void mono_ios_setup_execution_mode (void)
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
 mono_install_load_aot_data_hook (load_aot_data, free_aot_data, NULL);
 mono_install_unhandled_exception_hook (unhandled_exception_handler, NULL);
 mono_trace_init ();
 mono_trace_set_log_handler (log_callback, NULL);
 mono_set_signal_chaining (TRUE);
 mono_set_crash_chaining (TRUE);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[mono] Make some API functions public and private#33736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lambdageek
merged 7 commits into

from

Mar 24, 2020
 Merged


[mono] Make some API functions public and private
#33736
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
92290b1

[mini] Move mono_install_load_aot_data_hook to a public header


lambdageek Mar 18, 2020
f8f4419

[gc] Make mono_gc_init_finalizer_thread a public API


lambdageek Mar 18, 2020
a0cc087

[utils] Move mono_trace_init to a public header


lambdageek Mar 18, 2020
9b80efe

Update ios sample


lambdageek Mar 18, 2020
c7cf3af

Revert "[utils] Move mono_trace_init to a public header"


lambdageek Mar 24, 2020
6e3f02f

[utils] init mono_logger in all public API functions


lambdageek Mar 24, 2020
7dfc6ef

[jit] Move mono_install_load_aot_data_hook to mono-private-unstable.h


lambdageek Mar 24, 2020

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


27 changes: 21 additions & 6 deletions
src/mono/mono/metadata/gc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -999,17 +999,32 @@ finalizer_thread (gpointer unused)
	return 0;
}

#ifndef LAZY_GC_THREAD_CREATION
static
#endif
void
mono_gc_init_finalizer_thread (void)
static void
init_finalizer_thread (void)
{
	ERROR_DECL (error);
	gc_thread = mono_thread_create_internal (mono_domain_get (), (gpointer)finalizer_thread, NULL, MONO_THREAD_CREATE_FLAGS_NONE, error);
	mono_error_assert_ok (error);
}

/**
 * mono_gc_init_finalizer_thread:
 *
 * If the runtime is compiled with --with-lazy-gc-thread-creation, this
 * function must be called by embedders to create the finalizer. Otherwise, the
 * function does nothing and the runtime creates the finalizer thread
 * automatically.
 */
void
mono_gc_init_finalizer_thread (void)
{
#ifndef LAZY_GC_THREAD_CREATION
	/* do nothing */
#else
	init_finalizer_thread ();
#endif
}

static void
reference_queue_mutex_init (void)
{
Expand DownExpand Up@@ -1048,7 +1063,7 @@ mono_gc_init (void)

#ifndef LAZY_GC_THREAD_CREATION
	if (!mono_runtime_get_no_exec ())
mono_gc_init_finalizer_thread ();
init_finalizer_thread ();
#endif
}

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/mono-gc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ MONO_API int mono_gc_invoke_finalizers (void);
/* heap walking is only valid in the pre-stop-world event callback */
MONO_API int mono_gc_walk_heap (int flags, MonoGCReferences callback, void *data);

MONO_API MONO_RT_EXTERNAL_ONLY void
mono_gc_init_finalizer_thread (void);

MONO_END_DECLS

#endif /* __METADATA_MONO_GC_H__ */
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/aot-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@
#include "aot-runtime.h"
#include "jit-icalls.h"
#include "mini-runtime.h"
#include "mono-private-unstable.h"
#include "llvmonly-runtime.h"

#ifndef DISABLE_AOT
Expand Down

10 changes: 0 additions & 10 deletions
src/mono/mono/mini/aot-runtime.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,16 +273,6 @@ gboolean mono_aot_init_llvmonly_method (gpointer amodule, guint32 method_in
GHashTable *mono_aot_get_weak_field_indexes (MonoImage *image);
MonoAotMethodFlags mono_aot_get_method_flags (guint8 *code);

/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void *handle);
MONO_API void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, gpointer user_data);

#ifdef MONO_ARCH_CODE_EXEC_ONLY
typedef guint32 (*MonoAotResolvePltInfoOffset)(gpointer amodule, guint32 plt_entry_index);
#endif
Expand Down

1 change: 0 additions & 1 deletion
src/mono/mono/mini/jit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,6 @@ mono_aot_register_module (void **aot_info);
MONO_API MONO_RT_EXTERNAL_ONLY
MonoDomain* mono_jit_thread_attach (MonoDomain *domain);


MONO_END_DECLS

#endif
Expand Down

12 changes: 11 additions & 1 deletion
src/mono/mono/mini/mono-private-unstable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,17 @@
#define __MONO_JIT_MONO_PRIVATE_UNSTABLE_H__

#include <mono/utils/mono-publib.h>
#include <mono/metadata/image.h>


/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void *handle);
MONO_API MONO_RT_EXTERNAL_ONLY void
mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void* user_data);

#endif /*__MONO_JIT_MONO_PRIVATE_UNSTABLE_H__*/

7 changes: 7 additions & 0 deletions
src/mono/mono/utils/mono-logger.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,9 @@ mono_trace_set_log_handler (MonoLogCallback callback, void *user_data)
{
	g_assert (callback);

	if (level_stack == NULL)
 mono_trace_init ();

	if (logCallback.closer != NULL)
 logCallback.closer();
	UserSuppliedLoggerUserData *ll = (UserSuppliedLoggerUserData*)g_malloc (sizeof (UserSuppliedLoggerUserData));
Expand DownExpand Up@@ -514,6 +517,8 @@ void
mono_trace_set_print_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	print_callback = callback;
	g_set_print_handler (print_handler);
}
Expand All@@ -527,6 +532,8 @@ void
mono_trace_set_printerr_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	printerr_callback = callback;
	g_set_printerr_handler (printerr_handler);
}
Expand Down

10 changes: 2 additions & 8 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,22 +3,17 @@
#include <mono/utils/mono-logger.h>
#include <mono/metadata/assembly.h>
#include <mono/metadata/mono-debug.h>
#include <mono/metadata/mono-gc.h>
#include <mono/metadata/exception.h>
#include <mono/jit/jit.h>
#include <mono/jit/mono-private-unstable.h>

#import <os/log.h>
#include <sys/stat.h>
#include <sys/mman.h>

static os_log_t stdout_log;

/* These are not in public headers */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void **out_handle);
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void *handle);
void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void *user_data);
void mono_trace_init (void);
void mono_gc_init_finalizer_thread (void);

static char *bundle_path;

const char *
Expand DownExpand Up@@ -272,7 +267,6 @@ void mono_ios_setup_execution_mode (void)
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
 mono_install_load_aot_data_hook (load_aot_data, free_aot_data, NULL);
 mono_install_unhandled_exception_hook (unhandled_exception_handler, NULL);
 mono_trace_init ();
 mono_trace_set_log_handler (log_callback, NULL);
 mono_set_signal_chaining (TRUE);
 mono_set_crash_chaining (TRUE);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[mono] Make some API functions public and private#33736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lambdageek
merged 7 commits into

from

Mar 24, 2020
 Merged


[mono] Make some API functions public and private
#33736
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
92290b1

[mini] Move mono_install_load_aot_data_hook to a public header


lambdageek Mar 18, 2020
f8f4419

[gc] Make mono_gc_init_finalizer_thread a public API


lambdageek Mar 18, 2020
a0cc087

[utils] Move mono_trace_init to a public header


lambdageek Mar 18, 2020
9b80efe

Update ios sample


lambdageek Mar 18, 2020
c7cf3af

Revert "[utils] Move mono_trace_init to a public header"


lambdageek Mar 24, 2020
6e3f02f

[utils] init mono_logger in all public API functions


lambdageek Mar 24, 2020
7dfc6ef

[jit] Move mono_install_load_aot_data_hook to mono-private-unstable.h


lambdageek Mar 24, 2020

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


27 changes: 21 additions & 6 deletions
src/mono/mono/metadata/gc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -999,17 +999,32 @@ finalizer_thread (gpointer unused)
	return 0;
}

#ifndef LAZY_GC_THREAD_CREATION
static
#endif
void
mono_gc_init_finalizer_thread (void)
static void
init_finalizer_thread (void)
{
	ERROR_DECL (error);
	gc_thread = mono_thread_create_internal (mono_domain_get (), (gpointer)finalizer_thread, NULL, MONO_THREAD_CREATE_FLAGS_NONE, error);
	mono_error_assert_ok (error);
}

/**
 * mono_gc_init_finalizer_thread:
 *
 * If the runtime is compiled with --with-lazy-gc-thread-creation, this
 * function must be called by embedders to create the finalizer. Otherwise, the
 * function does nothing and the runtime creates the finalizer thread
 * automatically.
 */
void
mono_gc_init_finalizer_thread (void)
{
#ifndef LAZY_GC_THREAD_CREATION
	/* do nothing */
#else
	init_finalizer_thread ();
#endif
}

static void
reference_queue_mutex_init (void)
{
Expand DownExpand Up@@ -1048,7 +1063,7 @@ mono_gc_init (void)

#ifndef LAZY_GC_THREAD_CREATION
	if (!mono_runtime_get_no_exec ())
mono_gc_init_finalizer_thread ();
init_finalizer_thread ();
#endif
}

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/mono-gc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ MONO_API int mono_gc_invoke_finalizers (void);
/* heap walking is only valid in the pre-stop-world event callback */
MONO_API int mono_gc_walk_heap (int flags, MonoGCReferences callback, void *data);

MONO_API MONO_RT_EXTERNAL_ONLY void
mono_gc_init_finalizer_thread (void);

MONO_END_DECLS

#endif /* __METADATA_MONO_GC_H__ */
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/aot-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@
#include "aot-runtime.h"
#include "jit-icalls.h"
#include "mini-runtime.h"
#include "mono-private-unstable.h"
#include "llvmonly-runtime.h"

#ifndef DISABLE_AOT
Expand Down

10 changes: 0 additions & 10 deletions
src/mono/mono/mini/aot-runtime.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,16 +273,6 @@ gboolean mono_aot_init_llvmonly_method (gpointer amodule, guint32 method_in
GHashTable *mono_aot_get_weak_field_indexes (MonoImage *image);
MonoAotMethodFlags mono_aot_get_method_flags (guint8 *code);

/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void *handle);
MONO_API void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, gpointer user_data);

#ifdef MONO_ARCH_CODE_EXEC_ONLY
typedef guint32 (*MonoAotResolvePltInfoOffset)(gpointer amodule, guint32 plt_entry_index);
#endif
Expand Down

1 change: 0 additions & 1 deletion
src/mono/mono/mini/jit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,6 @@ mono_aot_register_module (void **aot_info);
MONO_API MONO_RT_EXTERNAL_ONLY
MonoDomain* mono_jit_thread_attach (MonoDomain *domain);


MONO_END_DECLS

#endif
Expand Down

12 changes: 11 additions & 1 deletion
src/mono/mono/mini/mono-private-unstable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,17 @@
#define __MONO_JIT_MONO_PRIVATE_UNSTABLE_H__

#include <mono/utils/mono-publib.h>
#include <mono/metadata/image.h>


/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void *handle);
MONO_API MONO_RT_EXTERNAL_ONLY void
mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void* user_data);

#endif /*__MONO_JIT_MONO_PRIVATE_UNSTABLE_H__*/

7 changes: 7 additions & 0 deletions
src/mono/mono/utils/mono-logger.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,9 @@ mono_trace_set_log_handler (MonoLogCallback callback, void *user_data)
{
	g_assert (callback);

	if (level_stack == NULL)
 mono_trace_init ();

	if (logCallback.closer != NULL)
 logCallback.closer();
	UserSuppliedLoggerUserData *ll = (UserSuppliedLoggerUserData*)g_malloc (sizeof (UserSuppliedLoggerUserData));
Expand DownExpand Up@@ -514,6 +517,8 @@ void
mono_trace_set_print_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	print_callback = callback;
	g_set_print_handler (print_handler);
}
Expand All@@ -527,6 +532,8 @@ void
mono_trace_set_printerr_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	printerr_callback = callback;
	g_set_printerr_handler (printerr_handler);
}
Expand Down

10 changes: 2 additions & 8 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,22 +3,17 @@
#include <mono/utils/mono-logger.h>
#include <mono/metadata/assembly.h>
#include <mono/metadata/mono-debug.h>
#include <mono/metadata/mono-gc.h>
#include <mono/metadata/exception.h>
#include <mono/jit/jit.h>
#include <mono/jit/mono-private-unstable.h>

#import <os/log.h>
#include <sys/stat.h>
#include <sys/mman.h>

static os_log_t stdout_log;

/* These are not in public headers */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void **out_handle);
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void *handle);
void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void *user_data);
void mono_trace_init (void);
void mono_gc_init_finalizer_thread (void);

static char *bundle_path;

const char *
Expand DownExpand Up@@ -272,7 +267,6 @@ void mono_ios_setup_execution_mode (void)
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
 mono_install_load_aot_data_hook (load_aot_data, free_aot_data, NULL);
 mono_install_unhandled_exception_hook (unhandled_exception_handler, NULL);
 mono_trace_init ();
 mono_trace_set_log_handler (log_callback, NULL);
 mono_set_signal_chaining (TRUE);
 mono_set_crash_chaining (TRUE);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[mono] Make some API functions public and private#33736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lambdageek
merged 7 commits into

from

Mar 24, 2020
 Merged


[mono] Make some API functions public and private
#33736
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
92290b1

[mini] Move mono_install_load_aot_data_hook to a public header


lambdageek Mar 18, 2020
f8f4419

[gc] Make mono_gc_init_finalizer_thread a public API


lambdageek Mar 18, 2020
a0cc087

[utils] Move mono_trace_init to a public header


lambdageek Mar 18, 2020
9b80efe

Update ios sample


lambdageek Mar 18, 2020
c7cf3af

Revert "[utils] Move mono_trace_init to a public header"


lambdageek Mar 24, 2020
6e3f02f

[utils] init mono_logger in all public API functions


lambdageek Mar 24, 2020
7dfc6ef

[jit] Move mono_install_load_aot_data_hook to mono-private-unstable.h


lambdageek Mar 24, 2020

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


27 changes: 21 additions & 6 deletions
src/mono/mono/metadata/gc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -999,17 +999,32 @@ finalizer_thread (gpointer unused)
	return 0;
}

#ifndef LAZY_GC_THREAD_CREATION
static
#endif
void
mono_gc_init_finalizer_thread (void)
static void
init_finalizer_thread (void)
{
	ERROR_DECL (error);
	gc_thread = mono_thread_create_internal (mono_domain_get (), (gpointer)finalizer_thread, NULL, MONO_THREAD_CREATE_FLAGS_NONE, error);
	mono_error_assert_ok (error);
}

/**
 * mono_gc_init_finalizer_thread:
 *
 * If the runtime is compiled with --with-lazy-gc-thread-creation, this
 * function must be called by embedders to create the finalizer. Otherwise, the
 * function does nothing and the runtime creates the finalizer thread
 * automatically.
 */
void
mono_gc_init_finalizer_thread (void)
{
#ifndef LAZY_GC_THREAD_CREATION
	/* do nothing */
#else
	init_finalizer_thread ();
#endif
}

static void
reference_queue_mutex_init (void)
{
Expand DownExpand Up@@ -1048,7 +1063,7 @@ mono_gc_init (void)

#ifndef LAZY_GC_THREAD_CREATION
	if (!mono_runtime_get_no_exec ())
mono_gc_init_finalizer_thread ();
init_finalizer_thread ();
#endif
}

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/mono-gc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ MONO_API int mono_gc_invoke_finalizers (void);
/* heap walking is only valid in the pre-stop-world event callback */
MONO_API int mono_gc_walk_heap (int flags, MonoGCReferences callback, void *data);

MONO_API MONO_RT_EXTERNAL_ONLY void
mono_gc_init_finalizer_thread (void);

MONO_END_DECLS

#endif /* __METADATA_MONO_GC_H__ */
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/aot-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@
#include "aot-runtime.h"
#include "jit-icalls.h"
#include "mini-runtime.h"
#include "mono-private-unstable.h"
#include "llvmonly-runtime.h"

#ifndef DISABLE_AOT
Expand Down

10 changes: 0 additions & 10 deletions
src/mono/mono/mini/aot-runtime.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,16 +273,6 @@ gboolean mono_aot_init_llvmonly_method (gpointer amodule, guint32 method_in
GHashTable *mono_aot_get_weak_field_indexes (MonoImage *image);
MonoAotMethodFlags mono_aot_get_method_flags (guint8 *code);

/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void *handle);
MONO_API void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, gpointer user_data);

#ifdef MONO_ARCH_CODE_EXEC_ONLY
typedef guint32 (*MonoAotResolvePltInfoOffset)(gpointer amodule, guint32 plt_entry_index);
#endif
Expand Down

1 change: 0 additions & 1 deletion
src/mono/mono/mini/jit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,6 @@ mono_aot_register_module (void **aot_info);
MONO_API MONO_RT_EXTERNAL_ONLY
MonoDomain* mono_jit_thread_attach (MonoDomain *domain);


MONO_END_DECLS

#endif
Expand Down

12 changes: 11 additions & 1 deletion
src/mono/mono/mini/mono-private-unstable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,17 @@
#define __MONO_JIT_MONO_PRIVATE_UNSTABLE_H__

#include <mono/utils/mono-publib.h>
#include <mono/metadata/image.h>


/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void *handle);
MONO_API MONO_RT_EXTERNAL_ONLY void
mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void* user_data);

#endif /*__MONO_JIT_MONO_PRIVATE_UNSTABLE_H__*/

7 changes: 7 additions & 0 deletions
src/mono/mono/utils/mono-logger.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,9 @@ mono_trace_set_log_handler (MonoLogCallback callback, void *user_data)
{
	g_assert (callback);

	if (level_stack == NULL)
 mono_trace_init ();

	if (logCallback.closer != NULL)
 logCallback.closer();
	UserSuppliedLoggerUserData *ll = (UserSuppliedLoggerUserData*)g_malloc (sizeof (UserSuppliedLoggerUserData));
Expand DownExpand Up@@ -514,6 +517,8 @@ void
mono_trace_set_print_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	print_callback = callback;
	g_set_print_handler (print_handler);
}
Expand All@@ -527,6 +532,8 @@ void
mono_trace_set_printerr_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	printerr_callback = callback;
	g_set_printerr_handler (printerr_handler);
}
Expand Down

10 changes: 2 additions & 8 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,22 +3,17 @@
#include <mono/utils/mono-logger.h>
#include <mono/metadata/assembly.h>
#include <mono/metadata/mono-debug.h>
#include <mono/metadata/mono-gc.h>
#include <mono/metadata/exception.h>
#include <mono/jit/jit.h>
#include <mono/jit/mono-private-unstable.h>

#import <os/log.h>
#include <sys/stat.h>
#include <sys/mman.h>

static os_log_t stdout_log;

/* These are not in public headers */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void **out_handle);
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void *handle);
void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void *user_data);
void mono_trace_init (void);
void mono_gc_init_finalizer_thread (void);

static char *bundle_path;

const char *
Expand DownExpand Up@@ -272,7 +267,6 @@ void mono_ios_setup_execution_mode (void)
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
 mono_install_load_aot_data_hook (load_aot_data, free_aot_data, NULL);
 mono_install_unhandled_exception_hook (unhandled_exception_handler, NULL);
 mono_trace_init ();
 mono_trace_set_log_handler (log_callback, NULL);
 mono_set_signal_chaining (TRUE);
 mono_set_crash_chaining (TRUE);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[mono] Make some API functions public and private#33736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lambdageek
merged 7 commits into

from

Mar 24, 2020
 Merged


[mono] Make some API functions public and private
#33736
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
92290b1

[mini] Move mono_install_load_aot_data_hook to a public header


lambdageek Mar 18, 2020
f8f4419

[gc] Make mono_gc_init_finalizer_thread a public API


lambdageek Mar 18, 2020
a0cc087

[utils] Move mono_trace_init to a public header


lambdageek Mar 18, 2020
9b80efe

Update ios sample


lambdageek Mar 18, 2020
c7cf3af

Revert "[utils] Move mono_trace_init to a public header"


lambdageek Mar 24, 2020
6e3f02f

[utils] init mono_logger in all public API functions


lambdageek Mar 24, 2020
7dfc6ef

[jit] Move mono_install_load_aot_data_hook to mono-private-unstable.h


lambdageek Mar 24, 2020

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


27 changes: 21 additions & 6 deletions
src/mono/mono/metadata/gc.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -999,17 +999,32 @@ finalizer_thread (gpointer unused)
	return 0;
}

#ifndef LAZY_GC_THREAD_CREATION
static
#endif
void
mono_gc_init_finalizer_thread (void)
static void
init_finalizer_thread (void)
{
	ERROR_DECL (error);
	gc_thread = mono_thread_create_internal (mono_domain_get (), (gpointer)finalizer_thread, NULL, MONO_THREAD_CREATE_FLAGS_NONE, error);
	mono_error_assert_ok (error);
}

/**
 * mono_gc_init_finalizer_thread:
 *
 * If the runtime is compiled with --with-lazy-gc-thread-creation, this
 * function must be called by embedders to create the finalizer. Otherwise, the
 * function does nothing and the runtime creates the finalizer thread
 * automatically.
 */
void
mono_gc_init_finalizer_thread (void)
{
#ifndef LAZY_GC_THREAD_CREATION
	/* do nothing */
#else
	init_finalizer_thread ();
#endif
}

static void
reference_queue_mutex_init (void)
{
Expand DownExpand Up@@ -1048,7 +1063,7 @@ mono_gc_init (void)

#ifndef LAZY_GC_THREAD_CREATION
	if (!mono_runtime_get_no_exec ())
mono_gc_init_finalizer_thread ();
init_finalizer_thread ();
#endif
}

Expand Down

3 changes: 3 additions & 0 deletions
src/mono/mono/metadata/mono-gc.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,9 @@ MONO_API int mono_gc_invoke_finalizers (void);
/* heap walking is only valid in the pre-stop-world event callback */
MONO_API int mono_gc_walk_heap (int flags, MonoGCReferences callback, void *data);

MONO_API MONO_RT_EXTERNAL_ONLY void
mono_gc_init_finalizer_thread (void);

MONO_END_DECLS

#endif /* __METADATA_MONO_GC_H__ */
Expand Down

1 change: 1 addition & 0 deletions
src/mono/mono/mini/aot-runtime.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@
#include "aot-runtime.h"
#include "jit-icalls.h"
#include "mini-runtime.h"
#include "mono-private-unstable.h"
#include "llvmonly-runtime.h"

#ifndef DISABLE_AOT
Expand Down

10 changes: 0 additions & 10 deletions
src/mono/mono/mini/aot-runtime.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -273,16 +273,6 @@ gboolean mono_aot_init_llvmonly_method (gpointer amodule, guint32 method_in
GHashTable *mono_aot_get_weak_field_indexes (MonoImage *image);
MonoAotMethodFlags mono_aot_get_method_flags (guint8 *code);

/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, gpointer user_data, void *handle);
MONO_API void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, gpointer user_data);

#ifdef MONO_ARCH_CODE_EXEC_ONLY
typedef guint32 (*MonoAotResolvePltInfoOffset)(gpointer amodule, guint32 plt_entry_index);
#endif
Expand Down

1 change: 0 additions & 1 deletion
src/mono/mono/mini/jit.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -112,7 +112,6 @@ mono_aot_register_module (void **aot_info);
MONO_API MONO_RT_EXTERNAL_ONLY
MonoDomain* mono_jit_thread_attach (MonoDomain *domain);


MONO_END_DECLS

#endif
Expand Down

12 changes: 11 additions & 1 deletion
src/mono/mono/mini/mono-private-unstable.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,17 @@
#define __MONO_JIT_MONO_PRIVATE_UNSTABLE_H__

#include <mono/utils/mono-publib.h>
#include <mono/metadata/image.h>


/* These are used to load the AOT data for aot images compiled with MONO_AOT_FILE_FLAG_SEPARATE_DATA */
/*
 * Return the AOT data for ASSEMBLY. SIZE is the size of the data. OUT_HANDLE should be set to a handle which is later
 * passed to the free function.
 */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void **out_handle);
/* Not yet used */
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void* user_data, void *handle);
MONO_API MONO_RT_EXTERNAL_ONLY void
mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void* user_data);

#endif /*__MONO_JIT_MONO_PRIVATE_UNSTABLE_H__*/

7 changes: 7 additions & 0 deletions
src/mono/mono/utils/mono-logger.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -449,6 +449,9 @@ mono_trace_set_log_handler (MonoLogCallback callback, void *user_data)
{
	g_assert (callback);

	if (level_stack == NULL)
 mono_trace_init ();

	if (logCallback.closer != NULL)
 logCallback.closer();
	UserSuppliedLoggerUserData *ll = (UserSuppliedLoggerUserData*)g_malloc (sizeof (UserSuppliedLoggerUserData));
Expand DownExpand Up@@ -514,6 +517,8 @@ void
mono_trace_set_print_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	print_callback = callback;
	g_set_print_handler (print_handler);
}
Expand All@@ -527,6 +532,8 @@ void
mono_trace_set_printerr_handler (MonoPrintCallback callback)
{
	g_assert (callback);
	if (level_stack == NULL)
 mono_trace_init ();
	printerr_callback = callback;
	g_set_printerr_handler (printerr_handler);
}
Expand Down

10 changes: 2 additions & 8 deletions
src/mono/netcore/sample/iOS/runtime.m

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,22 +3,17 @@
#include <mono/utils/mono-logger.h>
#include <mono/metadata/assembly.h>
#include <mono/metadata/mono-debug.h>
#include <mono/metadata/mono-gc.h>
#include <mono/metadata/exception.h>
#include <mono/jit/jit.h>
#include <mono/jit/mono-private-unstable.h>

#import <os/log.h>
#include <sys/stat.h>
#include <sys/mman.h>

static os_log_t stdout_log;

/* These are not in public headers */
typedef unsigned char* (*MonoLoadAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void **out_handle);
typedef void (*MonoFreeAotDataFunc) (MonoAssembly *assembly, int size, void *user_data, void *handle);
void mono_install_load_aot_data_hook (MonoLoadAotDataFunc load_func, MonoFreeAotDataFunc free_func, void *user_data);
void mono_trace_init (void);
void mono_gc_init_finalizer_thread (void);

static char *bundle_path;

const char *
Expand DownExpand Up@@ -272,7 +267,6 @@ void mono_ios_setup_execution_mode (void)
 mono_install_assembly_preload_hook (assembly_preload_hook, NULL);
 mono_install_load_aot_data_hook (load_aot_data, free_aot_data, NULL);
 mono_install_unhandled_exception_hook (unhandled_exception_handler, NULL);
 mono_trace_init ();
 mono_trace_set_log_handler (log_callback, NULL);
 mono_set_signal_chaining (TRUE);
 mono_set_crash_chaining (TRUE);
Expand Down