C-EDF: move /proc/litmus/cluster_cache to /proc/litmus/plugins/C-EDF/cluster

Make use of the new per-plugin proc file infrastructure to avoid
littering the global namespace. While at it, also move all the
relevant bits to sched_cedf.c. In the future, each plugin's parameters
should be handled in the respective plugin file.

1 files changed, 2 insertions, 68 deletions

diff --git a/litmus/litmus_proc.c b/litmus/litmus_proc.c
index ee0ad56d445c..c10a6a6d3975 100644
--- a/litmus/litmus_proc.c
+++ b/litmus/litmus_proc.c
@@ -4,6 +4,7 @@
 
 #include <linux/uaccess.h>
 
+#include <litmus/litmus.h>
 #include <litmus/litmus_proc.h>
 
 /* in litmus/litmus.c */
@@ -13,11 +14,10 @@ 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;
+        *plugs_file = NULL;
 
 /* in litmus/sync.c */
 int count_tasks_waiting_for_release(void);
@@ -93,60 +93,6 @@ static int proc_write_curr(struct file *file,
         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,
@@ -229,16 +175,6 @@ int __init init_litmus_proc(void)
         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);
 
@@ -265,8 +201,6 @@ void exit_litmus_proc(void)
                 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);