[profiler] fixes to profiler sample

- Fix the Linux build instructions.
- Remove eglib dependencies, as they complicate the build of an
  extenral module.
- Make instance static instead of heap-allocated.
- Make the call counter 64 bits.
- Adjustments to accommodate the new profiling API.

diff --git a/samples/profiler/sample.c b/samples/profiler/sample.c
index a2953eacbc5dbabbb57afe3ee5e5ddcaa78c82fd..a5ee4435ea6843b554b986cf344e6276d833619d 100644 (file)
--- a/samples/profiler/sample.c
+++ b/samples/profiler/sample.c
@@ -3,10 +3,13 @@
 /*
  * Bare bones profiler. Compile with:
  * 
- * linux : gcc -shared -o mono-profiler-sample.so sample.c `pkg-config --cflags --libs mono`
+ * linux : gcc -fPIC -shared -o libmono-profiler-sample.so sample.c `pkg-config --cflags --libs mono-2`
  * mac : gcc sample.c -o mono-profiler-sample.dylib -Dmono_free=free -lz `pkg-config --cflags mono-2` -undefined suppress -flat_namespace  
+ * linux with a custom prefix (e.g. --prefix=/opt/my-mono-build):
+ *     gcc -fPIC -shared -o libmono-profiler-sample.so sample.c `PKG_CONFIG_PATH=/opt/my-mono-build/lib/pkgconfig/ pkg-config --cflags --libs mono-2`
  *
- * Install the binary where the dynamic loader can find it. eg /usr/lib etc
+ * Install the binary where the dynamic loader can find it. eg /usr/lib etc.
+ * For a custom prefix build, <prefix>/lib would also work.
  * Then run mono with:
  * mono --profile=sample your_application.exe
  *
@@ -14,24 +17,26 @@
  */
 
 struct _MonoProfiler {
-       int ncalls;
+       unsigned long long ncalls;
 };
 
+static MonoProfiler prof_instance;
+
 /* called at the end of the program */
 static void
 sample_shutdown (MonoProfiler *prof)
 {
-       g_print ("total number of calls: %d\n", prof->ncalls);
+       printf("total number of calls: %llu\n", prof->ncalls);
 }
 
 static void
-sample_method_enter (MonoProfiler *prof, MonoMethod *method)
+sample_method_enter (MonoProfiler *prof, MonoMethod *method, MonoProfilerCallContext *ctx)
 {
        prof->ncalls++;
 }
 
 static void
-sample_method_leave (MonoProfiler *prof, MonoMethod *method)
+sample_method_leave (MonoProfiler *prof, MonoMethod *method, MonoProfilerCallContext *ctx)
 {
 }
 
@@ -45,12 +50,10 @@ sample_instrumentation_filter (MonoProfiler *prof, MonoMethod *method)
 void
 mono_profiler_init_sample (const char *desc)
 {
-       MonoProfiler *prof;
-
-       prof = g_new0 (MonoProfiler, 1);
+       MonoProfiler *prof = &prof_instance;
 
        MonoProfilerHandle handle = mono_profiler_create (prof);
-       mono_profiler_set_runtime_shutdown_callback (handle, sample_shutdown);
+       mono_profiler_set_runtime_shutdown_end_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);
        mono_profiler_set_method_leave_callback (handle, sample_method_leave);