Replaces BCQs with UCQs (XCC)
[akaros.git] / kern / include / ros / procinfo.h
index 30d9890..91a0dcb 100644 (file)
@@ -5,16 +5,12 @@
 
 #include <ros/memlayout.h>
 #include <ros/common.h>
+#include <ros/atomic.h>
 #include <ros/arch/arch.h>
 
 #define PROCINFO_MAX_ARGP 32
 #define PROCINFO_ARGBUF_SIZE 3072
 
-// TODO: move me to an atomic header, and give me some support functions.
-#ifndef __TMP_SEQ_CTR
-#define __TMP_SEQ_CTR
-typedef uint8_t seq_ctr_t;
-#endif
 
 /* Not necessary to expose all of this, but it doesn't hurt, and is convenient
  * for the kernel. */
@@ -23,7 +19,6 @@ struct vcore {
        bool                            valid;
        bool                            preempt_served;
        uint64_t                        preempt_pending;
-       struct trapframe        *tf_to_run;
 };
 
 struct pcore {
@@ -34,7 +29,7 @@ struct pcore {
 typedef struct procinfo {
        pid_t pid;
        pid_t ppid;
-       size_t max_harts;
+       size_t max_vcores;
        uint64_t tsc_freq;
        void* heap_bottom;
        char* argp[PROCINFO_MAX_ARGP];
@@ -44,7 +39,7 @@ typedef struct procinfo {
        struct vcore            vcoremap[MAX_NUM_CPUS];
        uint32_t                        num_vcores;
        struct pcore            pcoremap[MAX_NUM_CPUS];
-       seq_ctr_t                       coremap_edit;
+       seq_ctr_t                       coremap_seqctr;
 } procinfo_t;
 #define PROCINFO_NUM_PAGES  ((sizeof(procinfo_t)-1)/PGSIZE + 1)