iproute.c compiles
[akaros.git] / kern / src / manager.c
index bf5e6c2..20111b9 100644 (file)
 #include <kfs.h>
 #include <stdio.h>
 #include <time.h>
-#include <resource.h>
 #include <monitor.h>
 #include <colored_caches.h>
 #include <string.h>
 #include <pmap.h>
 #include <arch/console.h>
-#include <ros/time.h>
+#include <time.h>
 #include <ros/arch/membar.h>
 
 /*
@@ -67,7 +66,7 @@ char *p_envp[] = {"LD_LIBRARY_PATH=/lib", 0};
        spin_lock(&(p)->proc_lock);                                                  \
        __proc_set_state((p), PROC_RUNNABLE_S);                                      \
        spin_unlock(&(p)->proc_lock);                                                \
-       proc_run((p));                                                               \
+       proc_run_s((p));                                                             \
        proc_decref((p));
 
 #define quick_proc_create(x, p, f)                                               \
@@ -92,7 +91,7 @@ char *p_envp[] = {"LD_LIBRARY_PATH=/lib", 0};
        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_run_s((p));                                                             \
        proc_decref((p));
 
 #define quick_proc_color_create(x, p, c, f)                                      \
@@ -110,37 +109,36 @@ char *p_envp[] = {"LD_LIBRARY_PATH=/lib", 0};
 
 void manager_brho(void)
 {
-       static uint8_t RACY progress = 0;       /* this will wrap around. */
-       static struct proc *p;
-       struct file *temp_f;
        static bool first = TRUE;
+       struct per_cpu_info *pcpui = &per_cpu_info[core_id()];
 
        if (first) {    
-               printk("*** Hit shift-g to get into the monitor. ***\n");
+               printk("*** IRQs must be enabled for input emergency codes ***\n");
+               #ifdef CONFIG_X86
+               printk("*** Hit ctrl-g or shift-g to enter the monitor. ***\n");
+               printk("*** Hit ctrl-q to force-enter the monitor. ***\n");
+               printk("*** Hit ctrl-b for a backtrace of core 0 ***\n");
+               #else
+               printk("*** Hit shift-g to enter the monitor. ***\n");
+               #endif
                first = FALSE;
        }
-       while (1) {
-               enable_irq();
-               /* one time keyboard / serial check for some magic, then monitor */
-               if (cons_getc() == 'G') {
-                       printk("Heard the call of the giraffe!\n");
-                       monitor(0);
-               }
-               process_routine_kmsg(0);
-               schedule();
-       }
+       /* just idle, and deal with things via interrupts.  or via face. */
+       smp_idle();
        /* whatever we do in the manager, keep in mind that we need to not do
         * anything too soon (like make processes), since we'll drop in here during
         * boot if the boot sequence required any I/O (like EXT2), and we need to
         * PRKM() */
-
        assert(0);
-       /* ancient tests below: */
 
+#if 0 /* ancient tests below: (keeping around til we ditch the manager) */
        // for testing taking cores, check in case 1 for usage
        uint32_t corelist[MAX_NUM_CPUS];
        uint32_t num = 3;
+       struct file *temp_f;
+       static struct proc *p;
 
+       static uint8_t RACY progress = 0;       /* this will wrap around. */
        switch (progress++) {
                case 0:
                        printk("Top of the manager to ya!\n");
@@ -181,6 +179,7 @@ void manager_brho(void)
                                spin_unlock(&p->proc_lock);
                                udelay(5000000);
                                printk("Killing p\n");
+                               enable_irq();
                                proc_destroy(p);
                                printk("Killed p\n");
                        panic("This is okay");
@@ -188,6 +187,7 @@ void manager_brho(void)
                        envs[0] = kfs_proc_create(kfs_lookup_path("roslib_hello"));
                        __proc_set_state(envs[0], PROC_RUNNABLE_S);
                        proc_run(envs[0]);
+                       warn("DEPRECATED");
                        break;
                        #endif
                case 2:
@@ -204,7 +204,7 @@ void manager_brho(void)
                        printd("Manager Progress: %d\n", progress);
                        // delay if you want to test rescheduling an MCP that yielded
                        //udelay(15000000);
-                       schedule();
+                       run_scheduler();
        }
        panic("If you see me, then you probably screwed up");
        monitor(0);
@@ -217,6 +217,7 @@ void manager_brho(void)
        }
        */
        return;
+#endif
 }
 
 void manager_klueska()
@@ -229,39 +230,23 @@ void manager_klueska()
                panic("what do you want to do?");
                //envs[0] = kfs_proc_create(kfs_lookup_path("fillmeup"));
                __proc_set_state(envs[0], PROC_RUNNABLE_S);
-               proc_run(envs[0]);
+               proc_run_s(envs[0]);
+               warn("DEPRECATED");
        }
-       schedule();
+       run_scheduler();
 
        panic("DON'T PANIC");
 }
 
 void manager_waterman()
 {
-       schedule();
-       monitor(0);
+       static bool first = true;
+       if (first)
+               mon_bb(0, 0, 0);
+       smp_idle();
        assert(0);
 }
 
-void manager_pearce()
-{
-       static struct proc *envs[256];
-       static volatile uint8_t progress = 0;
-
-       if (progress == 0) {
-               progress++;
-               panic("what do you want to do?");
-               //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");
-
-}
-
 void manager_yuzhu()
 {
        
@@ -279,54 +264,3 @@ void manager_yuzhu()
        // quick_proc_run("hello", p);
 
 }
-
-#ifdef __sparc_v8__
-
-static char*
-itoa(int num, char* buf0, size_t base)
-{
-       if(base > 16)
-               return NULL;
-
-       char* buf = buf0;
-       int len = 0, i;
-
-       if(num < 0)
-       {
-               *buf++ = '-';
-               num = -num;
-       }
-
-       do {
-               buf[len++] = "0123456789abcdef"[num%base];
-               num /= base;
-       } while(num);
-
-       for(i = 0; i < len/2; i++)
-       {
-               char temp = buf[i];
-               buf[i] = buf[len-i-1];
-               buf[len-i-1] = temp;
-       }
-       buf[len] = 0;
-
-       return buf0;
-}
-
-void gsf_set_frame_cycles(int cycles)
-{
-       store_alternate(26*4,2,cycles);
-}
-
-void gsf_set_partition_credits(int partition, int credits)
-{
-       store_alternate((32+partition)*4,2,credits);
-}
-
-void gsf_set_core_partition(int core, int partition)
-{
-       store_alternate((64+core)*4,2,partition);
-}
-
-#endif
-