DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-25 18:23:22 +00:00
Code Issues Releases Wiki Activity

新版文件系统重构完成 (#198)

Browse Source 
1.重构：VFS
2. 重构：ProcFS
3. 重构：DevFS
4. 重构：FAT32
5. 重构：AHCI驱动
6. 新增：RamFS
7. 新增：MountFS
8. 新增：FAT12
9. 新增：FAT16
10. 重构：设备抽象

Co-authored-by: guanjinquan <1666320330@qq.com>
Co-authored-by: DaJiYuQia <88259094+DaJiYuQia@users.noreply.github.com>
This commit is contained in:
login
2023-03-12 22:36:11 +08:00
committed by GitHub
parent 17041e0e30
commit 004e86ff19
109 changed files with 11258 additions and 7486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/src/ipc/Makefile
View File

@ -1,10 +1,10 @@
all: pipe.o
all:
CFLAGS += -I .
pipe.o: pipe.c
$(CC) $(CFLAGS) -c pipe.c -o pipe.o
# pipe.o: pipe.c
# $(CC) $(CFLAGS) -c pipe.c -o pipe.o
clean:
echo "Done."

176
kernel/src/ipc/pipe.c
View File

@ -1,176 +0,0 @@
#include "pipe.h"
#include <common/spinlock.h>
#include <process/process.h>
#include <process/ptrace.h>
#include <filesystem/vfs/VFS.h>
#include <filesystem/fat32/fat32.h>
#include <common/atomic.h>
#include <mm/slab.h>
struct pipe_data_t
{
volatile unsigned int valid_cnt;
unsigned int read_pos;
unsigned int write_pos;
wait_queue_node_t read_wait_queue;
wait_queue_node_t write_wait_queue;
spinlock_t lock;
} __attribute__((packed));
// 由于kmalloc分配的内存是按照2^n对齐的，因此我们需要这样来确定pipe的buffer大小以消除内部碎片
// 我们设定pipe的总大小为1024字节
#define PIPE_BUFF_SIZE (1024 - sizeof(struct pipe_data_t))
struct pipe_t
{
struct pipe_data_t data;
char buf[PIPE_BUFF_SIZE];
};
long pipe_read(struct vfs_file_t *file_ptr, char *buf,
int64_t count, long *position)
{
int i = 0;
struct pipe_t *pipe_ptr = NULL;
kdebug("pipe_read into!\n");
pipe_ptr = (struct pipe_t *)file_ptr->private_data;
spin_lock(&pipe_ptr->data.lock);
while (pipe_ptr->data.valid_cnt == 0)
{
/* pipe 空 */
kdebug("pipe_read empty!\n");
wait_queue_wakeup(&pipe_ptr->data.write_wait_queue, PROC_UNINTERRUPTIBLE);
wait_queue_sleep_on_unlock(&pipe_ptr->data.read_wait_queue, (void *)&pipe_ptr->data.lock);
spin_lock(&pipe_ptr->data.lock);
}
for (i = 0; i < pipe_ptr->data.valid_cnt; i++)
{
if (i == count)
{
break;
}
copy_to_user(buf + i, &pipe_ptr->buf[pipe_ptr->data.read_pos], sizeof(char));
pipe_ptr->data.read_pos = (pipe_ptr->data.read_pos + 1) % PIPE_BUFF_SIZE;
}
pipe_ptr->data.valid_cnt = pipe_ptr->data.valid_cnt - i;
spin_unlock(&pipe_ptr->data.lock);
wait_queue_wakeup(&pipe_ptr->data.write_wait_queue, PROC_UNINTERRUPTIBLE);
kdebug("pipe_read end!\n");
return i;
}
long pipe_write(struct vfs_file_t *file_ptr, char *buf,
int64_t count, long *position)
{
int i = 0;
struct pipe_t *pipe_ptr = NULL;
kdebug("pipe_write into!\n");
pipe_ptr = (struct pipe_t *)file_ptr->private_data;
spin_lock(&pipe_ptr->data.lock);
while (pipe_ptr->data.valid_cnt + count >= PIPE_BUFF_SIZE)
{
/* pipe 满 */
kdebug("pipe_write pipe full!\n");
wait_queue_wakeup(&pipe_ptr->data.read_wait_queue, PROC_UNINTERRUPTIBLE);
wait_queue_sleep_on_unlock(&pipe_ptr->data.write_wait_queue, (void *)&pipe_ptr->data.lock);
spin_lock(&pipe_ptr->data.lock);
}
for (i = pipe_ptr->data.valid_cnt; i < PIPE_BUFF_SIZE; i++)
{
if (i - pipe_ptr->data.valid_cnt == count)
{
break;
}
copy_from_user(&pipe_ptr->buf[pipe_ptr->data.write_pos], buf + i, sizeof(char));
pipe_ptr->data.write_pos = (pipe_ptr->data.write_pos + 1) % PIPE_BUFF_SIZE;
}
pipe_ptr->data.valid_cnt += count;
spin_unlock(&pipe_ptr->data.lock);
wait_queue_wakeup(&pipe_ptr->data.read_wait_queue, PROC_UNINTERRUPTIBLE);
kdebug("pipe_write out!\n");
return count;
}
long pipe_close(struct vfs_index_node_t *inode, struct vfs_file_t *file_ptr)
{
return 0;
}
struct vfs_file_operations_t g_pipe_file_ops = {
.open = NULL,
.close = pipe_close,
.read = pipe_read,
.write = pipe_write,
.lseek = NULL,
.ioctl = NULL,
.readdir = NULL,
};
static struct pipe_t *pipe_alloc()
{
struct pipe_t *pipe_ptr = NULL;
pipe_ptr = (struct pipe_t *)kzalloc(sizeof(struct pipe_t), 0);
spin_init(&pipe_ptr->data.lock);
pipe_ptr->data.read_pos = 0;
pipe_ptr->data.write_pos = 0;
pipe_ptr->data.valid_cnt = 0;
memset(pipe_ptr->buf, 0, PIPE_BUFF_SIZE);
wait_queue_init(&pipe_ptr->data.read_wait_queue, NULL);
wait_queue_init(&pipe_ptr->data.write_wait_queue, NULL);
return pipe_ptr;
}
/**
* @brief 创建管道
*
* @param fd(r8) 文件句柄指针
* @param num(r9) 文件句柄个数
* @return uint64_t
*/
uint64_t sys_pipe(struct pt_regs *regs)
{
int *fd = NULL;
struct pipe_t *pipe_ptr = NULL;
struct vfs_file_t *read_file = NULL;
struct vfs_file_t *write_file = NULL;
fd = (int *)regs->r8;
kdebug("pipe creat into!\n");
/* step1 申请pipe结构体、初始化 */
pipe_ptr = pipe_alloc();
/* step2 申请2个fd文件句柄，1个作为读端、1个作为写端 */
read_file = (struct vfs_file_t *)kzalloc(sizeof(struct vfs_file_t), 0);
fd[0] = process_fd_alloc(read_file);
if (fd[0] == -1)
{
kdebug("pipe alloc read fd fail!\n");
kfree(pipe_ptr);
kfree(read_file);
return -1;
}
write_file = (struct vfs_file_t *)kzalloc(sizeof(struct vfs_file_t), 0);
fd[1] = process_fd_alloc(write_file);
if (fd[1] == -1)
{
kdebug("pipe alloc write fd fail!\n");
kfree(pipe_ptr);
kfree(read_file);
kfree(write_file);
return -1;
}
/* step3 绑定pipe和file */
read_file->private_data = (void *)pipe_ptr;
read_file->file_ops = &g_pipe_file_ops;
read_file->mode = VFS_FILE_MODE_READ;
write_file->private_data = (void *)pipe_ptr;
write_file->file_ops = &g_pipe_file_ops;
write_file->mode = VFS_FILE_MODE_WRITE;
kdebug("pipe creat end!\n");
return 0;
}

4
kernel/src/ipc/pipe.h
View File

@ -1,4 +0,0 @@
#ifndef __PIPE_H__
#define __PIPE_H__
#endif