Merge remote branch 'origin/sparc-dev'

[akaros.git] / kern / include / env.h

diff --git a/kern/include/env.h b/kern/include/env.h
index 969f203..92faa26 100644 (file)
--- a/kern/include/env.h
+++ b/kern/include/env.h
@@ -9,6 +9,7 @@
 #include <ros/sysevent.h>
 #include <ros/error.h>
 #include <ros/procdata.h>
+#include <ros/resource.h>
 #include <arch/trap.h>
 #include <ros/common.h>
 #include <arch/arch.h>
@@ -17,56 +18,36 @@
 struct Env;
 typedef struct Env env_t;
 
-// An environment ID 'envid_t' has three parts:
-//
-// +1+---------------21-----------------+--------10--------+
-// |0|          Uniqueifier             |   Environment    |
-// | |                                  |      Index       |
-// +------------------------------------+------------------+
-//                                       \--- ENVX(eid) --/
-//
-// The environment index ENVX(eid) equals the environment's offset in the
-// 'envs[]' array.  The uniqueifier distinguishes environments that were
-// created at different times, but share the same environment index.
-//
-// All real environments are greater than 0 (so the sign bit is zero).
-// envid_ts less than 0 signify errors.  The envid_t == 0 is special, and
-// stands for the current environment.
-
-typedef int32_t envid_t;
-
-#define LOG2NENV               10
-#define NENV                   (1 << LOG2NENV)
-#define ENVX(envid)            ((envid) & (NENV - 1))
-
 // TODO: clean this up.
-#ifdef __SHARC__
-typedef sharC_env_t;
-#endif
 struct Env {
        TAILQ_ENTRY(Env) proc_link NOINIT;      // Free list link pointers
        spinlock_t proc_lock;
-       trapframe_t env_tf                                              // Saved registers
-         __attribute__((aligned (8)));                 // for sparc --asw
-       ancillary_state_t env_ancillary_state   // State saved when descheduled
-         __attribute__((aligned (8)));                 // for sparc --asw
-       envid_t env_id;                         // Unique environment identifier
-       envid_t env_parent_id;          // env_id of this env's parent
+       trapframe_t env_tf;                                             // Saved registers
+       ancillary_state_t env_ancillary_state;  // State saved when descheduled
+       pid_t pid;
+       pid_t ppid;                 // Parent's PID
        uint32_t state;                         // Status of the process
-       uint32_t env_runs;                      // Number of times environment has run
        uint32_t env_refcnt;            // Reference count of kernel contexts using this
        uint32_t env_flags;
        uint32_t env_entry;
        /* Virtual coremap: each index is the virtual core id, the contents at that
-        * index is the physical core_id() corresponding to the vcore. */
-       uint32_t vcoremap[MAX_NUM_CPUS];
+        * index is the physical core_id() corresponding to the vcore.  -1 means it
+        * is unused */
+       int32_t vcoremap[MAX_NUM_CPUS];
        uint32_t num_vcores;
 
-#ifdef __SHARC__
-       // held spin-locks
-       // zra: Used by Ivy. Let me know if this should go elsewhere.
-       sharC_env_t sharC_env;
-#endif
+       /* Cache color map: bitmap of the cache colors currently allocated to this
+        * process */
+       uint8_t* cache_colors_map;
+       size_t next_cache_color;
+
+       /* Info about this process's resources (granted, desired) for each type. */
+       struct resource resources[MAX_NUM_RESOURCES];
+
+       /* Keeps track of this process's current memory allocation 
+     * (i.e. its heap pointer) */
+       void* heap_bottom;
+       void* heap_top;
 
        // Address space
        pde_t *COUNT(NPDENTRIES) env_pgdir;                     // Kernel virtual address of page dir
@@ -87,41 +68,18 @@ struct Env {
 };
 
 /* Process Flags */
-// None yet
+#define PROC_TRANSITION_TO_M                   0x0001
 
-extern env_t *COUNT(NENV) envs;                // All environments
 extern atomic_t num_envs;              // Number of envs
-// TODO: consider moving this to struct per_cpu_info
-extern env_t * (RO curenvs)[MAX_NUM_CPUS];
-
-static inline env_t *
-get_cpu_curenv() TRUSTED
-{
-       return curenvs[core_id()];
-}
-
-static inline void
-set_cpu_curenv(env_t *p) TRUSTED
-{
-       curenvs[core_id()] = p;
-}
-
-void   env_init(void);
-int            env_alloc(env_t *SAFE*SAFE e, envid_t parent_id);
+
+int            env_setup_vm(env_t *e);
 void   env_push_ancillary_state(env_t* e);
 void   env_pop_ancillary_state(env_t* e);
-void   env_free(env_t *SAFE e);
 void   env_user_mem_free(env_t* e);
-env_t* env_create(uint8_t *COUNT(size) binary, size_t size);
-
-/*
- * Allows the kernel to figure out what process is running on its core.
- * Can be used just like a pointer to a struct process.
- */
-#define current (get_cpu_curenv())
-//#define current (curenvs[core_id()])
+void   env_segment_alloc(env_t *e, void *SNT va, size_t len);
+void   env_segment_free(env_t *e, void *SNT va, size_t len);
+void   env_load_icode(env_t* e, env_t* binary_env, uint8_t *COUNT(size) binary, size_t size);
 
-int    envid2env(envid_t envid, env_t **env_store, bool checkperm);
 // The following three functions do not return
 void   env_pop_tf(trapframe_t *tf) __attribute__((noreturn));