restructure

vityaman-edu · Nov 21, 2024 · 15af55e · 15af55e
1 parent 789f1f3
commit 15af55e
Show file tree

Hide file tree

Showing 17 changed files with 54 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ CFLAGS   += $(SANITIZERS)
 
 LDFLAGS   = $(CFLAGS)
 
-SRCS     := $(wildcard $(SRC_DIR)/*.c) $(wildcard $(SRC_DIR)/*.S)
+SRCS     := $(shell find source -iname '*.c') $(shell find source -iname '*.S')
 
 OBJS     := $(patsubst $(SRC_DIR)/%.c, $(OBJ_DIR)/%.o, $(SRCS))
 OBJS     := $(patsubst $(SRC_DIR)/%.S, $(OBJ_DIR)/%.o, $(OBJS))
@@ -37,9 +37,11 @@ $(BIN_DIR)/$(TARGET): $(BIN_DIR) $(OBJ_DIR) $(OBJS)
 	$(CC) $(OBJS) -o $@ $(LDFLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
+	mkdir -p $(shell dirname $@)
 	$(CC) $(CFLAGS) -c $< -o $@
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.S
+	mkdir -p $(shell dirname $@)
 	$(CC) $(CFLAGS) -c $< -o $@
 
 $(OBJ_DIR): $(BUILD_DIR)

diff --git a/source/clock.c → source/coroed/api/clock.c b/source/clock.c → source/coroed/api/clock.c
diff --git a/source/clock.h → source/coroed/api/clock.h b/source/clock.h → source/coroed/api/clock.h
diff --git a/source/log.c → source/coroed/api/log.c b/source/log.c → source/coroed/api/log.c
@@ -1,6 +1,6 @@
 #include "log.h"
 
-#include "spinlock.h"
+#include "coroed/core/spinlock.h"
 
 struct spinlock log_lock;
 

diff --git a/source/log.h → source/coroed/api/log.h b/source/log.h → source/coroed/api/log.h
@@ -2,7 +2,7 @@
 
 #include <stdio.h>  // NOLINT
 
-#include "spinlock.h"
+#include "coroed/core/spinlock.h"
 
 #define LOG_INFO(message, ...)                   \
   do {                                           \

diff --git a/source/coroed/api/task.c b/source/coroed/api/task.c
@@ -0,0 +1,27 @@
+#include "task.h"
+
+#include "coroed/sched/schedy.h"
+
+void tasks_init() {
+  sched_init();
+}
+
+void tasks_submit(task_body body, void* argument) {
+  sched_submit(body, argument);
+}
+
+void tasks_start() {
+  sched_start();
+}
+
+void tasks_wait() {
+  sched_wait();
+}
+
+void tasks_print_statistics() {
+  sched_print_statistics();
+}
+
+void tasks_destroy() {
+  sched_destroy();
+}
diff --git a/source/task.h → source/coroed/api/task.h b/source/task.h → source/coroed/api/task.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "uthread.h"
+#include "coroed/sched/uthread.h"
 
 #define YIELD           \
   do {                  \
@@ -14,6 +14,15 @@
 
 struct task;
 
+typedef uthread_routine task_body;
+
+void tasks_init();
+void tasks_submit(task_body body, void* argument);
+void tasks_start();
+void tasks_wait();
+void tasks_print_statistics();
+void tasks_destroy();
+
 void task_yield(struct task* task);
 void task_exit(struct task* task);
 void task_submit(struct task* parent, uthread_routine entry, void* argument);

diff --git a/source/spinlock.c → source/coroed/core/spinlock.c b/source/spinlock.c → source/coroed/core/spinlock.c
diff --git a/source/spinlock.h → source/coroed/core/spinlock.h b/source/spinlock.h → source/coroed/core/spinlock.h
diff --git a/source/kthread.c → source/coroed/sched/kthread.c b/source/kthread.c → source/coroed/sched/kthread.c
diff --git a/source/kthread.h → source/coroed/sched/kthread.h b/source/kthread.h → source/coroed/sched/kthread.h
diff --git a/source/schedy.c → source/coroed/sched/schedy.c b/source/schedy.c → source/coroed/sched/schedy.c
@@ -10,9 +10,9 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "coroed/api/task.h"
+#include "coroed/core/spinlock.h"
 #include "kthread.h"
-#include "spinlock.h"
-#include "task.h"
 #include "uthread.h"
 
 enum {

diff --git a/source/schedy.h → source/coroed/sched/schedy.h b/source/schedy.h → source/coroed/sched/schedy.h
diff --git a/source/switch.S → source/coroed/sched/switch.S b/source/switch.S → source/coroed/sched/switch.S
diff --git a/source/uthread.c → source/coroed/sched/uthread.c b/source/uthread.c → source/coroed/sched/uthread.c
diff --git a/source/uthread.h → source/coroed/sched/uthread.h b/source/uthread.h → source/coroed/sched/uthread.h
diff --git a/source/main.c b/source/main.c
@@ -7,10 +7,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "clock.h"
-#include "log.h"
-#include "schedy.h"
-#include "task.h"
+#include "coroed/api/clock.h"
+#include "coroed/api/log.h"
+#include "coroed/api/task.h"
 
 enum {
   DELAY = 50,
@@ -65,7 +64,7 @@ TASK_DEFINE(spammer, void, ignored) {
 
 void add(int64_t value) {
   expected_count += value;
-  sched_submit(&adder, (void*)(value));
+  tasks_submit(&adder, (void*)(value));
 }
 
 int randint() {
@@ -74,11 +73,11 @@ int randint() {
 
 int main() {
   log_init();
-  sched_init();
+  tasks_init();
 
   srand(231);  // NOLINT
 
-  sched_submit(&spammer, NULL);
+  tasks_submit(&spammer, NULL);
   add(randint());
   add(randint());
   add(randint());
@@ -88,15 +87,15 @@ int main() {
   add(randint());
   add(randint());
 
-  sched_start();
+  tasks_start();
 
-  sched_wait();
+  tasks_wait();
 
-  sched_print_statistics();
+  tasks_print_statistics();
 
   assert(atomic_load(&actual_count) == expected_count);
 
-  sched_destroy();
+  tasks_destroy();
 
   return 0;
 }