update X86_ZLMediaKit

.gitignore

@@ -9,6 +9,8 @@ rusty-tags.vi
 /testcases/riscv64-linux-musl-native.tgz
 /testcases/gcc/riscv64-linux-musl-native
 /testcases/ZLM/MediaServer
+/testcases/ZLM/ffmpeg
+/testcases/ZLM/lib
 testsuits-x86_64-linux-musl.tgz
 .idea/
 arceos-fada.bin.gz

build_img.sh

@@ -3,17 +3,19 @@
 # 	MacOS  : brew install dosfstools
 # 	Ubuntu : apt-get install dosfstools
 #	Usage:
-# 		build_img.sh -m [arch] -fs [ext4|fat32] -file [testcast]
+# 		build_img.sh -m [arch] -fs [ext4|fat32] -file [testcast] -s [size]
 ################################################################
 # default setting
 arch=x86_64
 fs=fat32
+size=30
 FILE=
 
 display_help()
 {
 	echo ""
 	echo "./build_img.sh -m [arch] -fs [filesystem] -file [testcast]"
+	echo "  -s | --size		size of the disk image in 4MB batch size, default is set to 30, which means 120MB disk image"
 	echo ""
 	exit 1
 }
@@ -32,6 +34,10 @@ while [ -n "$1" ]; do
 			shift
 			FILE="$1"
 			;;
+		-s | --size )
+			shift
+			size=$1
+			;;
 		riscv64)
 			arch=riscv64
 			;;
@@ -96,7 +102,7 @@ if [ "$FILE" = "testsuits-x86_64-linux-musl" ] && [ ! -e testcases/$FILE ]; then
 fi
 
 rm -f disk.img
-dd if=/dev/zero of=disk.img bs=4M count=30
+dd if=/dev/zero of=disk.img bs=4M count=$size
 
 if [ "$fs" = "ext4" ]; then
 	mkfs.ext4 -t ext4 disk.img
@@ -124,4 +130,4 @@ else
 	sudo umount mnt
 	sudo rm -rf mnt
 	sudo chmod 777 disk.img
-fi
+fi

platforms/x86_64-qemu-q35.toml

@@ -39,7 +39,7 @@ timer-frequency = "4_000_000_000"   # 4.0GHz
 # Testcase memory start address.
 testcase-memory-start = "0x1_8000_0000"
 # Testcase memory size.
-testcase-memory-size = "0x800_0000"
+testcase-memory-size = "0x1700_0000"
 # The base address of the user heap.
 user-heap-base = "0x3FA0_0000"
 # The base address of the user stack. And the stack bottom is `user-stack-top + max-user-stack-size`.

testcases/ZLM/downloads.sh

@@ -0,0 +1,6 @@
+rm -rf lib ffmpeg MediaServer
+git clone https://gitee.com/baiqiaosen/zlm_ffmpeg.git
+mv zlm_ffmpeg/lib ./
+mv zlm_ffmpeg/ffmpeg ./
+mv zlm_ffmpeg/MediaServer ./
+rm -rf zlm_ffmpeg

ulib/axstarry/src/syscall_mem/imp.rs

@@ -376,3 +376,8 @@ pub fn syscall_shmat(args: [usize; 6]) -> SyscallResult {
 
     Ok(addr.as_usize() as isize)
 }
+
+/// # mlock
+pub fn syscall_mlock(args: [usize; 6]) -> SyscallResult {
+    Ok(0)
+}

ulib/axstarry/src/syscall_mem/mem_syscall_id.rs

@@ -34,6 +34,7 @@ numeric_enum_macro::numeric_enum! {
     #[derive(Eq, PartialEq, Debug, Copy, Clone)]
     pub enum MemSyscallId {
         // mem
+        MREMAP = 25,
         SHMGET = 29,
         SHMCTL = 31,
         SHMAT = 30,
@@ -43,5 +44,6 @@ numeric_enum_macro::numeric_enum! {
         MSYNC = 26,
         MPROTECT = 10,
         MEMBARRIER = 324,
+        MLOCK = 149,
     }
 }

ulib/axstarry/src/syscall_mem/mod.rs

@@ -22,6 +22,8 @@ pub fn mem_syscall(syscall_id: mem_syscall_id::MemSyscallId, args: [usize; 6]) -
         SHMGET => syscall_shmget(args),
         SHMCTL => Ok(0),
         SHMAT => syscall_shmat(args),
+        #[cfg(target_arch = "x86_64")]
+        MLOCK => syscall_mlock(args),
         #[allow(unused)]
         _ => {
             panic!("Invalid Syscall Id: {:?}!", syscall_id);