Slite and parallel runtime work

src/Makefile

@@ -1,9 +1,9 @@
 MAKEFLAGS=--no-print-directory --section-alignment 0x1000 -I$(PWD)
 #$(info Make flags $(MAKEFLAGS))
 
-default: | all cp
+default: | all
 
-all: comps plat
+all: comps plat cp
 
 comps:
 	$(info )

src/components/Makefile.comp

@@ -11,6 +11,7 @@ MUSLBIN=$(MUSLDIR)/bin
 MUSLCC=$(MUSLBIN)/musl-$(CC)
 MUSLINC=-isystem$(MUSLDIR)/include
 
+PSLIBDIR=$(LIBDIR)/ps
 CKDIR=$(LIBDIR)/ck
 CKLIBDIR=$(CKDIR)/lib
 CKINCDIR=$(CKDIR)/include
@@ -40,26 +41,26 @@ LUAINC=-I$(LUADIR)/src -I$(LUABASE)/cos/include
 
 INC_PATH=-I./ -I$(CDIR)/include/ -I$(CDIR)/interface/ -I$(SHAREDINC) -I$(CKINCDIR)
 SHARED_FLAGS=-fno-merge-constants -nostdinc -nostdlib -fno-pic
-OPT= -g -fvar-tracking
-#OPT= -O3
+OPT  = -g -fvar-tracking
+OPT += -O3
 CFLAGS=-m32 -D__x86__ -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -fno-stack-protector -fno-omit-frame-pointer -Wno-unused-variable $(INC_PATH) $(MUSLINC) $(LWIPINC) $(LUAINC) $(OPT) $(SHARED_FLAGS)
 CXXFLAGS=-fno-exceptions -fno-threadsafe-statics -Wno-write-strings $(CFLAGS)
 LDFLAGS=-melf_i386
 MUSLCFLAGS=$(CFLAGS) -lc -lgcc -Xlinker -r
 ASFLAGS=-m32 $(INC_PATH) $(SHARED_FLAGS)
 
-SERVER_STUB=s_stub.o
-CLIENT_STUB=c_stub.o
-
-LIBCOSDEFKERN=-lcos_kernel_api -lcos_defkernel_api
-LIBSLCORE=$(LIBCOSDEFKERN) -lsl_sched -lheap -lsl_xcpu -lsl_child -lck
-LIBSLCAPMGR=$(LIBSLCORE) -lsl_capmgr
-LIBSLRAW=$(LIBSLCORE) -lsl_raw
-
 GCC_PIE=$(shell gcc -v 2>&1 | grep -c "\--enable-default-pie")
 ifeq ($(GCC_PIE),1)
 MUSLCFLAGS+=-no-pie
 LDFLAGS+=-no-pie
 CFLAGS+=-fno-pie
 CXXFLAGS+=-fno-pie
 endif
+
+SERVER_STUB=s_stub.o
+CLIENT_STUB=c_stub.o
+
+LIBCOSDEFKERN=-lcos_kernel_api -lcos_defkernel_api
+LIBSLCORE=$(LIBCOSDEFKERN) -lsl_sched -lheap -lsl_xcore -lsl_child -lck
+LIBSLCAPMGR=$(LIBSLCORE) -lsl_capmgr
+LIBSLRAW=$(LIBSLCORE) -lsl_raw -lcos_dcb

src/components/implementation/Makefile.subsubdir

@@ -42,7 +42,7 @@ TMP_STR2=tmp2
 INCLUDE=-I../ $(DEP_INC) $(IF_INCLUDE) $(CINC)
 LIB_LIBRARIES_PRE=$(DEP_LIB_EXIST)
 LIB_LIBRARIES=$(strip $(LIB_LIBRARIES_PRE))
-LIB_FLAGS=-L$(CKLIBDIR) -L$(LIBDIR) -L$(LIBCXXDIR) $(DEP_LIB) $(LIB_LIBRARIES) $(ADDITIONAL_LIBS)
+LIB_FLAGS=-L$(PSLIBDIR) -L$(CKLIBDIR) -L$(LIBDIR) -L$(LIBCXXDIR) $(DEP_LIB) $(LIB_LIBRARIES) $(ADDITIONAL_LIBS)
 
 C_SOURCES=$(C_OBJS:%.o=%.c)
 CXX_SOURCES=$(CXX_OBJS:%.o=%.cc)

src/components/implementation/capmgr/naive/Makefile

@@ -1,7 +1,7 @@
 C_OBJS=cap_mgr.c mem_mgr.c init.c
 ASM_OBJS=
 COMPONENT=capmgr.o
-INTERFACES=capmgr channel
+INTERFACES=capmgr channel work
 DEPENDENCIES=
 IF_LIB=
 ADDITIONAL_LIBS=$(LIBSLRAW) -lsl_mod_fprr -lsl_thd_static_backend

src/components/implementation/capmgr/naive/cap_info.c

@@ -62,6 +62,27 @@ cap_info_thd_next(struct cap_comp_info *rci)
 	return NULL;
 }
 
+void
+cap_info_cpu_initdcb_init(struct cap_comp_info *rci)
+{
+	dcbcap_t initdcb = 0;
+	unsigned short init_off = 0;
+	vaddr_t  initaddr = 0;
+	struct cos_compinfo *ci = cos_compinfo_get(cap_info_dci(rci));
+	struct cap_comp_cpu_info *rci_cpu = cap_info_cpu_local(rci);
+
+	if (rci->cid == 0 || rci->cid == cos_spd_id()) {
+		cos_dcb_info_init_ext(cap_info_cpu_dcbdata(rci_cpu), 0, 0, 0, 0);
+		return;
+	}
+
+	initaddr = rci->init_dcb_start + cos_cpuid() * PAGE_SIZE;
+	initdcb  = cos_dcb_alloc(cos_compinfo_get(cos_defcompinfo_curr_get()), ci->pgtbl_cap, initaddr);
+	assert(initdcb);
+
+	cos_dcb_info_init_ext(cap_info_cpu_dcbdata(rci_cpu), ci, initdcb, initaddr, init_off);
+}
+
 struct cap_comp_info *
 cap_info_comp_init(spdid_t spdid, captblcap_t captbl_cap, pgtblcap_t pgtbl_cap, compcap_t compcap,
 		   capid_t cap_frontier, vaddr_t heap_frontier, spdid_t sched_spdid)
@@ -76,13 +97,16 @@ cap_info_comp_init(spdid_t spdid, captblcap_t captbl_cap, pgtblcap_t pgtbl_cap,
 
 	capci[spdid].cid = spdid;
 	cos_meminfo_init(&ci->mi, 0, 0, 0);
-	cos_compinfo_init(ci, pgtbl_cap, captbl_cap, compcap, heap_frontier, cap_frontier,
-			cos_compinfo_get(cos_defcompinfo_curr_get()));
+	cos_compinfo_init(ci, pgtbl_cap, captbl_cap, compcap, heap_frontier,
+			  cap_frontier, cos_compinfo_get(cos_defcompinfo_curr_get()));
 
 	memset(rglb, 0, sizeof(struct cap_shmem_glb_info));
 	memset(cap_shi, 0, sizeof(struct cap_shmem_info));
 	cap_shi->cinfo = ci;
 
+	capci[spdid].init_dcb_start = heap_frontier - (NUM_CPU * PAGE_SIZE);
+	cap_info_cpu_initdcb_init(&capci[spdid]);
+
 	capci[spdid].initflag = 1;
 	ps_faa((unsigned long *)&cap_comp_count, 1);
 
@@ -336,7 +360,8 @@ cap_shmem_region_find(cos_channelkey_t key)
 	cbuf_t i, free = rglb->free_region_id;
 
 	for (i = 1; i <= free; i++) {
-		if (ps_load((unsigned long *)&rglb->region_keys[i - 1]) == key) {
+		cos_channelkey_t *k = &rglb->region_keys[i - 1];
+		if (ps_load((unsigned long *)k) == (unsigned long)key) {
 			id = i;
 			break;
 		}

src/components/implementation/capmgr/naive/cap_info.h

@@ -15,6 +15,7 @@
 #include <capmgr.h>
 #include <memmgr.h>
 #include <bitmap.h>
+#include <cos_dcb.h>
 
 #define CAP_INFO_MAX_THREADS (MAX_NUM_THREADS)
 
@@ -29,12 +30,12 @@ struct cap_shmem_glb_info {
 };
 
 struct cap_comm_info {
-	arcvcap_t  rcvcap; /* rcv capid in capmgr! */
-	cpuid_t    rcvcpuid;
-	cycles_t   ipiwin, ipiwin_start; /* TODO: synchronize TSC on all cores */
-	u32_t      ipicnt, ipimax;
-	asndcap_t  sndcap[NUM_CPU]; /* for cross-core asnds */
-	sinvcap_t  sinvcap[NUM_CPU]; /* for each core (except for the same core!) */
+	arcvcap_t     rcvcap; /* rcv capid in capmgr! */
+	cpuid_t       rcvcpuid;
+	cycles_t      ipiwin, ipiwin_start; /* TODO: synchronize TSC on all cores */
+	unsigned long ipicnt, ipimax;
+	asndcap_t     sndcap[NUM_CPU]; /* for cross-core asnds */
+	sinvcap_t     sinvcap[NUM_CPU]; /* for each core (except for the same core!) */
 } cap_comminfo[CAP_INFO_MAX_THREADS];
 
 struct cap_channelaep_info {
@@ -58,13 +59,16 @@ struct cap_comp_cpu_info {
 	int p_thd_iterator; /* iterator for parent to get all threads created by capmgr in this component so far! */
 	thdcap_t p_initthdcap; /* init thread's cap in parent */
 	thdid_t  initthdid; /* init thread's tid */
+
+	struct cos_dcbinfo_data dcb_data;
 } CACHE_ALIGNED;
 
 struct cap_comp_info {
 	spdid_t cid;
 	struct cos_defcompinfo defci;
 	struct cap_shmem_info shminfo;
 	int initflag;
+	vaddr_t init_dcb_start;
 
 	struct cap_comp_cpu_info cpu_local[NUM_CPU];
 };
@@ -74,6 +78,7 @@ struct cap_comp_info *cap_info_comp_init(spdid_t spdid, captblcap_t captbl_cap,
 
 struct sl_thd *cap_info_thd_init(struct cap_comp_info *rci, struct sl_thd *t, cos_channelkey_t key);
 struct sl_thd *cap_info_initthd_init(struct cap_comp_info *rci, struct sl_thd *t, cos_channelkey_t key);
+void           cap_info_cpu_initdcb_init(struct cap_comp_info *rci);
 
 struct cap_comp_info *cap_info_comp_find(spdid_t s);
 struct sl_thd        *cap_info_thd_find(struct cap_comp_info *r, thdid_t t);
@@ -116,6 +121,12 @@ cap_info_cpu_local(struct cap_comp_info *c)
 	return &c->cpu_local[cos_cpuid()];
 }
 
+static inline struct cos_dcbinfo_data *
+cap_info_cpu_dcbdata(struct cap_comp_cpu_info *c)
+{
+	return &c->dcb_data;
+}
+
 static inline struct cap_comp_info *
 cap_info_parent(struct cap_comp_info *r)
 {
@@ -133,11 +144,18 @@ cap_info_is_parent(struct cap_comp_info *r, spdid_t p)
 }
 
 static inline int
-cap_info_is_sched(spdid_t c)
+cap_info_is_sched_core(spdid_t c, cpuid_t core)
 {
+	if (core >= NUM_CPU) return 0;
 	if (!c) return 1; /* llbooter! */
 
-	return bitmap_check(cap_info_schedbmp[cos_cpuid()], c - 1);
+	return bitmap_check(cap_info_schedbmp[core], c - 1);
+}
+
+static inline int
+cap_info_is_sched(spdid_t c)
+{
+	return cap_info_is_sched_core(c, cos_cpuid());
 }
 
 static inline int