oprofile: making add_sample_entry() inline

[safe/jmp/linux-2.6] / drivers / oprofile / oprof.c

diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
index b3f1cd6..3cffce9 100644 (file)
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -12,20 +12,20 @@
 #include <linux/init.h>
 #include <linux/oprofile.h>
 #include <linux/moduleparam.h>
-#include <asm/semaphore.h>
+#include <asm/mutex.h>
 
 #include "oprof.h"
 #include "event_buffer.h"
 #include "cpu_buffer.h"
 #include "buffer_sync.h"
 #include "oprofile_stats.h"
- 
+
 struct oprofile_operations oprofile_ops;
 
 unsigned long oprofile_started;
-unsigned long backtrace_depth;
+unsigned long oprofile_backtrace_depth;
 static unsigned long is_setup;
-static DECLARE_MUTEX(start_sem);
+static DEFINE_MUTEX(start_mutex);
 
 /* timer
    0 - use performance monitoring hardware if available
@@ -36,30 +36,45 @@ static int timer = 0;
 int oprofile_setup(void)
 {
        int err;
- 
-       down(&start_sem);
+
+       mutex_lock(&start_mutex);
 
        if ((err = alloc_cpu_buffers()))
                goto out;
 
        if ((err = alloc_event_buffer()))
                goto out1;
- 
+
        if (oprofile_ops.setup && (err = oprofile_ops.setup()))
                goto out2;
- 
+
        /* Note even though this starts part of the
         * profiling overhead, it's necessary to prevent
         * us missing task deaths and eventually oopsing
         * when trying to process the event buffer.
         */
+       if (oprofile_ops.sync_start) {
+               int sync_ret = oprofile_ops.sync_start();
+               switch (sync_ret) {
+               case 0:
+                       goto post_sync;
+               case 1:
+                       goto do_generic;
+               case -1:
+                       goto out3;
+               default:
+                       goto out3;
+               }
+       }
+do_generic:
        if ((err = sync_start()))
                goto out3;
 
+post_sync:
        is_setup = 1;
-       up(&start_sem);
+       mutex_unlock(&start_mutex);
        return 0;
- 
+
 out3:
        if (oprofile_ops.shutdown)
                oprofile_ops.shutdown();
@@ -68,7 +83,7 @@ out2:
 out1:
        free_cpu_buffers();
 out:
-       up(&start_sem);
+       mutex_unlock(&start_mutex);
        return err;
 }
 
@@ -77,17 +92,17 @@ out:
 int oprofile_start(void)
 {
        int err = -EINVAL;
- 
-       down(&start_sem);
- 
+
+       mutex_lock(&start_mutex);
+
        if (!is_setup)
                goto out;
 
-       err = 0; 
- 
+       err = 0;
+
        if (oprofile_started)
                goto out;
- 
+
        oprofile_reset_stats();
 
        if ((err = oprofile_ops.start()))
@@ -95,15 +110,15 @@ int oprofile_start(void)
 
        oprofile_started = 1;
 out:
-       up(&start_sem); 
+       mutex_unlock(&start_mutex);
        return err;
 }
 
- 
+
 /* echo 0>/dev/oprofile/enable */
 void oprofile_stop(void)
 {
-       down(&start_sem);
+       mutex_lock(&start_mutex);
        if (!oprofile_started)
                goto out;
        oprofile_ops.stop();
@@ -111,20 +126,33 @@ void oprofile_stop(void)
        /* wake up the daemon to read what remains */
        wake_up_buffer_waiter();
 out:
-       up(&start_sem);
+       mutex_unlock(&start_mutex);
 }
 
 
 void oprofile_shutdown(void)
 {
-       down(&start_sem);
+       mutex_lock(&start_mutex);
+       if (oprofile_ops.sync_stop) {
+               int sync_ret = oprofile_ops.sync_stop();
+               switch (sync_ret) {
+               case 0:
+                       goto post_sync;
+               case 1:
+                       goto do_generic;
+               default:
+                       goto post_sync;
+               }
+       }
+do_generic:
        sync_stop();
+post_sync:
        if (oprofile_ops.shutdown)
                oprofile_ops.shutdown();
        is_setup = 0;
        free_event_buffer();
        free_cpu_buffers();
-       up(&start_sem);
+       mutex_unlock(&start_mutex);
 }
 
 
@@ -132,7 +160,7 @@ int oprofile_set_backtrace(unsigned long val)
 {
        int err = 0;
 
-       down(&start_sem);
+       mutex_lock(&start_mutex);
 
        if (oprofile_started) {
                err = -EBUSY;
@@ -144,10 +172,10 @@ int oprofile_set_backtrace(unsigned long val)
                goto out;
        }
 
-       backtrace_depth = val;
+       oprofile_backtrace_depth = val;
 
 out:
-       up(&start_sem);
+       mutex_unlock(&start_mutex);
        return err;
 }
 
@@ -176,13 +204,13 @@ static void __exit oprofile_exit(void)
        oprofile_arch_exit();
 }
 
- 
+
 module_init(oprofile_init);
 module_exit(oprofile_exit);
 
 module_param_named(timer, timer, int, 0644);
 MODULE_PARM_DESC(timer, "force use of timer interrupt");
- 
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("John Levon <levon@movementarian.org>");
 MODULE_DESCRIPTION("OProfile system profiler");