feat: (iso9660) directory read support

[lunaix-os.git] / lunaix-os / kernel / demos / iotest.c

diff --git a/lunaix-os/kernel/demos/iotest.c b/lunaix-os/kernel/demos/iotest.c
index f41c9a8e499e63eaeb7854a5d522ad43c3dbe567..cba89623af1ab9c3dc6893bf84195385380ca23e 100644 (file)
--- a/lunaix-os/kernel/demos/iotest.c
+++ b/lunaix-os/kernel/demos/iotest.c
@@ -1,10 +1,8 @@
 #include <lunaix/fctrl.h>
 #include <lunaix/foptions.h>
 #include <lunaix/fctrl.h>
 #include <lunaix/foptions.h>

+#include <lunaix/lunaix.h>

 #include <lunaix/lunistd.h>
 #include <lunaix/lunistd.h>

-#include <lunaix/proc.h>
-#include <lunaix/syslog.h>
-
-LOG_MODULE("IOTEST")
+#include <ulibc/stdio.h>

 
 void
 _iotest_main()
 
 void
 _iotest_main()


@@ -12,19 +10,26 @@ _iotest_main()
     char test_sequence[] = "Once upon a time, in a magical land of Equestria. "
                            "There were two regal sisters who ruled together "
                            "and created harmony for all the land.";
     char test_sequence[] = "Once upon a time, in a magical land of Equestria. "
                            "There were two regal sisters who ruled together "
                            "and created harmony for all the land.";

+    char read_out[256];
+
+    // 切换工作目录至 /dev
+    int errno = chdir("/dev");
+    if (errno) {
+        write(stdout, "fail to chdir", 15);
+        return;
+    }
+
+    if (getcwd(read_out, sizeof(read_out))) {
+        printf("current working dir: %s\n", read_out);
+    }

 
     // sda 设备 - 硬盘
     //  sda设备属于容积设备（Volumetric Device），
     //  Lunaix会尽可能缓存任何对此设备的上层读写，并使用延迟写入策略。（FO_DIRECT可用于屏蔽该功能）
 
     // sda 设备 - 硬盘
     //  sda设备属于容积设备（Volumetric Device），
     //  Lunaix会尽可能缓存任何对此设备的上层读写，并使用延迟写入策略。（FO_DIRECT可用于屏蔽该功能）

-    int fd = open("/dev/sda", 0);
-
-    // tty 设备 - 控制台。
-    //  tty设备属于序列设备（Sequential Device），该类型设备的上层读写
-    //  无须经过Lunaix的缓存层，而是直接下发到底层驱动。（不受FO_DIRECT的影响）
-    int tty = open("/dev/tty", 0);
+    int fd = open("./sda", 0);

 
 

-    if (fd < 0 || tty < 0) {
-        kprintf(KERROR "fail to open (%d)\n", geterrno());
+    if (fd < 0) {
+        printf("fail to open (%d)\n", geterrno());

         return;
     }
 
         return;
     }
 


@@ -36,29 +41,25 @@ _iotest_main()
         write(fd, test_sequence, sizeof(test_sequence));
     }
 
         write(fd, test_sequence, sizeof(test_sequence));
     }
 

-    lseek(fd, 521, FSEEK_SET);
+    // 随机读写测试
+    lseek(fd, 4 * 4096, FSEEK_SET);

     write(fd, test_sequence, sizeof(test_sequence));
 
     write(fd, test_sequence, sizeof(test_sequence));
 

-    char read_out[256];
-    write(tty, "input: ", 8);
-    int size = read(tty, read_out, 256);
+    printf("input: ");
+    int size = read(stdin, read_out, 256);
+
+    printf("your said: %s\n", read_out);

 
 

-    write(tty, "your input: ", 13);
-    write(tty, read_out, size);

     write(fd, read_out, size);
     write(fd, read_out, size);

-    write(tty, "\n", 1);

 
     // 读出我们写的内容
     lseek(fd, 512, FSEEK_SET);
     read(fd, read_out, sizeof(read_out));
 
     // 将读出的内容直接写入tty设备
 
     // 读出我们写的内容
     lseek(fd, 512, FSEEK_SET);
     read(fd, read_out, sizeof(read_out));
 
     // 将读出的内容直接写入tty设备

-    write(tty, read_out, sizeof(read_out));
-    write(tty, "\n", 1);
+    write(stdout, read_out, sizeof(read_out));
+    write(stdout, "\n", 1);

 
     // 关闭文件，这同时会将页缓存中的数据下发到底层驱动
     close(fd);
 
     // 关闭文件，这同时会将页缓存中的数据下发到底层驱动
     close(fd);

-    close(tty);
-
-    kprint_hex(read_out, sizeof(read_out));

 }
\ No newline at end of file
 }
\ No newline at end of file