From 71e4f3812982dba2efb471283d310224e8db363e Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Wed, 3 Mar 2021 22:09:50 -0800 Subject: 7842 - new directory organization Baremetal is now the default build target and therefore has its sources at the top-level. Baremetal programs build using the phase-2 Mu toolchain that requires a Linux kernel. This phase-2 codebase which used to be at the top-level is now under the linux/ directory. Finally, the phase-2 toolchain, while self-hosting, has a way to bootstrap from a C implementation, which is now stored in linux/bootstrap. The bootstrap C implementation uses some literate programming tools that are now in linux/bootstrap/tools. So the whole thing has gotten inverted. Each directory should build one artifact and include the main sources (along with standard library). Tools used for building it are relegated to sub-directories, even though those tools are often useful in their own right, and have had lots of interesting programs written using them. A couple of things have gotten dropped in this process: - I had old ways to run on just a Linux kernel, or with a Soso kernel. No more. - I had some old tooling for running a single test at the cursor. I haven't used that lately. Maybe I'll bring it back one day. The reorg isn't done yet. Still to do: - redo documentation everywhere. All the README files, all other markdown, particularly vocabulary.md. - clean up how-to-run comments at the start of programs everywhere - rethink what to do with the html/ directory. Do we even want to keep supporting it? In spite of these shortcomings, all the scripts at the top-level, linux/ and linux/bootstrap are working. The names of the scripts also feel reasonable. This is a good milestone to take stock at. --- tools/iso/kernel.soso/sharedmemory.c | 224 ----------------------------------- 1 file changed, 224 deletions(-) delete mode 100644 tools/iso/kernel.soso/sharedmemory.c (limited to 'tools/iso/kernel.soso/sharedmemory.c') diff --git a/tools/iso/kernel.soso/sharedmemory.c b/tools/iso/kernel.soso/sharedmemory.c deleted file mode 100644 index 8082d2a4..00000000 --- a/tools/iso/kernel.soso/sharedmemory.c +++ /dev/null @@ -1,224 +0,0 @@ -#include "fs.h" -#include "common.h" -#include "list.h" -#include "alloc.h" -#include "spinlock.h" -#include "vmm.h" -#include "sharedmemory.h" - -static List* gShmList = NULL; -static Spinlock gShmListLock; - -static FileSystemNode* gShmRoot = NULL; - -static FileSystemDirent gDirent; - -static BOOL sharedmemorydir_open(File *file, uint32 flags); -static FileSystemDirent *sharedmemorydir_readdir(FileSystemNode *node, uint32 index); -static FileSystemNode *sharedmemorydir_finddir(FileSystemNode *node, char *name); - -typedef struct SharedMemory { - FileSystemNode* node; - List* physicalAddressList; - Spinlock physicalAddressListLock; - //TODO: permissions -} SharedMemory; - -void initializeSharedMemory() { - Spinlock_Init(&gShmListLock); - - gShmList = List_Create(); - - gShmRoot = getFileSystemNode("/system/shm"); - - if (NULL == gShmRoot) { - WARNING("/system/shm not found!!"); - } - else { - gShmRoot->open = sharedmemorydir_open; - gShmRoot->finddir = sharedmemorydir_finddir; - gShmRoot->readdir = sharedmemorydir_readdir; - } -} - -static BOOL sharedmemorydir_open(File *file, uint32 flags) { - return TRUE; -} - -static FileSystemDirent *sharedmemorydir_readdir(FileSystemNode *node, uint32 index) { - FileSystemDirent* result = NULL; - - int counter = 0; - - Spinlock_Lock(&gShmListLock); - - List_Foreach (n, gShmList) { - SharedMemory* p = (SharedMemory*)n->data; - - if (counter == index) { - strcpy(gDirent.name, p->node->name); - gDirent.fileType = p->node->nodeType; - - result = &gDirent; - - break; - } - ++counter; - } - - Spinlock_Unlock(&gShmListLock); - - return result; -} - -static FileSystemNode *sharedmemorydir_finddir(FileSystemNode *node, char *name) { - FileSystemNode* result = NULL; - - Spinlock_Lock(&gShmListLock); - - List_Foreach (n, gShmList) { - SharedMemory* p = (SharedMemory*)n->data; - - if (strcmp(name, p->node->name) == 0) { - result = p->node; - break; - } - } - - Spinlock_Unlock(&gShmListLock); - - return result; -} - -static BOOL sharedmemory_open(File *file, uint32 flags) { - return TRUE; -} - -static void sharedmemory_unlink(File *file) { - destroySharedMemory(file->node->name); -} - -static int32 sharedmemory_ftruncate(File *file, int32 length) { - if (length <= 0) { - return -1; - } - - SharedMemory* sharedMem = (SharedMemory*)file->node->privateNodeData; - - if (0 != file->node->length) { - //already set - return -1; - } - - int pageCount = (length / PAGESIZE_4M) + 1; - - Spinlock_Lock(&sharedMem->physicalAddressListLock); - - for (int i = 0; i < pageCount; ++i) { - char* pAddress = getPageFrame4M(); - - List_Append(sharedMem->physicalAddressList, pAddress); - } - - file->node->length = length; - - Spinlock_Unlock(&sharedMem->physicalAddressListLock); - - return 0; -} - -static void* sharedmemory_mmap(File* file, uint32 size, uint32 offset, uint32 flags) { - void* result = NULL; - - SharedMemory* sharedMem = (SharedMemory*)file->node->privateNodeData; - - Spinlock_Lock(&sharedMem->physicalAddressListLock); - - if (List_GetCount(sharedMem->physicalAddressList) > 0) { - result = mapMemory(file->thread->owner, size, 0, sharedMem->physicalAddressList); - } - - Spinlock_Unlock(&sharedMem->physicalAddressListLock); - - return result; -} - -FileSystemNode* getSharedMemoryNode(const char* name) { - FileSystemNode* result = NULL; - - Spinlock_Lock(&gShmListLock); - - List_Foreach (n, gShmList) { - SharedMemory* p = (SharedMemory*)n->data; - - if (strcmp(name, p->node->name) == 0) { - result = p->node; - break; - } - } - - Spinlock_Unlock(&gShmListLock); - - return result; -} - -FileSystemNode* createSharedMemory(const char* name) { - if (getSharedMemoryNode(name) != NULL) { - return NULL; - } - - SharedMemory* sharedMem = (SharedMemory*)kmalloc(sizeof(SharedMemory)); - memset((uint8*)sharedMem, 0, sizeof(SharedMemory)); - - FileSystemNode* node = (FileSystemNode*)kmalloc(sizeof(FileSystemNode)); - memset((uint8*)node, 0, sizeof(FileSystemNode)); - - strcpy(node->name, name); - node->nodeType = FT_CharacterDevice; - node->open = sharedmemory_open; - //TODO: node->shm_unlink = sharedmemory_unlink; - node->ftruncate = sharedmemory_ftruncate; - node->mmap = sharedmemory_mmap; - node->privateNodeData = sharedMem; - - sharedMem->node = node; - sharedMem->physicalAddressList = List_Create(); - Spinlock_Init(&sharedMem->physicalAddressListLock); - - Spinlock_Lock(&gShmListLock); - List_Append(gShmList, sharedMem); - Spinlock_Unlock(&gShmListLock); - - return node; -} - -void destroySharedMemory(const char* name) { - SharedMemory* sharedMem = NULL; - - Spinlock_Lock(&gShmListLock); - - List_Foreach (n, gShmList) { - SharedMemory* p = (SharedMemory*)n->data; - - if (strcmp(name, p->node->name) == 0) { - sharedMem = (SharedMemory*)p; - break; - } - } - - if (sharedMem) { - Spinlock_Lock(&sharedMem->physicalAddressListLock); - - kfree(sharedMem->node); - - List_Destroy(sharedMem->physicalAddressList); - - List_RemoveFirstOccurrence(gShmList, sharedMem); - - Spinlock_Unlock(&sharedMem->physicalAddressListLock); - - kfree(sharedMem); - } - - Spinlock_Unlock(&gShmListLock); -} -- cgit 1.4.1-2-gfad0