From c42fb858baf8c00b12c2dbdd340b7925d5f18161 Mon Sep 17 00:00:00 2001 From: Drew Galbraith Date: Wed, 22 Nov 2023 14:10:10 -0800 Subject: [PATCH] [Mammoth] Move thread and process to the proc/ folder --- lib/mammoth/CMakeLists.txt | 4 ++-- lib/mammoth/ipc/endpoint_server.h | 2 +- lib/mammoth/{src => proc}/process.cpp | 2 +- lib/mammoth/{include/mammoth => proc}/process.h | 0 lib/mammoth/{src => proc}/thread.cpp | 2 +- lib/mammoth/{include/mammoth => proc}/thread.h | 0 sys/denali/ahci/ahci_driver.h | 2 +- sys/denali/lib/denali/denali.yunq.server.h | 2 +- .../lib/victoriafalls/victoriafalls.yunq.server.h | 2 +- sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.h | 2 +- sys/yellowstone/yellowstone.cpp | 2 +- sys/yellowstone/yellowstone_server.cpp | 1 - sys/yellowstone/yellowstone_server.h | 1 - yunq/server.h.jinja | 2 +- 14 files changed, 11 insertions(+), 13 deletions(-) rename lib/mammoth/{src => proc}/process.cpp (99%) rename lib/mammoth/{include/mammoth => proc}/process.h (100%) rename lib/mammoth/{src => proc}/thread.cpp (95%) rename lib/mammoth/{include/mammoth => proc}/thread.h (100%) diff --git a/lib/mammoth/CMakeLists.txt b/lib/mammoth/CMakeLists.txt index 225221b..aea2e76 100644 --- a/lib/mammoth/CMakeLists.txt +++ b/lib/mammoth/CMakeLists.txt @@ -4,12 +4,12 @@ add_library(mammoth STATIC ipc/endpoint_server.cpp ipc/port_client.cpp ipc/port_server.cpp + proc/process.cpp + proc/thread.cpp src/debug.cpp src/init.cpp src/memory_region.cpp src/new.cpp - src/process.cpp - src/thread.cpp sync/mutex.cpp sync/semaphore.cpp ) diff --git a/lib/mammoth/ipc/endpoint_server.h b/lib/mammoth/ipc/endpoint_server.h index 44a70bc..ca054c6 100644 --- a/lib/mammoth/ipc/endpoint_server.h +++ b/lib/mammoth/ipc/endpoint_server.h @@ -7,7 +7,7 @@ #include "mammoth/ipc/endpoint_client.h" #include "mammoth/ipc/request_context.h" #include "mammoth/ipc/response_context.h" -#include "mammoth/thread.h" +#include "mammoth/proc/thread.h" class EndpointServer { public: diff --git a/lib/mammoth/src/process.cpp b/lib/mammoth/proc/process.cpp similarity index 99% rename from lib/mammoth/src/process.cpp rename to lib/mammoth/proc/process.cpp index 8f61ad4..2e4b996 100644 --- a/lib/mammoth/src/process.cpp +++ b/lib/mammoth/proc/process.cpp @@ -1,4 +1,4 @@ -#include "mammoth/process.h" +#include "proc/process.h" #include #include diff --git a/lib/mammoth/include/mammoth/process.h b/lib/mammoth/proc/process.h similarity index 100% rename from lib/mammoth/include/mammoth/process.h rename to lib/mammoth/proc/process.h diff --git a/lib/mammoth/src/thread.cpp b/lib/mammoth/proc/thread.cpp similarity index 95% rename from lib/mammoth/src/thread.cpp rename to lib/mammoth/proc/thread.cpp index 2d3eb8c..849032c 100644 --- a/lib/mammoth/src/thread.cpp +++ b/lib/mammoth/proc/thread.cpp @@ -1,4 +1,4 @@ -#include "mammoth/thread.h" +#include "proc/thread.h" #include diff --git a/lib/mammoth/include/mammoth/thread.h b/lib/mammoth/proc/thread.h similarity index 100% rename from lib/mammoth/include/mammoth/thread.h rename to lib/mammoth/proc/thread.h diff --git a/sys/denali/ahci/ahci_driver.h b/sys/denali/ahci/ahci_driver.h index 9122e14..e79bd14 100644 --- a/sys/denali/ahci/ahci_driver.h +++ b/sys/denali/ahci/ahci_driver.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include "ahci/ahci.h" diff --git a/sys/denali/lib/denali/denali.yunq.server.h b/sys/denali/lib/denali/denali.yunq.server.h index b33d731..d337d0a 100644 --- a/sys/denali/lib/denali/denali.yunq.server.h +++ b/sys/denali/lib/denali/denali.yunq.server.h @@ -2,7 +2,7 @@ #pragma once #include -#include +#include #include #include "denali.yunq.h" diff --git a/sys/victoriafalls/lib/victoriafalls/victoriafalls.yunq.server.h b/sys/victoriafalls/lib/victoriafalls/victoriafalls.yunq.server.h index b2d82ab..9734c27 100644 --- a/sys/victoriafalls/lib/victoriafalls/victoriafalls.yunq.server.h +++ b/sys/victoriafalls/lib/victoriafalls/victoriafalls.yunq.server.h @@ -2,7 +2,7 @@ #pragma once #include -#include +#include #include #include "victoriafalls.yunq.h" diff --git a/sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.h b/sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.h index 92b4ae3..e44fe2b 100644 --- a/sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.h +++ b/sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.h @@ -2,7 +2,7 @@ #pragma once #include -#include +#include #include #include "yellowstone.yunq.h" diff --git a/sys/yellowstone/yellowstone.cpp b/sys/yellowstone/yellowstone.cpp index 43d5a75..467974d 100644 --- a/sys/yellowstone/yellowstone.cpp +++ b/sys/yellowstone/yellowstone.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/yellowstone/yellowstone_server.cpp b/sys/yellowstone/yellowstone_server.cpp index 58e4d0a..d2ab8f5 100644 --- a/sys/yellowstone/yellowstone_server.cpp +++ b/sys/yellowstone/yellowstone_server.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/sys/yellowstone/yellowstone_server.h b/sys/yellowstone/yellowstone_server.h index e3608fb..9d23c8f 100644 --- a/sys/yellowstone/yellowstone_server.h +++ b/sys/yellowstone/yellowstone_server.h @@ -5,7 +5,6 @@ #include #include #include -#include #include #include "hw/pcie.h" diff --git a/yunq/server.h.jinja b/yunq/server.h.jinja index 19df555..58e9232 100644 --- a/yunq/server.h.jinja +++ b/yunq/server.h.jinja @@ -2,7 +2,7 @@ #pragma once #include -#include +#include #include #include "{{file}}.h"