Litmus core: refactor the implementation of /proc

1 files changed, 2 insertions, 311 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index 3b73b39ffbbf..99c35ac99870 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -19,6 +19,8 @@
 
 #include <litmus/rt_domain.h>
 
+#include <litmus/litmus_proc.h>
+
 /* Number of RT tasks that exist in the system */
 atomic_t rt_task_count          = ATOMIC_INIT(0);
 static DEFINE_RAW_SPINLOCK(task_transition_lock);
@@ -505,317 +507,6 @@ static struct sysrq_key_op sysrq_kill_rt_tasks_op = {
 };
 #endif
 
-/* in litmus/sync.c */
-int count_tasks_waiting_for_release(void);
-
-static int proc_read_stats(char *page, char **start,
-                           off_t off, int count,
-                           int *eof, void *data)
-{
-        int len;
-
-        len = snprintf(page, PAGE_SIZE,
-                       "real-time tasks   = %d\n"
-                       "ready for release = %d\n",
-                       atomic_read(&rt_task_count),
-                       count_tasks_waiting_for_release());
-        return len;
-}
-
-static int proc_read_plugins(char *page, char **start,
-                           off_t off, int count,
-                           int *eof, void *data)
-{
-        int len;
-
-        len = print_sched_plugins(page, PAGE_SIZE);
-        return len;
-}
-
-static int proc_read_curr(char *page, char **start,
-                          off_t off, int count,
-                          int *eof, void *data)
-{
-        int len;
-
-        len = snprintf(page, PAGE_SIZE, "%s\n", litmus->plugin_name);
-        return len;
-}
-
-static int proc_write_curr(struct file *file,
-                           const char *buffer,
-                           unsigned long count,
-                           void *data)
-{
-        int len, ret;
-        char name[65];
-        struct sched_plugin* found;
-
-        if(count > 64)
-                len = 64;
-        else
-                len = count;
-
-        if(copy_from_user(name, buffer, len))
-                return -EFAULT;
-
-        name[len] = '\0';
-        /* chomp name */
-        if (len > 1 && name[len - 1] == '\n')
-                name[len - 1] = '\0';
-
-        found = find_sched_plugin(name);
-
-        if (found) {
-                ret = switch_sched_plugin(found);
-                if (ret != 0)
-                        printk(KERN_INFO "Could not switch plugin: %d\n", ret);
-        } else
-                printk(KERN_INFO "Plugin '%s' is unknown.\n", name);
-
-        return len;
-}
-
-static int proc_read_cluster_size(char *page, char **start,
-                          off_t off, int count,
-                          int *eof, void *data)
-{
-        int len;
-        if (cluster_cache_index == 2)
-                len = snprintf(page, PAGE_SIZE, "L2\n");
-        else if (cluster_cache_index == 3)
-                len = snprintf(page, PAGE_SIZE, "L3\n");
-        else if (cluster_cache_index == 1)
-                len = snprintf(page, PAGE_SIZE, "L1\n");
-        else
-                len = snprintf(page, PAGE_SIZE, "ALL\n");
-
-        return len;
-}
-
-static int proc_write_cluster_size(struct file *file,
-                           const char *buffer,
-                           unsigned long count,
-                           void *data)
-{
-        int len;
-        /* L2, L3 */
-        char cache_name[33];
-
-        if(count > 32)
-                len = 32;
-        else
-                len = count;
-
-        if(copy_from_user(cache_name, buffer, len))
-                return -EFAULT;
-
-        cache_name[len] = '\0';
-        /* chomp name */
-        if (len > 1 && cache_name[len - 1] == '\n')
-                cache_name[len - 1] = '\0';
-
-        /* do a quick and dirty comparison to find the cluster size */
-        if (!strcmp(cache_name, "L2"))
-                cluster_cache_index = 2;
-        else if (!strcmp(cache_name, "L3"))
-                cluster_cache_index = 3;
-        else if (!strcmp(cache_name, "L1"))
-                cluster_cache_index = 1;
-        else if (!strcmp(cache_name, "ALL"))
-                cluster_cache_index = num_online_cpus();
-        else
-                printk(KERN_INFO "Cluster '%s' is unknown.\n", cache_name);
-
-        return len;
-}
-
-#ifdef CONFIG_RELEASE_MASTER
-static int proc_read_release_master(char *page, char **start,
-                                    off_t off, int count,
-                                    int *eof, void *data)
-{
-        int len, master;
-        master = atomic_read(&release_master_cpu);
-        if (master == NO_CPU)
-                len = snprintf(page, PAGE_SIZE, "NO_CPU\n");
-        else
-                len = snprintf(page, PAGE_SIZE, "%d\n", master);
-        return len;
-}
-
-static int proc_write_release_master(struct file *file,
-                                     const char *buffer,
-                                     unsigned long count,
-                                     void *data)
-{
-        int cpu, err, online = 0;
-        char msg[64];
-
-        if (count > 63)
-                return -EINVAL;
-
-        if (copy_from_user(msg, buffer, count))
-                return -EFAULT;
-
-        /* terminate */
-        msg[count] = '\0';
-        /* chomp */
-        if (count > 1 && msg[count - 1] == '\n')
-                msg[count - 1] = '\0';
-
-        if (strcmp(msg, "NO_CPU") == 0) {
-                atomic_set(&release_master_cpu, NO_CPU);
-                return count;
-        } else {
-                err = sscanf(msg, "%d", &cpu);
-                if (err == 1 && cpu >= 0 && (online = cpu_online(cpu))) {
-                        atomic_set(&release_master_cpu, cpu);
-                        return count;
-                } else {
-                        TRACE("invalid release master: '%s' "
-                              "(err:%d cpu:%d online:%d)\n",
-                              msg, err, cpu, online);
-                        return -EINVAL;
-                }
-        }
-}
-#endif
-
-static struct proc_dir_entry *litmus_dir = NULL,
-        *curr_file = NULL,
-        *stat_file = NULL,
-        *plugs_dir = NULL,
-        *plugs_file = NULL,
-#ifdef CONFIG_RELEASE_MASTER
-        *release_master_file = NULL,
-#endif
-        *clus_cache_idx_file = NULL;
-
-static int __init init_litmus_proc(void)
-{
-        litmus_dir = proc_mkdir("litmus", NULL);
-        if (!litmus_dir) {
-                printk(KERN_ERR "Could not allocate LITMUS^RT procfs entry.\n");
-                return -ENOMEM;
-        }
-
-        curr_file = create_proc_entry("active_plugin",
-                                      0644, litmus_dir);
-        if (!curr_file) {
-                printk(KERN_ERR "Could not allocate active_plugin "
-                       "procfs entry.\n");
-                return -ENOMEM;
-        }
-        curr_file->read_proc  = proc_read_curr;
-        curr_file->write_proc = proc_write_curr;
-
-#ifdef CONFIG_RELEASE_MASTER
-        release_master_file = create_proc_entry("release_master",
-                                                0644, litmus_dir);
-        if (!release_master_file) {
-                printk(KERN_ERR "Could not allocate release_master "
-                       "procfs entry.\n");
-                return -ENOMEM;
-        }
-        release_master_file->read_proc = proc_read_release_master;
-        release_master_file->write_proc  = proc_write_release_master;
-#endif
-
-        clus_cache_idx_file = create_proc_entry("cluster_cache",
-                                                0644, litmus_dir);
-        if (!clus_cache_idx_file) {
-                printk(KERN_ERR "Could not allocate cluster_cache "
-                       "procfs entry.\n");
-                return -ENOMEM;
-        }
-        clus_cache_idx_file->read_proc = proc_read_cluster_size;
-        clus_cache_idx_file->write_proc = proc_write_cluster_size;
-
-        stat_file = create_proc_read_entry("stats", 0444, litmus_dir,
-                                           proc_read_stats, NULL);
-
-        plugs_dir = proc_mkdir("plugins", litmus_dir);
-        if (!plugs_dir){
-                printk(KERN_ERR "Could not allocate plugins directory "
-                                "procfs entry.\n");
-                return -ENOMEM;
-        }
-
-        plugs_file = create_proc_read_entry("loaded", 0444, plugs_dir,
-                                           proc_read_plugins, NULL);
-
-        return 0;
-}
-
-static void exit_litmus_proc(void)
-{
-        if (plugs_file)
-                remove_proc_entry("loaded", plugs_dir);
-        if (plugs_dir)
-                remove_proc_entry("plugins", litmus_dir);
-        if (stat_file)
-                remove_proc_entry("stats", litmus_dir);
-        if (curr_file)
-                remove_proc_entry("active_plugin", litmus_dir);
-        if (clus_cache_idx_file)
-                remove_proc_entry("cluster_cache", litmus_dir);
-#ifdef CONFIG_RELEASE_MASTER
-        if (release_master_file)
-                remove_proc_entry("release_master", litmus_dir);
-#endif
-        if (litmus_dir)
-                remove_proc_entry("litmus", NULL);
-}
-
-long make_plugin_proc_dir(struct sched_plugin* plugin,
-                struct proc_dir_entry** pde_in)
-{
-        struct proc_dir_entry *pde_new = NULL;
-        long rv;
-
-        if (!plugin || !plugin->plugin_name){
-                printk(KERN_ERR "Invalid plugin struct passed to %s.\n",
-                                __func__);
-                rv = -EINVAL;
-                goto out_no_pde;
-        }
-
-        if (!plugs_dir){
-                printk(KERN_ERR "Could not make plugin sub-directory, because "
-                                "/proc/litmus/plugins does not exist.\n");
-                rv = -ENOENT;
-                goto out_no_pde;
-        }
-
-        pde_new = proc_mkdir(plugin->plugin_name, plugs_dir);
-        if (!pde_new){
-                printk(KERN_ERR "Could not make plugin sub-directory: "
-                                "out of memory?.\n");
-                rv = -ENOMEM;
-                goto out_no_pde;
-        }
-
-        rv = 0;
-        *pde_in = pde_new;
-        goto out_ok;
-
-out_no_pde:
-        *pde_in = NULL;
-out_ok:
-        return rv;
-}
-
-void remove_plugin_proc_dir(struct sched_plugin* plugin)
-{
-        if (!plugin || !plugin->plugin_name){
-                printk(KERN_ERR "Invalid plugin struct passed to %s.\n",
-                                __func__);
-                return;
-        }
-        remove_proc_entry(plugin->plugin_name, plugs_dir);
-}
-
 extern struct sched_plugin linux_sched_plugin;
 
 static int __init _init_litmus(void)