[profiler] Rename mono_profiler_install to mono_profiler_create.

9 files changed, 10 insertions, 17 deletions

diff --git a/mono/metadata/profiler.c b/mono/metadata/profiler.c
index 33bac7e505c..ccdb022a14f 100644
--- a/mono/metadata/profiler.c
+++ b/mono/metadata/profiler.c
@@ -145,7 +145,7 @@ mono_profiler_load (const char *desc)
 }
 
 MonoProfilerHandle
-mono_profiler_install (MonoProfiler *prof)
+mono_profiler_create (MonoProfiler *prof)
 {
 	MonoProfilerHandle handle = g_new0 (struct _MonoProfilerDesc, 1);
 
diff --git a/mono/metadata/profiler.h b/mono/metadata/profiler.h
index 5063431bc8b..0bbc0fe0061 100644
--- a/mono/metadata/profiler.h
+++ b/mono/metadata/profiler.h
@@ -54,12 +54,12 @@ typedef struct _MonoProfilerDesc *MonoProfilerHandle;
  * };
  *
  * MonoProfiler *prof = calloc (1, sizeof (MonoProfiler));
- * MonoProfilerHandle handle = mono_profiler_install (prof);
+ * MonoProfilerHandle handle = mono_profiler_create (prof);
  * mono_profiler_set_shutdown_callback (handle, my_shutdown_cb);
  *
  * This function is not async safe.
  */
-MONO_API MonoProfilerHandle mono_profiler_install (MonoProfiler *prof);
+MONO_API MonoProfilerHandle mono_profiler_create (MonoProfiler *prof);
 
 typedef mono_bool (*MonoProfilerCoverageFilterCallback) (MonoProfiler *prof, MonoMethod *method);
 
diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
index 102158e4fda..b625580c1fe 100644
--- a/mono/mini/debugger-agent.c
+++ b/mono/mini/debugger-agent.c
@@ -595,11 +595,6 @@ typedef struct {
 	MonoClass *klass;
 } EventInfo;
 
-/* Dummy structure used for the profiler callbacks */
-typedef struct {
-	void* dummy;
-} DebuggerProfiler;
-
 typedef struct {
 	guint8 *buf, *p, *end;
 } Buffer;
@@ -700,8 +695,6 @@ static MonoCoopCond debugger_thread_exited_cond;
 /* Mutex for the cond var above */
 static MonoCoopMutex debugger_thread_exited_mutex;
 
-static DebuggerProfiler debugger_profiler;
-
 /* The single step request instance */
 static SingleStepReq *ss_req;
 
@@ -999,7 +992,7 @@ mono_debugger_agent_init (void)
 	mono_coop_mutex_init (&debugger_thread_exited_mutex);
 	mono_coop_cond_init (&debugger_thread_exited_cond);
 
-	MonoProfilerHandle prof = mono_profiler_install ((MonoProfiler*)&debugger_profiler);
+	MonoProfilerHandle prof = mono_profiler_create (NULL);
 	mono_profiler_set_runtime_shutdown_end_callback (prof, runtime_shutdown);
 	mono_profiler_set_runtime_initialized_callback (prof, runtime_initialized);
 	mono_profiler_set_domain_loaded_callback (prof, appdomain_load);
diff --git a/mono/profiler/aot.c b/mono/profiler/aot.c
index 49980d9ccd9..ea2dc1b23fa 100644
--- a/mono/profiler/aot.c
+++ b/mono/profiler/aot.c
@@ -167,7 +167,7 @@ mono_profiler_init_aot (const char *desc)
 
 	mono_os_mutex_init (&mutex);
 
-	MonoProfilerHandle handle = mono_profiler_install (prof);
+	MonoProfilerHandle handle = mono_profiler_create (prof);
 	mono_profiler_set_runtime_shutdown_end_callback (handle, prof_shutdown);
 	mono_profiler_set_jit_done_callback (handle, prof_jit_leave);
 }
diff --git a/mono/profiler/iomap.c b/mono/profiler/iomap.c
index c2b48fa3ee3..b2ce8871001 100644
--- a/mono/profiler/iomap.c
+++ b/mono/profiler/iomap.c
@@ -540,7 +540,7 @@ void mono_profiler_init_iomap (const char *desc)
 	prof->saved_strings_hash = g_hash_table_new (NULL, NULL);
 	prof->string_locations_hash = g_hash_table_new (mismatched_files_guint32_hash, mismatched_files_guint32_equal);
 
-	MonoProfilerHandle handle = mono_profiler_install (prof);
+	MonoProfilerHandle handle = mono_profiler_create (prof);
 	mono_profiler_set_runtime_shutdown_end_callback (handle, profiler_shutdown);
 	mono_profiler_set_runtime_initialized_callback (handle, runtime_initialized_cb);
 	mono_profiler_set_iomap_report_callback (handle, mono_portability_iomap_event);
diff --git a/mono/profiler/log.c b/mono/profiler/log.c
index acf02fc3c6a..ed7a2122659 100644
--- a/mono/profiler/log.c
+++ b/mono/profiler/log.c
@@ -4653,7 +4653,7 @@ mono_profiler_init_log (const char *desc)
 
 	mono_lls_init (&log_profiler.profiler_thread_list, NULL);
 
-	MonoProfilerHandle handle = log_profiler.handle = mono_profiler_install (&log_profiler);
+	MonoProfilerHandle handle = log_profiler.handle = mono_profiler_create (&log_profiler);
 
 	/*
 	 * Required callbacks. These are either necessary for the profiler itself
diff --git a/mono/profiler/vtune.c b/mono/profiler/vtune.c
index 1f06bb81c8b..e372724393b 100644
--- a/mono/profiler/vtune.c
+++ b/mono/profiler/vtune.c
@@ -166,7 +166,7 @@ mono_profiler_init_vtune (const char *desc)
 	iJIT_IsProfilingActiveFlags flags = iJIT_IsProfilingActive();
 	if (flags == iJIT_SAMPLING_ON)
 	{
-		MonoProfilerHandle handle = mono_profiler_install (NULL);
+		MonoProfilerHandle handle = mono_profiler_create (NULL);
 		mono_profiler_set_runtime_shutdown_end_callback (handle, codeanalyst_shutdown);
 		mono_profiler_set_jit_done_callback (handle, method_jit_done);
 		mono_profiler_set_jit_code_buffer_callback (handle, code_buffer_new);
diff --git a/samples/profiler/sample.c b/samples/profiler/sample.c
index bd0ee4f552f..a2953eacbc5 100644
--- a/samples/profiler/sample.c
+++ b/samples/profiler/sample.c
@@ -49,7 +49,7 @@ mono_profiler_init_sample (const char *desc)
 
 	prof = g_new0 (MonoProfiler, 1);
 
-	MonoProfilerHandle handle = mono_profiler_install (prof);
+	MonoProfilerHandle handle = mono_profiler_create (prof);
 	mono_profiler_set_runtime_shutdown_callback (handle, sample_shutdown);
 	mono_profiler_set_call_instrumentation_filter_callback (handle, sample_instrumentation_filter);
 	mono_profiler_set_method_enter_callback (handle, sample_method_enter);
diff --git a/samples/size/size.c b/samples/size/size.c
index 40edb321a0a..a0f2690f6d9 100644
--- a/samples/size/size.c
+++ b/samples/size/size.c
@@ -133,6 +133,6 @@ void install_icall (MonoProfiler *prof, MonoMethod *method, MonoJitInfo* jinfo)
 void
 mono_profiler_init_size (const char *desc)
 {
-	MonoProfilerHandle handle = mono_profiler_install (NULL);
+	MonoProfilerHandle handle = mono_profiler_create (NULL);
 	mono_profiler_set_jit_done_callback (handle, install_icall);
 }