Commit-ID: a5659d17adb815fb35e11745e2f39c3f0bfd579f
Gitweb: http://git.kernel.org/tip/a5659d17adb815fb35e11745e2f39c3f0bfd579f
Author: Robert Richter <robert.richter@xxxxxxx>
AuthorDate: Fri, 19 Jun 2009 16:45:34 +0200
Committer: Robert Richter <robert.richter@xxxxxxx>
CommitDate: Mon, 20 Jul 2009 16:43:19 +0200
oprofile: Grouping multiplexing code in oprof.c
This patch moves multiplexing code to a single section of code. This
reduces the use of #ifdefs especially within functions.
Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
---
drivers/oprofile/oprof.c | 100 ++++++++++++++++++++++-----------------------
1 files changed, 49 insertions(+), 51 deletions(-)
diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
index fa6cccd..a48294a 100644
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -29,13 +29,6 @@ unsigned long oprofile_backtrace_depth;
static unsigned long is_setup;
static DEFINE_MUTEX(start_mutex);
-#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
-
-static void switch_worker(struct work_struct *work);
-static DECLARE_DELAYED_WORK(switch_work, switch_worker);
-
-#endif
-
/* timer
0 - use performance monitoring hardware if available
1 - use the timer int mechanism regardless
@@ -98,9 +91,18 @@ out:
#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
+static void switch_worker(struct work_struct *work);
+static DECLARE_DELAYED_WORK(switch_work, switch_worker);
+
static void start_switch_worker(void)
{
- schedule_delayed_work(&switch_work, oprofile_time_slice);
+ if (oprofile_ops.switch_events)
+ schedule_delayed_work(&switch_work, oprofile_time_slice);
+}
+
+static void stop_switch_worker(void)
+{
+ cancel_delayed_work_sync(&switch_work);
}
static void switch_worker(struct work_struct *work)
@@ -109,6 +111,43 @@ static void switch_worker(struct work_struct *work)
start_switch_worker();
}
+/* User inputs in ms, converts to jiffies */
+int oprofile_set_timeout(unsigned long val_msec)
+{
+ int err = 0;
+ unsigned long time_slice;
+
+ mutex_lock(&start_mutex);
+
+ if (oprofile_started) {
+ err = -EBUSY;
+ goto out;
+ }
+
+ if (!oprofile_ops.switch_events) {
+ err = -EINVAL;
+ goto out;
+ }
+
+ time_slice = msecs_to_jiffies(val_msec);
+ if (time_slice == MAX_JIFFY_OFFSET) {
+ err = -EINVAL;
+ goto out;
+ }
+
+ oprofile_time_slice = time_slice;
+
+out:
+ mutex_unlock(&start_mutex);
+ return err;
+
+}
+
+#else
+
+static inline void start_switch_worker(void) { }
+static inline void stop_switch_worker(void) { }
+
#endif
/* Actually start profiling (echo 1>/dev/oprofile/enable) */
@@ -131,10 +170,7 @@ int oprofile_start(void)
if ((err = oprofile_ops.start()))
goto out;
-#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
- if (oprofile_ops.switch_events)
- start_switch_worker();
-#endif
+ start_switch_worker();
oprofile_started = 1;
out:
@@ -152,9 +188,7 @@ void oprofile_stop(void)
oprofile_ops.stop();
oprofile_started = 0;
-#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
- cancel_delayed_work_sync(&switch_work);
-#endif
+ stop_switch_worker();
/* wake up the daemon to read what remains */
wake_up_buffer_waiter();
@@ -188,42 +222,6 @@ post_sync:
mutex_unlock(&start_mutex);
}
-#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
-
-/* User inputs in ms, converts to jiffies */
-int oprofile_set_timeout(unsigned long val_msec)
-{
- int err = 0;
- unsigned long time_slice;
-
- mutex_lock(&start_mutex);
-
- if (oprofile_started) {
- err = -EBUSY;
- goto out;
- }
-
- if (!oprofile_ops.switch_events) {
- err = -EINVAL;
- goto out;
- }
-
- time_slice = msecs_to_jiffies(val_msec);
- if (time_slice == MAX_JIFFY_OFFSET) {
- err = -EINVAL;
- goto out;
- }
-
- oprofile_time_slice = time_slice;
-
-out:
- mutex_unlock(&start_mutex);
- return err;
-
-}
-
-#endif
-
int oprofile_set_backtrace(unsigned long val)
{
int err = 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|