mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Revert "Oprofile Multiplexing Patch"
Reverting commit 1a960b402a for the main
branch. Multiplexing will be tracked on a separate feature branch.
Conflicts:
arch/x86/oprofile/nmi_int.c
This commit is contained in:
Robert Richter
parent
45f197ade7
commit
4c168eaf7e
10 changed files with 45 additions and 247 deletions
|
|
@ -12,8 +12,6 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/oprofile.h>
|
||||
#include <linux/moduleparam.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/time.h>
|
||||
#include <asm/mutex.h>
|
||||
|
||||
#include "oprof.h"
|
||||
|
|
@ -21,18 +19,13 @@
|
|||
#include "cpu_buffer.h"
|
||||
#include "buffer_sync.h"
|
||||
#include "oprofile_stats.h"
|
||||
|
||||
static unsigned long is_setup;
|
||||
static void switch_worker(struct work_struct *work);
|
||||
static DECLARE_DELAYED_WORK(switch_work, switch_worker);
|
||||
static DEFINE_MUTEX(start_mutex);
|
||||
|
||||
struct oprofile_operations oprofile_ops;
|
||||
|
||||
unsigned long timeout_jiffies;
|
||||
unsigned long oprofile_started;
|
||||
unsigned long backtrace_depth;
|
||||
/* Multiplexing defaults at 1 msec*/
|
||||
static unsigned long is_setup;
|
||||
static DEFINE_MUTEX(start_mutex);
|
||||
|
||||
/* timer
|
||||
0 - use performance monitoring hardware if available
|
||||
|
|
@ -94,16 +87,6 @@ out:
|
|||
return err;
|
||||
}
|
||||
|
||||
static void start_switch_worker(void)
|
||||
{
|
||||
schedule_delayed_work(&switch_work, timeout_jiffies);
|
||||
}
|
||||
|
||||
static void switch_worker(struct work_struct *work)
|
||||
{
|
||||
if (!oprofile_ops.switch_events())
|
||||
start_switch_worker();
|
||||
}
|
||||
|
||||
/* Actually start profiling (echo 1>/dev/oprofile/enable) */
|
||||
int oprofile_start(void)
|
||||
|
|
@ -111,6 +94,7 @@ int oprofile_start(void)
|
|||
int err = -EINVAL;
|
||||
|
||||
mutex_lock(&start_mutex);
|
||||
|
||||
if (!is_setup)
|
||||
goto out;
|
||||
|
||||
|
|
@ -124,9 +108,6 @@ int oprofile_start(void)
|
|||
if ((err = oprofile_ops.start()))
|
||||
goto out;
|
||||
|
||||
if (oprofile_ops.switch_events)
|
||||
start_switch_worker();
|
||||
|
||||
oprofile_started = 1;
|
||||
out:
|
||||
mutex_unlock(&start_mutex);
|
||||
|
|
@ -142,7 +123,6 @@ void oprofile_stop(void)
|
|||
goto out;
|
||||
oprofile_ops.stop();
|
||||
oprofile_started = 0;
|
||||
cancel_delayed_work_sync(&switch_work);
|
||||
/* wake up the daemon to read what remains */
|
||||
wake_up_buffer_waiter();
|
||||
out:
|
||||
|
|
@ -175,32 +155,6 @@ post_sync:
|
|||
mutex_unlock(&start_mutex);
|
||||
}
|
||||
|
||||
/* User inputs in ms, converts to jiffies */
|
||||
int oprofile_set_timeout(unsigned long val_msec)
|
||||
{
|
||||
int err = 0;
|
||||
|
||||
mutex_lock(&start_mutex);
|
||||
|
||||
if (oprofile_started) {
|
||||
err = -EBUSY;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!oprofile_ops.switch_events) {
|
||||
err = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
timeout_jiffies = msecs_to_jiffies(val_msec);
|
||||
if (timeout_jiffies == MAX_JIFFY_OFFSET)
|
||||
timeout_jiffies = msecs_to_jiffies(1);
|
||||
|
||||
out:
|
||||
mutex_unlock(&start_mutex);
|
||||
return err;
|
||||
|
||||
}
|
||||
|
||||
int oprofile_set_backtrace(unsigned long val)
|
||||
{
|
||||
|
|
@ -225,16 +179,10 @@ out:
|
|||
return err;
|
||||
}
|
||||
|
||||
static void __init oprofile_switch_timer_init(void)
|
||||
{
|
||||
timeout_jiffies = msecs_to_jiffies(1);
|
||||
}
|
||||
|
||||
static int __init oprofile_init(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
oprofile_switch_timer_init();
|
||||
err = oprofile_arch_init(&oprofile_ops);
|
||||
|
||||
if (err < 0 || timer) {
|
||||
|
|
|
|||
|
|
@ -27,8 +27,7 @@ extern unsigned long fs_buffer_watershed;
|
|||
extern struct oprofile_operations oprofile_ops;
|
||||
extern unsigned long oprofile_started;
|
||||
extern unsigned long backtrace_depth;
|
||||
extern unsigned long timeout_jiffies;
|
||||
|
||||
|
||||
struct super_block;
|
||||
struct dentry;
|
||||
|
||||
|
|
@ -36,6 +35,5 @@ void oprofile_create_files(struct super_block * sb, struct dentry * root);
|
|||
void oprofile_timer_init(struct oprofile_operations * ops);
|
||||
|
||||
int oprofile_set_backtrace(unsigned long depth);
|
||||
int oprofile_set_timeout(unsigned long time);
|
||||
|
||||
#endif /* OPROF_H */
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
|
||||
#include <linux/fs.h>
|
||||
#include <linux/oprofile.h>
|
||||
#include <linux/jiffies.h>
|
||||
|
||||
#include "event_buffer.h"
|
||||
#include "oprofile_stats.h"
|
||||
|
|
@ -19,40 +18,6 @@ unsigned long fs_buffer_size = 131072;
|
|||
unsigned long fs_cpu_buffer_size = 8192;
|
||||
unsigned long fs_buffer_watershed = 32768; /* FIXME: tune */
|
||||
|
||||
static ssize_t timeout_read(struct file *file, char __user *buf,
|
||||
size_t count, loff_t *offset)
|
||||
{
|
||||
return oprofilefs_ulong_to_user(jiffies_to_msecs(timeout_jiffies),
|
||||
buf, count, offset);
|
||||
}
|
||||
|
||||
|
||||
static ssize_t timeout_write(struct file *file, char const __user *buf,
|
||||
size_t count, loff_t *offset)
|
||||
{
|
||||
unsigned long val;
|
||||
int retval;
|
||||
|
||||
if (*offset)
|
||||
return -EINVAL;
|
||||
|
||||
retval = oprofilefs_ulong_from_user(&val, buf, count);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
retval = oprofile_set_timeout(val);
|
||||
|
||||
if (retval)
|
||||
return retval;
|
||||
return count;
|
||||
}
|
||||
|
||||
static const struct file_operations timeout_fops = {
|
||||
.read = timeout_read,
|
||||
.write = timeout_write,
|
||||
};
|
||||
|
||||
|
||||
static ssize_t depth_read(struct file * file, char __user * buf, size_t count, loff_t * offset)
|
||||
{
|
||||
return oprofilefs_ulong_to_user(backtrace_depth, buf, count, offset);
|
||||
|
|
@ -120,10 +85,11 @@ static ssize_t enable_write(struct file * file, char const __user * buf, size_t
|
|||
|
||||
if (*offset)
|
||||
return -EINVAL;
|
||||
|
||||
retval = oprofilefs_ulong_from_user(&val, buf, count);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
|
||||
if (val)
|
||||
retval = oprofile_start();
|
||||
else
|
||||
|
|
@ -163,7 +129,6 @@ void oprofile_create_files(struct super_block * sb, struct dentry * root)
|
|||
oprofilefs_create_file(sb, root, "cpu_type", &cpu_type_fops);
|
||||
oprofilefs_create_file(sb, root, "backtrace_depth", &depth_fops);
|
||||
oprofilefs_create_file(sb, root, "pointer_size", &pointer_size_fops);
|
||||
oprofilefs_create_file(sb, root, "timeout_ms", &timeout_fops);
|
||||
oprofile_create_stats_files(sb, root);
|
||||
if (oprofile_ops.create_files)
|
||||
oprofile_ops.create_files(sb, root);
|
||||
|
|
|
|||
Loading…
Reference in a new issue