Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
index 5d36ffc..bbd7516 100644 (file)
--- a/drivers/oprofile/oprofile_files.c
+++ b/drivers/oprofile/oprofile_files.c
@@ -9,6 +9,7 @@
 
 #include <linux/fs.h>
 #include <linux/oprofile.h>
+#include <linux/jiffies.h>
 
 #include "event_buffer.h"
 #include "oprofile_stats.h"
@@ -17,10 +18,51 @@
 #define BUFFER_SIZE_DEFAULT            131072
 #define CPU_BUFFER_SIZE_DEFAULT                8192
 #define BUFFER_WATERSHED_DEFAULT       32768   /* FIXME: tune */
+#define TIME_SLICE_DEFAULT             1
 
 unsigned long oprofile_buffer_size;
 unsigned long oprofile_cpu_buffer_size;
 unsigned long oprofile_buffer_watershed;
+unsigned long oprofile_time_slice;
+
+#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
+
+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(oprofile_time_slice),
+                                       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,
+};
+
+#endif
+
 
 static ssize_t depth_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
 {
@@ -129,6 +171,7 @@ void oprofile_create_files(struct super_block *sb, struct dentry *root)
        oprofile_buffer_size =          BUFFER_SIZE_DEFAULT;
        oprofile_cpu_buffer_size =      CPU_BUFFER_SIZE_DEFAULT;
        oprofile_buffer_watershed =     BUFFER_WATERSHED_DEFAULT;
+       oprofile_time_slice =           msecs_to_jiffies(TIME_SLICE_DEFAULT);
 
        oprofilefs_create_file(sb, root, "enable", &enable_fops);
        oprofilefs_create_file_perm(sb, root, "dump", &dump_fops, 0666);
@@ -139,6 +182,9 @@ 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);
+#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
+       oprofilefs_create_file(sb, root, "time_slice", &timeout_fops);
+#endif
        oprofile_create_stats_files(sb, root);
        if (oprofile_ops.create_files)
                oprofile_ops.create_files(sb, root);