VFS: mounts KFS, shell functions
[akaros.git] / kern / src / manager.c
index 7e9545a..2cfeea5 100644 (file)
@@ -4,6 +4,7 @@
  * See LICENSE for details.
  */
 
+
 #ifdef __SHARC__
 #pragma nosharc
 #endif
 #include <ros/common.h>
 #include <smp.h>
 #include <arch/init.h>
+#include <mm.h>
+#include <elf.h>
+#include <frontend.h>
 
+#include <kmalloc.h>
 #include <assert.h>
 #include <manager.h>
 #include <process.h>
 #include <schedule.h>
-#include <workqueue.h>
 #include <syscall.h>
 #include <testing.h>
 #include <kfs.h>
@@ -26,6 +30,9 @@
 #include <monitor.h>
 #include <colored_caches.h>
 #include <string.h>
+#include <pmap.h>
+#include <ros/timer.h>
+#include <ros/arch/membar.h>
 
 /*
  * Currently, if you leave this function by way of proc_run (process_workqueue
@@ -46,12 +53,46 @@ void manager(void)
        MANAGER_FUNC(DEVELOPER_NAME)();
 }
 
+/* Helper macro for quickly running something out of KFS.  Pass it a string and
+ * a proc pointer. */
+#define quick_proc_run(x, p)                                                     \
+       (p) = kfs_proc_create(kfs_lookup_path((x)));                                 \
+       spin_lock(&(p)->proc_lock);                                                  \
+       __proc_set_state((p), PROC_RUNNABLE_S);                                      \
+       spin_unlock(&(p)->proc_lock);                                                \
+       proc_run((p));                                                               \
+       proc_decref((p), 1);
+
+#define quick_proc_create(x, p)                                                  \
+       (p) = kfs_proc_create(kfs_lookup_path((x)));                                 \
+       spin_lock(&(p)->proc_lock);                                                  \
+       __proc_set_state((p), PROC_RUNNABLE_S);                                      \
+       spin_unlock(&(p)->proc_lock);
+
+#define quick_proc_color_run(x, p, c)                                            \
+       (p) = kfs_proc_create(kfs_lookup_path((x)));                                 \
+       spin_lock(&(p)->proc_lock);                                                  \
+       __proc_set_state((p), PROC_RUNNABLE_S);                                      \
+       spin_unlock(&(p)->proc_lock);                                                \
+       p->cache_colors_map = cache_colors_map_alloc();                              \
+       for (int i = 0; i < (c); i++)                                                \
+               cache_color_alloc(llc_cache, p->cache_colors_map);                       \
+       proc_run((p));                                                               \
+       proc_decref((p), 1);
+
+#define quick_proc_color_create(x, p, c)                                         \
+       (p) = kfs_proc_create(kfs_lookup_path((x)));                                 \
+       spin_lock(&(p)->proc_lock);                                                  \
+       __proc_set_state((p), PROC_RUNNABLE_S);                                      \
+       spin_unlock(&(p)->proc_lock);                                                \
+       p->cache_colors_map = cache_colors_map_alloc();                              \
+       for (int i = 0; i < (c); i++)                                                \
+               cache_color_alloc(llc_cache, p->cache_colors_map);
+
 void manager_brho(void)
 {
        static uint8_t RACY progress = 0;
-
-       static struct proc *envs[256];
-       static struct proc *p ;
+       static struct proc *p;
 
        // for testing taking cores, check in case 1 for usage
        uint32_t corelist[MAX_NUM_CPUS];
@@ -59,39 +100,31 @@ void manager_brho(void)
 
        switch (progress++) {
                case 0:
-                       // TODO: need to store the pid for future manager runs, not the *p
-                       p = kfs_proc_create(kfs_lookup_path("parlib_mhello"));
-                       //p = kfs_proc_create(kfs_lookup_path("roslib_mhello"));
-                       //p = kfs_proc_create(kfs_lookup_path("roslib_mproctests"));
-                       //p = kfs_proc_create(kfs_lookup_path("roslib_spawn"));
-                       // being proper and all:
-                       spin_lock_irqsave(&p->proc_lock);
-                       __proc_set_state(p, PROC_RUNNABLE_S);
-                       // normal single-cored way
-                       spin_unlock_irqsave(&p->proc_lock);
-                       proc_run(p);
-                       proc_decref(p, 1);
+                       monitor(0);
+                       /* 124 is half of the available boxboro colors (with the kernel
+                        * getting 8) */
+                       //quick_proc_color_run("msr_dumb_while", p, 124);
+                       quick_proc_run("mhello", p);
                        #if 0
                        // this is how you can transition to a parallel process manually
                        // make sure you don't proc run first
                        __proc_set_state(p, PROC_RUNNING_S);
                        __proc_set_state(p, PROC_RUNNABLE_M);
                        p->resources[RES_CORES].amt_wanted = 5;
-                       spin_unlock_irqsave(&p->proc_lock);
+                       spin_unlock(&p->proc_lock);
                        core_request(p);
                        panic("This is okay");
                        #endif
                        break;
                case 1:
-                       monitor(0);
                        #if 0
                        udelay(10000000);
                        // this is a ghetto way to test restarting an _M
                                printk("\nattempting to ghetto preempt...\n");
-                               spin_lock_irqsave(&p->proc_lock);
+                               spin_lock(&p->proc_lock);
                                proc_take_allcores(p, __death);
                                __proc_set_state(p, PROC_RUNNABLE_M);
-                               spin_unlock_irqsave(&p->proc_lock);
+                               spin_unlock(&p->proc_lock);
                                udelay(5000000);
                                printk("\nattempting to restart...\n");
                                core_request(p); // proc still wants the cores
@@ -100,9 +133,9 @@ void manager_brho(void)
                                printk("taking 3 cores from p\n");
                                for (int i = 0; i < num; i++)
                                        corelist[i] = 7-i; // 7, 6, and 5
-                               spin_lock_irqsave(&p->proc_lock);
+                               spin_lock(&p->proc_lock);
                                proc_take_cores(p, corelist, &num, __death);
-                               spin_unlock_irqsave(&p->proc_lock);
+                               spin_unlock(&p->proc_lock);
                                udelay(5000000);
                                printk("Killing p\n");
                                proc_destroy(p);
@@ -115,28 +148,6 @@ void manager_brho(void)
                        break;
                        #endif
                case 2:
-                       #if 0
-                       panic("Do not panic");
-                       envs[0] = kfs_proc_create(kfs_lookup_path("parlib_channel_test_client"));
-                       envs[1] = kfs_proc_create(kfs_lookup_path("parlib_channel_test_server"));
-                       smp_call_function_single(1, run_env_handler, envs[0], 0);
-                       smp_call_function_single(2, run_env_handler, envs[1], 0);
-                       break;
-                       #endif
-               case 3:
-               #if 0
-               case 4:
-                       printk("Beginning Tests\n");
-                       test_run_measurements(progress-1);  // should never return
-                       break;
-               case 5:
-                       envs[0] = kfs_proc_create(kfs_lookup_path("parlib_channel_test_client"));
-                       envs[1] = kfs_proc_create(kfs_lookup_path("parlib_channel_test_server"));
-                       smp_call_function_single(1, run_env_handler, envs[0], 0);
-                       smp_call_function_single(2, run_env_handler, envs[1], 0);
-               case 6:
-               #endif
-               case 4:
                        /*
                        test_smp_call_functions();
                        test_checklists();
@@ -146,24 +157,14 @@ void manager_brho(void)
                        test_ipi_sending();
                        test_pit();
                        */
-               case 5:
-               case 6:
-               case 7:
-               case 8:
-               case 9:
-               case 10:
-               case 11:
-               case 12:
-               case 13:
-               case 14:
-                       //test_run_measurements(progress-1);
                default:
-                       printk("Manager Progress: %d\n", progress);
+                       printd("Manager Progress: %d\n", progress);
                        // delay if you want to test rescheduling an MCP that yielded
                        //udelay(15000000);
                        schedule();
        }
        panic("If you see me, then you probably screwed up");
+       monitor(0);
 
        /*
        printk("Servicing syscalls from Core 0:\n\n");
@@ -178,10 +179,11 @@ void manager_brho(void)
 void manager_klueska()
 {
        static struct proc *envs[256];
-       static uint8_t progress = 0;
+       static volatile uint8_t progress = 0;
 
-       if (progress++ == 0) {
-               envs[0] = kfs_proc_create(kfs_lookup_path("parlib_matrix"));
+       if (progress == 0) {
+               progress++;
+               envs[0] = kfs_proc_create(kfs_lookup_path("fillmeup"));
                __proc_set_state(envs[0], PROC_RUNNABLE_S);
                proc_run(envs[0]);
        }
@@ -190,16 +192,55 @@ void manager_klueska()
        panic("DON'T PANIC");
 }
 
+struct elf_info
+{
+       long entry;
+       long phdr;
+       int phnum;
+       int dynamic;
+       char interp[256];
+};
+
 void manager_waterman()
 {
-       manager_klueska();
+       static int init = 0;
+       if(!init)
+       {
+               init = 1;
+               struct proc* p = proc_create(NULL,0);
+
+               char* argv[] = {"/bin/sh","-l",0};
+               char* envp[] = {"LD_LIBRARY_PATH=/lib",0};
+               procinfo_pack_args(p->procinfo,argv,envp);
+
+               struct file* f = file_open("/bin/busybox",0,0);
+               assert(f != NULL);
+               assert(load_elf(p,f) == 0);
+               file_decref(f);
+
+               __proc_set_state(p, PROC_RUNNABLE_S);
+               proc_run(p);
+       }
+       schedule();
 }
 
 void manager_pearce()
 {
-       manager_klueska();
-}
+       static struct proc *envs[256];
+       static volatile uint8_t progress = 0;
 
+       if (progress == 0) {
+               progress++;
+               envs[0] = kfs_proc_create(kfs_lookup_path("parlib_httpserver_integrated"));
+               //envs[0] = kfs_proc_create(kfs_lookup_path("parlib_lock_test"));
+               __proc_set_state(envs[0], PROC_RUNNABLE_S);
+               proc_run(envs[0]);
+       }
+       schedule();
+
+       panic("DON'T PANIC");
+
+}
 
 #ifdef __sparc_v8__