Move IPC stuff from the libc side, inside the sys folder.

libc/CMakeLists.txt

@@ -100,7 +100,7 @@ add_library(
     ${PROJECT_SOURCE_DIR}/src/io/mm_io.c
     ${PROJECT_SOURCE_DIR}/src/io/port_io.c
     ${PROJECT_SOURCE_DIR}/src/io/debug.c
-    ${PROJECT_SOURCE_DIR}/src/ipc/ipc.c
+    ${PROJECT_SOURCE_DIR}/src/sys/ipc.c
     ${PROJECT_SOURCE_DIR}/src/sys/unistd.c
     ${PROJECT_SOURCE_DIR}/src/sys/errno.c
     ${PROJECT_SOURCE_DIR}/src/sys/utsname.c

libc/inc/sys/ipc.h

@@ -6,6 +6,7 @@
 #pragma once
 
 #include "sys/types.h"
+#include "stddef.h"
 
 #define IPC_CREAT   01000 ///< Create key if key does not exist.
 #define IPC_EXCL    02000 ///< Fail if key exists.

libc/inc/sys/msg.h

@@ -5,10 +5,11 @@
 
 #pragma once
 
+#include "sys/ipc.h"
+
 #include "sys/types.h"
 #include "stddef.h"
 #include "time.h"
-#include "ipc.h"
 
 /// Type for storing the number of messages in a message queue.
 typedef unsigned int msgqnum_t;

libc/inc/sys/sem.h

@@ -6,9 +6,10 @@
 #pragma once
 
 #include "sys/types.h"
+#include "sys/ipc.h"
+
 #include "stddef.h"
 #include "time.h"
-#include "ipc.h"
 
 #define SEM_UNDO 0x1000 ///< Undo the operation on exit.
 

libc/inc/sys/shm.h

@@ -5,10 +5,11 @@
 
 #pragma once
 
+#include "sys/ipc.h"
+
 #include "sys/types.h"
 #include "stddef.h"
 #include "time.h"
-#include "ipc.h"
 
 /// Data type for storing the number of attaches.
 typedef unsigned long shmatt_t;
@@ -39,7 +40,6 @@ struct shmid_ds {
 
 #if 0
 
-#include "ipc.h"
 #include "debug.h"
 #include "time.h"
 #include "kheap.h"

libc/src/sys/ipc.c

@@ -4,20 +4,18 @@
 /// See LICENSE.md for details.
 
 #include "sys/unistd.h"
-#include "system/syscall_types.h"
 #include "sys/errno.h"
+#include "sys/stat.h"
+#include "sys/sem.h"
+#include "sys/shm.h"
+#include "sys/msg.h"
+
+#include "system/syscall_types.h"
 #include "stddef.h"
 #include "string.h"
 #include "io/debug.h"
 #include "stdio.h"
-#include "ipc/sem.h"
-#include "ipc/shm.h"
-#include "ipc/msg.h"
 #include "stdlib.h"
-#include "ipc/sem.h"
-#include "ipc/shm.h"
-#include "ipc/msg.h"
-#include "sys/stat.h"
 #include "io/debug.h"
 #include "stdio.h"
 

mentos/src/io/proc_ipc.c

@@ -3,15 +3,15 @@
 /// @copyright (c) 2014-2022 This file is distributed under the MIT License.
 /// See LICENSE.md for details.
 
-#include "fs/procfs.h"
 #include "process/process.h"
 #include "sys/errno.h"
+#include "fs/procfs.h"
 #include "io/debug.h"
+#include "sys/msg.h"
+#include "sys/sem.h"
+#include "sys/shm.h"
 #include "string.h"
 
-#include "ipc/msg.h"
-#include "ipc/sem.h"
-#include "ipc/shm.h"
 
 extern ssize_t procipc_msg_read(vfs_file_t *file, char *buf, off_t offset, size_t nbyte);
 

mentos/src/ipc/msg.c

@@ -12,10 +12,10 @@
 #include "io/debug.h"                    // Include debugging functions.
 // ============================================================================
 
-#include "ipc/msg.h"
-#include "system/panic.h"
 #include "process/process.h"
+#include "system/panic.h"
 #include "sys/errno.h"
+#include "sys/msg.h"
 #include "string.h"
 #include "assert.h"
 #include "stdio.h"

mentos/src/ipc/sem.c

@@ -38,9 +38,10 @@
 #include "io/debug.h"                   // Include debugging functions.
 // ============================================================================
 
-#include "ipc/sem.h"
-#include "klib/list.h"
+#include "sys/sem.h"
+
 #include "process/process.h"
+#include "klib/list.h"
 #include "sys/errno.h"
 #include "string.h"
 #include "assert.h"

mentos/src/ipc/shm.c

@@ -12,7 +12,7 @@
 #include "io/debug.h"                    // Include debugging functions.
 // ============================================================================
 
-#include "ipc/shm.h"
+#include "sys/shm.h"
 #include "system/panic.h"
 #include "process/process.h"
 #include "sys/errno.h"

mentos/src/system/syscall.c

@@ -13,17 +13,17 @@
 #include "mem/kheap.h"
 #include "system/syscall.h"
 #include "descriptor_tables/isr.h"
-#include "sys/errno.h"
 #include "kernel.h"
 #include "process/process.h"
 #include "process/scheduler.h"
-#include "sys/utsname.h"
 #include "fs/ioctl.h"
 #include "hardware/timer.h"
 
-#include "ipc/msg.h"
-#include "ipc/sem.h"
-#include "ipc/shm.h"
+#include "sys/errno.h"
+#include "sys/utsname.h"
+#include "sys/msg.h"
+#include "sys/sem.h"
+#include "sys/shm.h"
 
 /// The signature of a function call.
 typedef int (*SystemCall)();

programs/ipcrm.c

@@ -5,8 +5,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ipc/sem.h>
-#include <ipc/ipc.h>
+#include <sys/sem.h>
+#include <sys/ipc.h>
 #include <stdlib.h>
 
 

programs/ipcs.c

@@ -5,8 +5,8 @@
 
 #include <sys/unistd.h>
 #include <stdio.h>
-#include <ipc/sem.h>
-#include <ipc/ipc.h>
+#include <sys/sem.h>
+#include <sys/ipc.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>

programs/tests/t_sem1.c

@@ -1,7 +1,7 @@
 //test
-#include "ipc/sem.h"
+#include "sys/sem.h"
 #include "stdio.h"
-#include "ipc/ipc.h"
+#include "sys/ipc.h"
 #include "sys/errno.h"
 #include "sys/wait.h"
 #include "stdlib.h"

programs/tests/t_semflg.c

@@ -1,10 +1,10 @@
 //test
-#include "ipc/sem.h"
-#include "stdio.h"
-#include "ipc/ipc.h"
-#include "sys/errno.h"
-#include "stdlib.h"
 #include "sys/unistd.h"
+#include "sys/errno.h"
+#include "sys/sem.h"
+#include "sys/ipc.h"
+#include "stdlib.h"
+#include "stdio.h"
 
 /*
 Testing IPC_NOWAIT flag.

programs/tests/t_semget.c

@@ -1,10 +1,10 @@
 //test
-#include "ipc/sem.h"
-#include "stdio.h"
-#include "ipc/ipc.h"
-#include "sys/errno.h"
-#include "stdlib.h"
 #include "sys/unistd.h"
+#include "sys/errno.h"
+#include "sys/sem.h"
+#include "sys/ipc.h"
+#include "stdlib.h"
+#include "stdio.h"
 
 /*
 Testing Semaphores.