更新ISO9660文件系统

修复SMBIOS的缺陷
优化pcb调度队列

Author: xiaoyi1212

assets/limine.conf

@@ -2,5 +2,5 @@ timeout: 0
 
 /CoolPotOS_CP_Kernel-x86_64
     protocol: limine
-    module_path: boot():/sys/sysfont.ttf
+   # module_path: boot():/sys/sysfont.ttf
     kernel_path: boot():/sys/cpkrnl.elf

libs/libos_terminal.a

@@ -23,6 +23,11 @@ typedef struct {
   uint32_t ansi_colors[16];
 } TerminalPalette;
 
+typedef struct {
+  const char *(*get)(void);
+  void (*set)(const char*);
+} TerminalClipboard;
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
@@ -67,11 +72,13 @@ void terminal_set_color_scheme(size_t palette_index);
 
 void terminal_set_custom_color_scheme(const TerminalPalette *palette);
 
-void terminal_string_free(char *s);
+void terminal_set_clipboard(TerminalClipboard clipboard);
+
+void terminal_set_pty_writer(void (*writer)(const uint8_t*));
 
-char *terminal_handle_keyboard(uint8_t scancode);
+void terminal_handle_keyboard(uint8_t scancode);
 
-char *terminal_handle_mouse_scroll(ptrdiff_t delta);
+void terminal_handle_mouse_scroll(ptrdiff_t delta);
 
 #ifdef __cplusplus
 }  // extern "C"

libs/os_terminal.h

@@ -7,6 +7,7 @@ gdt_entries_t gdt_entries;
 struct gdt_register gdt_pointer;
 tss_t tss0;
 tss_stack_t tss_stack;
+extern uint32_t bsp_processor_id;
 
 extern smp_cpu_t cpus[MAX_CPU];
 
@@ -59,7 +60,7 @@ void tss_setup() {
 
 void set_kernel_stack(uint64_t rsp){
     uint64_t cpuid = get_current_cpuid();
-    if(cpuid == 0) tss0.rsp[0] = rsp;
+    if(cpuid == bsp_processor_id) tss0.rsp[0] = rsp;
     else {
         cpus[cpuid].tss0.rsp[0] = rsp;
     }

src/core/cpu/gdt.c

@@ -19,9 +19,13 @@ extern bool x2apic_mode; //apic.c
 ticketlock apu_lock;
 
 smp_cpu_t cpus[MAX_CPU];
-uint32_t bsp_lapic_id;
+uint32_t bsp_processor_id;
 uint64_t cpu_count = 0;
 
+static void apu_hlt(){
+    cpu_hlt;
+}
+
 uint64_t cpu_num(){
     return cpu_count;
 }
@@ -110,29 +114,34 @@ void apu_entry(){
     apu_idle->kernel_stack = apu_idle->context0.rsp = get_rsp();
     apu_idle->user_stack = apu_idle->kernel_stack;
     apu_idle->tty = get_default_tty();
-    apu_idle->context0.rflags = get_rflags();
+    apu_idle->context0.rflags = get_rflags() | 0x200;
     apu_idle->cpu_timer = nanoTime();
     apu_idle->time_buf = alloc_timer();
     apu_idle->cpu_id = get_current_cpuid();
+    apu_idle->context0.rip = (uint64_t)apu_hlt;
     char name[50];
     sprintf(name,"CP_IDLE_CPU%lu",get_current_cpuid());
     memcpy(apu_idle->name, name, strlen(name));
+    apu_idle->name[strlen(name)] = '\0';
     smp_cpu_t *cpu = get_cpu_smp(get_current_cpuid());
     if(cpu == NULL){
-        return;
+        logkf("Error: smp cpu info null %d\n",get_current_cpuid());
+        cpu_hlt;
     }
     cpu->idle_pcb = apu_idle;
     apu_idle->queue_index = queue_enqueue(cpu->scheduler_queue,apu_idle);
     if(apu_idle->queue_index == -1){
         logkf("Error: scheduler null %d\n",get_current_cpuid());
+        cpu_hlt;
     }
     pivfs_update(kernel_head_task);
+    logkf("APU %d started.\n",get_current_cpuid());
     ticket_unlock(&apu_lock);
-    cpu_hlt;
+    open_interrupt;
+    apu_hlt();
 }
 
 smp_cpu_t *get_cpu_smp(uint32_t processor_id){
-    if(processor_id == bsp_lapic_id) return &cpus[MAX_CPU - 1];
     smp_cpu_t cpu = cpus[processor_id];
     if(cpu.flags == 1){
         return &cpus[processor_id];
@@ -142,22 +151,18 @@ smp_cpu_t *get_cpu_smp(uint32_t processor_id){
 void apu_startup(struct limine_smp_request smp_request){
     struct limine_smp_response *response = smp_request.response;
     cpu_count = response->cpu_count;
-    bsp_lapic_id = response->bsp_lapic_id;
     for (uint64_t i = 0; i < cpu_count && i < MAX_CPU - 1; i++){
         struct limine_smp_info *info = response->cpus[i];
-        if(info->lapic_id == response->bsp_lapic_id) {
-            cpus[MAX_CPU - 1].lapic_id = response->bsp_lapic_id;
-            cpus[MAX_CPU - 1].flags = 1;
-            cpus[MAX_CPU - 1].scheduler_queue = queue_init();
-            cpus[MAX_CPU - 1].iter_node = NULL;
-            cpus[MAX_CPU - 1].idle_pcb = kernel_head_task;
-            continue;
-        }
         cpus[info->processor_id].scheduler_queue = queue_init();
-        cpus[info->processor_id].lapic_id = info->lapic_id;
         cpus[info->processor_id].flags = 1;
         cpus[info->processor_id].iter_node = NULL;
-        info->goto_address = (void*)apu_entry;
+        cpus[info->processor_id].lapic_id = info->lapic_id;
+        if(info->lapic_id == response->bsp_lapic_id){
+            bsp_processor_id = info->processor_id;
+            cpus[info->processor_id].idle_pcb = kernel_head_task;
+        } else {
+            info->goto_address = (void*)apu_entry;
+        }
     }
     smp_cpu_t *cpu = get_cpu_smp(get_current_cpuid());
     if(cpu == NULL){

src/core/cpu/smp.c

@@ -19,7 +19,8 @@ void print_register(interrupt_frame_t *frame){
 }
 
 void print_task_info(pcb_t pcb){
-    printk("Current process PID: %d (%s) CPU%d\n",pcb->pid,pcb->name,get_current_cpuid());
+    if(pcb == NULL) printk("Current process PID: 0 (Kernel) CPU%d\n",get_current_cpuid());
+    else printk("Current process PID: %d (%s) CPU%d\n",pcb->pid,pcb->name,get_current_cpuid());
 }
 
 void kernel_error(const char *msg,uint64_t code,interrupt_frame_t *frame) {

src/core/error_handle.c

@@ -53,6 +53,7 @@ __attribute__((used, section(".limine_requests_end")))
 static volatile LIMINE_REQUESTS_END_MARKER
 
 extern void error_setup(); //error_handle.c
+extern void iso9660_regist(); //iso9660.c
 
 _Noreturn void cp_shutdown() {
     printk("Shutdown %s...\n", KERNEL_NAME);
@@ -80,32 +81,34 @@ void kmain(void) {
     printk("CoolPotOS %s (%s version %s) (Limine Bootloader) on an x86_64\n", KERNEL_NAME, COMPILER_NAME, COMPILER_VERSION);
     init_cpuid();
     kinfo("Video: 0x%p - %d x %d", framebuffer->address, framebuffer->width, framebuffer->height);
-	kinfo("SMBIOS %d.%d.0 present.\n",smbios_major_version(), smbios_minor_version());
     gdt_setup();
     idt_setup();
     page_setup();
     error_setup();
+    smbios_setup();
     acpi_setup();
     keyboard_setup();
     mouse_setup();
     char *date = get_date_time();
     kinfo("RTC time %s", date);
     free(date);
     vfs_init();
+    iso9660_regist();
+
     vdisk_init();
     devfs_setup();
     pcie_init();
     ide_setup();
     //nvme_setup();
-    //ahci_setup();
+   // ahci_setup();
     //xhci_setup();
 
 
     pivfs_setup();
     init_pcb();
     smp_setup();
     build_stream_device();
-    
+
     init_iic();
 
     /*TODO*/ create_kernel_thread(terminal_flush_service, NULL, "TerminalFlush");

src/core/main.c

@@ -28,15 +28,19 @@ __IRQHANDLER static void page_fault_handle(interrupt_frame_t *frame,uint64_t err
     uint64_t faulting_address;
     __asm__ volatile("mov %%cr2, %0" : "=r"(faulting_address));
     logkf("Page fault, virtual address 0x%x\n", faulting_address);
-    logkf("Current process PID: %d (%s)\n",get_current_task()->pid,get_current_task()->name);
+    if(get_current_task() != NULL){
+        logkf("Current process PID: %d (%s)\n",get_current_task()->pid,get_current_task()->name);
+    }
     printk("\n");
     printk("\033[31m:3 Your CP_Kernel ran into a problem.\nERROR CODE >(PageFault%s:0x%p)<\033[0m\n",
            !(error_code & 0x1) ? "NotPresent" :
            error_code & 0x2 ? "WriteError" :
            error_code & 0x4 ? "UserMode" :
            error_code & 0x8 ? "ReservedBitsSet" :
            error_code & 0x10 ? "DecodeAddress" : "Unknown",faulting_address);
-    printk("Current process PID: %d (%s) at CPU%d\n",get_current_task()->pid,get_current_task()->name,get_current_cpuid());
+    if(get_current_task() != NULL){
+        printk("Current process PID: %d (%s) at CPU%d\n",get_current_task()->pid,get_current_task()->name,get_current_cpuid());
+    }
     print_register(frame);
     update_terminal();
     cpu_hlt;

src/core/mem/page.c

@@ -131,5 +131,5 @@ void init_pcb(){
     memcpy(current_task->name, name, strlen(name));
     pivfs_update(kernel_head_task);
 
-    kinfo("Load task schedule. | KernelProcessName: %s PID: %d", current_task->name, current_task->pid);
+    kinfo("Load task schedule. | KernelProcess PID: %d", current_task->pid);
 }

src/core/task/pcb.c

@@ -11,7 +11,11 @@ pcb_t current_task = NULL;
 pcb_t kernel_head_task = NULL;
 bool is_scheduler = false;
 
+extern uint64_t cpu_count; //smp.c
+extern uint32_t bsp_processor_id; //smp.c
+
 ticketlock scheduler_lock;
+ticketlock scheduler_lock_rw;
 
 pcb_t get_current_task(){
     return current_task;
@@ -29,20 +33,31 @@ int add_task(pcb_t new_task) {
     if (new_task == NULL) return -1;
     ticket_lock(&scheduler_lock);
 
-    smp_cpu_t *cpu = get_cpu_smp(get_current_cpuid());
-    if(cpu == NULL){
+    smp_cpu_t *cpu0 = get_cpu_smp(bsp_processor_id);
+    uint32_t cpuid = bsp_processor_id;
+
+//    for (int i = 0; i < cpu_count; i++) {
+//        smp_cpu_t *cpu = get_cpu_smp(i);
+//        if(cpu == NULL) continue;
+//        if(cpu->flags == 1 && cpu->scheduler_queue->size < cpu0->scheduler_queue->size){
+//            cpu0 = cpu;
+//            cpuid = i;
+//        }
+//    }
+
+    if(cpu0 == NULL){
         ticket_unlock(&scheduler_lock);
         return -1;
     }
-    new_task->queue_index = queue_enqueue(cpu->scheduler_queue,new_task);
+    new_task->cpu_id = cpuid;
+    new_task->queue_index = queue_enqueue(cpu0->scheduler_queue,new_task);
     if(new_task->queue_index == -1){
         logkf("Error: scheduler null %d\n",get_current_cpuid());
         return -1;
     }
+    if(new_task->pid == cpu0->idle_pcb->pid) goto ret;
 
-    if(new_task->pid == kernel_head_task->pid) goto ret;
-
-    pivfs_update(kernel_head_task);
+    //pivfs_update(kernel_head_task);
     ret:
     ticket_unlock(&scheduler_lock);
     return new_task->queue_index;
@@ -58,7 +73,7 @@ void remove_task(pcb_t task){
         return;
     }
     queue_remove_at(cpu->scheduler_queue,task->queue_index);
-    pivfs_update(kernel_head_task);
+    //pivfs_update(kernel_head_task);
     ticket_unlock(&scheduler_lock);
 }
 
@@ -109,17 +124,30 @@ void change_proccess(registers_t *reg,pcb_t taget){
     reg->rip = taget->context0.rip;
     reg->rsp = taget->context0.rsp;
 
+
     current_task = taget;
 }
 
 /**
- * CP_Kernel 默认单核调度器 - 循环公平调度
+ * CP_Kernel 默认多核调度器 - 循环公平调度
  * @param reg 当前进程上下文
  */
 void scheduler(registers_t *reg){
     if(is_scheduler){
         if(current_task != NULL){
+            ticket_lock(&scheduler_lock);
             smp_cpu_t *cpu = get_cpu_smp(get_current_cpuid());
+            if(cpu == NULL) {
+                logkf("Error: scheduler null %d\n",get_current_cpuid());
+                ticket_unlock(&scheduler_lock);
+                return;
+            }
+
+            if(cpu->scheduler_queue->size == 1){
+                ticket_unlock(&scheduler_lock);
+                return;
+            }
+
             if (cpu->iter_node == NULL) {
                 iter_head:
                 cpu->iter_node = cpu->scheduler_queue->head;
@@ -133,7 +161,6 @@ void scheduler(registers_t *reg){
             }
 
             pcb_t next = (pcb_t)data;
-           // logkf("p: %p\n",next);
 
             current_task->cpu_clock++;
             if(current_task->time_buf != NULL){
@@ -147,6 +174,8 @@ void scheduler(registers_t *reg){
                 change_proccess(reg,next);
                 enable_scheduler();
             }
+
+            ticket_unlock(&scheduler_lock);
         }
     }
     send_eoi();