内核编号修改, 增加CPU速度统计

Author: xiaoyi1212

src/x86_64/core/cpu/cpusp.c

@@ -0,0 +1,18 @@
+#include "cpusp.h"
+#include "kprint.h"
+#include "timer.h"
+
+uint64_t ips = 0;
+
+uint64_t get_cpu_speed(){
+    return ips;
+}
+
+_Noreturn void cpu_speed_test(){
+    infinite_loop{
+        size_t _start_t = nanoTime();
+        for (volatile uint64_t i = 0; i < 1000; i++);
+        size_t _end_t = nanoTime() - _start_t;
+        ips = _end_t / 1000;
+    }
+}

src/x86_64/core/cpu/smp.c

@@ -22,7 +22,7 @@ smp_cpu_t cpus[MAX_CPU];
 uint32_t  bsp_processor_id;
 uint64_t  cpu_count = 0;
 
-static int16_t cpu_done_count = 0;
+static uint64_t cpu_done_count = 0;
 
 static void apu_hlt() {
     cpu_hlt;
@@ -127,7 +127,7 @@ void apu_entry() {
     cpu->current_pcb             = apu_idle;
     cpu->flags                   = 1;
     apu_idle->queue_index        = queue_enqueue(cpu->scheduler_queue, apu_idle);
-    if (apu_idle->queue_index == -1) {
+    if (apu_idle->queue_index == (size_t)-1) {
         logkf("Error: scheduler null %d\n", get_current_cpuid());
         cpu_hlt;
     }
@@ -175,7 +175,7 @@ void apu_startup(struct limine_smp_request smp_request) {
     if (cpu == NULL) { return; }
     cpu->idle_pcb                 = kernel_head_task;
     kernel_head_task->queue_index = queue_enqueue(cpu->scheduler_queue, kernel_head_task);
-    if (kernel_head_task->queue_index == -1) {
+    if (kernel_head_task->queue_index == (size_t)-1) {
         logkf("Error: scheduler null %d\n", get_current_cpuid());
     }
 

src/x86_64/core/main.c

@@ -30,6 +30,7 @@
 #include "vdisk.h"
 #include "vfs.h"
 #include "pcnet.h"
+#include "cpusp.h"
 
 // 编译器判断
 #if defined(__clang__)
@@ -55,7 +56,7 @@ LIMINE_REQUEST LIMINE_BASE_REVISION(2);
 LIMINE_REQUEST struct limine_stack_size_request stack_request = {
     .id         = LIMINE_STACK_SIZE_REQUEST,
     .revision   = 0,
-    .stack_size = 131072 // 128K
+    .stack_size = KERNEL_ST_SZ // 128K
 };
 
 extern void  error_setup();    // error_handle.c
@@ -123,6 +124,7 @@ void kmain(void) {
 
     create_kernel_thread(terminal_flush_service, NULL, "TerminalFlush");
     create_kernel_thread((void *)shell_setup, NULL, "KernelShell");
+    create_kernel_thread((void *)cpu_speed_test,NULL,"CPUSpeed");
     kinfo("Kernel load Done!");
     // beep();
     enable_scheduler();

src/x86_64/core/task/scheduler.c

@@ -36,7 +36,7 @@ int add_task(pcb_t new_task) {
     smp_cpu_t *cpu0  = get_cpu_smp(bsp_processor_id);
     uint32_t   cpuid = bsp_processor_id;
 
-    for (int i = 0; i < cpu_count; i++) {
+    for (size_t 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) {
@@ -53,13 +53,12 @@ int add_task(pcb_t new_task) {
     }
     new_task->cpu_id      = cpuid;
     new_task->queue_index = queue_enqueue(cpu0->scheduler_queue, new_task);
-    if (new_task->queue_index == -1) {
+    if (new_task->queue_index == (size_t)-1) {
         logkf("Error: scheduler null %d\n", get_current_cpuid());
         return -1;
     }
 
 //pivfs_update(kernel_head_task);
-ret:
     ticket_unlock(&scheduler_lock);
     return new_task->queue_index;
 }

src/x86_64/driver/pci/ide.c

@@ -142,7 +142,7 @@ void ide_write(uint8_t channel, uint8_t reg, uint8_t data) {
 }
 
 uint8_t ide_read(uint8_t channel, uint8_t reg) {
-    uint8_t result;
+    uint8_t result = 0;
     if (reg > 0x07 && reg < 0x0C)
         ide_write(channel, ATA_REG_CONTROL, 0x80 | channels[channel].nIEN);
     if (reg < 0x08)
@@ -151,8 +151,7 @@ uint8_t ide_read(uint8_t channel, uint8_t reg) {
         result = io_in8(channels[channel].base + reg - 0x06);
     else if (reg < 0x0E)
         result = io_in8(channels[channel].ctrl + reg - 0x0A);
-    else if (reg < 0x16)
-        result = io_in8(channels[channel].bmide + reg - 0x0E);
+    else result = io_in8(channels[channel].bmide + reg - 0x0E);
     if (reg > 0x07 && reg < 0x0C) ide_write(channel, ATA_REG_CONTROL, channels[channel].nIEN);
     return result;
 }
@@ -181,7 +180,7 @@ uint8_t ide_ata_access(uint8_t direction, uint8_t drive, uint32_t lba, uint8_t n
                        uint16_t selector, uint64_t edi) {
     uint8_t  lba_mode /* 0: CHS, 1:LBA28, 2: LBA48 */, dma /* 0: No DMA, 1: DMA */, cmd;
     uint8_t  lba_io[6];
-    uint32_t channel  = ide_devices[drive].Channel; // Read the Channel.
+    uint8_t  channel  = ide_devices[drive].Channel; // Read the Channel.
     uint32_t slavebit = ide_devices[drive].Drive;   // Read the Drive [Master/Slave]
     uint32_t bus      = channels[channel].base;     // Bus Base, like 0x1F0 which is also data port.
     uint32_t words    = 256; // Almost every ATA drive has a sector-size of 512-byte.
@@ -276,7 +275,7 @@ uint8_t ide_ata_access(uint8_t direction, uint8_t drive, uint32_t lba, uint8_t n
         uint16_t *word_ = (uint16_t *)edi;
         for (i = 0; i < numsects; i++) {
             klog("read %d", i);
-            if ((err = ide_polling(channel, 1)) != NULL)
+            if ((err = ide_polling(channel, 1)) != 0)
                 return err; // Polling, set error and exit if there is.
 
             klog("words=%d bus=%d", words, bus);

src/x86_64/include/cpusp.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include "ctype.h"
+
+_Noreturn void cpu_speed_test();
+
+uint64_t get_cpu_speed();

src/x86_64/include/krlibc.h

@@ -1,11 +1,12 @@
 #pragma once
 
 /**
- * 定义CP_Kernel的各种属性
+ * 定义cpinl内核的各种属性
  */
-#define KERNEL_NAME    "CP_Kernel-x86_64-0.1.1" // 内核编号
-#define MAX_CPU        (256 * 2)                // 最大支持CPU核心数 256
+#define KERNEL_NAME    "cpinl-x86_64-0.1.2"     // 内核编号
+#define MAX_CPU        (256)                    // 最大支持CPU核心数 256
 #define STACK_SIZE     32768                    // 栈大小(byte)
+#define KERNEL_ST_SZ   131072                   // 内核栈大小 128k
 #define MAX_WAIT_INDEX 100000                   // 阻塞最大循环数
 
 // 常用工具宏

src/x86_64/sysapp/shell.c

@@ -15,6 +15,7 @@
 #include "sprintf.h"
 #include "timer.h"
 #include "vfs.h"
+#include "cpusp.h"
 
 extern void cp_shutdown();
 extern void cp_reset();
@@ -101,6 +102,7 @@ static void reboot_os() {
 }
 
 static void cd(int argc, char **argv) {
+    UNUSED(argv);
     if (argc == 1) {
         printk("If there are too few parameters.\n");
         return;
@@ -182,11 +184,13 @@ void ps() {
             }
         }
     }
-    printk("   --- CPU Usage: %d%% | Memory Usage: %d%s/%dMB ---\n", idle_time * 100 / all_time,
+    printk("   --- CPU Usage: %d%% IPS: %d | Memory Usage: %d%s/%dMB ---\n", idle_time * 100 / all_time,
+           get_cpu_speed(),
            mem_use + memory, bytes > 10485760 ? "MB" : "KB", memory_size / 1024 / 1024);
 }
 
 static void ls(int argc, char **argv) {
+    UNUSED(argv);
     vfs_node_t p;
     if (argc == 1) {
         p = vfs_open(shell_work_path);
@@ -228,6 +232,7 @@ static void pkill(int argc, char **argv) {
 }
 
 static void echo(int argc, char **argv) {
+    UNUSED(argv);
     if (argc == 1) {
         printk("[Shell-ECHO]: If there are too few parameters.\n");
         return;