From a8384b5db2274d50a350910d7cfd3fc36b4f4103 Mon Sep 17 00:00:00 2001 From: Far Date: Sat, 26 Jun 2021 10:13:23 +0800 Subject: [PATCH 01/43] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E5=86=85=E6=A0=B8=E7=9A=84VFAT=E6=B5=8B=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复内容包括如下： 1. 将memset_s中buffer的大小设置正确； 2. 将用例文件夹名由vfat2修改为vfat； 3. 修复了vfat用例在SetUpTestcase和TearDownTestCase； 4. 全局变量g_fatFilesystem在初始化时设置为2（即FAT32）； Close #I3XF3R Signed-off-by: Far --- testsuites/unittest/BUILD.gn | 6 +- .../unittest/fs/{vfat2 => vfat}/BUILD.gn | 2 +- .../unittest/fs/{vfat2 => vfat}/It_vfs_fat.h | 5 +- .../fs/{vfat2 => vfat}/VfsFatTest.cpp | 44 ++++----- .../{vfat2 => vfat}/full/It_vfs_fat_066.cpp | 2 +- .../{vfat2 => vfat}/full/It_vfs_fat_068.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_072.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_073.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_074.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_496.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_497.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_498.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_499.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_500.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_501.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_502.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_503.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_504.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_506.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_507.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_508.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_509.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_510.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_511.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_512.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_513.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_514.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_515.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_516.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_517.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_518.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_519.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_662.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_663.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_664.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_665.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_666.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_667.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_668.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_669.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_670.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_671.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_672.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_673.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_674.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_675.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_676.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_677.cpp | 4 - .../{vfat2 => vfat}/full/It_vfs_fat_678.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_679.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_680.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_681.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_682.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_683.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_684.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_685.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_686.cpp | 2 +- .../{vfat2 => vfat}/full/It_vfs_fat_687.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_692.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_693.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_694.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_870.cpp | 2 +- .../{vfat2 => vfat}/full/It_vfs_fat_872.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_873.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_874.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_875.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_902.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_903.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_904.cpp | 0 .../{vfat2 => vfat}/full/It_vfs_fat_909.cpp | 4 +- .../pressure/It_fs_fat_performance_001.cpp | 0 .../pressure/It_fs_fat_performance_002.cpp | 0 .../pressure/It_fs_fat_performance_003.cpp | 0 .../pressure/It_fs_fat_performance_004.cpp | 0 .../pressure/It_fs_fat_performance_005.cpp | 0 .../pressure/It_fs_fat_performance_006.cpp | 0 .../pressure/It_fs_fat_performance_007.cpp | 0 .../pressure/It_fs_fat_performance_008.cpp | 0 .../pressure/It_fs_fat_performance_013.cpp | 2 +- .../pressure/It_fs_fat_performance_014.cpp | 2 +- .../pressure/It_fs_fat_performance_015.cpp | 6 +- .../pressure/It_fs_fat_performance_016.cpp | 6 +- .../pressure/It_fs_fat_pressure_029.cpp | 0 .../pressure/It_fs_fat_pressure_030.cpp | 24 ++--- .../pressure/It_fs_fat_pressure_031.cpp | 0 .../pressure/It_fs_fat_pressure_038.cpp | 8 +- .../pressure/It_fs_fat_pressure_040.cpp | 0 .../pressure/It_fs_fat_pressure_041.cpp | 4 +- .../pressure/It_fs_fat_pressure_042.cpp | 0 .../pressure/It_fs_fat_pressure_301.cpp | 0 .../pressure/It_fs_fat_pressure_302.cpp | 0 .../pressure/It_fs_fat_pressure_303.cpp | 0 .../pressure/It_fs_fat_pressure_305.cpp | 0 .../pressure/It_fs_fat_pressure_306.cpp | 4 +- .../pressure/It_fs_fat_pressure_309.cpp | 0 .../pressure/It_vfs_fat_mutipthread_003.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_004.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_005.cpp | 18 ++-- .../pressure/It_vfs_fat_mutipthread_006.cpp | 18 ++-- .../pressure/It_vfs_fat_mutipthread_008.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_009.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_010.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_012.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_014.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_016.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_017.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_018.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_019.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_020.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_021.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_022.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_023.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_024.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_027.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_029.cpp | 8 +- .../pressure/It_vfs_fat_mutipthread_030.cpp | 8 +- .../pressure/It_vfs_fat_mutipthread_032.cpp | 8 +- .../pressure/It_vfs_fat_mutipthread_033.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_035.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_036.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_038.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_039.cpp | 8 +- .../pressure/It_vfs_fat_mutipthread_040.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_041.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_042.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_043.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_044.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_045.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_046.cpp | 96 +++++-------------- .../pressure/It_vfs_fat_mutipthread_047.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_048.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_049.cpp | 6 +- .../pressure/It_vfs_fat_mutipthread_050.cpp | 6 +- .../{vfat2 => vfat}/smoke/It_vfs_fat_026.cpp | 2 +- 134 files changed, 213 insertions(+), 266 deletions(-) rename testsuites/unittest/fs/{vfat2 => vfat}/BUILD.gn (99%) rename testsuites/unittest/fs/{vfat2 => vfat}/It_vfs_fat.h (99%) rename testsuites/unittest/fs/{vfat2 => vfat}/VfsFatTest.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_066.cpp (99%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_068.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_072.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_073.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_074.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_496.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_497.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_498.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_499.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_500.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_501.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_502.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_503.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_504.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_506.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_507.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_508.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_509.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_510.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_511.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_512.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_513.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_514.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_515.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_516.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_517.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_518.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_519.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_662.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_663.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_664.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_665.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_666.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_667.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_668.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_669.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_670.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_671.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_672.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_673.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_674.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_675.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_676.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_677.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_678.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_679.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_680.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_681.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_682.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_683.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_684.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_685.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_686.cpp (99%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_687.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_692.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_693.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_694.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_870.cpp (99%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_872.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_873.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_874.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_875.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_902.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_903.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_904.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/full/It_vfs_fat_909.cpp (97%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_performance_001.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_performance_002.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_performance_003.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_performance_004.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_performance_005.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_performance_006.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_performance_007.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_performance_008.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_performance_013.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_performance_014.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_performance_015.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_performance_016.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_pressure_029.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_pressure_030.cpp (86%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_pressure_031.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_pressure_038.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_pressure_040.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_pressure_041.cpp (99%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_pressure_042.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_pressure_301.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_pressure_302.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_pressure_303.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_pressure_305.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_pressure_306.cpp (97%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_fs_fat_pressure_309.cpp (100%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_003.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_004.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_005.cpp (95%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_006.cpp (97%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_008.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_009.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_010.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_012.cpp (99%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_014.cpp (99%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_016.cpp (99%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_017.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_018.cpp (99%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_019.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_020.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_021.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_022.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_023.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_024.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_027.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_029.cpp (97%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_030.cpp (97%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_032.cpp (97%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_033.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_035.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_036.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_038.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_039.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_040.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_041.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_042.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_043.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_044.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_045.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_046.cpp (87%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_047.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_048.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_049.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/pressure/It_vfs_fat_mutipthread_050.cpp (98%) rename testsuites/unittest/fs/{vfat2 => vfat}/smoke/It_vfs_fat_026.cpp (99%) diff --git a/testsuites/unittest/BUILD.gn b/testsuites/unittest/BUILD.gn index da118cdf..f287a343 100644 --- a/testsuites/unittest/BUILD.gn +++ b/testsuites/unittest/BUILD.gn @@ -81,13 +81,13 @@ group("unittest") { } if (LOSCFG_USER_TEST_FS_VFAT == true) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { - deps += [ "fs/vfat2:liteos_a_fs_vfat_unittest_door" ] + deps += [ "fs/vfat:liteos_a_fs_vfat_unittest_door" ] } if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { - deps += [ "fs/vfat2:liteos_a_fs_vfat_unittest" ] + deps += [ "fs/vfat:liteos_a_fs_vfat_unittest" ] } if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_HIGH) { - deps += [ "fs/vfat2:liteos_a_fs_vfat_unittest_pressure" ] + deps += [ "fs/vfat:liteos_a_fs_vfat_unittest_pressure" ] } } if (LOSCFG_USER_TEST_FS_PROC == true) { diff --git a/testsuites/unittest/fs/vfat2/BUILD.gn b/testsuites/unittest/fs/vfat/BUILD.gn similarity index 99% rename from testsuites/unittest/fs/vfat2/BUILD.gn rename to testsuites/unittest/fs/vfat/BUILD.gn index 47d650d1..cae4233e 100644 --- a/testsuites/unittest/fs/vfat2/BUILD.gn +++ b/testsuites/unittest/fs/vfat/BUILD.gn @@ -34,7 +34,7 @@ common_include_dirs = [ "//third_party/googletest/googletest/include", "../../common/include", "//kernel/liteos_a/testsuites/unittest/fs/vfs", - "//kernel/liteos_a/testsuites/unittest/fs/vfat2", + "//kernel/liteos_a/testsuites/unittest/fs/vfat", ] sources_entry = [ diff --git a/testsuites/unittest/fs/vfat2/It_vfs_fat.h b/testsuites/unittest/fs/vfat/It_vfs_fat.h similarity index 99% rename from testsuites/unittest/fs/vfat2/It_vfs_fat.h rename to testsuites/unittest/fs/vfat/It_vfs_fat.h index a2e0c125..e863e1fc 100644 --- a/testsuites/unittest/fs/vfat2/It_vfs_fat.h +++ b/testsuites/unittest/fs/vfat/It_vfs_fat.h @@ -33,7 +33,6 @@ #define IT_VFS_FAT_H #include "osTest.h" -#include "syslog.h" #include "sys/uio.h" #include "utime.h" #include @@ -265,6 +264,8 @@ VOID ItFsFat903(VOID); VOID ItFsFat904(VOID); VOID ItFsFat909(VOID); +#endif + #if defined(LOSCFG_USER_TEST_PRESSURE) VOID ItFsFatMutipthread003(VOID); VOID ItFsFatMutipthread004(VOID); @@ -334,5 +335,3 @@ VOID ItFsFatPerformance007(VOID); VOID ItFsFatPerformance008(VOID); #endif - -#endif \ No newline at end of file diff --git a/testsuites/unittest/fs/vfat2/VfsFatTest.cpp b/testsuites/unittest/fs/vfat/VfsFatTest.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/VfsFatTest.cpp rename to testsuites/unittest/fs/vfat/VfsFatTest.cpp index ba226ec4..b87e7f31 100644 --- a/testsuites/unittest/fs/vfat2/VfsFatTest.cpp +++ b/testsuites/unittest/fs/vfat/VfsFatTest.cpp @@ -788,26 +788,20 @@ public: { INT32 ret = 0; sleep(3); // 3s - if (ret != 0) - perror("format sd card"); - return; + ret = mkdir("/vs/", S_IRWXU | S_IRWXG | S_IRWXO); if (ret != 0) { perror("mkdir mount dir"); - return; - - ret = mkdir(FAT_MOUNT_DIR, S_IRWXU | S_IRWXG | S_IRWXO); - if (ret != 0) { - perror("mkdir mount dir"); - return; - - ret = mount(FAT_DEV_PATH, FAT_MOUNT_DIR, FAT_FILESYS_TYPE, 0, nullptr); - if (ret != 0) { - perror("mount sd card"); - return; - } - } } + + ret = mkdir(FAT_MOUNT_DIR, S_IRWXU | S_IRWXG | S_IRWXO); + if (ret != 0) { + perror("mkdir mount dir"); + } + + g_fatFilesystem = 2; + ret = mount(FAT_DEV_PATH, FAT_MOUNT_DIR, FAT_FILESYS_TYPE, 0, nullptr); + ASSERT_EQ(0, ret); } static void TearDownTestCase(void) { @@ -815,6 +809,13 @@ public: } }; +#if defined(LOSCFG_USER_TEST_SMOKE) +HWTEST_F(VfsFatTest, ItFsFat026, TestSize.Level0) +{ + ItFsFat026(); +} +#endif + #if defined(LOSCFG_USER_TEST_FULL) HWTEST_F(VfsFatTest, ItFsFat066, TestSize.Level0) { @@ -1146,7 +1147,8 @@ HWTEST_F(VfsFatTest, ItFsFat909, TestSize.Level0) ItFsFat909(); // plug and unplug during writing or reading } -#endif +#endif // LOSCFG_USER_TEST_FULL + #if defined(LOSCFG_USER_TEST_PRESSURE) HWTEST_F(VfsFatTest, ItFsFatPressure040, TestSize.Level0) { @@ -1460,11 +1462,5 @@ HWTEST_F(VfsFatTest, ItFsFatPerformance008, TestSize.Level0) ItFsFatPerformance008(); // fix write and read for three pthread } -#endif -#if defined(LOSCFG_USER_TEST_SMOKE) -HWTEST_F(VfsFatTest, ItFsFat026, TestSize.Level0) -{ - ItFsFat026(); // statfs Unsupport -} -#endif +#endif // LOSCFG_USER_TEST_PRESSURE } // namespace OHOS diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_066.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_066.cpp similarity index 99% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_066.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_066.cpp index 13c60710..8bd2ddec 100644 --- a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_066.cpp +++ b/testsuites/unittest/fs/vfat/full/It_vfs_fat_066.cpp @@ -53,7 +53,7 @@ static const int CLUSTER_SIZE64 = 64; static const int CLUSTER_SIZE128 = 128; static const int CLUSTER_SIZE255 = 255; static const int CLUSTER_SIZE256 = 256; -static const int SECTOR_SIZE = 128; +static const int SECTOR_SIZE = 512; static UINT32 TestCase(VOID) { diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_068.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_068.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_068.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_068.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_072.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_072.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_072.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_072.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_073.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_073.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_073.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_073.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_074.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_074.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_074.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_074.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_496.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_496.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_496.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_496.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_497.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_497.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_497.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_497.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_498.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_498.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_498.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_498.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_499.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_499.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_499.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_499.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_500.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_500.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_500.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_500.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_501.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_501.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_501.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_501.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_502.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_502.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_502.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_502.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_503.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_503.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_503.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_503.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_504.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_504.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_504.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_504.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_506.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_506.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_506.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_506.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_507.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_507.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_507.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_507.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_508.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_508.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_508.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_508.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_509.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_509.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_509.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_509.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_510.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_510.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_510.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_510.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_511.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_511.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_511.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_511.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_512.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_512.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_512.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_512.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_513.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_513.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_513.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_513.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_514.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_514.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_514.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_514.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_515.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_515.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_515.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_515.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_516.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_516.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_516.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_516.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_517.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_517.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_517.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_517.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_518.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_518.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_518.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_518.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_519.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_519.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_519.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_519.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_662.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_662.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_662.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_662.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_663.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_663.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_663.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_663.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_664.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_664.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_664.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_664.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_665.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_665.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_665.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_665.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_666.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_666.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_666.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_666.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_667.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_667.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_667.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_667.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_668.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_668.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_668.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_668.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_669.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_669.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_669.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_669.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_670.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_670.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_670.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_670.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_671.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_671.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_671.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_671.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_672.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_672.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_672.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_672.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_673.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_673.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_673.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_673.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_674.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_674.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_674.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_674.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_675.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_675.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_675.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_675.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_676.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_676.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_676.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_676.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_677.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_677.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_677.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_677.cpp index 51b2483c..4c8dca7a 100644 --- a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_677.cpp +++ b/testsuites/unittest/fs/vfat/full/It_vfs_fat_677.cpp @@ -130,10 +130,6 @@ static UINT32 TestCase(VOID) ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT1); FatStatfsPrintf(buf1); - ICUNIT_GOTO_EQUAL(ret, FAT_IS_ERROR, ret, EXIT1); - - ICUNIT_GOTO_EQUAL(ret, FAT_IS_ERROR, ret, EXIT1); - ret = statfs(pathname1, &buf2); ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT1); FatStatfsPrintf(buf2); diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_678.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_678.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_678.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_678.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_679.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_679.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_679.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_679.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_680.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_680.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_680.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_680.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_681.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_681.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_681.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_681.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_682.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_682.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_682.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_682.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_683.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_683.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_683.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_683.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_684.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_684.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_684.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_684.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_685.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_685.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_685.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_685.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_686.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_686.cpp similarity index 99% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_686.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_686.cpp index cc5e1cf1..33573f51 100644 --- a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_686.cpp +++ b/testsuites/unittest/fs/vfat/full/It_vfs_fat_686.cpp @@ -62,7 +62,7 @@ static UINT32 TestCase(VOID) ICUNIT_GOTO_NOT_EQUAL(writebuf, NULL, writebuf, EXIT); (void)memset_s(writebuf, size + 1, 0, size + 1); ret = memset_s(writebuf, size + 1, 0x61, size); - ICUNIT_GOTO_NOT_EQUAL(ret, 0, ret, EXIT); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); fd = open(pathname1, O_NONBLOCK | O_CREAT | O_RDWR | O_EXCL, S_IRWXU | S_IRWXG | S_IRWXO); ICUNIT_GOTO_NOT_EQUAL(fd, FAT_IS_ERROR, fd, EXIT1); diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_687.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_687.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_687.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_687.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_692.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_692.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_692.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_692.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_693.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_693.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_693.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_693.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_694.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_694.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_694.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_694.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_870.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_870.cpp similarity index 99% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_870.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_870.cpp index cf88c74f..aaec7768 100644 --- a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_870.cpp +++ b/testsuites/unittest/fs/vfat/full/It_vfs_fat_870.cpp @@ -113,7 +113,7 @@ static UINT32 TestCase(VOID) ret = write(g_fatFd, bufWrite, strlen(bufWrite)); if (ret <= 0) { if (g_testCount < (4 * BYTES_PER_KBYTES / 8)) { // 4 * BYTES_PER_KBYTES MB/GB, 8MB per write - printf("The biggest file size is smaller than the 4GB"); + printf("The biggest file size is smaller than the 4GB\n"); goto EXIT2; } printf("The cycle count = :%d,the file size = :%dMB,= :%0.3lfGB\n", g_testCount, diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_872.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_872.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_872.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_872.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_873.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_873.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_873.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_873.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_874.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_874.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_874.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_874.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_875.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_875.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_875.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_875.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_902.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_902.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_902.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_902.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_903.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_903.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_903.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_903.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_904.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_904.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_904.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_904.cpp diff --git a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_909.cpp b/testsuites/unittest/fs/vfat/full/It_vfs_fat_909.cpp similarity index 97% rename from testsuites/unittest/fs/vfat2/full/It_vfs_fat_909.cpp rename to testsuites/unittest/fs/vfat/full/It_vfs_fat_909.cpp index bba7944b..28ce4c79 100644 --- a/testsuites/unittest/fs/vfat2/full/It_vfs_fat_909.cpp +++ b/testsuites/unittest/fs/vfat/full/It_vfs_fat_909.cpp @@ -62,8 +62,8 @@ static UINT32 TestCase(VOID) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB - for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // 1M * BYTES_PER_KBYTES * 4 = 4GB - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // 256 * BYTES_PER_KBYTES * 4 = 1MB + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } ret = mkdir(pathname, S_IRWXU | S_IRWXG | S_IRWXO); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_001.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_001.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_001.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_001.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_002.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_002.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_002.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_002.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_003.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_003.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_003.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_003.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_004.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_004.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_004.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_004.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_005.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_005.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_005.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_005.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_006.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_006.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_006.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_006.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_007.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_007.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_007.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_007.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_008.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_008.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_008.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_008.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_013.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_013.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_013.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_013.cpp index ed82e423..b71a9256 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_013.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_013.cpp @@ -65,7 +65,7 @@ static UINT32 TestCase(VOID) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB // 1M for (i = 0; i < 200 * 4; i++) { // append 200 * 4 times to 1M - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } ret = mkdir(pathname0, S_IRWXU | S_IRWXG | S_IRWXO); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_014.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_014.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_014.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_014.cpp index 2b0276f1..1fe244bd 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_014.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_014.cpp @@ -75,7 +75,7 @@ static UINT32 TestCase(VOID) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < 200 * 4; i++) { // append 200 * 4 times to 1M - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } ret = mkdir(pathname1, S_IRWXU | S_IRWXG | S_IRWXO); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_015.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_015.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_015.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_015.cpp index dcdda2d4..39dced3d 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_015.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_015.cpp @@ -64,7 +64,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < 4; i++) { // append 4 times to 1M - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } ret = mkdir(bufname, S_IRWXU | S_IRWXG | S_IRWXO); @@ -156,7 +156,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < 4; i++) { // append 4 times to 1M - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } ret = mkdir(bufname, S_IRWXU | S_IRWXG | S_IRWXO); @@ -247,7 +247,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < 4; i++) { // append 4 times to 1M - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } ret = mkdir(bufname, S_IRWXU | S_IRWXG | S_IRWXO); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_016.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_016.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_016.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_016.cpp index d47d8d66..c6f64ce2 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_performance_016.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_performance_016.cpp @@ -50,7 +50,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < 4; i++) { // append 4 times to 1M - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } ret = mkdir(bufname, S_IRWXU | S_IRWXG | S_IRWXO); @@ -139,7 +139,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < 4; i++) { // append 4 times to 1M - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } ret = mkdir(bufname, S_IRWXU | S_IRWXG | S_IRWXO); @@ -228,7 +228,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < 4; i++) { // append 4 times to 1M - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } ret = mkdir(bufname, S_IRWXU | S_IRWXG | S_IRWXO); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_029.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_029.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_029.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_029.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_030.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_030.cpp similarity index 86% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_030.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_030.cpp index a366f118..23f42249 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_030.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_030.cpp @@ -77,23 +77,23 @@ static UINT32 TestCase(VOID) (void)memset_s(bufWrite2, 16 * BYTES_PER_KBYTES + 1, 0, 16 * BYTES_PER_KBYTES + 1); // 16 kb for (j = 0; j < 16; j++) { // loop 16 times - (void)strcat_s(bufWrite2, 16 * BYTES_PER_KBYTES, filebuf); // 16kb - (void)strcat_s(bufWrite2, 16 * BYTES_PER_KBYTES, filebuf); // 16kb - (void)strcat_s(bufWrite2, 16 * BYTES_PER_KBYTES, filebuf); // 16kb - (void)strcat_s(bufWrite2, 16 * BYTES_PER_KBYTES, filebuf); // 16kb + (void)strcat_s(bufWrite2, 16 * BYTES_PER_KBYTES + 1, filebuf); // 16kb + (void)strcat_s(bufWrite2, 16 * BYTES_PER_KBYTES + 1, filebuf); // 16kb + (void)strcat_s(bufWrite2, 16 * BYTES_PER_KBYTES + 1, filebuf); // 16kb + (void)strcat_s(bufWrite2, 16 * BYTES_PER_KBYTES + 1, filebuf); // 16kb } for (i = 0; i < 4; i++) { // loop 4 times - (void)strcat_s(bufWrite1, 256 * BYTES_PER_KBYTES, bufWrite2); // 256kb - (void)strcat_s(bufWrite1, 256 * BYTES_PER_KBYTES, bufWrite2); // 256kb - (void)strcat_s(bufWrite1, 256 * BYTES_PER_KBYTES, bufWrite2); // 256kb - (void)strcat_s(bufWrite1, 256 * BYTES_PER_KBYTES, bufWrite2); // 256kb + (void)strcat_s(bufWrite1, 256 * BYTES_PER_KBYTES + 1, bufWrite2); // 256kb + (void)strcat_s(bufWrite1, 256 * BYTES_PER_KBYTES + 1, bufWrite2); // 256kb + (void)strcat_s(bufWrite1, 256 * BYTES_PER_KBYTES + 1, bufWrite2); // 256kb + (void)strcat_s(bufWrite1, 256 * BYTES_PER_KBYTES + 1, bufWrite2); // 256kb } for (i = 0; i < 5; i++) { // loop 5 times - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); + (void)strcat_s(bufWrite, 5 * BYTES_PER_MBYTES + 1, bufWrite1); + (void)strcat_s(bufWrite, 5 * BYTES_PER_MBYTES + 1, bufWrite1); + (void)strcat_s(bufWrite, 5 * BYTES_PER_MBYTES + 1, bufWrite1); + (void)strcat_s(bufWrite, 5 * BYTES_PER_MBYTES + 1, bufWrite1); } free(bufWrite1); free(bufWrite2); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_031.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_031.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_031.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_031.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_038.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_038.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_038.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_038.cpp index 72a6dfa3..a0d9531f 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_038.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_038.cpp @@ -214,8 +214,8 @@ static VOID *PthreadF02(void *arg) } for (i = 0; i < 10; i++) { // loop 10 times - (void)strcat_s(bufWrite, 10 * BYTES_PER_MBYTES, bufWrite1); // 10 * BYTES_PER_MBYTES = 10MB - (void)strcat_s(bufWrite, 10 * BYTES_PER_MBYTES, bufWrite1); // 10 * BYTES_PER_MBYTES = 10MB + (void)strcat_s(bufWrite, 10 * BYTES_PER_MBYTES + 1, bufWrite1); // 10 * BYTES_PER_MBYTES = 10MB + (void)strcat_s(bufWrite, 10 * BYTES_PER_MBYTES + 1, bufWrite1); // 10 * BYTES_PER_MBYTES = 10MB } free(bufWrite1); free(bufWrite2); @@ -331,11 +331,11 @@ static UINT32 TestCase(VOID) ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT2); ret = PosixPthreadDestroy(&attr1, newThread1); - ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT2); + ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT1); printf("\tg_fatFlag=:%d\t", g_fatFlag); } printf("\n"); - ICUNIT_GOTO_EQUAL(g_fatFlag, FAT_PRESSURE_CYCLES, g_fatFlag, EXIT2); + ICUNIT_GOTO_EQUAL(g_fatFlag, FAT_PRESSURE_CYCLES, g_fatFlag, EXIT); dir = opendir(FAT_PATH_NAME); ICUNIT_GOTO_NOT_EQUAL(dir, NULL, dir, EXIT3); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_040.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_040.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_040.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_040.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_041.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_041.cpp similarity index 99% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_041.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_041.cpp index 21ff9f4c..b85a244d 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_041.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_041.cpp @@ -212,6 +212,7 @@ static VOID *PthreadF02(void *arg) (void)strcat_s(bufWrite1, 10 * BYTES_PER_MBYTES + 1, bufWrite2); // 10 mb (void)strcat_s(bufWrite1, 10 * BYTES_PER_MBYTES + 1, bufWrite2); // 10 mb (void)strcat_s(bufWrite1, 10 * BYTES_PER_MBYTES + 1, bufWrite2); // 10 mb + (void)strcat_s(bufWrite1, 10 * BYTES_PER_MBYTES + 1, bufWrite2); // 10 mb } free(bufWrite4); @@ -357,7 +358,6 @@ static UINT32 TestCase(VOID) printf("\tg_fatFlag=:%d\t", g_fatFlag); } printf("\n"); - ICUNIT_GOTO_EQUAL(g_fatFlag, FAT_PRESSURE_CYCLES, g_fatFlag, EXIT2); dir = opendir(FAT_PATH_NAME); ICUNIT_GOTO_NOT_EQUAL(dir, NULL, dir, EXIT3); @@ -368,6 +368,8 @@ static UINT32 TestCase(VOID) ret = closedir(dir); ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT3); + ICUNIT_GOTO_EQUAL(g_fatFlag, FAT_PRESSURE_CYCLES, g_fatFlag, EXIT); + ret = rmdir(FAT_PATH_NAME); ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_042.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_042.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_042.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_042.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_301.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_301.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_301.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_301.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_302.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_302.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_302.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_302.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_303.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_303.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_303.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_303.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_305.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_305.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_305.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_305.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_306.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_306.cpp similarity index 97% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_306.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_306.cpp index 469e0618..dd508314 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_306.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_306.cpp @@ -75,9 +75,9 @@ static UINT32 TestCase(VOID) for (i = 0; i < 50; i++) { // loop 50 times (void)memset_s(bufname, FAT_SHORT_ARRAY_LENGTH, 0, FAT_SHORT_ARRAY_LENGTH); - (void)memset_s(pathname2[i], FAT_STANDARD_NAME_LENGTH, 0, FAT_SHORT_ARRAY_LENGTH); + (void)memset_s(pathname2[i], FAT_STANDARD_NAME_LENGTH, 0, FAT_STANDARD_NAME_LENGTH); (void)snprintf_s(bufname, FAT_SHORT_ARRAY_LENGTH, FAT_SHORT_ARRAY_LENGTH, "/test%d", i); - FatStrcat2(pathname2[i], bufname, strlen(bufname)); + FatStrcat2(pathname2[i], bufname, FAT_STANDARD_NAME_LENGTH); ret = mkdir(pathname2[i], S_IRWXU | S_IRWXG | S_IRWXO); ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT2); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_309.cpp b/testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_309.cpp similarity index 100% rename from testsuites/unittest/fs/vfat2/pressure/It_fs_fat_pressure_309.cpp rename to testsuites/unittest/fs/vfat/pressure/It_fs_fat_pressure_309.cpp diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_003.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_003.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_003.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_003.cpp index ca93e976..05798938 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_003.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_003.cpp @@ -51,7 +51,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -186,7 +186,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -320,7 +320,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_004.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_004.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_004.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_004.cpp index cf9b091e..ca68b6b7 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_004.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_004.cpp @@ -52,7 +52,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } printf("In %s,line %d\n", __FUNCTION__, __LINE__); index = 0; @@ -179,7 +179,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } printf("In %s,line %d\n", __FUNCTION__, __LINE__); @@ -307,7 +307,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } printf("In %s,line %d\n", __FUNCTION__, __LINE__); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_005.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_005.cpp similarity index 95% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_005.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_005.cpp index 0a063f65..adcbf5df 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_005.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_005.cpp @@ -51,7 +51,7 @@ static VOID *PthreadF01(void *arg) printf("pthread_f01 is excecuting\n"); bufWrite = (CHAR *)malloc(4 * BYTES_PER_MBYTES + 1); // 4MB ICUNIT_GOTO_NOT_EQUAL(bufWrite, NULL, 0, EXIT1); - (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, 4 * BYTES_PER_MBYTES + 1); // 4mb + (void)memset_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, 0, 4 * BYTES_PER_MBYTES + 1); // 4mb bufWrite1 = (CHAR *)malloc(BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB ICUNIT_GOTO_NOT_EQUAL(bufWrite1, NULL, 0, EXIT2); @@ -76,8 +76,8 @@ static VOID *PthreadF01(void *arg) } for (i = 0; i < 2; i++) { // loop 2 times - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); + (void)strcat_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, bufWrite1); + (void)strcat_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, bufWrite1); } free(bufWrite1); @@ -157,7 +157,7 @@ static VOID *PthreadF02(void *arg) printf("pthread_f02 is excecuting\n"); bufWrite = (CHAR *)malloc(4 * BYTES_PER_MBYTES + 1); // 4MB ICUNIT_GOTO_NOT_EQUAL(bufWrite, NULL, 0, EXIT1); - (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, 4 * BYTES_PER_MBYTES + 1); // 4mb + (void)memset_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, 0, 4 * BYTES_PER_MBYTES + 1); // 4mb bufWrite1 = (CHAR *)malloc(BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB ICUNIT_GOTO_NOT_EQUAL(bufWrite1, NULL, 0, EXIT2); @@ -182,8 +182,8 @@ static VOID *PthreadF02(void *arg) } for (i = 0; i < 2; i++) { // loop 2 times - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); + (void)strcat_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, bufWrite1); + (void)strcat_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, bufWrite1); } free(bufWrite1); @@ -263,7 +263,7 @@ static VOID *PthreadF03(void *arg) printf("pthread_f03 is excecuting\n"); bufWrite = (CHAR *)malloc(4 * BYTES_PER_MBYTES + 1); // 4MB ICUNIT_GOTO_NOT_EQUAL(bufWrite, NULL, 0, EXIT1); - (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, 4 * BYTES_PER_MBYTES + 1); // 4mb + (void)memset_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, 0, 4 * BYTES_PER_MBYTES + 1); // 4mb bufWrite1 = (CHAR *)malloc(BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB ICUNIT_GOTO_NOT_EQUAL(bufWrite1, NULL, 0, EXIT2); @@ -288,8 +288,8 @@ static VOID *PthreadF03(void *arg) } for (i = 0; i < 2; i++) { // loop 2 times - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); + (void)strcat_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, bufWrite1); + (void)strcat_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, bufWrite1); } free(bufWrite1); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_006.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_006.cpp similarity index 97% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_006.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_006.cpp index 29e22841..4a3212f6 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_006.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_006.cpp @@ -53,7 +53,7 @@ static VOID *PthreadF01(void *arg) bufWrite = (CHAR *)malloc(4 * BYTES_PER_MBYTES + 1); // 4MB ICUNIT_GOTO_NOT_EQUAL(bufWrite, NULL, 0, EXIT1); - (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, 4 * BYTES_PER_MBYTES + 1); // 4mb + (void)memset_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, 0, 4 * BYTES_PER_MBYTES + 1); // 4mb bufWrite1 = (CHAR *)malloc(BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB ICUNIT_GOTO_NOT_EQUAL(bufWrite1, NULL, 0, EXIT2); @@ -78,8 +78,8 @@ static VOID *PthreadF01(void *arg) } for (i = 0; i < 2; i++) { // loop 2 times - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); + (void)strcat_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, bufWrite1); + (void)strcat_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, bufWrite1); } free(bufWrite1); @@ -239,7 +239,7 @@ static VOID *PthreadF02(void *arg) bufWrite = (CHAR *)malloc(4 * BYTES_PER_MBYTES + 1); // 4MB ICUNIT_GOTO_NOT_EQUAL(bufWrite, NULL, 0, EXIT1); - (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, 4 * BYTES_PER_MBYTES + 1); // 4mb + (void)memset_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, 0, 4 * BYTES_PER_MBYTES + 1); // 4mb bufWrite1 = (CHAR *)malloc(BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB ICUNIT_GOTO_NOT_EQUAL(bufWrite1, NULL, 0, EXIT2); @@ -264,8 +264,8 @@ static VOID *PthreadF02(void *arg) } for (i = 0; i < 2; i++) { // loop 2 times - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); + (void)strcat_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, bufWrite1); + (void)strcat_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, bufWrite1); } free(bufWrite1); @@ -425,7 +425,7 @@ static VOID *PthreadF03(void *arg) bufWrite = (CHAR *)malloc(4 * BYTES_PER_MBYTES + 1); // 4MB ICUNIT_GOTO_NOT_EQUAL(bufWrite, NULL, 0, EXIT1); - (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, 4 * BYTES_PER_MBYTES + 1); // 4mb + (void)memset_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, 0, 4 * BYTES_PER_MBYTES + 1); // 4mb bufWrite1 = (CHAR *)malloc(BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB ICUNIT_GOTO_NOT_EQUAL(bufWrite1, NULL, 0, EXIT2); @@ -450,8 +450,8 @@ static VOID *PthreadF03(void *arg) } for (i = 0; i < 2; i++) { // loop 2 times - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, bufWrite1); + (void)strcat_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, bufWrite1); + (void)strcat_s(bufWrite, 4 * BYTES_PER_MBYTES + 1, bufWrite1); } free(bufWrite1); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_008.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_008.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_008.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_008.cpp index 2e5b8a49..619eb952 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_008.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_008.cpp @@ -55,7 +55,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -191,7 +191,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -327,7 +327,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_009.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_009.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_009.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_009.cpp index fa619d10..6959b2a1 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_009.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_009.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; for (i = 0; i < FAT_MAX_CYCLES; i++) { // 100 ļ @@ -134,7 +134,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; for (i = 0; i < FAT_MAX_CYCLES; i++) { // 100 ļ @@ -219,7 +219,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; for (i = 0; i < FAT_MAX_CYCLES; i++) { // 100 ļ diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_010.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_010.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_010.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_010.cpp index 798f922d..a7e1f733 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_010.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_010.cpp @@ -53,7 +53,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -194,7 +194,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -336,7 +336,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_012.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_012.cpp similarity index 99% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_012.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_012.cpp index fbb3acdc..4dd8e105 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_012.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_012.cpp @@ -56,7 +56,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -218,7 +218,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -378,7 +378,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_014.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_014.cpp similarity index 99% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_014.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_014.cpp index a0dd652f..23824d53 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_014.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_014.cpp @@ -55,7 +55,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -215,7 +215,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -376,7 +376,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_016.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_016.cpp similarity index 99% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_016.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_016.cpp index 17c1f2ee..7880ef62 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_016.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_016.cpp @@ -54,7 +54,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -226,7 +226,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -398,7 +398,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_017.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_017.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_017.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_017.cpp index 4a87a7d2..06d41d21 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_017.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_017.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -147,7 +147,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -247,7 +247,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_018.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_018.cpp similarity index 99% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_018.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_018.cpp index 3c19cf76..c66e24f0 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_018.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_018.cpp @@ -54,7 +54,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -219,7 +219,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -385,7 +385,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_019.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_019.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_019.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_019.cpp index 606a36fd..8e71f3bf 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_019.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_019.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -156,7 +156,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -262,7 +262,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_020.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_020.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_020.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_020.cpp index 28fbcf23..0299cc5c 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_020.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_020.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -156,7 +156,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -262,7 +262,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_021.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_021.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_021.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_021.cpp index e9cde0f0..29116342 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_021.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_021.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -155,7 +155,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -261,7 +261,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_022.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_022.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_022.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_022.cpp index 3a5273b4..6369422a 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_022.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_022.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -157,7 +157,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -262,7 +262,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_023.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_023.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_023.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_023.cpp index dc994c2a..06b7a1fb 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_023.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_023.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -156,7 +156,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -262,7 +262,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_024.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_024.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_024.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_024.cpp index a4e429bf..ad6d4e27 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_024.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_024.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -155,7 +155,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -261,7 +261,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_027.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_027.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_027.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_027.cpp index ea8858a8..0e36a7b0 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_027.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_027.cpp @@ -48,7 +48,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -133,7 +133,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -218,7 +218,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_029.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_029.cpp similarity index 97% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_029.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_029.cpp index fd100322..bc67be1e 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_029.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_029.cpp @@ -48,7 +48,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -133,7 +133,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -218,7 +218,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -333,7 +333,7 @@ static UINT32 TestCase(VOID) ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT1); - ICUNIT_ASSERT_EQUAL(g_testCount, 3, g_testCount); // there 3 threads + ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT); // there 3 threads ret = rmdir(bufname3); ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_030.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_030.cpp similarity index 97% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_030.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_030.cpp index 66d04432..40a2180e 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_030.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_030.cpp @@ -48,7 +48,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -132,7 +132,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -216,7 +216,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -332,7 +332,7 @@ static UINT32 TestCase(VOID) ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT1); - ICUNIT_ASSERT_EQUAL(g_testCount, 3, g_testCount); // there 3 threads + ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT); // there 3 threads ret = rmdir(bufname3); ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_032.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_032.cpp similarity index 97% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_032.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_032.cpp index 93506b18..5d9a68a3 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_032.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_032.cpp @@ -48,7 +48,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -132,7 +132,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -217,7 +217,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -333,7 +333,7 @@ static UINT32 TestCase(VOID) ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT1); - ICUNIT_ASSERT_EQUAL(g_testCount, 3, g_testCount); // there 3 threads + ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT); // there 3 threads ret = rmdir(bufname3); ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_033.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_033.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_033.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_033.cpp index 38c55105..b5ac0acd 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_033.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_033.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -148,7 +148,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -247,7 +247,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_035.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_035.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_035.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_035.cpp index 67439785..623acc00 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_035.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_035.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -148,7 +148,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -249,7 +249,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_036.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_036.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_036.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_036.cpp index d9bbcba8..16e66e5a 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_036.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_036.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -149,7 +149,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -249,7 +249,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_038.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_038.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_038.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_038.cpp index fd4d78b1..0a43ba6c 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_038.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_038.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -150,7 +150,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -253,7 +253,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_039.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_039.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_039.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_039.cpp index 37cb5620..bd35dc08 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_039.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_039.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -266,7 +266,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -395,7 +395,7 @@ static UINT32 TestCase(VOID) ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT1); } - ICUNIT_ASSERT_EQUAL(g_testCount, 3, g_testCount); // there 3 threads + ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT); // there 3 threads ret = rmdir(bufname); ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_040.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_040.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_040.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_040.cpp index 460d1c05..a2dc3b99 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_040.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_040.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -266,7 +266,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_041.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_041.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_041.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_041.cpp index 520c3ffa..19f31f2d 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_041.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_041.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -266,7 +266,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_042.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_042.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_042.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_042.cpp index 8db6215d..161ac289 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_042.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_042.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -266,7 +266,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_043.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_043.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_043.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_043.cpp index 7699a766..a003fa33 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_043.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_043.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -266,7 +266,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_044.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_044.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_044.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_044.cpp index 0af397d4..14b9f3a3 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_044.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_044.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -266,7 +266,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_045.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_045.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_045.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_045.cpp index 54d726ea..64d81794 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_045.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_045.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -266,7 +266,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_046.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_046.cpp similarity index 87% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_046.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_046.cpp index 8b4c640e..3bf81ed5 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_046.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_046.cpp @@ -33,7 +33,7 @@ static VOID *PthreadF01(void *arg) { - INT32 i, j, ret, len, flag, index; + INT32 i, j, ret, len, index; INT32 fd[100] = {}; CHAR pathname[FAT_STANDARD_NAME_LENGTH] = ""; CHAR readbuf[FAT_STANDARD_NAME_LENGTH] = ""; @@ -43,13 +43,12 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufWrite = nullptr; - flag = 0; bufWrite = (CHAR *)malloc(BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB ICUNIT_ASSERT_NOT_EQUAL_NULL(bufWrite, NULL, NULL); (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -58,35 +57,27 @@ static VOID *PthreadF01(void *arg) index); fd[index] = open(pathname, O_NONBLOCK | O_CREAT | O_RDWR | O_EXCL, S_IRWXU | S_IRWXG | S_IRWXO); if (fd[index] == -1) { - break; + index--; + ICUNIT_GOTO_NOT_EQUAL(fd[index], -1, fd[index], EXIT1); } switch (index % 3) { // mod 3 case 0: for (j = 0; j < FAT_MAX_CYCLES; j++) { // д100M len = write(fd[index], bufWrite, strlen(bufWrite)); - if (len <= 0) { - flag = 1; - break; - } + ICUNIT_GOTO_EQUAL(len, strlen(bufWrite), len, EXIT1); } LosTaskDelay(3); // delay 3 s break; case 1: for (j = 0; j < FAT_MIDDLE_CYCLES; j++) { // д10M len = write(fd[index], bufWrite, strlen(bufWrite)); - if (len <= 0) { - flag = 1; - break; - } + ICUNIT_GOTO_EQUAL(len, strlen(bufWrite), len, EXIT1); } LosTaskDelay(5); // delay 5 s break; case 2: // the 2 nd case len = write(fd[index], writebuf, strlen(writebuf)); - if (len <= 0) { - flag = 1; - break; - } + ICUNIT_GOTO_EQUAL(len, strlen(writebuf), len, EXIT1); LosTaskDelay(7); // delay 7 s break; default: @@ -100,16 +91,10 @@ static VOID *PthreadF01(void *arg) ICUNIT_ASSERT_STRING_EQUAL_RET(readbuf, "0123456789", readbuf, NULL); ret = close(fd[index]); ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT1); - if (flag == 1) { - break; - } index++; } - if (flag == 0) { - index--; - } - for (i = index; i >= 0; i--) { + for (i = index - 1; i >= 0; i--) { (void)snprintf_s(pathname, FAT_STANDARD_NAME_LENGTH, FAT_STANDARD_NAME_LENGTH, "%s/file1%d.txt", FAT_PATH_NAME, i); ret = unlink(pathname); @@ -135,7 +120,7 @@ EXIT: static VOID *PthreadF02(void *arg) { - INT32 i, j, ret, len, flag, index; + INT32 i, j, ret, len, index; INT32 fd[100] = {}; CHAR pathname[FAT_STANDARD_NAME_LENGTH] = ""; CHAR filebuf[260] = "01234567890123456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123" @@ -145,13 +130,12 @@ static VOID *PthreadF02(void *arg) CHAR *bufWrite = nullptr; struct stat statbuf; - flag = 0; bufWrite = (CHAR *)malloc(BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB ICUNIT_ASSERT_NOT_EQUAL_NULL(bufWrite, NULL, NULL); (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -160,35 +144,27 @@ static VOID *PthreadF02(void *arg) index); fd[index] = open(pathname, O_NONBLOCK | O_CREAT | O_RDWR | O_EXCL, S_IRWXU | S_IRWXG | S_IRWXO); if (fd[index] == -1) { - break; + index--; + ICUNIT_GOTO_NOT_EQUAL(fd[index], -1, fd[index], EXIT1); } switch (index % 3) { // mod 3 case 0: for (j = 0; j < FAT_MAX_CYCLES; j++) { // д100M len = write(fd[index], bufWrite, strlen(bufWrite)); - if (len <= 0) { - flag = 1; - break; - } + ICUNIT_GOTO_EQUAL(len, strlen(bufWrite), len, EXIT1); } LosTaskDelay(3); // delay 3 s break; case 1: for (j = 0; j < FAT_MIDDLE_CYCLES; j++) { // д10M len = write(fd[index], bufWrite, strlen(bufWrite)); - if (len <= 0) { - flag = 1; - break; - } + ICUNIT_GOTO_EQUAL(len, strlen(bufWrite), len, EXIT1); } LosTaskDelay(5); // delay 5 s break; case 2: // the 2 nd case len = write(fd[index], writebuf, strlen(writebuf)); - if (len <= 0) { - flag = 1; - break; - } + ICUNIT_GOTO_EQUAL(len, strlen(writebuf), len, EXIT1); LosTaskDelay(7); // delay 7 s break; default: @@ -202,17 +178,10 @@ static VOID *PthreadF02(void *arg) ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT1); FatStatPrintf(statbuf); - if (flag == 1) { - break; - } index++; } - if (flag == 0) { - index--; - } - - for (i = index; i >= 0; i--) { + for (i = index - 1; i >= 0; i--) { (void)snprintf_s(pathname, FAT_STANDARD_NAME_LENGTH, FAT_STANDARD_NAME_LENGTH, "%s/file2%d.txt", FAT_PATH_NAME, i); ret = unlink(pathname); @@ -240,7 +209,7 @@ EXIT: static VOID *PthreadF03(void *arg) { - INT32 i, j, ret, len, flag, index; + INT32 i, j, ret, len, index; INT32 fd[100] = {}; CHAR pathname[FAT_STANDARD_NAME_LENGTH] = ""; CHAR pathname1[FAT_STANDARD_NAME_LENGTH] = ""; @@ -250,13 +219,12 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufWrite = nullptr; - flag = 0; bufWrite = (CHAR *)malloc(BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB ICUNIT_ASSERT_NOT_EQUAL_NULL(bufWrite, NULL, NULL); (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -265,35 +233,27 @@ static VOID *PthreadF03(void *arg) index); fd[index] = open(pathname, O_NONBLOCK | O_CREAT | O_RDWR | O_EXCL, S_IRWXU | S_IRWXG | S_IRWXO); if (fd[index] == -1) { - break; + index--; + ICUNIT_GOTO_NOT_EQUAL(fd[index], -1, fd[index], EXIT1); } switch (index % 3) { // mod 3 case 0: for (j = 0; j < FAT_MAX_CYCLES; j++) { // д100M len = write(fd[index], bufWrite, strlen(bufWrite)); - if (len <= 0) { - flag = 1; - break; - } + ICUNIT_GOTO_EQUAL(len, strlen(bufWrite), len, EXIT1); } LosTaskDelay(3); // delay 3 s break; case 1: for (j = 0; j < FAT_MIDDLE_CYCLES; j++) { // д10M len = write(fd[index], bufWrite, strlen(bufWrite)); - if (len <= 0) { - flag = 1; - break; - } + ICUNIT_GOTO_EQUAL(len, strlen(bufWrite), len, EXIT1); } LosTaskDelay(5); // delay 5 s break; case 2: // the 2 nd case len = write(fd[index], writebuf, strlen(writebuf)); - if (len <= 0) { - flag = 1; - break; - } + ICUNIT_GOTO_EQUAL(len, strlen(writebuf), len, EXIT1); LosTaskDelay(7); // delay 7 s break; default: @@ -308,16 +268,10 @@ static VOID *PthreadF03(void *arg) ret = rename(pathname, pathname1); ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT1); - if (flag == 1) { - break; - } index++; } - if (flag == 0) { - index--; - } - for (i = index; i >= 0; i--) { + for (i = index - 1; i >= 0; i--) { (void)snprintf_s(pathname, FAT_STANDARD_NAME_LENGTH, FAT_STANDARD_NAME_LENGTH, "%s/file3_%d.txt", FAT_PATH_NAME, i); ret = unlink(pathname); @@ -380,7 +334,7 @@ static UINT32 TestCase(VOID) ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT1); } - ICUNIT_ASSERT_EQUAL(g_testCount, 3, g_testCount); // there 3 threads + ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT); // there 3 threads ret = rmdir(bufname); ICUNIT_GOTO_EQUAL(ret, FAT_NO_ERROR, ret, EXIT); diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_047.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_047.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_047.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_047.cpp index 58e9b5dc..4b68477a 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_047.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_047.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -266,7 +266,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_048.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_048.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_048.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_048.cpp index bf6fde50..deb6fa9b 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_048.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_048.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -159,7 +159,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -267,7 +267,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_049.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_049.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_049.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_049.cpp index 8a18abf3..84a307c4 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_049.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_049.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -266,7 +266,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_050.cpp b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_050.cpp similarity index 98% rename from testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_050.cpp rename to testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_050.cpp index d565ac09..38f4ab95 100644 --- a/testsuites/unittest/fs/vfat2/pressure/It_vfs_fat_mutipthread_050.cpp +++ b/testsuites/unittest/fs/vfat/pressure/It_vfs_fat_mutipthread_050.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; @@ -266,7 +266,7 @@ static VOID *PthreadF03(void *arg) (void)memset_s(bufWrite, BYTES_PER_MBYTES + 1, 0, BYTES_PER_MBYTES + 1); // BYTES_PER_MBYTES = 1MB for (i = 0; i < BYTES_PER_KBYTES * 4; i++) { // loop in 4 Kb - (void)strcat_s(bufWrite, BYTES_PER_MBYTES, filebuf); + (void)strcat_s(bufWrite, BYTES_PER_MBYTES + 1, filebuf); } index = 0; diff --git a/testsuites/unittest/fs/vfat2/smoke/It_vfs_fat_026.cpp b/testsuites/unittest/fs/vfat/smoke/It_vfs_fat_026.cpp similarity index 99% rename from testsuites/unittest/fs/vfat2/smoke/It_vfs_fat_026.cpp rename to testsuites/unittest/fs/vfat/smoke/It_vfs_fat_026.cpp index 7a418526..b19fbe97 100644 --- a/testsuites/unittest/fs/vfat2/smoke/It_vfs_fat_026.cpp +++ b/testsuites/unittest/fs/vfat/smoke/It_vfs_fat_026.cpp @@ -39,7 +39,7 @@ static UINT32 TestCase(VOID) INT32 ret; INT32 fd = 0; INT32 len = 0; - INT32 i = 0; + INT32 i = FAT_SHORT_ARRAY_LENGTH; CHAR pathname1[FAT_STANDARD_NAME_LENGTH] = FAT_PATH_NAME; CHAR buffile[FAT_STANDARD_NAME_LENGTH] = FAT_PATH_NAME; CHAR filebuf[FAT_STANDARD_NAME_LENGTH] = "12345678901234567890"; From 49856dc1e0de1c5e92346c83eda641dfb1bb16be Mon Sep 17 00:00:00 2001 From: laokz Date: Wed, 9 Jun 2021 13:09:09 +0800 Subject: [PATCH 02/43] =?UTF-8?q?feat(QEMU=5FARM=5FVIRT=5FCA7):=20?= =?UTF-8?q?=E4=BD=BF=E8=83=BDFAT=E6=96=87=E4=BB=B6=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laokz Change-Id: I0eece39921292498243bd017f168f953a437731c --- tools/build/config/qemu_arm_virt_debug_shell.config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/build/config/qemu_arm_virt_debug_shell.config b/tools/build/config/qemu_arm_virt_debug_shell.config index d22f8fd8..cef8fbb3 100644 --- a/tools/build/config/qemu_arm_virt_debug_shell.config +++ b/tools/build/config/qemu_arm_virt_debug_shell.config @@ -2,7 +2,10 @@ LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7=y LOSCFG_BOARD_CONFIG_PATH="device/qemu/arm_virt/liteos_a/config/board" # LOSCFG_HRTIMER_ENABLE is not set # LOSCFG_KERNEL_CPPSUPPORT is not set -# LOSCFG_FS_FAT is not set +LOSCFG_FS_FAT=y +LOSCFG_FS_FAT_DISK=y +LOSCFG_FS_FAT_VIRTUAL_PARTITION=y +LOSCFG_FS_VFS_BLOCK_DEVICE=y LOSCFG_ENABLE_MAGICKEY=y LOSCFG_DEBUG_VERSION=y # LOSCFG_SHELL_LK is not set From e0a27badde20868cf3a5b4a44305b90af00e4f3f Mon Sep 17 00:00:00 2001 From: Joker2770 <1214220480@qq.com> Date: Mon, 28 Jun 2021 09:33:29 +0800 Subject: [PATCH 03/43] perf: assign '-1' to uninitialized variable: ret Signed-off-by: Joker2770 <1214220480@qq.com> --- drivers/char/random/src/random_hw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/char/random/src/random_hw.c b/drivers/char/random/src/random_hw.c index ffaa495a..a290a586 100644 --- a/drivers/char/random/src/random_hw.c +++ b/drivers/char/random/src/random_hw.c @@ -65,7 +65,7 @@ static int RandomHwClose(struct file *filep) static int RandomHwIoctl(struct file *filep, int cmd, unsigned long arg) { - int ret; + int ret = -1; switch (cmd) { default: @@ -77,7 +77,7 @@ static int RandomHwIoctl(struct file *filep, int cmd, unsigned long arg) static ssize_t RandomHwRead(struct file *filep, char *buffer, size_t buflen) { - int ret; + int ret = -1; if (g_randomOp.read != NULL) { ret = g_randomOp.read(buffer, buflen); From 455e42e5b953d80164ede19431551d7bd9db899a Mon Sep 17 00:00:00 2001 From: vcbchang Date: Mon, 28 Jun 2021 19:27:38 +0800 Subject: [PATCH 04/43] =?UTF-8?q?test:=20=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E6=9D=80=E6=AD=BB=E6=8E=89hilog=E8=BF=9B=E7=A8=8B=E5=90=8ESecu?= =?UTF-8?q?rityCapability=E9=97=A8=E7=A6=81=E7=94=A8=E4=BE=8B=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E9=80=9A=E8=BF=87=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【背景】如果操作系统先执行kill hilog进程，然后再执行SecurityCapability，那么门禁用例将无法通过，原因是该用例先获取了hilog进程的id，但hilog进程已经杀掉了，所以报错 【修改方案】 1. 增加kill 0与错误码判断，如果发现进程已经被干掉的话将不执行相关内容 【影响】 无其它影响。 Signed-off-by: vcbchang Change-Id: Icdf357800175eff19acf1f92426469642a697386 --- .../capability/smoke/cap_test_001.cpp | 40 +++++++++++++------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/testsuites/unittest/security/capability/smoke/cap_test_001.cpp b/testsuites/unittest/security/capability/smoke/cap_test_001.cpp index 95f6eb9f..f8887989 100644 --- a/testsuites/unittest/security/capability/smoke/cap_test_001.cpp +++ b/testsuites/unittest/security/capability/smoke/cap_test_001.cpp @@ -82,22 +82,38 @@ static int TestChild(VOID) capheader.pid = INVAILD_PID; ret = capget(&capheader, &capdatac[0]); ICUNIT_ASSERT_EQUAL(ret, -1, ret); + errno = 0; capheader.pid = 3; - ret = capget(&capheader, &capdatac[0]); - ICUNIT_ASSERT_EQUAL(ret, 0, ret); - printf("e %d,p %d\n", capdatac[0].effective, capdatac[0].permitted); + kill(capheader.pid, 0); + if (errno != ESRCH) { + ret = capget(&capheader, &capdatac[0]); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); + printf("e %d,p %d\n", capdatac[0].effective, capdatac[0].permitted); + } + errno = 0; capheader.pid = 4; - ret = capget(&capheader, &capdatac[0]); - ICUNIT_ASSERT_EQUAL(ret, 0, ret); - printf("e %d,p %d\n", capdatac[0].effective, capdatac[0].permitted); + kill(capheader.pid, 0); + if (errno != ESRCH) { + ret = capget(&capheader, &capdatac[0]); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); + printf("e %d,p %d\n", capdatac[0].effective, capdatac[0].permitted); + } + errno = 0; capheader.pid = 5; - ret = capget(&capheader, &capdatac[0]); - ICUNIT_ASSERT_EQUAL(ret, 0, ret); - printf("e %d,p %d\n", capdatac[0].effective, capdatac[0].permitted); + kill(capheader.pid, 0); + if (errno != ESRCH) { + ret = capget(&capheader, &capdatac[0]); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); + printf("e %d,p %d\n", capdatac[0].effective, capdatac[0].permitted); + } + errno = 0; capheader.pid = 6; - ret = capget(&capheader, &capdatac[0]); - ICUNIT_ASSERT_EQUAL(ret, 0, ret); - printf("e %d,p %d\n", capdatac[0].effective, capdatac[0].permitted); + kill(capheader.pid, 0); + if (errno != ESRCH) { + ret = capget(&capheader, &capdatac[0]); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); + printf("e %d,p %d\n", capdatac[0].effective, capdatac[0].permitted); + } capheader.pid = 0; int pid = fork(); From d7672d47f2188f177c57383289e088575315e763 Mon Sep 17 00:00:00 2001 From: Caoruihong Date: Wed, 30 Jun 2021 17:41:05 +0800 Subject: [PATCH 05/43] chore: make liteos_a can be built alone in the liteos_a directory, we used to use `make clean all` command to build liteos_a kernel for test. Signed-off-by: Caoruihong Change-Id: I5ca689c1c44052f7de937d7faa9e4d3534d97380 --- Makefile | 24 +++++++++++++++--------- apps/config.mk | 2 +- apps/mksh/Makefile | 4 ++-- apps/toybox/Makefile | 4 ++-- kernel/extended/vdso/usr/Makefile | 2 +- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 9323917e..5653d002 100644 --- a/Makefile +++ b/Makefile @@ -116,6 +116,15 @@ else $(HIDE)$(SCRIPTS_PATH)/mklibversion.sh endif +##### make sysroot ##### +sysroot: +ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y) +ifeq ($(wildcard $(SYSROOT_PATH)/usr/include/$(LLVM_TARGET)/),) + $(HIDE)$(MAKE) -C $(SYSROOT_PATH)/build TARGETS=liteos_a_user +endif + $(HIDE)echo "sysroot:" $(abspath $(SYSROOT_PATH)) +endif + ##### make dynload ##### -include $(LITEOS_MK_PATH)/dynload.mk @@ -132,7 +141,7 @@ $(OUT): $(LITEOS_MENUCONFIG_H) $(BUILD): $(HIDE)mkdir -p $(BUILD) -$(LITEOS_LIBS_TARGET): $(__LIBS) +$(LITEOS_LIBS_TARGET): $(__LIBS) sysroot $(HIDE)for dir in $(LIB_SUBDIRS); \ do $(MAKE) -C $$dir all || exit 1; \ done @@ -151,7 +160,7 @@ genconfig:$(MENUCONFIG_CONF) $(LITEOS_MENUCONFIG_H): .config $(HIDE)$(MAKE) genconfig -$(LITEOS_TARGET): $(__LIBS) +$(LITEOS_TARGET): $(__LIBS) sysroot $(HIDE)touch $(LOSCFG_ENTRY_SRC) $(HIDE)for dir in $(LITEOS_SUBDIRS); \ @@ -165,18 +174,14 @@ $(LITEOS_TARGET): $(__LIBS) $(OBJDUMP) -d $(OUT)/$@ >$(OUT)/$@.asm # $(NM) -S --size-sort $(OUT)/$@ >$(OUT)/$@.size -$(APPS): $(LITEOS_TARGET) +$(APPS): $(LITEOS_TARGET) sysroot $(HIDE)$(MAKE) -C apps all -ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y) -MULTILIB := $(patsubst $(shell $(CC) --target=$(LLVM_TARGET) $(ARCH_CFLAGS) -print-file-name=lib/$(LLVM_TARGET)/)%,%,$(dir $(shell $(CC) --target=$(LLVM_TARGET) $(ARCH_CFLAGS) -print-libgcc-file-name))) -endif - prepare: $(HIDE)mkdir -p $(OUT)/musl ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y) - $(HIDE)cp -f $(SYSROOT_PATH)/usr/lib/$(LLVM_TARGET)/$(MULTILIB)/libc.so $(OUT)/musl - $(HIDE)cp -f $(LITEOS_COMPILER_PATH)/lib/$(LLVM_TARGET)/c++/$(MULTILIB)/libc++.so $(OUT)/musl + $(HIDE)cp -f $$($(CC) --target=$(LLVM_TARGET) --sysroot=$(SYSROOT_PATH) $(LITEOS_CFLAGS) -print-file-name=libc.so) $(OUT)/musl + $(HIDE)cp -f $$($(GPP) --target=$(LLVM_TARGET) --sysroot=$(SYSROOT_PATH) $(LITEOS_CXXFLAGS) -print-file-name=libc++.so) $(OUT)/musl else $(HIDE)cp -f $(LITEOS_COMPILER_PATH)/target/usr/lib/libc.so $(OUT)/musl $(HIDE)cp -f $(LITEOS_COMPILER_PATH)/arm-linux-musleabi/lib/libstdc++.so.6 $(OUT)/musl @@ -225,3 +230,4 @@ update_all_config: $(HIDE)test -f tools/build/config/$@ && cp tools/build/config/$@ .config && $(MENUCONFIG_MCONF) $(KCONFIG_FILE_PATH) && $(MENUCONFIG_CONF) --savedefconfig tools/build/config/$@ $(KCONFIG_FILE_PATH) .PHONY: all lib clean cleanall $(LITEOS_TARGET) debug release help update_all_config +.PHONY: prepare sysroot cleanrootfs $(ROOTFS) $(ROOTFSDIR) $(APPS) menuconfig genconfig $(LITEOS_LIBS_TARGET) $(__LIBS) $(OUT) diff --git a/apps/config.mk b/apps/config.mk index 417446cb..21410057 100644 --- a/apps/config.mk +++ b/apps/config.mk @@ -44,7 +44,7 @@ CFLAGS := -std=c99 -fno-exceptions $(BASE_OPTS) $(LITEOS_COPTS_OPTMIZE) CXXFLAGS := -std=c++11 -fexceptions -fpermissive -frtti $(BASE_OPTS) $(LITEOS_COPTS_OPTMIZE) LDCFLAGS := -lc ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y) -LLVM_SYSROOT := --sysroot=$(SYSROOT_PATH) $(ARCH_CFLAGS) +LLVM_SYSROOT := --sysroot=$(SYSROOT_PATH) LDCXXFLGS := -lc++ -lc++abi -lc else BASE_OPTS += -Wl,-z,relro,-z,now diff --git a/apps/mksh/Makefile b/apps/mksh/Makefile index 8aa8bcdc..182c7c01 100755 --- a/apps/mksh/Makefile +++ b/apps/mksh/Makefile @@ -39,10 +39,10 @@ BUILD_LOG := $(MKSH_DIR)/build.log TARGET_OS := OpenHarmony LOCAL_CFLAGS := -flto -fdata-sections -ffunction-sections -Oz -fstack-protector-strong -D_FORTIFY_SOURCE=2 -LOCAL_CFLAGS += --target=arm-liteos $(LLVM_SYSROOT) +LOCAL_CFLAGS += --target=$(LLVM_TARGET) $(LLVM_SYSROOT) LOCAL_CFLAGS += -DMKSH_DISABLE_TTY_WARNING -DMKSH_SMALL=1 -DMKSH_ASSUME_UTF8=1 -DMKSH_SMALL_BUT_FAST=0 -DMKSH_S_NOVI=1 -DHAVE_CAN_FSTACKPROTECTORSTRONG=1 LOCAL_CFLAGS += -DMKSH_LESS_CMDLINE_EDITING -DMKSH_LESS_BUILDINS -DMKSH_NO_INITCOMS -DADAPT_FOR_LITEOS_A -LOCAL_LDFLAGS := -Wl,--gc-sections -flto -O2 --target=arm-liteos $(LLVM_SYSROOT) +LOCAL_LDFLAGS := -Wl,--gc-sections -flto -O2 --target=$(LLVM_TARGET) $(LLVM_SYSROOT) all:$(MKSH) diff --git a/apps/toybox/Makefile b/apps/toybox/Makefile index 0af3c951..d4345bae 100644 --- a/apps/toybox/Makefile +++ b/apps/toybox/Makefile @@ -46,8 +46,8 @@ else $(HIDE)$(CP) $(LITEOSTHIRDPARTY)/$(TOYBOX)/. $(BUILD_DIR) $(HIDE)$(CP) -p $(LITEOSTHIRDPARTY)/$(TOYBOX)/porting/liteos_a/. $(BUILD_DIR) endif - $(HIDE)CFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-strong --target=arm-liteos $(LLVM_SYSROOT)" CC="$(CC)" OUTNAME=$(OUTNAME) \ - LDFLAGS="--target=arm-liteos $(LLVM_SYSROOT)" \ + $(HIDE)CFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-strong --target=$(LLVM_TARGET) $(LLVM_SYSROOT)" CC="$(CC)" OUTNAME=$(OUTNAME) \ + LDFLAGS="--target=$(LLVM_TARGET) $(LLVM_SYSROOT)" \ make -C $(BUILD_DIR) toybox -j> $(BUILD_LOG) 2>&1 $(HIDE)$(CP) $(BUILD_DIR)/$(TOYBOX) . $(HIDE)$(STRIP) $(TOYBOX) diff --git a/kernel/extended/vdso/usr/Makefile b/kernel/extended/vdso/usr/Makefile index 33b04ebc..dde4d96d 100644 --- a/kernel/extended/vdso/usr/Makefile +++ b/kernel/extended/vdso/usr/Makefile @@ -40,7 +40,7 @@ VDSO_INCLUDE := -I $(LITEOSTOPDIR)/kernel/extended/vdso/include \ VDSO_CCFLAGS := -nostdlib -fPIC -fno-common -fno-strict-aliasing \ $(LITEOS_SSP) $(LITEOS_CORE_COPTS) $(WARNING_AS_ERROR) $(LITEOS_COPTS_OPTMIZE) ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y) -VDSO_CCFLAGS += $(LLVM_EXTRA_OPTS) --sysroot=$(SYSROOT_PATH) $(ARCH_CFLAGS) +VDSO_CCFLAGS += $(LLVM_EXTRA_OPTS) --sysroot=$(SYSROOT_PATH) endif VDSO_LDFLAGS := -shared -s -Bsymbolic -T los_vdso.ld From 4e4f2d6d7ee120c951006998e0d7b0f4fa250240 Mon Sep 17 00:00:00 2001 From: boxi Date: Tue, 29 Jun 2021 19:34:16 +0800 Subject: [PATCH 06/43] =?UTF-8?q?refactor:=20=E5=AF=B9LiteOS=5Fa=E5=86=85?= =?UTF-8?q?=E6=A0=B8=E4=B8=ADmenuconfig=E5=BC=80=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E5=AE=8F=E4=BD=BF=E7=94=A8#ifdef/#ifndef=E5=81=9A=E9=A2=84?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LiteOS_a中有部分配置宏进行了重复冗余定义，导致当头文件未被包含时，极易引入错误， 故对menuconfig配置宏进行统一处理，均使用#ifdef/#ifndef作为预编译判断方式 Close #I3YEGS Change-Id: Ife6db770cc66de1d6199a4f3ba3950e9bfd0e71a Signed-off-by: boxi --- arch/arm/arm/include/los_hw_cpu.h | 2 +- arch/arm/arm/src/los_arch_mmu.c | 6 +- arch/arm/arm/src/los_exc.c | 16 +++--- arch/arm/gic/gic_v2.c | 4 +- arch/arm/gic/gic_v3.c | 4 +- arch/arm/include/hal_hwi.h | 2 +- compat/posix/src/pthread.c | 2 +- compat/posix/src/pthread_attr.c | 6 +- compat/posix/src/sched.c | 4 +- fs/jffs2/src/vfs_jffs2.c | 2 +- kernel/base/core/los_process.c | 10 ++-- kernel/base/core/los_sortlink.c | 6 +- kernel/base/core/los_swtmr.c | 6 +- kernel/base/core/los_task.c | 42 +++++++------- kernel/base/core/los_tick.c | 2 +- kernel/base/include/los_percpu_pri.h | 4 +- kernel/base/include/los_process_pri.h | 6 +- kernel/base/include/los_sched_pri.h | 2 +- kernel/base/include/los_sortlink_pri.h | 2 +- kernel/base/include/los_task_pri.h | 8 +-- kernel/base/ipc/los_event.c | 2 +- kernel/base/ipc/los_mux.c | 4 +- kernel/base/ipc/los_queue.c | 4 +- kernel/base/ipc/los_sem.c | 4 +- kernel/base/mem/tlsf/los_memory.c | 18 +++--- kernel/base/misc/sysinfo_shellcmd.c | 18 +++++- kernel/base/misc/task_shellcmd.c | 4 +- kernel/base/mp/los_lockdep.c | 2 +- kernel/base/mp/los_mp.c | 2 +- kernel/base/mp/los_spinlock.c | 2 +- kernel/base/mp/los_stat.c | 6 +- kernel/base/sched/sched_sq/los_sched.c | 24 ++++---- kernel/base/vm/oom.c | 6 +- kernel/common/console.c | 2 +- kernel/common/console.h | 2 +- kernel/common/los_config.c | 18 +++--- kernel/common/los_config.h | 56 ++++++------------- kernel/extended/liteipc/hm_liteipc.c | 18 +++--- kernel/include/los_memory.h | 15 +---- kernel/include/los_mp.h | 2 +- kernel/include/los_spinlock.h | 6 +- kernel/include/los_task.h | 2 +- net/lwip-2.1/porting/src/sys_arch.c | 12 ++-- net/telnet/src/telnet_dev.c | 4 +- platform/main.c | 8 +-- syscall/process_syscall.c | 2 +- testsuites/kernel/include/iCunit.h | 2 +- testsuites/kernel/include/osTest.h | 2 +- .../sample/kernel_base/core/hwi/It_smp_hwi.c | 4 +- .../core/hwi/smp/It_smp_los_hwi_001.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_002.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_003.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_004.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_005.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_006.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_007.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_008.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_009.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_010.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_011.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_012.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_013.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_ipi_001.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_ipi_002.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_ipi_003.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_ipi_004.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_ipi_005.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_ipi_006.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_ipi_007.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_ipi_008.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_nest_001.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_nest_002.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_nest_003.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_nest_004.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_nest_005.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_nest_006.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_nest_007.c | 2 +- .../core/hwi/smp/It_smp_los_hwi_nest_008.c | 2 +- .../kernel_base/core/swtmr/It_los_swtmr.c | 2 +- .../core/swtmr/full/It_los_swtmr_033.c | 2 +- .../core/swtmr/full/It_los_swtmr_039.c | 2 +- .../core/swtmr/full/It_los_swtmr_040.c | 2 +- .../core/swtmr/full/It_los_swtmr_041.c | 2 +- .../core/swtmr/full/It_los_swtmr_043.c | 2 +- .../core/swtmr/full/It_los_swtmr_064.c | 2 +- .../core/swtmr/full/It_los_swtmr_065.c | 2 +- .../kernel_base/core/task/It_los_task.c | 10 ++-- .../kernel_base/core/task/It_los_task.h | 4 +- .../task/float/It_smp_los_float_switch_007.c | 2 +- .../core/task/full/It_los_task_008.c | 2 +- .../core/task/full/It_los_task_011.c | 2 +- .../core/task/full/It_los_task_016.c | 2 +- .../core/task/full/It_los_task_017.c | 2 +- .../core/task/full/It_los_task_018.c | 2 +- .../core/task/full/It_los_task_025.c | 2 +- .../core/task/full/It_los_task_029.c | 2 +- .../core/task/full/It_los_task_031.c | 2 +- .../core/task/full/It_los_task_033.c | 2 +- .../core/task/full/It_los_task_038.c | 2 +- .../core/task/full/It_los_task_039.c | 2 +- .../core/task/full/It_los_task_040.c | 2 +- .../core/task/full/It_los_task_041.c | 2 +- .../core/task/full/It_los_task_042.c | 2 +- .../core/task/full/It_los_task_043.c | 2 +- .../core/task/full/It_los_task_047.c | 2 +- .../core/task/full/It_los_task_050.c | 4 +- .../core/task/full/It_los_task_052.c | 4 +- .../core/task/full/It_los_task_053.c | 4 +- .../core/task/full/It_los_task_054.c | 6 +- .../core/task/full/It_los_task_055.c | 4 +- .../core/task/full/It_los_task_056.c | 4 +- .../core/task/full/It_los_task_057.c | 2 +- .../core/task/full/It_los_task_058.c | 2 +- .../core/task/full/It_los_task_060.c | 2 +- .../core/task/full/It_los_task_061.c | 6 +- .../core/task/full/It_los_task_063.c | 4 +- .../core/task/full/It_los_task_064.c | 6 +- .../core/task/full/It_los_task_065.c | 4 +- .../core/task/full/It_los_task_066.c | 6 +- .../core/task/full/It_los_task_067.c | 4 +- .../core/task/full/It_los_task_068.c | 4 +- .../core/task/full/It_los_task_069.c | 4 +- .../core/task/full/It_los_task_071.c | 2 +- .../core/task/full/It_los_task_072.c | 2 +- .../core/task/full/It_los_task_073.c | 2 +- .../core/task/full/It_los_task_074.c | 2 +- .../core/task/full/It_los_task_075.c | 4 +- .../core/task/full/It_los_task_076.c | 2 +- .../core/task/full/It_los_task_077.c | 2 +- .../core/task/full/It_los_task_078.c | 2 +- .../core/task/full/It_los_task_079.c | 2 +- .../core/task/full/It_los_task_080.c | 2 +- .../core/task/full/It_los_task_082.c | 2 +- .../core/task/full/It_los_task_090.c | 2 +- .../core/task/full/It_los_task_093.c | 2 +- .../core/task/full/It_los_task_094.c | 6 +- .../core/task/full/It_los_task_095.c | 2 +- .../core/task/full/It_los_task_096.c | 4 +- .../core/task/full/It_los_task_098.c | 4 +- .../core/task/full/It_los_task_100.c | 2 +- .../core/task/full/It_los_task_102.c | 4 +- .../core/task/full/It_los_task_103.c | 4 +- .../core/task/full/It_los_task_104.c | 4 +- .../core/task/full/It_los_task_106.c | 4 +- .../core/task/full/It_los_task_107.c | 4 +- .../core/task/full/It_los_task_108.c | 4 +- .../core/task/full/It_los_task_109.c | 4 +- .../core/task/full/It_los_task_110.c | 4 +- .../core/task/full/It_los_task_111.c | 4 +- .../core/task/full/It_los_task_112.c | 4 +- .../core/task/full/It_los_task_113.c | 4 +- .../core/task/full/It_los_task_114.c | 4 +- .../core/task/full/It_los_task_115.c | 4 +- .../core/task/full/It_los_task_116.c | 2 +- .../core/task/full/It_los_task_118.c | 6 +- .../core/task/full/It_los_task_119.c | 2 +- .../core/task/full/It_los_task_120.c | 2 +- .../core/task/full/It_los_task_121.c | 2 +- .../core/task/full/It_los_task_122.c | 4 +- .../core/task/full/It_los_task_123.c | 4 +- .../core/task/full/It_los_task_124.c | 4 +- .../core/task/full/It_los_task_125.c | 4 +- .../core/task/full/It_los_task_126.c | 6 +- .../core/task/full/It_los_task_127.c | 4 +- .../core/task/full/It_los_task_128.c | 4 +- .../core/task/full/It_los_task_129.c | 4 +- .../core/task/full/It_los_task_130.c | 4 +- .../core/task/full/It_los_task_131.c | 6 +- .../core/task/full/It_los_task_133.c | 2 +- .../core/task/full/It_los_task_134.c | 2 +- .../core/task/full/It_los_task_135.c | 2 +- .../core/task/full/It_los_task_136.c | 4 +- .../core/task/full/It_los_task_138.c | 6 +- .../core/task/full/It_los_task_141.c | 2 +- .../core/task/full/It_los_task_142.c | 2 +- .../task/full/It_los_task_timeslice_002.c | 4 +- .../task/full/It_los_task_timeslice_003.c | 6 +- .../task/full/It_los_task_timeslice_004.c | 4 +- .../core/task/smoke/It_los_task_049.c | 2 +- .../core/task/smoke/It_los_task_081.c | 2 +- .../core/task/smoke/It_los_task_097.c | 4 +- .../core/task/smoke/It_los_task_099.c | 2 +- .../core/task/smoke/It_los_task_101.c | 2 +- .../core/task/smoke/It_los_task_105.c | 2 +- .../task/smoke/It_los_task_timeslice_001.c | 4 +- .../core/task/smp/It_smp_los_task_002.c | 2 +- .../core/task/smp/It_smp_los_task_024.c | 2 +- .../core/task/smp/It_smp_los_task_025.c | 2 +- .../kernel_base/ipc/event/It_los_event.c | 8 +-- .../kernel_base/ipc/event/It_los_event.h | 2 +- .../ipc/event/full/It_los_event_018.c | 2 +- .../ipc/event/full/It_los_event_023.c | 6 +- .../ipc/event/full/It_los_event_024.c | 2 +- .../ipc/event/full/It_los_event_026.c | 2 +- .../ipc/event/full/It_los_event_038.c | 6 +- .../ipc/event/full/It_los_event_039.c | 2 +- .../ipc/event/smoke/It_los_event_036.c | 2 +- .../ipc/event/smp/It_smp_los_event_032.c | 2 +- .../sample/kernel_base/ipc/mux/It_los_mux.c | 4 +- .../ipc/mux/full/It_los_mutex_013.c | 4 +- .../ipc/mux/full/It_los_mutex_016.c | 4 +- .../ipc/mux/full/It_los_mutex_017.c | 2 +- .../ipc/mux/full/It_los_mutex_020.c | 2 +- .../ipc/mux/full/It_los_mutex_021.c | 4 +- .../ipc/mux/full/It_los_mutex_026.c | 8 +-- .../ipc/mux/full/It_los_mutex_027.c | 8 +-- .../ipc/mux/full/It_los_mutex_028.c | 8 +-- .../ipc/mux/full/It_los_mutex_029.c | 8 +-- .../ipc/mux/full/It_los_mutex_031.c | 8 +-- .../ipc/mux/full/It_los_mutex_035.c | 6 +- .../ipc/mux/full/It_los_mutex_036.c | 6 +- .../ipc/mux/full/It_los_mutex_037.c | 4 +- .../ipc/mux/full/It_los_mutex_038.c | 4 +- .../ipc/mux/full/It_los_mutex_039.c | 4 +- .../ipc/mux/full/It_los_mutex_040.c | 8 +-- .../ipc/mux/full/It_los_mutex_041.c | 2 +- .../ipc/mux/full/It_los_mutex_042.c | 4 +- .../ipc/mux/full/It_los_mutex_043.c | 4 +- .../kernel_base/ipc/queue/It_los_queue.c | 6 +- .../kernel_base/ipc/queue/It_los_queue.h | 2 +- .../ipc/queue/full/It_los_queue_044.c | 2 +- .../ipc/queue/full/It_los_queue_045.c | 2 +- .../ipc/queue/full/It_los_queue_046.c | 2 +- .../ipc/queue/full/It_los_queue_047.c | 2 +- .../ipc/queue/full/It_los_queue_048.c | 2 +- .../ipc/queue/full/It_los_queue_050.c | 2 +- .../ipc/queue/full/It_los_queue_108.c | 2 +- .../ipc/queue/full/It_los_queue_111.c | 2 +- .../sample/kernel_base/ipc/sem/It_los_sem.c | 8 +-- .../sample/kernel_base/ipc/sem/It_los_sem.h | 2 +- .../kernel_base/ipc/sem/full/It_los_sem_020.c | 2 +- .../kernel_base/ipc/sem/full/It_los_sem_022.c | 4 +- .../kernel_base/ipc/sem/full/It_los_sem_023.c | 2 +- .../kernel_base/ipc/sem/full/It_los_sem_026.c | 4 +- .../ipc/sem/smp/It_smp_los_sem_030.c | 2 +- .../kernel_extend/cpup/It_extend_cpup.c | 2 +- .../kernel_extend/cpup/It_extend_cpup.h | 2 +- .../cpup/full/It_extend_cpup_004.c | 4 +- .../cpup/full/It_extend_cpup_005.c | 2 +- .../cpup/full/It_extend_cpup_006.c | 4 +- .../cpup/full/It_extend_cpup_008.c | 2 +- .../cpup/smp/It_smp_extend_cpup_001.c | 4 +- .../cpup/smp/It_smp_extend_cpup_002.c | 2 +- .../cpup/smp/It_smp_extend_cpup_003.c | 4 +- .../cpup/smp/It_smp_extend_cpup_004.c | 4 +- .../cpup/smp/It_smp_extend_cpup_005.c | 8 +-- .../cpup/smp/It_smp_extend_cpup_007.c | 4 +- .../cpup/smp/It_smp_extend_cpup_008.c | 4 +- .../cpup/smp/It_smp_extend_cpup_009.c | 6 +- .../cpup/smp/It_smp_extend_cpup_010.c | 4 +- .../cpup/smp/It_smp_extend_cpup_011.c | 4 +- .../cpup/smp/It_smp_extend_cpup_012.c | 4 +- .../sample/posix/mutex/It_posix_mutex.c | 2 +- .../sample/posix/pthread/It_posix_pthread.c | 2 +- .../posix/pthread/full/It_posix_pthread_066.c | 2 +- .../posix/pthread/full/It_posix_pthread_068.c | 2 +- testsuites/kernel/src/iCunit.c | 8 +-- testsuites/kernel/src/osTest.c | 6 +- testsuites/unittest/common/include/osTest.h | 2 +- testsuites/unittest/common/osTest.cpp | 2 +- testsuites/unittest/fs/proc/It_vfs_proc.cpp | 2 +- .../posix/mqueue/full/It_posix_queue_124.cpp | 4 +- .../posix/mqueue/posix_mqueue_test.cpp | 2 +- .../pthread/full/It_posix_pthread_066.cpp | 2 +- tools/build/mk/los_config.mk | 6 -- 265 files changed, 526 insertions(+), 557 deletions(-) diff --git a/arch/arm/arm/include/los_hw_cpu.h b/arch/arm/arm/include/los_hw_cpu.h index f6fc4460..425ca449 100644 --- a/arch/arm/arm/include/los_hw_cpu.h +++ b/arch/arm/arm/include/los_hw_cpu.h @@ -145,7 +145,7 @@ STATIC INLINE VOID ArchCurrUserTaskSet(UINTPTR val) STATIC INLINE UINT32 ArchCurrCpuid(VOID) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP return ARM_SYSREG_READ(MPIDR) & MPIDR_CPUID_MASK; #else return 0; diff --git a/arch/arm/arm/src/los_arch_mmu.c b/arch/arm/arm/src/los_arch_mmu.c index 435dcfaf..cce73fe2 100644 --- a/arch/arm/arm/src/los_arch_mmu.c +++ b/arch/arm/arm/src/los_arch_mmu.c @@ -51,7 +51,7 @@ __attribute__((aligned(MMU_DESCRIPTOR_L1_SMALL_ENTRY_NUMBERS))) \ __attribute__((section(".bss.prebss.translation_table"))) UINT8 \ g_firstPageTable[MMU_DESCRIPTOR_L1_SMALL_ENTRY_NUMBERS]; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP __attribute__((aligned(MMU_DESCRIPTOR_L1_SMALL_ENTRY_NUMBERS))) \ __attribute__((section(".bss.prebss.translation_table"))) UINT8 \ g_tempPageTable[MMU_DESCRIPTOR_L1_SMALL_ENTRY_NUMBERS]; @@ -218,7 +218,7 @@ STATIC UINT32 OsCvtSecCacheFlagsToMMUFlags(UINT32 flags) switch (flags & VM_MAP_REGION_FLAG_CACHE_MASK) { case VM_MAP_REGION_FLAG_CACHED: mmuFlags |= MMU_DESCRIPTOR_L1_TYPE_NORMAL_WRITE_BACK_ALLOCATE; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP mmuFlags |= MMU_DESCRIPTOR_L1_SECTION_SHAREABLE; #endif break; @@ -544,7 +544,7 @@ STATIC UINT32 OsCvtPte2CacheFlagsToMMUFlags(UINT32 flags) switch (flags & VM_MAP_REGION_FLAG_CACHE_MASK) { case VM_MAP_REGION_FLAG_CACHED: -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP mmuFlags |= MMU_DESCRIPTOR_L2_SHAREABLE; #endif mmuFlags |= MMU_DESCRIPTOR_L2_TYPE_NORMAL_WRITE_BACK_ALLOCATE; diff --git a/arch/arm/arm/src/los_exc.c b/arch/arm/arm/src/los_exc.c index 1c0c89cd..d944caaf 100644 --- a/arch/arm/arm/src/los_exc.c +++ b/arch/arm/arm/src/los_exc.c @@ -75,7 +75,7 @@ VOID OsExcHook(UINT32 excType, ExcContext *excBufAddr, UINT32 far, UINT32 fsr); UINT32 g_curNestCount[LOSCFG_KERNEL_CORE_NUM] = { 0 }; BOOL g_excFromUserMode[LOSCFG_KERNEL_CORE_NUM]; STATIC EXC_PROC_FUNC g_excHook = (EXC_PROC_FUNC)OsExcHook; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP STATIC SPIN_LOCK_INIT(g_excSerializerSpin); STATIC UINT32 g_currHandleExcPID = OS_INVALID_VALUE; STATIC UINT32 g_nextExcWaitCpu = INVALID_CPUID; @@ -531,7 +531,7 @@ STATIC VOID OsExcRestore(VOID) g_excFromUserMode[currCpuID] = FALSE; g_intCount[currCpuID] = 0; g_curNestCount[currCpuID] = 0; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP OsPercpuGet()->excFlag = CPU_RUNNING; #endif OsPercpuGet()->taskLockCnt = 0; @@ -548,7 +548,7 @@ STATIC VOID OsUserExcHandle(ExcContext *excBufAddr) return; } -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP LOS_SpinLock(&g_excSerializerSpin); if (g_nextExcWaitCpu != INVALID_CPUID) { g_currHandleExcCpuID = g_nextExcWaitCpu; @@ -563,7 +563,7 @@ STATIC VOID OsUserExcHandle(ExcContext *excBufAddr) #endif runProcess->processStatus &= ~OS_PROCESS_FLAG_EXIT; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP #ifdef LOSCFG_FS_VFS OsWakeConsoleSendTask(); #endif @@ -909,7 +909,7 @@ VOID OsDataAbortExcHandleEntry(ExcContext *excBufAddr) #endif /* __LINUX_ARM_ARCH__ */ #endif /* LOSCFG_GDB */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP #define EXC_WAIT_INTER 50U #define EXC_WAIT_TIME 2000U @@ -1027,7 +1027,7 @@ STATIC VOID OsCheckAllCpuStatus(VOID) STATIC VOID OsCheckCpuStatus(VOID) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP OsCheckAllCpuStatus(); #else g_currHandleExcCpuID = ArchCurrCpuid(); @@ -1048,7 +1048,7 @@ LITE_OS_SEC_TEXT VOID STATIC OsExcPriorDisposal(ExcContext *excBufAddr) OsCheckCpuStatus(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP #ifdef LOSCFG_FS_VFS /* Wait for the end of the Console task to avoid multicore printing code */ OsWaitConsoleSendTaskPend(OsCurrTaskGet()->taskID); @@ -1113,7 +1113,7 @@ LITE_OS_SEC_TEXT_INIT VOID OsExcHandleEntry(UINT32 excType, ExcContext *excBufAd OsPrintExcHead(far); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP OsAllCpuStatusOutput(); #endif diff --git a/arch/arm/gic/gic_v2.c b/arch/arm/gic/gic_v2.c index 75c23219..9479c0d4 100644 --- a/arch/arm/gic/gic_v2.c +++ b/arch/arm/gic/gic_v2.c @@ -40,7 +40,7 @@ STATIC_ASSERT(OS_USER_HWI_MAX <= 1020, "hwi max is too large!"); STATIC UINT32 g_curIrqNum = 0; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* * filter description * 0b00: forward to the cpu interfaces specified in cpu_mask @@ -144,7 +144,7 @@ VOID HalIrqInit(VOID) /* enable gic distributor control */ GIC_REG_32(GICD_CTLR) = 1; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* register inter-processor interrupt */ (VOID)LOS_HwiCreate(LOS_MP_IPI_WAKEUP, 0xa0, 0, OsMpWakeHandler, 0); (VOID)LOS_HwiCreate(LOS_MP_IPI_SCHEDULE, 0xa0, 0, OsMpScheduleHandler, 0); diff --git a/arch/arm/gic/gic_v3.c b/arch/arm/gic/gic_v3.c index 03b8cfd8..f6e943f9 100644 --- a/arch/arm/gic/gic_v3.c +++ b/arch/arm/gic/gic_v3.c @@ -48,7 +48,7 @@ STATIC INLINE UINT64 MpidrToAffinity(UINT64 mpidr) (MPIDR_AFF_LEVEL(mpidr, 0))); } -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP STATIC UINT32 NextCpu(UINT32 cpu, UINT32 cpuMask) { @@ -399,7 +399,7 @@ VOID HalIrqInit(VOID) HalIrqInitPercpu(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* register inter-processor interrupt */ LOS_HwiCreate(LOS_MP_IPI_WAKEUP, 0xa0, 0, OsMpWakeHandler, 0); LOS_HwiCreate(LOS_MP_IPI_SCHEDULE, 0xa0, 0, OsMpScheduleHandler, 0); diff --git a/arch/arm/include/hal_hwi.h b/arch/arm/include/hal_hwi.h index 9d08589a..4b068e41 100644 --- a/arch/arm/include/hal_hwi.h +++ b/arch/arm/include/hal_hwi.h @@ -49,7 +49,7 @@ extern VOID HalIrqClear(UINT32 vector); extern CHAR *HalIrqVersion(VOID); extern UINT32 HalCurIrqGet(VOID); extern UINT32 HalIrqSetPrio(UINT32 vector, UINT8 priority); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP extern VOID HalIrqSendIpi(UINT32 target, UINT32 ipi); extern VOID HalIrqSetAffinity(UINT32 vector, UINT32 cpuMask); #endif diff --git a/compat/posix/src/pthread.c b/compat/posix/src/pthread.c index b985da4f..f8ee1bf6 100644 --- a/compat/posix/src/pthread.c +++ b/compat/posix/src/pthread.c @@ -204,7 +204,7 @@ STATIC UINT32 InitPthreadData(pthread_t threadID, pthread_attr_t *userAttr, PRINT_ERR("%s: %d, err: %d\n", __FUNCTION__, __LINE__, err); return LOS_NOK; } -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP if (userAttr->cpuset.__bits[0] > 0) { taskCB->cpuAffiMask = (UINT16)userAttr->cpuset.__bits[0]; } diff --git a/compat/posix/src/pthread_attr.c b/compat/posix/src/pthread_attr.c index 29627cd3..0368b7bb 100644 --- a/compat/posix/src/pthread_attr.c +++ b/compat/posix/src/pthread_attr.c @@ -49,7 +49,7 @@ int pthread_attr_init(pthread_attr_t *attr) attr->stacksize_set = 1; attr->stacksize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP attr->cpuset.__bits[0] = 0; #endif @@ -239,7 +239,7 @@ int pthread_attr_getstacksize(const pthread_attr_t *attr, size_t *stackSize) */ int pthread_attr_setaffinity_np(pthread_attr_t* attr, size_t cpusetsize, const cpu_set_t* cpuset) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP if (attr == NULL) { return EINVAL; } @@ -264,7 +264,7 @@ int pthread_attr_setaffinity_np(pthread_attr_t* attr, size_t cpusetsize, const c */ int pthread_attr_getaffinity_np(const pthread_attr_t* attr, size_t cpusetsize, cpu_set_t* cpuset) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP if ((attr == NULL) || (cpuset == NULL) || (cpusetsize != sizeof(cpu_set_t))) { return EINVAL; } diff --git a/compat/posix/src/sched.c b/compat/posix/src/sched.c index 1c80780b..ece7752f 100644 --- a/compat/posix/src/sched.c +++ b/compat/posix/src/sched.c @@ -61,7 +61,7 @@ int sched_get_priority_max(int policy) */ int sched_setaffinity(pid_t pid, size_t set_size, const cpu_set_t* set) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP UINT32 taskID = (UINT32)pid; UINT32 ret; @@ -93,7 +93,7 @@ int sched_setaffinity(pid_t pid, size_t set_size, const cpu_set_t* set) */ int sched_getaffinity(pid_t pid, size_t set_size, cpu_set_t* set) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP UINT32 taskID = (UINT32)pid; UINT16 cpuAffiMask; diff --git a/fs/jffs2/src/vfs_jffs2.c b/fs/jffs2/src/vfs_jffs2.c index a0d3736c..5fa6a156 100644 --- a/fs/jffs2/src/vfs_jffs2.c +++ b/fs/jffs2/src/vfs_jffs2.c @@ -323,7 +323,7 @@ ssize_t VfsJffs2Write(struct file *filep, const char *buffer, size_t bufLen) c = JFFS2_SB_INFO(node->i_sb); pos = filep->f_pos; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP struct super_block *sb = node->i_sb; UINT16 gcCpuMask = LOS_TaskCpuAffiGet(sb->s_gc_thread); UINT32 curTaskId = LOS_CurTaskIDGet(); diff --git a/kernel/base/core/los_process.c b/kernel/base/core/los_process.c index 0f7c4b35..8d00696b 100644 --- a/kernel/base/core/los_process.c +++ b/kernel/base/core/los_process.c @@ -183,7 +183,7 @@ VOID OsWaitWakeTask(LosTaskCB *taskCB, UINT32 wakePID) { taskCB->waitID = wakePID; OsSchedTaskWake(taskCB); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP LOS_MpSchedule(OS_MP_CPU_ALL); #endif } @@ -312,7 +312,7 @@ LITE_OS_SEC_TEXT VOID OsProcessResourcesToFree(LosProcessCB *processCB) } #endif -#if (LOSCFG_KERNEL_LITEIPC == YES) +#ifdef LOSCFG_KERNEL_LITEIPC if (OsProcessIsUserMode(processCB)) { LiteIpcPoolDelete(&(processCB->ipcInfo)); (VOID)memset_s(&(processCB->ipcInfo), sizeof(ProcIpcInfo), 0, sizeof(ProcIpcInfo)); @@ -685,7 +685,7 @@ STATIC UINT32 OsProcessCreateInit(LosProcessCB *processCB, UINT32 flags, const C goto EXIT; } -#if (LOSCFG_KERNEL_LITEIPC == YES) +#ifdef LOSCFG_KERNEL_LITEIPC if (OsProcessIsUserMode(processCB)) { ret = LiteIpcPoolInit(&(processCB->ipcInfo)); if (ret != LOS_OK) { @@ -1294,7 +1294,7 @@ LITE_OS_SEC_TEXT UINT32 OsExecRecycleAndInit(LosProcessCB *processCB, const CHAR return ret; } -#if (LOSCFG_KERNEL_LITEIPC == YES) +#ifdef LOSCFG_KERNEL_LITEIPC ret = LiteIpcPoolInit(&(processCB->ipcInfo)); if (ret != LOS_OK) { return LOS_NOK; @@ -1690,7 +1690,7 @@ STATIC UINT32 OsCopyProcessResources(UINT32 flags, LosProcessCB *child, LosProce return ret; } -#if (LOSCFG_KERNEL_LITEIPC == YES) +#ifdef LOSCFG_KERNEL_LITEIPC if (OsProcessIsUserMode(child)) { ret = LiteIpcPoolReInit(&child->ipcInfo, (const ProcIpcInfo *)(&run->ipcInfo)); if (ret != LOS_OK) { diff --git a/kernel/base/core/los_sortlink.c b/kernel/base/core/los_sortlink.c index 8a997e50..6cb8b82b 100644 --- a/kernel/base/core/los_sortlink.c +++ b/kernel/base/core/los_sortlink.c @@ -127,7 +127,7 @@ STATIC Percpu *OsFindIdleCpu(UINT16 *ildeCpuID) Percpu *idleCpu = OsPercpuGetByID(0); *ildeCpuID = 0; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP UINT16 cpuID = 1; UINT32 nodeNum = idleCpu->taskSortLink.nodeNum + idleCpu->swtmrSortLink.nodeNum; @@ -174,7 +174,7 @@ VOID OsAdd2SortLink(SortLinkList *node, UINT64 startTime, UINT32 waitTicks, Sort LOS_SpinLockSave(spinLock, &intSave); SET_SORTLIST_VALUE(node, startTime + (UINT64)waitTicks * OS_CYCLE_PER_TICK); OsAddNode2SortLink(sortLinkHeader, node); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP node->cpuid = idleCpu; if (idleCpu != ArchCurrCpuid()) { LOS_MpSchedule(CPUID_TO_AFFI_MASK(idleCpu)); @@ -186,7 +186,7 @@ VOID OsAdd2SortLink(SortLinkList *node, UINT64 startTime, UINT32 waitTicks, Sort VOID OsDeleteSortLink(SortLinkList *node, SortLinkType type) { UINT32 intSave; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP Percpu *cpu = OsPercpuGetByID(node->cpuid); #else Percpu *cpu = OsPercpuGetByID(0); diff --git a/kernel/base/core/los_swtmr.c b/kernel/base/core/los_swtmr.c index c2b0ba44..2cad2825 100644 --- a/kernel/base/core/los_swtmr.c +++ b/kernel/base/core/los_swtmr.c @@ -38,7 +38,7 @@ #include "los_task_pri.h" -#if (LOSCFG_BASE_CORE_SWTMR == YES) +#ifdef LOSCFG_BASE_CORE_SWTMR_ENABLE #if (LOSCFG_BASE_CORE_SWTMR_LIMIT <= 0) #error "swtmr maxnum cannot be zero" #endif /* LOSCFG_BASE_CORE_SWTMR_LIMIT <= 0 */ @@ -84,7 +84,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsSwtmrTaskCreate(VOID) swtmrTask.pcName = "Swt_Task"; swtmrTask.usTaskPrio = 0; swtmrTask.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP swtmrTask.usCpuAffiMask = CPUID_TO_AFFI_MASK(cpuid); #endif ret = LOS_TaskCreate(&swtmrTaskID, &swtmrTask); @@ -533,4 +533,4 @@ LITE_OS_SEC_TEXT UINT32 LOS_SwtmrDelete(UINT16 swtmrID) return ret; } -#endif /* LOSCFG_BASE_CORE_SWTMR */ +#endif /* LOSCFG_BASE_CORE_SWTMR_ENABLE */ diff --git a/kernel/base/core/los_task.c b/kernel/base/core/los_task.c index 2d00d589..0eadc9db 100644 --- a/kernel/base/core/los_task.c +++ b/kernel/base/core/los_task.c @@ -51,10 +51,10 @@ #ifdef LOSCFG_KERNEL_CPUP #include "los_cpup_pri.h" #endif -#if (LOSCFG_BASE_CORE_SWTMR == YES) +#ifdef LOSCFG_BASE_CORE_SWTMR_ENABLE #include "los_swtmr_pri.h" #endif -#if (LOSCFG_KERNEL_LITEIPC == YES) +#ifdef LOSCFG_KERNEL_LITEIPC #include "hm_liteipc.h" #endif #ifdef LOSCFG_ENABLE_OOM_LOOP_TASK @@ -98,7 +98,7 @@ VOID OsSetMainTask() g_mainTask[i].taskStatus = OS_TASK_STATUS_UNUSED; g_mainTask[i].taskID = LOSCFG_BASE_CORE_TSK_LIMIT; g_mainTask[i].priority = OS_TASK_PRIORITY_LOWEST; -#if (LOSCFG_KERNEL_SMP_LOCKDEP == YES) +#ifdef LOSCFG_KERNEL_SMP_LOCKDEP g_mainTask[i].lockDep.lockDepth = 0; g_mainTask[i].lockDep.waitLock = NULL; #endif @@ -208,7 +208,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsTaskInit(VOID) LOS_ListTailInsert(&g_losFreeTask, &g_taskCBArray[index].pendList); } -#if (LOSCFG_KERNEL_TRACE == YES) +#ifdef LOSCFG_KERNEL_TRACE LOS_TraceReg(LOS_TRACE_TASK, OsTaskTrace, LOS_TRACE_TASK_NAME, LOS_TRACE_ENABLE); #endif @@ -240,7 +240,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsIdleTaskCreate(VOID) taskInitParam.pcName = "Idle"; taskInitParam.usTaskPrio = OS_TASK_PRIORITY_LOWEST; taskInitParam.processID = OsGetIdleProcessID(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreateOnly(idleTaskID, &taskInitParam); @@ -381,7 +381,7 @@ LITE_OS_SEC_TEXT_INIT STATIC VOID OsTaskStackAlloc(VOID **topStack, UINT32 stack STATIC INLINE UINT32 OsTaskSyncCreate(LosTaskCB *taskCB) { -#if (LOSCFG_KERNEL_SMP_TASK_SYNC == YES) +#ifdef LOSCFG_KERNEL_SMP_TASK_SYNC UINT32 ret = LOS_SemCreate(0, &taskCB->syncSignal); if (ret != LOS_OK) { return LOS_ERRNO_TSK_MP_SYNC_RESOURCE; @@ -394,7 +394,7 @@ STATIC INLINE UINT32 OsTaskSyncCreate(LosTaskCB *taskCB) STATIC INLINE VOID OsTaskSyncDestroy(UINT32 syncSignal) { -#if (LOSCFG_KERNEL_SMP_TASK_SYNC == YES) +#ifdef LOSCFG_KERNEL_SMP_TASK_SYNC (VOID)LOS_SemDelete(syncSignal); #else (VOID)syncSignal; @@ -403,7 +403,7 @@ STATIC INLINE VOID OsTaskSyncDestroy(UINT32 syncSignal) LITE_OS_SEC_TEXT UINT32 OsTaskSyncWait(const LosTaskCB *taskCB) { -#if (LOSCFG_KERNEL_SMP_TASK_SYNC == YES) +#ifdef LOSCFG_KERNEL_SMP_TASK_SYNC UINT32 ret = LOS_OK; LOS_ASSERT(LOS_SpinHeld(&g_taskSpin)); @@ -428,7 +428,7 @@ LITE_OS_SEC_TEXT UINT32 OsTaskSyncWait(const LosTaskCB *taskCB) STATIC INLINE VOID OsTaskSyncWake(const LosTaskCB *taskCB) { -#if (LOSCFG_KERNEL_SMP_TASK_SYNC == YES) +#ifdef LOSCFG_KERNEL_SMP_TASK_SYNC (VOID)OsSemPostUnsafe(taskCB->syncSignal, NULL); #else (VOID)taskCB; @@ -485,7 +485,7 @@ LITE_OS_SEC_TEXT VOID OsTaskResourcesToFree(LosTaskCB *taskCB) processCB->processID, taskCB->taskID, mapBase, mapSize, ret); } -#if (LOSCFG_KERNEL_LITEIPC == YES) +#ifdef LOSCFG_KERNEL_LITEIPC LiteIpcRemoveServiceHandle(taskCB); #endif } @@ -494,7 +494,7 @@ LITE_OS_SEC_TEXT VOID OsTaskResourcesToFree(LosTaskCB *taskCB) if (taskCB->taskStatus & OS_TASK_STATUS_UNUSED) { topOfStack = taskCB->topOfStack; taskCB->topOfStack = 0; -#if (LOSCFG_KERNEL_SMP_TASK_SYNC == YES) +#ifdef LOSCFG_KERNEL_SMP_TASK_SYNC syncSignal = taskCB->syncSignal; taskCB->syncSignal = LOSCFG_BASE_IPC_SEM_LIMIT; #endif @@ -523,12 +523,12 @@ LITE_OS_SEC_TEXT_INIT STATIC VOID OsTaskCBInitBase(LosTaskCB *taskCB, taskCB->taskEntry = initParam->pfnTaskEntry; taskCB->signal = SIGNAL_NONE; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskCB->currCpu = OS_TASK_INVALID_CPUID; taskCB->cpuAffiMask = (initParam->usCpuAffiMask) ? initParam->usCpuAffiMask : LOSCFG_KERNEL_CPU_MASK; #endif -#if (LOSCFG_KERNEL_LITEIPC == YES) +#ifdef LOSCFG_KERNEL_LITEIPC LOS_ListInit(&(taskCB->msgListHead)); #endif taskCB->policy = (initParam->policy == LOS_SCHED_FIFO) ? LOS_SCHED_FIFO : LOS_SCHED_RR; @@ -654,7 +654,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskCreateOnly(UINT32 *taskID, TSK_INIT_PARAM_S LOS_ERREND_TCB_INIT: (VOID)LOS_MemFree(pool, topStack); LOS_ERREND_REWIND_SYNC: -#if (LOSCFG_KERNEL_SMP_TASK_SYNC == YES) +#ifdef LOSCFG_KERNEL_SMP_TASK_SYNC OsTaskSyncDestroy(taskCB->syncSignal); #endif LOS_ERREND_REWIND_TCB: @@ -769,7 +769,7 @@ LITE_OS_SEC_TEXT_INIT STATIC BOOL OsTaskSuspendCheckOnRun(LosTaskCB *taskCB, UIN /* init default out return value */ *ret = LOS_OK; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* ASYNCHRONIZED. No need to do task lock checking */ if (taskCB->currCpu != ArchCurrCpuid()) { taskCB->signal = SIGNAL_SUSPEND; @@ -909,7 +909,7 @@ STATIC BOOL OsRunTaskToDeleteCheckOnRun(LosTaskCB *taskCB, UINT32 *ret) /* init default out return value */ *ret = LOS_OK; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* ASYNCHRONIZED. No need to do task lock checking */ if (taskCB->currCpu != ArchCurrCpuid()) { /* @@ -994,7 +994,7 @@ LITE_OS_SEC_TEXT UINT32 OsTaskDeleteUnsafe(LosTaskCB *taskCB, UINT32 status, UIN SCHEDULER_LOCK(intSave); } -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP LOS_ASSERT(OsPercpuGet()->taskLockCnt == 1); #else LOS_ASSERT(OsPercpuGet()->taskLockCnt == 0); @@ -1235,7 +1235,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskInfoGet(UINT32 taskID, TSK_INFO_S *taskInf LITE_OS_SEC_TEXT BOOL OsTaskCpuAffiSetUnsafe(UINT32 taskID, UINT16 newCpuAffiMask, UINT16 *oldCpuAffiMask) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID); taskCB->cpuAffiMask = newCpuAffiMask; @@ -1286,7 +1286,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskCpuAffiSet(UINT32 taskID, UINT16 cpuAffiMa LITE_OS_SEC_TEXT_MINOR UINT16 LOS_TaskCpuAffiGet(UINT32 taskID) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP #define INVALID_CPU_AFFI_MASK 0 LosTaskCB *taskCB = NULL; UINT16 cpuAffiMask; @@ -1346,7 +1346,7 @@ LITE_OS_SEC_TEXT_MINOR VOID OsTaskProcSignal(VOID) /* suspend killed task may fail, ignore the result */ (VOID)LOS_TaskSuspend(runTask->taskID); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP } else if (runTask->signal & SIGNAL_AFFI) { runTask->signal &= ~SIGNAL_AFFI; @@ -1406,7 +1406,7 @@ STATIC VOID OsExitGroupActiveTaskKilled(LosProcessCB *processCB, LosTaskCB *task INT32 ret; taskCB->taskStatus |= OS_TASK_FLAG_EXIT_KILL; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* The other core that the thread is running on and is currently running in a non-system call */ if (!taskCB->sig.sigIntLock && (taskCB->taskStatus & OS_TASK_STATUS_RUNNING)) { taskCB->signal = SIGNAL_KILL; diff --git a/kernel/base/core/los_tick.c b/kernel/base/core/los_tick.c index e799e4db..b5c2794e 100644 --- a/kernel/base/core/los_tick.c +++ b/kernel/base/core/los_tick.c @@ -57,7 +57,7 @@ LITE_OS_SEC_TEXT VOID OsTickHandler(VOID) OsVdsoTimevalUpdate(); #endif -#if (LOSCFG_BASE_CORE_TICK_HW_TIME == YES) +#ifdef LOSCFG_BASE_CORE_TICK_HW_TIME HalClockIrqClear(); /* diff from every platform */ #endif diff --git a/kernel/base/include/los_percpu_pri.h b/kernel/base/include/los_percpu_pri.h index 0a82c530..70662bf1 100644 --- a/kernel/base/include/los_percpu_pri.h +++ b/kernel/base/include/los_percpu_pri.h @@ -43,7 +43,7 @@ extern "C" { #endif /* __cplusplus */ #endif /* __cplusplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP typedef enum { CPU_RUNNING = 0, /* cpu is running */ CPU_HALT, /* cpu in the halt */ @@ -66,7 +66,7 @@ typedef struct { UINT32 swtmrTaskID; /* software timer task id */ UINT32 schedFlag; /* pending scheduler flag */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP UINT32 excFlag; /* cpu halt or exc flag */ #endif } Percpu; diff --git a/kernel/base/include/los_process_pri.h b/kernel/base/include/los_process_pri.h index e07ea820..8cf6b7c0 100644 --- a/kernel/base/include/los_process_pri.h +++ b/kernel/base/include/los_process_pri.h @@ -36,7 +36,7 @@ #include "los_sem_pri.h" #include "los_process.h" #include "los_vm_map.h" -#if (LOSCFG_KERNEL_LITEIPC == YES) +#ifdef LOSCFG_KERNEL_LITEIPC #include "hm_liteipc.h" #endif #ifdef LOSCFG_SECURITY_CAPABILITY @@ -96,12 +96,12 @@ typedef struct ProcessCB { volatile UINT32 threadNumber; /**< Number of threads alive under this process */ UINT32 threadCount; /**< Total number of threads created under this process */ LOS_DL_LIST waitList; /**< The process holds the waitLits to support wait/waitpid */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP UINT32 timerCpu; /**< CPU core number of this task is delayed or pended */ #endif UINTPTR sigHandler; /**< Signal handler */ sigset_t sigShare; /**< Signal share bit */ -#if (LOSCFG_KERNEL_LITEIPC == YES) +#ifdef LOSCFG_KERNEL_LITEIPC ProcIpcInfo ipcInfo; /**< Memory pool for lite ipc */ #endif #ifdef LOSCFG_KERNEL_VM diff --git a/kernel/base/include/los_sched_pri.h b/kernel/base/include/los_sched_pri.h index e5f1ea7c..21af8ce6 100644 --- a/kernel/base/include/los_sched_pri.h +++ b/kernel/base/include/los_sched_pri.h @@ -112,7 +112,7 @@ STATIC INLINE BOOL OsPreemptableInSched(VOID) { BOOL preemptable = FALSE; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* * For smp systems, schedule must hold the task spinlock, and this counter * will increase by 1 in that case. diff --git a/kernel/base/include/los_sortlink_pri.h b/kernel/base/include/los_sortlink_pri.h index fa2edf17..07a04d91 100644 --- a/kernel/base/include/los_sortlink_pri.h +++ b/kernel/base/include/los_sortlink_pri.h @@ -50,7 +50,7 @@ typedef enum { typedef struct { LOS_DL_LIST sortLinkNode; UINT64 responseTime; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP UINT32 cpuid; #endif } SortLinkList; diff --git a/kernel/base/include/los_task_pri.h b/kernel/base/include/los_task_pri.h index a4fdf7d3..13e5b4f9 100644 --- a/kernel/base/include/los_task_pri.h +++ b/kernel/base/include/los_task_pri.h @@ -344,14 +344,14 @@ typedef struct { INT32 errorNo; /**< Error Num */ UINT32 signal; /**< Task signal */ sig_cb sig; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP UINT16 currCpu; /**< CPU core number of this task is running on */ UINT16 lastCpu; /**< CPU core number of this task is running on last time */ UINT16 cpuAffiMask; /**< CPU affinity mask, support up to 16 cores */ -#if (LOSCFG_KERNEL_SMP_TASK_SYNC == YES) +#ifdef LOSCFG_KERNEL_SMP_TASK_SYNC UINT32 syncSignal; /**< Synchronization for signal handling */ #endif -#if (LOSCFG_KERNEL_SMP_LOCKDEP == YES) +#ifdef LOSCFG_KERNEL_SMP_LOCKDEP LockDep lockDep; #endif #endif @@ -368,7 +368,7 @@ typedef struct { UINTPTR waitID; /**< Wait for the PID or GID of the child process */ UINT16 waitFlag; /**< The type of child process that is waiting, belonging to a group or parent, a specific child process, or any child process */ -#if (LOSCFG_KERNEL_LITEIPC == YES) +#ifdef LOSCFG_KERNEL_LITEIPC UINT32 ipcStatus; LOS_DL_LIST msgListHead; BOOL accessMap[LOSCFG_BASE_CORE_TSK_LIMIT]; diff --git a/kernel/base/ipc/los_event.c b/kernel/base/ipc/los_event.c index fd872d64..4b745f88 100644 --- a/kernel/base/ipc/los_event.c +++ b/kernel/base/ipc/los_event.c @@ -35,7 +35,7 @@ #include "los_mp.h" #include "los_percpu_pri.h" #include "los_sched_pri.h" -#if (LOSCFG_BASE_CORE_SWTMR == YES) +#ifdef LOSCFG_BASE_CORE_SWTMR_ENABLE #include "los_exc.h" #endif diff --git a/kernel/base/ipc/los_mux.c b/kernel/base/ipc/los_mux.c index 7dc321af..61ee89e0 100644 --- a/kernel/base/ipc/los_mux.c +++ b/kernel/base/ipc/los_mux.c @@ -38,7 +38,7 @@ #include "los_sched_pri.h" -#if (LOSCFG_BASE_IPC_MUX == YES) +#ifdef LOSCFG_BASE_IPC_MUX #define MUTEXATTR_TYPE_MASK 0x0FU LITE_OS_SEC_TEXT UINT32 LOS_MuxAttrInit(LosMuxAttr *attr) @@ -560,5 +560,5 @@ LITE_OS_SEC_TEXT UINT32 LOS_MuxUnlock(LosMux *mutex) return ret; } -#endif /* (LOSCFG_BASE_IPC_MUX == YES) */ +#endif /* LOSCFG_BASE_IPC_MUX */ diff --git a/kernel/base/ipc/los_queue.c b/kernel/base/ipc/los_queue.c index 983e11f1..be4d176f 100644 --- a/kernel/base/ipc/los_queue.c +++ b/kernel/base/ipc/los_queue.c @@ -38,7 +38,7 @@ #include "los_percpu_pri.h" -#if (LOSCFG_BASE_IPC_QUEUE == YES) +#ifdef LOSCFG_BASE_IPC_QUEUE #if (LOSCFG_BASE_IPC_QUEUE_LIMIT <= 0) #error "queue maxnum cannot be zero" #endif /* LOSCFG_BASE_IPC_QUEUE_LIMIT <= 0 */ @@ -493,5 +493,5 @@ QUEUE_END: return ret; } -#endif /* (LOSCFG_BASE_IPC_QUEUE == YES) */ +#endif /* LOSCFG_BASE_IPC_QUEUE */ diff --git a/kernel/base/ipc/los_sem.c b/kernel/base/ipc/los_sem.c index 7f80a0ae..a6f10a80 100644 --- a/kernel/base/ipc/los_sem.c +++ b/kernel/base/ipc/los_sem.c @@ -40,7 +40,7 @@ #include "los_percpu_pri.h" -#if (LOSCFG_BASE_IPC_SEM == YES) +#ifdef LOSCFG_BASE_IPC_SEM #if (LOSCFG_BASE_IPC_SEM_LIMIT <= 0) #error "sem maxnum cannot be zero" @@ -283,5 +283,5 @@ LITE_OS_SEC_TEXT UINT32 LOS_SemPost(UINT32 semHandle) return ret; } -#endif /* (LOSCFG_BASE_IPC_SEM == YES) */ +#endif /* LOSCFG_BASE_IPC_SEM */ diff --git a/kernel/base/mem/tlsf/los_memory.c b/kernel/base/mem/tlsf/los_memory.c index a958ce92..0642a692 100644 --- a/kernel/base/mem/tlsf/los_memory.c +++ b/kernel/base/mem/tlsf/los_memory.c @@ -147,7 +147,7 @@ struct OsMemPoolInfo { VOID *pool; UINT32 totalSize; UINT32 attr; -#if defined(OS_MEM_WATERLINE) && (OS_MEM_WATERLINE == YES) +#ifdef LOSCFG_MEM_WATERLINE UINT32 waterLine; /* Maximum usage size in a memory pool */ UINT32 curUsedSize; /* Current usage size in a memory pool */ #endif @@ -230,7 +230,7 @@ STATIC INLINE VOID OsMemNodeSetTaskID(struct OsMemUsedNodeHead *node) } #endif -#if defined(OS_MEM_WATERLINE) && (OS_MEM_WATERLINE == YES) +#ifdef LOSCFG_MEM_WATERLINE STATIC INLINE VOID OsMemWaterUsedRecord(struct OsMemPoolHead *pool, UINT32 size) { pool->info.curUsedSize += size; @@ -775,7 +775,7 @@ STATIC UINT32 OsMemPoolInit(VOID *pool, UINT32 size) endNode->ptr.prev = newNode; OS_MEM_NODE_SET_USED_FLAG(endNode->sizeAndFlag); #endif -#if defined(OS_MEM_WATERLINE) && (OS_MEM_WATERLINE == YES) +#ifdef LOSCFG_MEM_WATERLINE poolHead->info.curUsedSize = sizeof(struct OsMemPoolHead) + OS_MEM_NODE_HEAD_SIZE; poolHead->info.waterLine = poolHead->info.curUsedSize; #endif @@ -1171,7 +1171,7 @@ STATIC INLINE UINT32 OsMemFree(struct OsMemPoolHead *pool, struct OsMemNodeHead return ret; } -#if defined(OS_MEM_WATERLINE) && (OS_MEM_WATERLINE == YES) +#ifdef LOSCFG_MEM_WATERLINE pool->info.curUsedSize -= OS_MEM_NODE_GET_SIZE(node->sizeAndFlag); #endif @@ -1256,14 +1256,14 @@ UINT32 LOS_MemFree(VOID *pool, VOID *ptr) STATIC INLINE VOID OsMemReAllocSmaller(VOID *pool, UINT32 allocSize, struct OsMemNodeHead *node, UINT32 nodeSize) { -#if defined(OS_MEM_WATERLINE) && (OS_MEM_WATERLINE == YES) +#ifdef LOSCFG_MEM_WATERLINE struct OsMemPoolHead *poolInfo = (struct OsMemPoolHead *)pool; #endif node->sizeAndFlag = nodeSize; if ((allocSize + OS_MEM_NODE_HEAD_SIZE + OS_MEM_MIN_ALLOC_SIZE) <= nodeSize) { OsMemSplitNode(pool, node, allocSize); OS_MEM_NODE_SET_USED_FLAG(node->sizeAndFlag); -#if defined(OS_MEM_WATERLINE) && (OS_MEM_WATERLINE == YES) +#ifdef LOSCFG_MEM_WATERLINE poolInfo->info.curUsedSize -= nodeSize - allocSize; #endif } @@ -1603,7 +1603,7 @@ STATIC VOID OsMemPoolHeadCheck(const struct OsMemPoolHead *pool) OUT: if (flag) { PRINTK("mem pool info: poolAddr: %#x, poolSize: 0x%x\n", pool, pool->info.totalSize); -#if defined(OS_MEM_WATERLINE) && (OS_MEM_WATERLINE == YES) +#ifdef LOSCFG_MEM_WATERLINE PRINTK("mem pool info: poolWaterLine: 0x%x, poolCurUsedSize: 0x%x\n", pool->info.waterLine, pool->info.curUsedSize); #endif @@ -1844,7 +1844,7 @@ UINT32 LOS_MemInfoGet(VOID *pool, LOS_MEM_POOL_STATUS *poolStatus) OsMemInfoGet(poolInfo, tmpNode, poolStatus); } #endif -#if defined(OS_MEM_WATERLINE) && (OS_MEM_WATERLINE == YES) +#ifdef LOSCFG_MEM_WATERLINE poolStatus->usageWaterLine = poolInfo->info.waterLine; #endif MEM_UNLOCK(poolInfo, intSave); @@ -1861,7 +1861,7 @@ STATIC VOID OsMemInfoPrint(VOID *pool) return; } -#if defined(OS_MEM_WATERLINE) && (OS_MEM_WATERLINE == YES) +#ifdef LOSCFG_MEM_WATERLINE PRINTK("pool addr pool size used size free size " "max free node size used node num free node num UsageWaterLine\n"); PRINTK("--------------- -------- ------- -------- " diff --git a/kernel/base/misc/sysinfo_shellcmd.c b/kernel/base/misc/sysinfo_shellcmd.c index 31431743..ba9186f8 100644 --- a/kernel/base/misc/sysinfo_shellcmd.c +++ b/kernel/base/misc/sysinfo_shellcmd.c @@ -119,9 +119,21 @@ UINT32 OsShellCmdSwtmrCntGet(VOID) LITE_OS_SEC_TEXT_MINOR VOID OsShellCmdSystemInfoGet(VOID) { UINT8 isTaskEnable = YES; - UINT8 isSemEnable = LOSCFG_BASE_IPC_SEM; - UINT8 isQueueEnable = LOSCFG_BASE_IPC_QUEUE; - UINT8 isSwtmrEnable = LOSCFG_BASE_CORE_SWTMR; +#ifdef LOSCFG_BASE_IPC_SEM + UINT8 isSemEnable = YES; +#else + UINT8 isSemEnable = NO; +#endif +#ifdef LOSCFG_BASE_IPC_QUEUE + UINT8 isQueueEnable = YES; +#else + UINT8 isQueueEnable = NO; +#endif +#ifdef LOSCFG_BASE_CORE_SWTMR_ENABLE + UINT8 isSwtmrEnable = YES; +#else + UINT8 isSwtmrEnable = NO; +#endif PRINTK("\n Module Used Total Enabled\n"); PRINTK("--------------------------------------------\n"); diff --git a/kernel/base/misc/task_shellcmd.c b/kernel/base/misc/task_shellcmd.c index 085788ad..05623a56 100644 --- a/kernel/base/misc/task_shellcmd.c +++ b/kernel/base/misc/task_shellcmd.c @@ -428,7 +428,7 @@ EXIT: STATIC VOID OsShellCmdTskInfoTitle(VOID *seqBuf, UINT16 flag) { PROCESS_INFO_SHOW(seqBuf, "\r\n TID PID "); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP PROCESS_INFO_SHOW(seqBuf, "Affi CPU "); #endif PROCESS_INFO_SHOW(seqBuf, " Status StackSize WaterLine "); @@ -456,7 +456,7 @@ STATIC INLINE VOID OsShellTskInfoData(const LosTaskCB *taskCB, VOID *seqBuf, UIN #endif PROCESS_INFO_SHOW(seqBuf, " %4u%5u", taskCB->taskID, taskCB->processID); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP PROCESS_INFO_SHOW(seqBuf, "%#5x%4d ", taskCB->cpuAffiMask, (INT16)(taskCB->currCpu)); #endif diff --git a/kernel/base/mp/los_lockdep.c b/kernel/base/mp/los_lockdep.c index 2f2ac0b8..2b850eb7 100644 --- a/kernel/base/mp/los_lockdep.c +++ b/kernel/base/mp/los_lockdep.c @@ -37,7 +37,7 @@ #include "los_exc.h" -#if (LOSCFG_KERNEL_SMP_LOCKDEP == YES) +#ifdef LOSCFG_KERNEL_SMP_LOCKDEP #define LOCKDEP_GET_NAME(lockDep, index) (((SPIN_LOCK_S *)((lockDep)->heldLocks[(index)].lockPtr))->name) #define LOCKDEP_GET_ADDR(lockDep, index) ((lockDep)->heldLocks[(index)].lockAddr) diff --git a/kernel/base/mp/los_mp.c b/kernel/base/mp/los_mp.c index c98cc01e..7bdce6ac 100644 --- a/kernel/base/mp/los_mp.c +++ b/kernel/base/mp/los_mp.c @@ -36,7 +36,7 @@ #include "los_swtmr.h" #include "los_task_pri.h" -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP VOID LOS_MpSchedule(UINT32 target) { diff --git a/kernel/base/mp/los_spinlock.c b/kernel/base/mp/los_spinlock.c index 385291ec..991af71d 100644 --- a/kernel/base/mp/los_spinlock.c +++ b/kernel/base/mp/los_spinlock.c @@ -30,7 +30,7 @@ */ #include "los_spinlock.h" -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP #include "los_sched_pri.h" diff --git a/kernel/base/mp/los_stat.c b/kernel/base/mp/los_stat.c index 04e71f7d..a0d25ca0 100644 --- a/kernel/base/mp/los_stat.c +++ b/kernel/base/mp/los_stat.c @@ -32,7 +32,7 @@ #include "los_task_pri.h" -#if (LOSCFG_KERNEL_SCHED_STATISTICS == YES) +#ifdef LOSCFG_KERNEL_SCHED_STATISTICS #define HIGHTASKPRI 16 #define NS_PER_MS 1000000 #define DECIMAL_TO_PERCENTAGE 100 @@ -212,7 +212,7 @@ LITE_OS_SEC_TEXT_MINOR VOID OsShellMpStaticStart(VOID) for (loop = 0; loop < g_taskMaxNum; loop++) { taskCB = (((LosTaskCB *)g_taskCBArray) + loop); if (taskCB->taskStatus & OS_TASK_STATUS_RUNNING) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP cpuid = taskCB->currCpu; #endif if ((UINT32)(OS_TASK_INVALID_CPUID) == cpuid) { @@ -293,7 +293,7 @@ LITE_OS_SEC_TEXT_MINOR VOID OsShellMpStaticStop(VOID) for (loop = 0; loop < g_taskMaxNum; loop++) { taskCB = (((LosTaskCB *)g_taskCBArray) + loop); if (taskCB->taskStatus & OS_TASK_STATUS_RUNNING) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP cpuid = taskCB->currCpu; #endif if (cpuid == (UINT32)(OS_TASK_INVALID_CPUID)) { diff --git a/kernel/base/sched/sched_sq/los_sched.c b/kernel/base/sched/sched_sq/los_sched.c index 5ab81c4b..099d83be 100644 --- a/kernel/base/sched/sched_sq/los_sched.c +++ b/kernel/base/sched/sched_sq/los_sched.c @@ -39,7 +39,7 @@ #endif #include "los_hw_tick_pri.h" #include "los_tick_pri.h" -#if (LOSCFG_BASE_CORE_TSK_MONITOR == YES) +#ifdef LOSCFG_BASE_CORE_TSK_MONITOR #include "los_stackinfo_pri.h" #endif #include "los_mp.h" @@ -443,7 +443,7 @@ STATIC INLINE VOID OsSchedWakePendTimeTask(UINT64 currTime, LosTaskCB *taskCB, B if (tempStatus & (OS_TASK_STATUS_PENDING | OS_TASK_STATUS_DELAY)) { taskCB->taskStatus &= ~(OS_TASK_STATUS_PENDING | OS_TASK_STATUS_PEND_TIME | OS_TASK_STATUS_DELAY); if (tempStatus & OS_TASK_STATUS_PENDING) { -#if (LOSCFG_KERNEL_LITEIPC == YES) +#ifdef LOSCFG_KERNEL_LITEIPC taskCB->ipcStatus &= ~IPC_THREAD_STATUS_PEND; #endif taskCB->taskStatus |= OS_TASK_STATUS_TIMEOUT; @@ -819,7 +819,7 @@ STATIC LosTaskCB *OsGetTopTask(VOID) UINT32 bitmap; LosTaskCB *newTask = NULL; UINT32 processBitmap = g_sched->queueBitmap; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP UINT32 cpuid = ArchCurrCpuid(); #endif @@ -830,11 +830,11 @@ STATIC LosTaskCB *OsGetTopTask(VOID) while (bitmap) { priority = CLZ(bitmap); LOS_DL_LIST_FOR_EACH_ENTRY(newTask, &queueList->priQueueList[priority], LosTaskCB, pendList) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP if (newTask->cpuAffiMask & (1U << cpuid)) { #endif goto FIND_TASK; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP } #endif } @@ -869,7 +869,7 @@ VOID OsSchedStart(VOID) OsSchedSetStartTime(HalClockGetCycles()); newTask->startTime = OsGerCurrSchedTimeCycle(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* * attention: current cpu needs to be set, in case first task deletion * may fail because this flag mismatch with the real current cpu. @@ -889,7 +889,7 @@ VOID OsSchedStart(VOID) OsTaskContextLoad(newTask); } -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP VOID OsSchedToUserReleaseLock(VOID) { /* The scheduling lock needs to be released before returning to user mode */ @@ -900,7 +900,7 @@ VOID OsSchedToUserReleaseLock(VOID) } #endif -#if (LOSCFG_BASE_CORE_TSK_MONITOR == YES) +#ifdef LOSCFG_BASE_CORE_TSK_MONITOR STATIC VOID OsTaskStackCheck(LosTaskCB *runTask, LosTaskCB *newTask) { if (!OS_STACK_MAGIC_CHECK(runTask->topOfStack)) { @@ -917,9 +917,9 @@ STATIC VOID OsTaskStackCheck(LosTaskCB *runTask, LosTaskCB *newTask) STATIC INLINE VOID OsSchedSwitchCheck(LosTaskCB *runTask, LosTaskCB *newTask) { -#if (LOSCFG_BASE_CORE_TSK_MONITOR == YES) +#ifdef LOSCFG_BASE_CORE_TSK_MONITOR OsTaskStackCheck(runTask, newTask); -#endif /* LOSCFG_BASE_CORE_TSK_MONITOR == YES */ +#endif /* LOSCFG_BASE_CORE_TSK_MONITOR */ OsTraceTaskSchedule(newTask, runTask); } @@ -955,7 +955,7 @@ STATIC VOID OsSchedTaskSwicth(LosTaskCB *runTask, LosTaskCB *newTask) runTask->taskStatus &= ~OS_TASK_STATUS_RUNNING; newTask->taskStatus |= OS_TASK_STATUS_RUNNING; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* mask new running task's owner processor */ runTask->currCpu = OS_TASK_INVALID_CPUID; newTask->currCpu = ArchCurrCpuid(); @@ -1043,7 +1043,7 @@ VOID OsSchedIrqEndCheckNeedSched(VOID) VOID OsSchedResched(VOID) { LOS_ASSERT(LOS_SpinHeld(&g_taskSpin)); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP LOS_ASSERT(OsPercpuGet()->taskLockCnt == 1); #else LOS_ASSERT(OsPercpuGet()->taskLockCnt == 0); diff --git a/kernel/base/vm/oom.c b/kernel/base/vm/oom.c index f0c3c471..176429d5 100644 --- a/kernel/base/vm/oom.c +++ b/kernel/base/vm/oom.c @@ -37,7 +37,7 @@ #include "los_vm_phys.h" #include "los_vm_filemap.h" #include "los_process_pri.h" -#if (LOSCFG_BASE_CORE_SWTMR == YES) +#ifdef LOSCFG_BASE_CORE_SWTMR_ENABLE #include "los_swtmr_pri.h" #endif @@ -55,12 +55,12 @@ LITE_OS_SEC_TEXT_MINOR STATIC UINT32 OomScoreProcess(LosProcessCB *candidateProc { UINT32 actualPm; -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP (VOID)LOS_MuxAcquire(&candidateProcess->vmSpace->regionMux); #endif /* we only consider actual physical memory here. */ OsUProcessPmUsage(candidateProcess->vmSpace, NULL, &actualPm); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP (VOID)LOS_MuxRelease(&candidateProcess->vmSpace->regionMux); #endif return actualPm; diff --git a/kernel/common/console.c b/kernel/common/console.c index c70466c3..461025cb 100644 --- a/kernel/common/console.c +++ b/kernel/common/console.c @@ -1662,7 +1662,7 @@ STATIC UINT32 ConsoleSendTask(UINTPTR param) return LOS_OK; } -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP VOID OsWaitConsoleSendTaskPend(UINT32 taskID) { UINT32 i; diff --git a/kernel/common/console.h b/kernel/common/console.h index ff50d3c8..68018385 100644 --- a/kernel/common/console.h +++ b/kernel/common/console.h @@ -120,7 +120,7 @@ extern INT32 FilepWrite(struct file *filep, const struct file_operations_vfs *fo extern INT32 FilepPoll(struct file *filep, const struct file_operations_vfs *fops, poll_table *fds); extern INT32 FilepIoctl(struct file *filep, const struct file_operations_vfs *fops, INT32 cmd, unsigned long arg); extern INT32 GetFilepOps(const struct file *filep, struct file **privFilep, const struct file_operations_vfs **fops); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP extern VOID OsWaitConsoleSendTaskPend(UINT32 taskID); extern VOID OsWakeConsoleSendTask(VOID); #endif diff --git a/kernel/common/los_config.c b/kernel/common/los_config.c index afd45a78..adfafd70 100644 --- a/kernel/common/los_config.c +++ b/kernel/common/los_config.c @@ -65,7 +65,7 @@ SystemRebootFunc OsGetRebootHook(VOID) extern UINT32 OsSystemInit(VOID); extern VOID SystemInit(VOID); -#if (LOSCFG_KERNEL_SMP == 1) +#ifdef LOSCFG_KERNEL_SMP extern VOID release_secondary_cores(VOID); #endif @@ -90,7 +90,7 @@ LITE_OS_SEC_TEXT_INIT STATIC UINT32 ArchEarlyInit(VOID) HalClockFreqWrite(OS_SYS_CLOCK); #endif -#if (LOSCFG_PLATFORM_HWI == 1) +#ifdef LOSCFG_PLATFORM_HWI OsHwiInit(); #endif @@ -118,7 +118,7 @@ LITE_OS_SEC_TEXT_INIT STATIC UINT32 OsIpcInit(VOID) { UINT32 ret; -#if (LOSCFG_BASE_IPC_SEM == 1) +#ifdef LOSCFG_BASE_IPC_SEM ret = OsSemInit(); if (ret != LOS_OK) { PRINT_ERR("OsSemInit error\n"); @@ -126,7 +126,7 @@ LITE_OS_SEC_TEXT_INIT STATIC UINT32 OsIpcInit(VOID) } #endif -#if (LOSCFG_BASE_IPC_QUEUE == 1) +#ifdef LOSCFG_BASE_IPC_QUEUE ret = OsQueueInit(); if (ret != LOS_OK) { PRINT_ERR("OsQueueInit error\n"); @@ -151,7 +151,7 @@ LITE_OS_SEC_TEXT_INIT STATIC UINT32 PlatformInit(VOID) LITE_OS_SEC_TEXT_INIT STATIC UINT32 KModInit(VOID) { -#if (LOSCFG_BASE_CORE_SWTMR == 1) +#ifdef LOSCFG_BASE_CORE_SWTMR_ENABLE OsSwtmrInit(); #endif return LOS_OK; @@ -167,7 +167,7 @@ LITE_OS_SEC_TEXT_INIT VOID OsSystemInfo(VOID) PRINT_RELEASE("\n******************Welcome******************\n\n" "Processor : %s" -#if (LOSCFG_KERNEL_SMP == 1) +#ifdef LOSCFG_KERNEL_SMP " * %d\n" "Run Mode : SMP\n" #else @@ -179,7 +179,7 @@ LITE_OS_SEC_TEXT_INIT VOID OsSystemInfo(VOID) "Kernel : %s %d.%d.%d.%d/%s\n" "\n*******************************************\n", LOS_CpuInfo(), -#if (LOSCFG_KERNEL_SMP == 1) +#ifdef LOSCFG_KERNEL_SMP LOSCFG_KERNEL_SMP_CORE_NUM, #endif HalIrqVersion(), __DATE__, __TIME__,\ @@ -265,7 +265,7 @@ LITE_OS_SEC_TEXT_INIT INT32 OsMain(VOID) OsInitCall(LOS_INIT_LEVEL_KMOD_EXTENDED); -#if (LOSCFG_KERNEL_SMP == 1) +#ifdef LOSCFG_KERNEL_SMP release_secondary_cores(); #endif @@ -303,7 +303,7 @@ STATIC UINT32 OsSystemInitTaskCreate(VOID) sysTask.pcName = "SystemInit"; sysTask.usTaskPrio = LOSCFG_BASE_CORE_TSK_DEFAULT_PRIO; sysTask.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == 1) +#ifdef LOSCFG_KERNEL_SMP sysTask.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif return LOS_TaskCreate(&taskID, &sysTask); diff --git a/kernel/common/los_config.h b/kernel/common/los_config.h index 520bf56a..3ce31935 100644 --- a/kernel/common/los_config.h +++ b/kernel/common/los_config.h @@ -116,16 +116,15 @@ extern UINT32 __heap_end; * External configuration item for timer tailoring */ #ifndef LOSCFG_BASE_CORE_TICK_HW_TIME -#define LOSCFG_BASE_CORE_TICK_HW_TIME NO +#undef LOSCFG_BASE_CORE_TICK_HW_TIME #endif - /****************************** Hardware interrupt module configuration ******************************/ /** * @ingroup los_config * Configuration item for hardware interrupt tailoring */ #ifndef LOSCFG_PLATFORM_HWI -#define LOSCFG_PLATFORM_HWI YES +#define LOSCFG_PLATFORM_HWI #endif /** @@ -221,15 +220,7 @@ extern UINT32 __heap_end; * Configuration item for task (stack) monitoring module tailoring */ #ifndef LOSCFG_BASE_CORE_TSK_MONITOR -#define LOSCFG_BASE_CORE_TSK_MONITOR YES -#endif - -/** - * @ingroup los_config - * Configuration item for task perf task filter hook - */ -#ifndef OS_PERF_TSK_FILTER -#define OS_PERF_TSK_FILTER NO +#define LOSCFG_BASE_CORE_TSK_MONITOR #endif /****************************** Semaphore module configuration ******************************/ @@ -238,7 +229,7 @@ extern UINT32 __heap_end; * Configuration item for semaphore module tailoring */ #ifndef LOSCFG_BASE_IPC_SEM -#define LOSCFG_BASE_IPC_SEM YES +#define LOSCFG_BASE_IPC_SEM #endif /** @@ -263,7 +254,7 @@ extern UINT32 __heap_end; * Configuration item for mutex module tailoring */ #ifndef LOSCFG_BASE_IPC_MUX -#define LOSCFG_BASE_IPC_MUX YES +#define LOSCFG_BASE_IPC_MUX #endif /****************************** Queue module configuration ********************************/ @@ -272,7 +263,7 @@ extern UINT32 __heap_end; * Configuration item for queue module tailoring */ #ifndef LOSCFG_BASE_IPC_QUEUE -#define LOSCFG_BASE_IPC_QUEUE YES +#define LOSCFG_BASE_IPC_QUEUE #endif /** @@ -283,14 +274,20 @@ extern UINT32 __heap_end; #define LOSCFG_BASE_IPC_QUEUE_LIMIT 1024 #endif /****************************** Software timer module configuration **************************/ -#if (LOSCFG_BASE_IPC_QUEUE == YES) +#ifdef LOSCFG_BASE_IPC_QUEUE /** * @ingroup los_config * Configuration item for software timer module tailoring */ -#ifndef LOSCFG_BASE_CORE_SWTMR -#define LOSCFG_BASE_CORE_SWTMR YES +#ifndef LOSCFG_BASE_CORE_SWTMR_ENABLE +#define LOSCFG_BASE_CORE_SWTMR_ENABLE +#endif + +#ifdef LOSCFG_BASE_CORE_SWTMR_ENABLE +#define LOSCFG_BASE_CORE_SWTMR 1 +#else +#define LOSCFG_BASE_CORE_SWTMR 0 #endif /** @@ -338,23 +335,7 @@ extern UINT32 __heap_end; #endif /****************************** SMP module configuration **************************/ -#ifndef LOSCFG_KERNEL_SMP -#define LOSCFG_KERNEL_SMP NO -#endif - -#ifndef LOSCFG_KERNEL_SMP_LOCKDEP -#define LOSCFG_KERNEL_SMP_LOCKDEP NO -#endif - -#ifndef LOSCFG_KERNEL_SMP_TASK_SYNC -#define LOSCFG_KERNEL_SMP_TASK_SYNC NO -#endif - -#ifndef LOSCFG_KERNEL_SCHED_STATISTICS -#define LOSCFG_KERNEL_SCHED_STATISTICS NO -#endif - -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP #define LOSCFG_KERNEL_CORE_NUM LOSCFG_KERNEL_SMP_CORE_NUM #else #define LOSCFG_KERNEL_CORE_NUM 1 @@ -391,11 +372,6 @@ extern UINT32 __heap_end; #define VERSION_NUM(a, b, c, d) (((a) << 24) | ((b) << 16) | (c) << 8 | (d)) #define KERNEL_OPEN_VERSION_NUM VERSION_NUM(KERNEL_MAJOR, KERNEL_MINOR, KERNEL_PATCH, KERNEL_ITRE) -/****************************** Dynamic loading module configuration **************************/ -#ifndef OS_AUTOINIT_DYNLOADER -#define OS_AUTOINIT_DYNLOADER YES -#endif - /****************************** Exception information configuration ******************************/ #ifdef LOSCFG_SAVE_EXCINFO /** diff --git a/kernel/extended/liteipc/hm_liteipc.c b/kernel/extended/liteipc/hm_liteipc.c index 6788815a..6068396e 100644 --- a/kernel/extended/liteipc/hm_liteipc.c +++ b/kernel/extended/liteipc/hm_liteipc.c @@ -40,7 +40,7 @@ #include "los_sched_pri.h" #include "los_spinlock.h" #include "los_task_pri.h" -#if (LOSCFG_KERNEL_TRACE == YES) +#ifdef LOSCFG_KERNEL_TRACE #include "los_trace.h" #include "los_trace_frame.h" #endif @@ -100,7 +100,7 @@ STATIC const struct file_operations_vfs g_liteIpcFops = { .mmap = LiteIpcMmap, /* mmap */ }; -#if (LOSCFG_KERNEL_TRACE == YES) +#ifdef LOSCFG_KERNEL_TRACE typedef enum { WRITE, WRITE_DROP, @@ -160,7 +160,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsLiteIpcInit(VOID) for (i = 0; i < LOSCFG_BASE_CORE_PROCESS_LIMIT; i++) { LOS_ListInit(&(g_ipcUsedNodelist[i])); } -#if (LOSCFG_KERNEL_TRACE == YES) +#ifdef LOSCFG_KERNEL_TRACE ret = LOS_TraceReg(LOS_TRACE_IPC, OsIpcTrace, LOS_TRACE_IPC_NAME, LOS_TRACE_ENABLE); if (ret != LOS_OK) { PRINT_ERR("liteipc LOS_TraceReg failed:%d\n", ret); @@ -939,7 +939,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 CheckPara(IpcContent *content, UINT32 *dstTid) } #if (USE_TIMESTAMP == YES) if (now > msg->timestamp + LITEIPC_TIMEOUT_NS) { -#if (LOSCFG_KERNEL_TRACE == YES) +#ifdef LOSCFG_KERNEL_TRACE IpcTrace(msg, WRITE_DROP, 0, msg->type); #endif PRINT_ERR("A timeout reply, request timestamp:%lld, now:%lld\n", msg->timestamp, now); @@ -997,7 +997,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 LiteIpcWrite(IpcContent *content) SCHEDULER_LOCK(intSave); LosTaskCB *tcb = OS_TCB_FROM_TID(dstTid); LOS_ListTailInsert(&(tcb->msgListHead), &(buf->listNode)); -#if (LOSCFG_KERNEL_TRACE == YES) +#ifdef LOSCFG_KERNEL_TRACE IpcTrace(&buf->msg, WRITE, tcb->ipcStatus, buf->msg.type); #endif if (tcb->ipcStatus & IPC_THREAD_STATUS_PEND) { @@ -1057,13 +1057,13 @@ LITE_OS_SEC_TEXT STATIC UINT32 CheckRecievedMsg(IpcListNode *node, IpcContent *c ret = -EINVAL; } if (ret != LOS_OK) { -#if (LOSCFG_KERNEL_TRACE == YES) +#ifdef LOSCFG_KERNEL_TRACE IpcTrace(&node->msg, READ_DROP, tcb->ipcStatus, node->msg.type); #endif (VOID)HandleSpecialObjects(LOS_CurTaskIDGet(), node, TRUE); (VOID)LiteIpcNodeFree(LOS_GetCurrProcessID(), (VOID *)node); } else { -#if (LOSCFG_KERNEL_TRACE == YES) +#ifdef LOSCFG_KERNEL_TRACE IpcTrace(&node->msg, READ, tcb->ipcStatus, node->msg.type); #endif } @@ -1085,14 +1085,14 @@ LITE_OS_SEC_TEXT STATIC UINT32 LiteIpcRead(IpcContent *content) do { SCHEDULER_LOCK(intSave); if (LOS_ListEmpty(listHead)) { -#if (LOSCFG_KERNEL_TRACE == YES) +#ifdef LOSCFG_KERNEL_TRACE IpcTrace(NULL, TRY_READ, tcb->ipcStatus, syncFlag ? MT_REPLY : MT_REQUEST); #endif tcb->ipcStatus |= IPC_THREAD_STATUS_PEND; OsTaskWaitSetPendMask(OS_TASK_WAIT_LITEIPC, OS_INVALID_VALUE, timeout); ret = OsSchedTaskWait(&g_ipcPendlist, timeout, TRUE); if (ret == LOS_ERRNO_TSK_TIMEOUT) { -#if (LOSCFG_KERNEL_TRACE == YES) +#ifdef LOSCFG_KERNEL_TRACE IpcTrace(NULL, READ_TIMEOUT, tcb->ipcStatus, syncFlag ? MT_REPLY : MT_REQUEST); #endif SCHEDULER_UNLOCK(intSave); diff --git a/kernel/include/los_memory.h b/kernel/include/los_memory.h index 3ced9ad0..8dd00599 100644 --- a/kernel/include/los_memory.h +++ b/kernel/include/los_memory.h @@ -77,19 +77,6 @@ extern UINT8 *m_aucSysMem0; */ extern UINT8 *m_aucSysMem1; -/** - * @ingroup los_memory - * The memory Maximum memory usage statistics. - * @attention - *
  • If running as debug mode, it will affect the performance of memory malloc and free.
    • - *
  • OS_MEM_WATERLINE=YES: open the function for Maximum memory usage statistics
    • - *
  • OS_MEM_WATERLINE=NO: close the function for Maximum memory usage statistics, it set to NO as usual
    • - *
- */ -#ifdef LOSCFG_MEM_WATERLINE -#define OS_MEM_WATERLINE YES -#endif - #ifdef LOSCFG_MEM_MUL_POOL /** * @ingroup los_memory @@ -141,7 +128,7 @@ typedef struct { UINT32 maxFreeNodeSize; UINT32 usedNodeNum; UINT32 freeNodeNum; -#if defined(OS_MEM_WATERLINE) && (OS_MEM_WATERLINE == YES) +#ifdef LOSCFG_MEM_WATERLINE UINT32 usageWaterLine; #endif } LOS_MEM_POOL_STATUS; diff --git a/kernel/include/los_mp.h b/kernel/include/los_mp.h index 2b456620..dcb3e4cd 100644 --- a/kernel/include/los_mp.h +++ b/kernel/include/los_mp.h @@ -50,7 +50,7 @@ typedef enum { LOS_MP_IPI_HALT, } MP_IPI_TYPE; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP extern VOID LOS_MpSchedule(UINT32 target); extern VOID OsMpWakeHandler(VOID); extern VOID OsMpScheduleHandler(VOID); diff --git a/kernel/include/los_spinlock.h b/kernel/include/los_spinlock.h index 504fcfb0..8ee14b9d 100644 --- a/kernel/include/los_spinlock.h +++ b/kernel/include/los_spinlock.h @@ -49,14 +49,14 @@ extern INT32 ArchSpinTrylock(size_t *lock); typedef struct Spinlock { size_t rawLock; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP UINT32 cpuid; VOID *owner; const CHAR *name; #endif } SPIN_LOCK_S; -#if (LOSCFG_KERNEL_SMP_LOCKDEP == YES) +#ifdef LOSCFG_KERNEL_SMP_LOCKDEP #define LOCKDEP_CHECK_IN(lock) OsLockDepCheckIn(lock) #define LOCKDEP_RECORD(lock) OsLockDepRecord(lock) #define LOCKDEP_CHECK_OUT(lock) OsLockDepCheckOut(lock) @@ -68,7 +68,7 @@ typedef struct Spinlock { #define LOCKDEP_CLEAR_LOCKS() #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP #define SPINLOCK_OWNER_INIT NULL #define SPIN_LOCK_INITIALIZER(lockName) \ diff --git a/kernel/include/los_task.h b/kernel/include/los_task.h index 49df83b3..6477c735 100644 --- a/kernel/include/los_task.h +++ b/kernel/include/los_task.h @@ -498,7 +498,7 @@ typedef struct tagTskInitParam { UINTPTR auwArgs[4]; /**< Task parameters, of which the maximum number is four */ UINT32 uwStackSize; /**< Task stack size */ CHAR *pcName; /**< Task name */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP UINT16 usCpuAffiMask; /**< Task cpu affinity mask */ #endif UINT32 uwResved; /**< It is automatically deleted if set to LOS_TASK_STATUS_DETACHED. diff --git a/net/lwip-2.1/porting/src/sys_arch.c b/net/lwip-2.1/porting/src/sys_arch.c index 9826fba7..7e08ec57 100644 --- a/net/lwip-2.1/porting/src/sys_arch.c +++ b/net/lwip-2.1/porting/src/sys_arch.c @@ -40,11 +40,11 @@ #include #include -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP SPIN_LOCK_INIT(arch_protect_spin); static u32_t lwprot_thread = LOS_ERRNO_TSK_ID_INVALID; static int lwprot_count = 0; -#endif /* LOSCFG_KERNEL_SMP == YES */ +#endif /* LOSCFG_KERNEL_SMP */ #define ROUND_UP_DIV(val, div) (((val) + (div) - 1) / (div)) @@ -103,7 +103,7 @@ u16_t lwip_standard_chksum(const void *dataptr, int len) sys_prot_t sys_arch_protect(void) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* Note that we are using spinlock instead of mutex for LiteOS-SMP here: * 1. spinlock is more effective for short critical region protection. * 2. this function is called only in task context, not in interrupt handler. @@ -121,14 +121,14 @@ sys_prot_t sys_arch_protect(void) } #else LOS_TaskLock(); -#endif /* LOSCFG_KERNEL_SMP == YES */ +#endif /* LOSCFG_KERNEL_SMP */ return 0; /* return value is unused */ } void sys_arch_unprotect(sys_prot_t pval) { LWIP_UNUSED_ARG(pval); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP if (lwprot_thread == LOS_CurTaskIDGet()) { lwprot_count--; if (lwprot_count == 0) { @@ -138,7 +138,7 @@ void sys_arch_unprotect(sys_prot_t pval) } #else LOS_TaskUnlock(); -#endif /* LOSCFG_KERNEL_SMP == YES */ +#endif /* LOSCFG_KERNEL_SMP */ } diff --git a/net/telnet/src/telnet_dev.c b/net/telnet/src/telnet_dev.c index 06ab5685..0af77518 100644 --- a/net/telnet/src/telnet_dev.c +++ b/net/telnet/src/telnet_dev.c @@ -38,7 +38,7 @@ #include "pthread.h" #include "los_printf.h" -#if (LOSCFG_BASE_CORE_SWTMR == YES) +#ifdef LOSCFG_BASE_CORE_SWTMR_ENABLE #include "los_swtmr_pri.h" #endif #include "los_sched_pri.h" @@ -265,7 +265,7 @@ STATIC ssize_t TelnetWrite(struct file *file, const CHAR *buf, const size_t bufL } if (telnetDev->clientFd != 0) { -#if (LOSCFG_BASE_CORE_SWTMR == YES) +#ifdef LOSCFG_BASE_CORE_SWTMR_ENABLE /* DO NOT call blocking API in software timer task */ if (((LosTaskCB*)OsCurrTaskGet())->taskEntry == (TSK_ENTRY_FUNC)OsSwtmrTask) { TelnetUnlock(); diff --git a/platform/main.c b/platform/main.c index a021b1d9..7a9aa62c 100644 --- a/platform/main.c +++ b/platform/main.c @@ -40,13 +40,13 @@ #include "los_swtmr_pri.h" #include "los_task_pri.h" -#if (LOSCFG_KERNEL_SMP == 1) +#ifdef LOSCFG_KERNEL_SMP STATIC Atomic g_ncpu = 1; #endif LITE_OS_SEC_TEXT_INIT VOID secondary_cpu_start(VOID) { -#if (LOSCFG_KERNEL_SMP == 1) +#ifdef LOSCFG_KERNEL_SMP UINT32 cpuid = ArchCurrCpuid(); OsCurrTaskSet(OsGetMainTask()); @@ -73,7 +73,7 @@ LITE_OS_SEC_TEXT_INIT VOID secondary_cpu_start(VOID) OsCurrProcessSet(OS_PCB_FROM_PID(OsGetKernelInitProcessID())); OsInitCall(LOS_INIT_LEVEL_KMOD_BASIC); -#if (LOSCFG_BASE_CORE_SWTMR == 1) +#ifdef LOSCFG_BASE_CORE_SWTMR_ENABLE OsSwtmrInit(); #endif @@ -89,7 +89,7 @@ LITE_OS_SEC_TEXT_INIT VOID secondary_cpu_start(VOID) #endif } -#if (LOSCFG_KERNEL_SMP == 1) +#ifdef LOSCFG_KERNEL_SMP #ifdef LOSCFG_TEE_ENABLE #define TSP_CPU_ON 0xb2000011UL STATIC INT32 raw_smc_send(UINT32 cmd) diff --git a/syscall/process_syscall.c b/syscall/process_syscall.c index b4f5d002..997f631c 100644 --- a/syscall/process_syscall.c +++ b/syscall/process_syscall.c @@ -1037,7 +1037,7 @@ int SysSchedGetAffinity(int id, unsigned int *cpuset, int flag) } } -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP cpuAffiMask = (unsigned int)OS_TCB_FROM_TID(taskID)->cpuAffiMask; #else cpuAffiMask = 1; diff --git a/testsuites/kernel/include/iCunit.h b/testsuites/kernel/include/iCunit.h index a0de0031..c0c67484 100644 --- a/testsuites/kernel/include/iCunit.h +++ b/testsuites/kernel/include/iCunit.h @@ -522,7 +522,7 @@ extern void ICunitSaveErr(iiUINT32 line, iiUINT32 retCode); } while (0) #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP extern SPIN_LOCK_S g_testSuitSpin; #define TESTSUIT_LOCK(state) LOS_SpinLockSave(&g_testSuitSpin, &(state)) #define TESTSUIT_UNLOCK(state) LOS_SpinUnlockRestore(&g_testSuitSpin, state) diff --git a/testsuites/kernel/include/osTest.h b/testsuites/kernel/include/osTest.h index 7ad31b69..901dcf72 100644 --- a/testsuites/kernel/include/osTest.h +++ b/testsuites/kernel/include/osTest.h @@ -96,7 +96,7 @@ extern "C" { testTask.uwResved = LOS_TASK_STATUS_DETACHED; \ } while (0); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP #define TEST_TASK_PARAM_INIT_AFFI(testTask, task_name, entry, prio, affi) \ TEST_TASK_PARAM_INIT(testTask, task_name, entry, prio) \ testTask.usCpuAffiMask = affi; diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/It_smp_hwi.c b/testsuites/kernel/sample/kernel_base/core/hwi/It_smp_hwi.c index 36bea719..68d45192 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/It_smp_hwi.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/It_smp_hwi.c @@ -38,7 +38,7 @@ extern "C" { #endif /* __cpluscplus */ VOID ItSuiteSmpHwi(VOID) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP ItSmpLosHwi001(); ItSmpLosHwi002(); ItSmpLosHwi003(); @@ -84,7 +84,7 @@ VOID ItSuiteSmpHwi(VOID) ItSmpLosHwiNest007(); ItSmpLosHwiNest008(); #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, 1); HalIrqSetAffinity(HWI_NUM_TEST1, 1); HalIrqSetAffinity(HWI_NUM_TEST2, 1); diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_001.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_001.c index aa823736..a60728b6 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_001.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_001.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_testTimes; static VOID HwiF01(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_002.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_002.c index 06fde600..bc8bbf94 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_002.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_002.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static VOID HwiF01(void) { LOS_AtomicInc(&g_testCount); diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_003.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_003.c index f0b422da..c7cb8f1e 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_003.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_003.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_testTimes; static VOID HwiF01(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_004.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_004.c index ed809362..8a6e5138 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_004.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_004.c @@ -37,7 +37,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_testTimes; static VOID HwiF01(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_005.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_005.c index 2a408e27..3811c4e1 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_005.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_005.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static VOID HwiF01(void) { diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_006.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_006.c index 221678df..f3d58cda 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_006.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_006.c @@ -37,7 +37,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static VOID HwiF01(void) { diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_007.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_007.c index a63b39b0..1a901cc3 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_007.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_007.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static VOID HwiF01(void) { diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_008.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_008.c index b26f6adf..497d73eb 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_008.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_008.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_ret = 0; static VOID HwiF01(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_009.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_009.c index 22bb709f..f1541a4e 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_009.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_009.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_ret = 0; static VOID HwiF01(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_010.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_010.c index b28b2f42..230ae933 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_010.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_010.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_szId[LOSCFG_KERNEL_CORE_NUM] = {0}; static VOID SwtmrF01(void) { diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_011.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_011.c index b9ee190b..d58221d9 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_011.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_011.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_szId[LOSCFG_KERNEL_CORE_NUM] = {0}; static VOID SwtmrF01(void) { diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_012.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_012.c index 4d6ba350..ae21951c 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_012.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_012.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_szId[LOSCFG_KERNEL_CORE_NUM] = {0}; static VOID SwtmrF01(void) { diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_013.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_013.c index 7c3a571e..9b4604b3 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_013.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_013.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static VOID SwtmrF01(void) { diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_001.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_001.c index 820e3858..7507779e 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_001.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_001.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static VOID HwiF01(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_002.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_002.c index a19ad70c..054771aa 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_002.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_002.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static VOID HwiF01(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_003.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_003.c index 180b5065..d7c82d16 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_003.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_003.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static VOID HwiF01(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_004.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_004.c index a37d3108..b1ef1588 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_004.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_004.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static VOID HwiF01(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_005.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_005.c index 663e37e4..03964fc9 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_005.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_005.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static VOID HwiF01(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_006.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_006.c index d7f2a75b..4e4cc7b2 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_006.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_006.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static UINT32 g_szId[LOSCFG_KERNEL_CORE_NUM] = {0}; diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_007.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_007.c index 3597112f..e8decb70 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_007.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_007.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; /* for debugging */ diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_008.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_008.c index eb621014..ccfe146c 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_008.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_ipi_008.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static VOID SwtmrF01(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_001.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_001.c index 4d863e68..8bd2d2f0 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_001.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_001.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static VOID HwiF02(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_002.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_002.c index 6e334c56..4d8f9a27 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_002.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_002.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; extern EVENT_CB_S g_event; static VOID HwiF02(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_003.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_003.c index 8be106dd..9f71aa5d 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_003.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_003.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static VOID HwiF02(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_004.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_004.c index ef9720b0..62a285c0 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_004.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_004.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static VOID HwiF02(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_005.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_005.c index ce7aa34d..87414631 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_005.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_005.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static VOID HwiF02(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_006.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_006.c index f06786b3..fb416702 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_006.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_006.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static VOID HwiF02(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_007.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_007.c index 609c2275..b9050a8b 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_007.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_007.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static VOID HwiF02(void) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_008.c b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_008.c index 9d6a4ef6..d1fea484 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_008.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi/smp/It_smp_los_hwi_nest_008.c @@ -36,7 +36,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static VOID HwiF02(void) diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/It_los_swtmr.c b/testsuites/kernel/sample/kernel_base/core/swtmr/It_los_swtmr.c index 7ad82c51..f49d472c 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/It_los_swtmr.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/It_los_swtmr.c @@ -53,7 +53,7 @@ VOID ItSuiteLosSwtmr(VOID) ItLosSwtmr053(); ItLosSwtmr058(); #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP ItSmpLosSwtmr001(); /* Concurrent Multi-core */ ItSmpLosSwtmr002(); /* Stop Across Cores */ ItSmpLosSwtmr003(); diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_033.c b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_033.c index 7aa9b526..40cf3c17 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_033.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_033.c @@ -87,7 +87,7 @@ static UINT32 Testcase(VOID) ret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_039.c b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_039.c index 954f9d1a..f349fdf7 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_039.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_039.c @@ -74,7 +74,7 @@ static UINT32 Testcase(VOID) hwiMode = 0; ret = TEST_HwiCreate(HWI_NUM_TEST, hwiPrio, hwiMode, (HWI_PROC_FUNC)SwtmrF01, (HwiIrqParam *)arg); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT3); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif TestHwiTrigger(HWI_NUM_TEST); diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_040.c b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_040.c index d42b666c..c9e0dc7d 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_040.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_040.c @@ -79,7 +79,7 @@ static UINT32 Testcase(VOID) hwiMode = 0; ret = TEST_HwiCreate(HWI_NUM_TEST, hwiPrio, hwiMode, (HWI_PROC_FUNC)HwiF01, (HwiIrqParam *)arg); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT3); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_041.c b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_041.c index 34a6aa23..05e28865 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_041.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_041.c @@ -95,7 +95,7 @@ static UINT32 Testcase(VOID) ret = TEST_HwiCreate(HWI_NUM_TEST, hwiPrio, hwiMode, (HWI_PROC_FUNC)SwtmrF01, (HwiIrqParam *)arg); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT5); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_043.c b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_043.c index 070da1c3..b0e37b0f 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_043.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_043.c @@ -76,7 +76,7 @@ static UINT32 Testcase(VOID) ret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_064.c b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_064.c index afcb99f4..543eab9c 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_064.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_064.c @@ -72,7 +72,7 @@ static UINT32 Testcase(VOID) hwiMode = 0; ret = TEST_HwiCreate(HWI_NUM_TEST, hwiPrio, hwiMode, (HWI_PROC_FUNC)HwiF01, (HwiIrqParam *)arg); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT3); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_065.c b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_065.c index 190056f6..ddd739c2 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_065.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_065.c @@ -72,7 +72,7 @@ static UINT32 Testcase(VOID) hwiMode = 0; ret = TEST_HwiCreate(HWI_NUM_TEST, hwiPrio, hwiMode, (HWI_PROC_FUNC)HwiF01, (HwiIrqParam *)arg); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT3); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif ret = LOS_SwtmrStart(g_swTmrID1); diff --git a/testsuites/kernel/sample/kernel_base/core/task/It_los_task.c b/testsuites/kernel/sample/kernel_base/core/task/It_los_task.c index 48f146bc..b200fc64 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/It_los_task.c +++ b/testsuites/kernel/sample/kernel_base/core/task/It_los_task.c @@ -62,7 +62,7 @@ void ItSuiteLosTask(void) ItLosTask105(); ItLosTask099(); ItLosTaskTimeslice001(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP // reserved 20 for smoke test ItSmpLosTask001(); /* Task Affinity */ ItSmpLosTask002(); /* Task Deletion Across Cores */ @@ -137,7 +137,7 @@ void ItSuiteLosTask(void) ItLosTask072(); ItLosTask073(); ItLosTask074(); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ItLosTask075(); #endif ItLosTask076(); @@ -193,7 +193,7 @@ void ItSuiteLosTask(void) ItLosTaskTimeslice002(); ItLosTaskTimeslice003(); ItLosTaskTimeslice004(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP #ifndef LOSCFG_ARCH_FPU_DISABLE ItSmpLosFloatSwitch001(); @@ -290,7 +290,7 @@ void ItSuiteLosTask(void) ItSmpLosTask112(); ItSmpLosTask114(); ItSmpLosTask115(); -#if (LOSCFG_KERNEL_SMP_TASK_SYNC == NO) +#ifndef LOSCFG_KERNEL_SMP_TASK_SYNC ItSmpLosTask117(); #endif ItSmpLosTask126(); @@ -325,7 +325,7 @@ void ItSuiteLosTask(void) #endif #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, 1); HalIrqSetAffinity(HWI_NUM_TEST1, 1); HalIrqSetAffinity(HWI_NUM_TEST3, 1); diff --git a/testsuites/kernel/sample/kernel_base/core/task/It_los_task.h b/testsuites/kernel/sample/kernel_base/core/task/It_los_task.h index 9b0e9058..7f47bb5f 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/It_los_task.h +++ b/testsuites/kernel/sample/kernel_base/core/task/It_los_task.h @@ -51,7 +51,7 @@ extern "C" { #define SWTMR_LOOP_NUM 10 #define TEST_HWI_RUNTIME 0x100000 #define TASK_LOOP_NUM 0x100000 -#if (YES == LOSCFG_BASE_CORE_SWTMR) +#ifdef LOSCFG_BASE_CORE_SWTMR_ENABLE #define TASK_EXISTED_NUM 4 #else #define TASK_EXISTED_NUM 2 @@ -364,4 +364,4 @@ void ItLosTaskTimeslice004(void); #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#endif \ No newline at end of file +#endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/float/It_smp_los_float_switch_007.c b/testsuites/kernel/sample/kernel_base/core/task/float/It_smp_los_float_switch_007.c index 3aee9fb0..ce199698 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/float/It_smp_los_float_switch_007.c +++ b/testsuites/kernel/sample/kernel_base/core/task/float/It_smp_los_float_switch_007.c @@ -38,7 +38,7 @@ extern "C" { #endif /* __cpluscplus */ #ifndef LOSCFG_ARCH_FPU_DISABLE -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_targetCpuid; static void HwiF01(UINT32 arg) diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_008.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_008.c index 7bb9ec52..7302772f 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_008.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_008.c @@ -55,7 +55,7 @@ static UINT32 Testcase(void) task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.pcName = "Tsk007A_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_011.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_011.c index 0fc65c5c..3d985709 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_011.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_011.c @@ -61,7 +61,7 @@ static UINT32 Testcase(void) ret = LOS_TaskCreate(&g_testTaskID01, &task1); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* Wait TaskF01 to start */ while (g_testCount == 0) { } diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_016.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_016.c index 4d8d6dad..94549436 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_016.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_016.c @@ -88,7 +88,7 @@ static UINT32 Testcase(void) task1.uwResved = LOS_TASK_STATUS_DETACHED; // 0xffff, initializes the args. this parameter has no special meaning. task1.auwArgs[0] = 0xffff; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_017.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_017.c index bc91737a..8adb7c1d 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_017.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_017.c @@ -51,7 +51,7 @@ static UINT32 Testcase(void) task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.pcName = "Tsk017A"; task1.usTaskPrio = 1; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_018.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_018.c index 26fa787f..7f22abba 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_018.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_018.c @@ -51,7 +51,7 @@ static UINT32 Testcase(void) task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.pcName = "Tsk018A"; task1.usTaskPrio = OS_TASK_PRIORITY_LOWEST; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_025.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_025.c index 738d30cd..37a3619f 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_025.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_025.c @@ -56,7 +56,7 @@ static UINT32 Testcase(void) task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.pcName = "Tsk025A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_029.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_029.c index 1b913a63..87a18286 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_029.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_029.c @@ -67,7 +67,7 @@ static UINT32 Testcase(void) task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.pcName = "Tsk029A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_031.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_031.c index 1a444084..5065607e 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_031.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_031.c @@ -65,7 +65,7 @@ static UINT32 Testcase(void) task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.pcName = "Tsk031A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_033.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_033.c index 39712122..b4ba7424 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_033.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_033.c @@ -65,7 +65,7 @@ static UINT32 Testcase(void) task1.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task1.pcName = "Tsk033A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_038.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_038.c index d7965f31..6df1d299 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_038.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_038.c @@ -68,7 +68,7 @@ static UINT32 Testcase(void) task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; g_testCount = 0; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_039.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_039.c index 9ec8fb14..38fbdef6 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_039.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_039.c @@ -56,7 +56,7 @@ static UINT32 Testcase(void) task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.usTaskPrio = TASK_PRIO_TEST_TASK + 1; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_040.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_040.c index 005d3b83..9b7fcb23 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_040.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_040.c @@ -51,7 +51,7 @@ static UINT32 Testcase(void) TSK_INIT_PARAM_S task1 = { 0 }; task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.uwStackSize = TASK_STACK_SIZE_TEST; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif LOS_TaskLock(); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_041.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_041.c index 02f46c11..a5268b06 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_041.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_041.c @@ -60,7 +60,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk041A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_042.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_042.c index 21e5fa0c..9ff64254 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_042.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_042.c @@ -63,7 +63,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk042A"; task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_043.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_043.c index 881b9689..3b9a6f16 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_043.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_043.c @@ -59,7 +59,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk043A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_047.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_047.c index 00c35910..bb983c34 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_047.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_047.c @@ -69,7 +69,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_050.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_050.c index 3352043d..b02ac19e 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_050.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_050.c @@ -54,7 +54,7 @@ static void TaskF01(void) task1.pcName = "Tsk050B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -82,7 +82,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_052.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_052.c index 9e8b5699..fe98cbf9 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_052.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_052.c @@ -55,7 +55,7 @@ static void TaskF01(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 0, g_testCount); @@ -80,7 +80,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk052A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_053.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_053.c index 710cae51..a1c80e09 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_053.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_053.c @@ -57,7 +57,7 @@ static void TaskF01(void) ret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif @@ -78,7 +78,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk053A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_054.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_054.c index 09a7c3c0..d746a77d 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_054.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_054.c @@ -67,7 +67,7 @@ static void TaskF01(void) task1.pcName = "Tsk054B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount++; @@ -78,7 +78,7 @@ static void TaskF01(void) ret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif @@ -100,7 +100,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_055.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_055.c index b4edf7d7..66b9dd72 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_055.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_055.c @@ -51,7 +51,7 @@ static void TaskF01(void) task1.pcName = "Tsk055B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -80,7 +80,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_056.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_056.c index 0f453580..ac7823f9 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_056.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_056.c @@ -59,7 +59,7 @@ static void TaskF01(void) task1.pcName = "Tsk056B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -89,7 +89,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_057.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_057.c index f38e21ca..7f1451e3 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_057.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_057.c @@ -76,7 +76,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk057A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_058.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_058.c index f5684124..0137b11a 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_058.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_058.c @@ -95,7 +95,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk058A"; // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_060.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_060.c index 6673370b..2e0a188f 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_060.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_060.c @@ -78,7 +78,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_061.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_061.c index 59a683a0..c0ed2a19 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_061.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_061.c @@ -60,7 +60,7 @@ static void TaskF02(void) ret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif @@ -101,7 +101,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; @@ -116,7 +116,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk061B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_063.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_063.c index 922a2f99..9da5327e 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_063.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_063.c @@ -81,7 +81,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -97,7 +97,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk063B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_064.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_064.c index 2571a845..b82cceeb 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_064.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_064.c @@ -60,7 +60,7 @@ static void TaskF02(void) ret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif @@ -84,7 +84,7 @@ static void TaskF01(void) task1.pcName = "Tsk064B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount++; @@ -110,7 +110,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_065.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_065.c index ed904307..92623f6a 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_065.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_065.c @@ -54,7 +54,7 @@ static void TaskF01(void) task1.pcName = "Tsk065B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 0, g_testCount); @@ -79,7 +79,7 @@ static UINT32 Testcase(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_066.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_066.c index b5509d4d..b85ecf61 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_066.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_066.c @@ -63,7 +63,7 @@ static void TaskF01(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 0, g_testCount); @@ -76,7 +76,7 @@ static void TaskF01(void) task1.pcName = "Tsk066C"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID03, &task1); @@ -98,7 +98,7 @@ static UINT32 Testcase(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_067.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_067.c index 5d1a7f05..d7b9cf90 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_067.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_067.c @@ -60,7 +60,7 @@ static void TaskF01(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 0, g_testCount); @@ -90,7 +90,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk067A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_068.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_068.c index 93a1149f..92f726aa 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_068.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_068.c @@ -59,7 +59,7 @@ static void TaskF01(void) task1.pcName = "Tsk068B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 0, g_testCount); @@ -85,7 +85,7 @@ static UINT32 Testcase(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_069.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_069.c index fd08e7ff..d3668b0f 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_069.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_069.c @@ -56,7 +56,7 @@ static void TaskF01(void) task1.pcName = "Tsk069B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ICUNIT_ASSERT_EQUAL_VOID(g_testCount, 0, g_testCount); @@ -86,7 +86,7 @@ static UINT32 Testcase(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_071.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_071.c index 5d043d0e..963df73a 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_071.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_071.c @@ -54,7 +54,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk071A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_072.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_072.c index ae27bf8b..3a72268f 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_072.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_072.c @@ -54,7 +54,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk072A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_073.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_073.c index 7e0cb5dd..dee78432 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_073.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_073.c @@ -94,7 +94,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_074.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_074.c index e8a003d4..44a86715 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_074.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_074.c @@ -63,7 +63,7 @@ static UINT32 Testcase(void) task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.pcName = "Tsk074A"; task1.uwStackSize = TASK_STACK_SIZE_TEST; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_075.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_075.c index 9d9a81ba..2ba3c829 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_075.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_075.c @@ -99,7 +99,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; @@ -117,7 +117,7 @@ static UINT32 Testcase(void) task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF02; task1.pcName = "Tsk075B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_076.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_076.c index 2074443e..bc193435 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_076.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_076.c @@ -77,7 +77,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_077.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_077.c index 0c0dc6ea..5189bb24 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_077.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_077.c @@ -79,7 +79,7 @@ static UINT32 Testcase(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_078.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_078.c index 1c02aa73..22a88563 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_078.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_078.c @@ -66,7 +66,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk078A"; // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_079.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_079.c index 885f2c15..41d12880 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_079.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_079.c @@ -65,7 +65,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_080.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_080.c index b2209d73..43e792c0 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_080.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_080.c @@ -65,7 +65,7 @@ static UINT32 Testcase(void) ret = LOS_HwiCreate(HWI_NUM_TEST, hwiPrio, mode, (HWI_PROC_FUNC)HwiF01, (HwiIrqParam *)arg); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_082.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_082.c index f270941a..ac9b3a88 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_082.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_082.c @@ -77,7 +77,7 @@ static UINT32 Testcase(void) LOS_EventWrite(&g_eventCb01, 0x1); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ICUNIT_ASSERT_EQUAL(g_testCount, 2, g_testCount); // 2, assert that g_testCount is equal to this. diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_090.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_090.c index 3154d945..3a8c9803 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_090.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_090.c @@ -70,7 +70,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk090A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_093.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_093.c index 6bcfc350..7cd2591a 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_093.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_093.c @@ -69,7 +69,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk093A"; // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_094.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_094.c index c3712a2b..f3269e4f 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_094.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_094.c @@ -82,7 +82,7 @@ static UINT32 Testcase(void) // 0xffff, initializes the args. this parameter has no special meaning. task1.auwArgs[0] = 0xffff; task1.processID = LOS_GetCurrProcessID(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; @@ -104,7 +104,7 @@ static UINT32 Testcase(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.processID = LOS_GetCurrProcessID(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif task1.processID = LOS_GetCurrProcessID(); @@ -129,7 +129,7 @@ static UINT32 Testcase(void) // 4, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 4; task1.processID = LOS_GetCurrProcessID(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif task1.processID = LOS_GetCurrProcessID(); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_095.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_095.c index ffde8962..41ee35b1 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_095.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_095.c @@ -54,7 +54,7 @@ static UINT32 Testcase(void) task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; task1.processID = LOS_GetCurrProcessID(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif task1.processID = LOS_GetCurrProcessID(); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_096.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_096.c index 09be0708..57b5c8a0 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_096.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_096.c @@ -56,7 +56,7 @@ static void TaskF01(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -81,7 +81,7 @@ static UINT32 Testcase(void) task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = 0; task1.processID = LOS_GetCurrProcessID(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif task1.processID = LOS_GetCurrProcessID(); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_098.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_098.c index 0be50c2c..e8ef4d8f 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_098.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_098.c @@ -54,7 +54,7 @@ static void TaskF01(void) task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; task1.processID = LOS_GetCurrProcessID(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif task1.processID = LOS_GetCurrProcessID(); @@ -87,7 +87,7 @@ static UINT32 Testcase(void) task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; task1.processID = LOS_GetCurrProcessID(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif task1.processID = LOS_GetCurrProcessID(); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_100.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_100.c index 6cbc00f2..da22e5b4 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_100.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_100.c @@ -60,7 +60,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk100A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_102.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_102.c index b6669305..e395c577 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_102.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_102.c @@ -59,7 +59,7 @@ static void TaskF01(void) ret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif @@ -80,7 +80,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk102A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_103.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_103.c index 46ac159b..ef91eb9d 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_103.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_103.c @@ -59,7 +59,7 @@ static void TaskF01(void) task1.pcName = "Tsk103B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -95,7 +95,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_104.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_104.c index 3d5b1923..844f38f6 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_104.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_104.c @@ -68,7 +68,7 @@ static void TaskF01(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -98,7 +98,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_106.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_106.c index ad166138..e3b067d2 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_106.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_106.c @@ -74,7 +74,7 @@ static void TaskF01(void) ret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif @@ -96,7 +96,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk106A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_107.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_107.c index 6674235d..3b8430bd 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_107.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_107.c @@ -68,7 +68,7 @@ static void TaskF01(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -99,7 +99,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_108.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_108.c index 72c0b976..afefcb22 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_108.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_108.c @@ -67,7 +67,7 @@ static void TaskF01(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ICUNIT_GOTO_EQUAL(g_testCount, 0, g_testCount, EXIT); @@ -102,7 +102,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_109.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_109.c index 627369e7..981af5ce 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_109.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_109.c @@ -67,7 +67,7 @@ static void TaskF01(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -98,7 +98,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_110.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_110.c index bdf1791f..117485d8 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_110.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_110.c @@ -68,7 +68,7 @@ static void TaskF01(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ICUNIT_GOTO_EQUAL(g_testCount, 0, g_testCount, EXIT); @@ -104,7 +104,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_111.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_111.c index 5fd53d2c..9036dc02 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_111.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_111.c @@ -67,7 +67,7 @@ static void TaskF01(void) task1.pcName = "Tsk111B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -99,7 +99,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_112.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_112.c index 62d01f3f..09d6fc9d 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_112.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_112.c @@ -67,7 +67,7 @@ static void TaskF01(void) // 4, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 4; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -105,7 +105,7 @@ static UINT32 Testcase(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_113.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_113.c index bfc87872..70d96b3a 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_113.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_113.c @@ -67,7 +67,7 @@ static void TaskF01(void) task1.pcName = "Tsk113B"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ICUNIT_GOTO_EQUAL(g_testCount, 0, g_testCount, EXIT); @@ -107,7 +107,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_114.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_114.c index 2eb472f2..414a279c 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_114.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_114.c @@ -61,7 +61,7 @@ static void TaskF01(void) ret = LOS_HwiCreate(HWI_NUM_TEST, hwiPrio, mode, (HWI_PROC_FUNC)HwiF01, (HwiIrqParam *)arg); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT1); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif @@ -90,7 +90,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_115.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_115.c index 2677f918..5cfd8fb8 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_115.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_115.c @@ -74,7 +74,7 @@ static void TaskF01(void) // 4, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 4; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -112,7 +112,7 @@ static UINT32 Testcase(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_116.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_116.c index b1e2806c..7b5fdd2d 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_116.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_116.c @@ -97,7 +97,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_118.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_118.c index 85531ef9..7054a2fd 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_118.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_118.c @@ -85,7 +85,7 @@ static void TaskF01(void) ret = LOS_HwiCreate(HWI_NUM_TEST, hwiPrio, mode, (HWI_PROC_FUNC)HwiF01, arg); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif @@ -136,7 +136,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID01, &task1); @@ -149,7 +149,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_119.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_119.c index 467c8d39..908e332e 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_119.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_119.c @@ -56,7 +56,7 @@ static UINT32 Testcase(void) task1.pcName = "Task_119"; // 32, Set the priority according to the task purpose task1.usTaskPrio = 32; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_120.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_120.c index d1f4a1e4..03b989f1 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_120.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_120.c @@ -61,7 +61,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_121.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_121.c index 0e8aef7f..1d569e65 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_121.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_121.c @@ -56,7 +56,7 @@ static UINT32 Testcase(void) task1.pcName = "Task_121"; // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID01, &task1); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_122.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_122.c index 94d36286..e3ccd8b1 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_122.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_122.c @@ -55,7 +55,7 @@ static void TaskF01(void) task1.pcName = "Task_122_1"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -91,7 +91,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_123.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_123.c index f2636d2c..b7346365 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_123.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_123.c @@ -54,7 +54,7 @@ static void TaskF01(void) task1.pcName = "Task_123_1"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -86,7 +86,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_124.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_124.c index d51caa7c..79244497 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_124.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_124.c @@ -58,7 +58,7 @@ static void TaskF01(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -90,7 +90,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_125.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_125.c index 24b56ca1..28d09aad 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_125.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_125.c @@ -62,7 +62,7 @@ static void TaskF01(void) ret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, (HWI_PROC_FUNC)HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif @@ -88,7 +88,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_126.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_126.c index 030ac91e..46d46126 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_126.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_126.c @@ -76,7 +76,7 @@ static void TaskF01(void) task1.pcName = "Task_126_1"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -85,7 +85,7 @@ static void TaskF01(void) ret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, (HWI_PROC_FUNC)HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT1); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif @@ -120,7 +120,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_127.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_127.c index c9ed5a99..e3ea0943 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_127.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_127.c @@ -51,7 +51,7 @@ static void TaskF01(void) task1.pcName = "Task_127_1"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -77,7 +77,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_128.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_128.c index 04614748..ff52a0b3 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_128.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_128.c @@ -63,7 +63,7 @@ static void TaskF01(void) task1.pcName = "Task_128_1"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -92,7 +92,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_129.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_129.c index c80a883e..051c06b4 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_129.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_129.c @@ -52,7 +52,7 @@ static void HwiF01(void) // 3, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif TEST_HwiClear(HWI_NUM_TEST); @@ -79,7 +79,7 @@ static UINT32 Testcase(void) ret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, (HWI_PROC_FUNC)HwiF01, 0); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_130.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_130.c index 1af58128..ab3e7bd3 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_130.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_130.c @@ -95,7 +95,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; @@ -110,7 +110,7 @@ static UINT32 Testcase(void) task1.pcName = "Task_130_1"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_131.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_131.c index 136011b1..7bc428d0 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_131.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_131.c @@ -68,7 +68,7 @@ static void TaskF02(void) ret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, (HWI_PROC_FUNC)HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT1); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif @@ -130,7 +130,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; @@ -145,7 +145,7 @@ static UINT32 Testcase(void) task1.pcName = "Task_131_1"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_133.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_133.c index a607f4f8..9385e15a 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_133.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_133.c @@ -58,7 +58,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID01, &task1); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_134.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_134.c index ceb015fc..ac30ed74 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_134.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_134.c @@ -56,7 +56,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK + 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID01, &task1); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_135.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_135.c index 03f5ba0c..f95914f3 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_135.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_135.c @@ -60,7 +60,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk138A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID01, &task1); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_136.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_136.c index 78e86856..5a142e34 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_136.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_136.c @@ -73,7 +73,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif task2.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF02; @@ -81,7 +81,7 @@ static UINT32 Testcase(void) task2.pcName = "Task_136_2"; task2.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task2.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task2.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif for (i = 0; i < IT_TASK_SMP_LOOP; i++) { diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_138.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_138.c index 74aa61fb..e3410976 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_138.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_138.c @@ -85,7 +85,7 @@ static void TaskF01(void) ret = LOS_HwiCreate(HWI_NUM_TEST, hwiPrio, mode, (HWI_PROC_FUNC)HwiF01, (HwiIrqParam *)arg); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif @@ -136,7 +136,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID01, &task1); @@ -149,7 +149,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_141.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_141.c index 8e56235a..a41d892a 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_141.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_141.c @@ -83,7 +83,7 @@ static UINT32 Testcase(void) task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.pcName = "TskTstA"; task1.usTaskPrio = TASK_PRIO_TEST_TASK + 1; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_142.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_142.c index daeb6075..0f3f260c 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_142.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_142.c @@ -73,7 +73,7 @@ static UINT32 Testcase(void) ret = LOS_HwiCreate(HWI_NUM_TEST3, hwiPrio, mode, (HWI_PROC_FUNC)ItHwi, arg); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST3, ArchCurrCpuid() + 1); // curret cpu #endif float d1 = 100.0f; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_timeslice_002.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_timeslice_002.c index 9b5b56ef..d055f0cd 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_timeslice_002.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_timeslice_002.c @@ -84,7 +84,7 @@ static UINT32 Testcase(void) task.uwStackSize = TASK_STACK_SIZE_TEST * 2; task.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -96,7 +96,7 @@ static UINT32 Testcase(void) task.uwStackSize = TASK_STACK_SIZE_TEST; task.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_timeslice_003.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_timeslice_003.c index c8de1cc6..c62a362f 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_timeslice_003.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_timeslice_003.c @@ -126,7 +126,7 @@ static UINT32 Testcase(void) task.uwStackSize = TASK_STACK_SIZE_TEST * 2; task.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -139,7 +139,7 @@ static UINT32 Testcase(void) task.uwStackSize = TASK_STACK_SIZE_TEST * 2; task.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -151,7 +151,7 @@ static UINT32 Testcase(void) task.uwStackSize = TASK_STACK_SIZE_TEST; task.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_timeslice_004.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_timeslice_004.c index c96e453a..d59e9882 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_timeslice_004.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_timeslice_004.c @@ -131,7 +131,7 @@ static UINT32 Testcase(void) task.uwStackSize = TASK_STACK_SIZE_TEST * 3; task.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -143,7 +143,7 @@ static UINT32 Testcase(void) task.uwStackSize = TASK_STACK_SIZE_TEST; task.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_049.c b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_049.c index b3e8d03a..3742a238 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_049.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_049.c @@ -83,7 +83,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_081.c b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_081.c index 359c9aee..d37870f7 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_081.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_081.c @@ -105,7 +105,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk081A"; // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_097.c b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_097.c index 5b67c366..dee48ee6 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_097.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_097.c @@ -57,7 +57,7 @@ static void TaskF01(void) task1.usTaskPrio = TASK_PRIO_TEST_TASK - 3; task1.uwResved = 0; task1.processID = LOS_GetCurrProcessID(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif task1.processID = LOS_GetCurrProcessID(); @@ -87,7 +87,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif task1.processID = -1; diff --git a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_099.c b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_099.c index 5b884572..79459cf6 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_099.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_099.c @@ -55,7 +55,7 @@ static UINT32 Testcase(void) // 2, It is used to calculate a priority relative to TASK_PRIO_TEST_TASK. task1.usTaskPrio = TASK_PRIO_TEST_TASK - 2; task1.processID = LOS_GetCurrProcessID(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif task1.processID = LOS_GetCurrProcessID(); diff --git a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_101.c b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_101.c index c84a6869..d16703f0 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_101.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_101.c @@ -60,7 +60,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk101A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_105.c b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_105.c index e186f8ed..55932c80 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_105.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_105.c @@ -63,7 +63,7 @@ static UINT32 Testcase(void) task1.pcName = "Tsk105A"; task1.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_timeslice_001.c b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_timeslice_001.c index 93515685..bc5ad154 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_timeslice_001.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smoke/It_los_task_timeslice_001.c @@ -75,7 +75,7 @@ static UINT32 Testcase(void) task.uwStackSize = TASK_STACK_SIZE_TEST * 2; task.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -87,7 +87,7 @@ static UINT32 Testcase(void) task.uwStackSize = TASK_STACK_SIZE_TEST; task.usTaskPrio = TASK_PRIO_TEST_TASK - 1; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_002.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_002.c index ad1ee4a4..0958e7bc 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_002.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_002.c @@ -62,7 +62,7 @@ static UINT32 Testcase(void) LOS_TaskDelay(2); // 2, set delay time. ret = LOS_TaskDelete(testid); -#if (LOSCFG_KERNEL_SMP_TASK_SYNC == NO) +#ifndef LOSCFG_KERNEL_SMP_TASK_SYNC /* delay and check */ LOS_TaskDelay(10); // 10, set delay time. #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_024.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_024.c index a35fcfc9..d1b38e31 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_024.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_024.c @@ -76,7 +76,7 @@ static UINT32 Testcase(void) g_itTestResult = LOS_OK; LOS_TaskLock(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; #endif diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_025.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_025.c index b0c7cd42..33270a17 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_025.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_025.c @@ -95,7 +95,7 @@ static UINT32 Testcase(void) g_itTestResult = LOS_NOK; LOS_TaskLock(); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/It_los_event.c b/testsuites/kernel/sample/kernel_base/ipc/event/It_los_event.c index ee305b7f..949e547f 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/It_los_event.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/It_los_event.c @@ -39,7 +39,7 @@ extern "C" { VOID ItSuiteLosEvent(VOID) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP ItSmpLosEvent001(); ItSmpLosEvent002(); ItSmpLosEvent003(); @@ -107,7 +107,7 @@ VOID ItSuiteLosEvent(VOID) ItLosEvent023(); ItLosEvent024(); ItLosEvent025(); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ItLosEvent026(); #endif ItLosEvent027(); @@ -117,7 +117,7 @@ VOID ItSuiteLosEvent(VOID) ItLosEvent033(); // / ItLosEvent037(); ItLosEvent038(); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ItLosEvent039(); #endif ItLosEvent040(); @@ -134,7 +134,7 @@ VOID ItSuiteLosEvent(VOID) ItLosEvent017(); ItLosEvent034(); #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, 1); #endif } diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/It_los_event.h b/testsuites/kernel/sample/kernel_base/ipc/event/It_los_event.h index 61451f0c..26dad0f9 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/It_los_event.h +++ b/testsuites/kernel/sample/kernel_base/ipc/event/It_los_event.h @@ -151,7 +151,7 @@ extern VOID ItLosEvent017(VOID); extern VOID ItLosEvent034(VOID); #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP VOID ItSmpLosEvent001(VOID); VOID ItSmpLosEvent002(VOID); VOID ItSmpLosEvent003(VOID); diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_018.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_018.c index cb6b34b0..9f43e7cb 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_018.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_018.c @@ -46,7 +46,7 @@ static VOID TaskF02(VOID) ret = LOS_EventWrite(&g_event, 0x10); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ICUNIT_GOTO_EQUAL(g_testCount, 4, g_testCount, EXIT); // 4, Here, assert that g_testCount is equal to 4. #endif g_testCount++; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_023.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_023.c index f08a1c6f..24ffccee 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_023.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_023.c @@ -61,7 +61,7 @@ static VOID TaskF01(VOID) ICUNIT_GOTO_EQUAL(ret, g_event.uwEventID, ret, EXIT); ICUNIT_ASSERT_EQUAL_VOID(ret, 0x11, ret); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ICUNIT_GOTO_EQUAL(g_testCount, 5, g_testCount, EXIT); // 5, Here, assert that g_testCount is equal to 5. #endif g_testCount++; @@ -80,7 +80,7 @@ static VOID TaskF02(VOID) ICUNIT_GOTO_EQUAL(ret, g_event.uwEventID, ret, EXIT); ICUNIT_ASSERT_EQUAL_VOID(ret, 0x11, ret); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ICUNIT_GOTO_EQUAL(g_testCount, 6, g_testCount, EXIT); // 6, Here, assert that g_testCount is equal to 6. #endif g_testCount++; @@ -121,7 +121,7 @@ static UINT32 Testcase(VOID) ret = LOS_HwiCreate(HWI_NUM_TEST, 0, 0, HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_024.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_024.c index 988a6d1b..32d754be 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_024.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_024.c @@ -58,7 +58,7 @@ static UINT32 Testcase(VOID) ret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_026.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_026.c index 73069046..fc30d6a2 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_026.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_026.c @@ -73,7 +73,7 @@ static UINT32 Testcase(VOID) task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.usTaskPrio = TASK_PRIO_TEST - 2; // 2, set new task priority, it is higher than the current task. task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_038.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_038.c index 6a523f9f..ff269c61 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_038.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_038.c @@ -116,7 +116,7 @@ static UINT32 Testcase(VOID) task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.usTaskPrio = TASK_PRIO_TEST - 2; // 2, set new task priority, it is higher than the current task. task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -128,7 +128,7 @@ static UINT32 Testcase(VOID) task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.usTaskPrio = TASK_PRIO_TEST - 1; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -139,7 +139,7 @@ static UINT32 Testcase(VOID) ret = LOS_HwiCreate(HWI_NUM_TEST, 0, 0, HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT1); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_039.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_039.c index 4afc4dcf..7ded8636 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_039.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_039.c @@ -65,7 +65,7 @@ static UINT32 Testcase(VOID) task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.usTaskPrio = TASK_PRIO_TEST - 2; // 2, set new task priority, it is higher than the current task. task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/smoke/It_los_event_036.c b/testsuites/kernel/sample/kernel_base/ipc/event/smoke/It_los_event_036.c index a5edd54a..7428ff16 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/smoke/It_los_event_036.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/smoke/It_los_event_036.c @@ -66,7 +66,7 @@ static UINT32 Testcase(VOID) task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.usTaskPrio = TASK_PRIO_TEST - 2; // 2, set new task priority, it is higher than the current task. task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_032.c b/testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_032.c index ef39eb66..9c56de16 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_032.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_032.c @@ -37,7 +37,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_ret1, g_ret2, g_ret3; static UINT32 g_szId[3] = {0}; diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/It_los_mux.c b/testsuites/kernel/sample/kernel_base/ipc/mux/It_los_mux.c index c68b18f3..b0cb2a26 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/It_los_mux.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/It_los_mux.c @@ -107,7 +107,7 @@ VOID ItSuiteLosMux(void) ItLosMux043(); #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP ItSmpLosMux001(); ItSmpLosMux002(); ItSmpLosMux003(); @@ -143,7 +143,7 @@ VOID ItSuiteLosMux(void) ItSmpLosMux2029(); #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, 1); HalIrqSetAffinity(HWI_NUM_TEST1, 1); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_013.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_013.c index 76e1167e..d7b003b0 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_013.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_013.c @@ -72,11 +72,11 @@ static UINT32 Testcase(VOID) ret = LOS_HwiCreate(HWI_NUM_TEST, 0, 0, (HWI_PROC_FUNC)HwiF01, 0); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif TestHwiTrigger(HWI_NUM_TEST); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP TestBusyTaskDelay(5); // 5, delay for Timing control. #endif ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_016.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_016.c index 3db8a392..cd2ab6e1 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_016.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_016.c @@ -65,12 +65,12 @@ static UINT32 Testcase(VOID) ret = LOS_HwiCreate(HWI_NUM_TEST, 0, 0, (HWI_PROC_FUNC)HwiF01, 0); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif TestHwiTrigger(HWI_NUM_TEST); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP TestBusyTaskDelay(10); // 10, delay for Timing control. #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_017.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_017.c index 27ad8361..c98ff4e9 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_017.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_017.c @@ -64,7 +64,7 @@ static UINT32 Testcase(VOID) ret = LOS_HwiCreate(HWI_NUM_TEST, 0, 0, (HWI_PROC_FUNC)HwiF01, 0); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif TestHwiTrigger(HWI_NUM_TEST); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_020.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_020.c index 97230ac6..4da64155 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_020.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_020.c @@ -78,7 +78,7 @@ static UINT32 Testcase(VOID) ret = LOS_HwiCreate(HWI_NUM_TEST0, 0, 0, (HWI_PROC_FUNC)HwiF02, 0); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); HalIrqSetAffinity(HWI_NUM_TEST0, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_021.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_021.c index 0c7873c1..b91b06af 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_021.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_021.c @@ -69,7 +69,7 @@ VOID TaskF02(void) task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.usTaskPrio = TASK_PRIO_TEST - 3; // 3, set reasonable priority. task1.uwResved = 0; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -101,7 +101,7 @@ static UINT32 Testcase(VOID) task.pcName = "LosMB2_1"; task.uwStackSize = 0x900; task.uwResved = 0; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID01, &task); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_026.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_026.c index 5220c6fc..edb52dfe 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_026.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_026.c @@ -117,7 +117,7 @@ static VOID TaskAFunc(VOID) task1.pcName = "TaskB"; task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -135,7 +135,7 @@ static VOID TaskAFunc(VOID) task2.pcName = "TaskC"; task2.uwStackSize = TASK_STACK_SIZE_TEST; task2.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task2.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID03, &task2); @@ -152,7 +152,7 @@ static VOID TaskAFunc(VOID) task3.pcName = "TaskD"; task3.uwStackSize = TASK_STACK_SIZE_TEST; task3.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task3.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID04, &task3); @@ -210,7 +210,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskA"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID01, &task); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_027.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_027.c index bf957e9a..01db9295 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_027.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_027.c @@ -111,7 +111,7 @@ static VOID TaskA1Func(VOID) task1.pcName = "TaskB"; task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -122,7 +122,7 @@ static VOID TaskA1Func(VOID) task2.pcName = "TaskC"; task2.uwStackSize = TASK_STACK_SIZE_TEST; task2.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task2.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID03, &task2); @@ -133,7 +133,7 @@ static VOID TaskA1Func(VOID) task3.pcName = "TaskD"; task3.uwStackSize = TASK_STACK_SIZE_TEST; task3.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task3.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID04, &task3); @@ -168,7 +168,7 @@ static UINT32 Testcase(void) task.pcName = "TaskA"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID01, &task); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_028.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_028.c index de9234b4..6e367d5a 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_028.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_028.c @@ -103,7 +103,7 @@ static VOID TaskA2Func(VOID) task1.pcName = "TaskB"; task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -115,7 +115,7 @@ static VOID TaskA2Func(VOID) task2.pcName = "TaskC"; task2.uwStackSize = TASK_STACK_SIZE_TEST; task2.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task2.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID03, &task2); @@ -127,7 +127,7 @@ static VOID TaskA2Func(VOID) task3.pcName = "TaskD"; task3.uwStackSize = TASK_STACK_SIZE_TEST; task3.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task3.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID04, &task3); @@ -164,7 +164,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskA"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID01, &task); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_029.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_029.c index cdb90189..a46e0e36 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_029.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_029.c @@ -75,7 +75,7 @@ static VOID TaskC3Func(VOID) task1.pcName = "TaskD"; task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID04, &task1); @@ -130,7 +130,7 @@ static VOID TaskA3Func(VOID) task1.pcName = "TaskB"; task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -141,7 +141,7 @@ static VOID TaskA3Func(VOID) task2.pcName = "TaskC"; task2.uwStackSize = TASK_STACK_SIZE_TEST; task2.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task2.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID03, &task2); @@ -178,7 +178,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskA"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID01, &task); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_031.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_031.c index f0afad92..dde87d11 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_031.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_031.c @@ -119,7 +119,7 @@ static VOID TaskA5Func(VOID) task1.pcName = "TaskB"; task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID02, &task1); @@ -130,7 +130,7 @@ static VOID TaskA5Func(VOID) task2.pcName = "TaskC"; task2.uwStackSize = TASK_STACK_SIZE_TEST; task2.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task2.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID03, &task2); @@ -141,7 +141,7 @@ static VOID TaskA5Func(VOID) task3.pcName = "TaskD"; task3.uwStackSize = TASK_STACK_SIZE_TEST; task3.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task3.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID04, &task3); @@ -182,7 +182,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskA"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testTaskID01, &task); diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_035.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_035.c index b9c75822..db1e4f62 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_035.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_035.c @@ -100,7 +100,7 @@ static VOID TaskMisc10Func(VOID) task1.pcName = "TaskService_3"; task1.uwStackSize = LOS_TASK_MIN_STACK_SIZE; task1.uwResved = 0; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -134,7 +134,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskMisc_10"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = 0; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -146,7 +146,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskFe_2"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = 0; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_036.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_036.c index dd41f227..a050575e 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_036.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_036.c @@ -87,7 +87,7 @@ static VOID TaskMisc10Func(VOID) task1.pcName = "TaskService_5"; task1.uwStackSize = LOS_TASK_MIN_STACK_SIZE; task1.uwResved = 0; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -118,7 +118,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskMisc_10"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = 0; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -132,7 +132,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskFe_4"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = 0; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_037.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_037.c index 046a06fc..e0cf203b 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_037.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_037.c @@ -95,7 +95,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskMisc_10"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -107,7 +107,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskFe_4"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_038.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_038.c index 8ca4c571..a4560186 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_038.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_038.c @@ -89,7 +89,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskMisc_10"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -101,7 +101,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskFe_4"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_039.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_039.c index 854dc3ff..63d13309 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_039.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_039.c @@ -106,7 +106,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskMisc_10"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -121,7 +121,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskFe_4"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_040.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_040.c index 1a0523bd..e362c7fe 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_040.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_040.c @@ -199,7 +199,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskMisc_10"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -214,7 +214,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskFe_9"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -229,7 +229,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskFe_8"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -244,7 +244,7 @@ static UINT32 Testcase(VOID) task.pcName = "TaskFe_7"; task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_041.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_041.c index a0b9fdf8..4fb84b90 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_041.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_041.c @@ -81,7 +81,7 @@ static UINT32 Testcase(VOID) taskParam.pcName = "TaskMisc_10"; taskParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskParam.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_042.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_042.c index 59ecf212..f0cdfc3d 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_042.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_042.c @@ -99,7 +99,7 @@ static UINT32 Testcase(VOID) taskParam.pcName = "TaskMisc_10"; taskParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskParam.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -115,7 +115,7 @@ static UINT32 Testcase(VOID) taskParam.pcName = "TaskFe_4"; taskParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskParam.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_043.c b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_043.c index 0aa758fb..41324aef 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_043.c +++ b/testsuites/kernel/sample/kernel_base/ipc/mux/full/It_los_mutex_043.c @@ -120,7 +120,7 @@ static UINT32 Testcase(VOID) taskParam.pcName = "TaskMisc_10"; taskParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskParam.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif @@ -136,7 +136,7 @@ static UINT32 Testcase(VOID) taskParam.pcName = "TaskFe_4"; taskParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskParam.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/It_los_queue.c b/testsuites/kernel/sample/kernel_base/ipc/queue/It_los_queue.c index 2a7816a1..a1dd0a3a 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/It_los_queue.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/It_los_queue.c @@ -40,7 +40,7 @@ extern "C" { VOID ItSuiteLosQueue(VOID) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP ItSmpLosQueue001(); ItSmpLosQueue002(); ItSmpLosQueue003(); @@ -101,7 +101,7 @@ VOID ItSuiteLosQueue(VOID) ItLosQueue018(); ItLosQueue019(); ItLosQueue020(); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ItLosQueue021(); #endif ItLosQueue022(); @@ -228,7 +228,7 @@ VOID ItSuiteLosQueue(VOID) ItLosQueueHead042(); #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, 1); #endif } diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/It_los_queue.h b/testsuites/kernel/sample/kernel_base/ipc/queue/It_los_queue.h index fb0b30b6..0309563c 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/It_los_queue.h +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/It_los_queue.h @@ -256,7 +256,7 @@ VOID ItLosQueueDebug001(void); #endif #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP VOID ItSmpLosQueue001(VOID); VOID ItSmpLosQueue002(VOID); VOID ItSmpLosQueue003(VOID); diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_044.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_044.c index 3ceae8d8..f47b3586 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_044.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_044.c @@ -70,7 +70,7 @@ static UINT32 Testcase(VOID) ret = TEST_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_045.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_045.c index e11fcd6f..e57f3ec8 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_045.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_045.c @@ -64,7 +64,7 @@ static UINT32 Testcase(VOID) ret = TEST_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_046.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_046.c index 24336641..19bca4a7 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_046.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_046.c @@ -83,7 +83,7 @@ static UINT32 Testcase(VOID) ret = TEST_HwiCreate(HWI_NUM_TEST3, 1, 0, HwiF02, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_047.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_047.c index 3fb31a6c..f336392b 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_047.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_047.c @@ -95,7 +95,7 @@ static UINT32 Testcase(VOID) ret = TEST_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_048.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_048.c index 99f6dd66..3847f03f 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_048.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_048.c @@ -88,7 +88,7 @@ static UINT32 Testcase(VOID) ret = TEST_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_050.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_050.c index f1d4a9f6..205ab668 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_050.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_050.c @@ -68,7 +68,7 @@ static UINT32 Testcase(VOID) ret = TEST_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_108.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_108.c index 9a2d44b2..48e42202 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_108.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_108.c @@ -75,7 +75,7 @@ static UINT32 Testcase(VOID) ret = TEST_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_111.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_111.c index 72e22d82..84ed0f2a 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_111.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_111.c @@ -77,7 +77,7 @@ static UINT32 Testcase(VOID) ret = TEST_HwiCreate(HWI_NUM_TEST, 1, 0, HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.c b/testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.c index 4a07e548..08468c7d 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.c +++ b/testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.c @@ -39,7 +39,7 @@ extern "C" { VOID ItSuiteLosSem(void) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* fixed */ ItSmpLosSem008(); ItSmpLosSem022(); @@ -114,7 +114,7 @@ VOID ItSuiteLosSem(void) ItLosSem036(); ItLosSem037(); ItLosSem038(); -#if (LOSCFG_KERNEL_SMP_TASK_SYNC != YES) +#ifndef LOSCFG_KERNEL_SMP_TASK_SYNC // LOSCFG_KERNEL_SMP_TASK_SYNC is opened ,create task success is depend on created semaphore successed; ItLosSem039(); ItLosSem040(); @@ -134,7 +134,7 @@ VOID ItSuiteLosSem(void) ItLosSem024(); ItLosSem030(); ItLosSem032(); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ItLosSem033(); #endif LltLosSem001(); @@ -153,7 +153,7 @@ VOID ItSuiteLosSem(void) #endif #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, 1); #endif } diff --git a/testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.h b/testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.h index 0da88acf..62368917 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.h +++ b/testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.h @@ -102,7 +102,7 @@ VOID ItLosSem043(void); VOID ItLosSem044(void); #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP VOID ItSmpLosSem001(VOID); VOID ItSmpLosSem002(VOID); VOID ItSmpLosSem003(VOID); diff --git a/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_020.c b/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_020.c index be911426..47bb469c 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_020.c +++ b/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_020.c @@ -59,7 +59,7 @@ static UINT32 Testcase(VOID) task.uwStackSize = TASK_STACK_SIZE_TEST; task.usTaskPrio = TASK_PRIO_TEST - 1; task.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_testCount = 0; diff --git a/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_022.c b/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_022.c index db7ae18d..56ffb69d 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_022.c +++ b/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_022.c @@ -60,12 +60,12 @@ static VOID TaskF02(void) LOS_TaskLock(); ret = LOS_SemPost(g_semID); ICUNIT_TRACK_EQUAL(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ICUNIT_TRACK_EQUAL(g_testCount, 1, g_testCount); #endif LOS_TaskUnlock(); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ICUNIT_TRACK_EQUAL(g_testCount, 1, g_testCount); #endif g_testCount++; diff --git a/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_023.c b/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_023.c index 4eb0ab8c..263c6c41 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_023.c +++ b/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_023.c @@ -88,7 +88,7 @@ static UINT32 Testcase(VOID) TEST_HwiDelete(HWI_NUM_TEST); ret = TEST_HwiCreate(HWI_NUM_TEST, 0, 0, HwiF01, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT2); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_026.c b/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_026.c index 5195b921..65132b95 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_026.c +++ b/testsuites/kernel/sample/kernel_base/ipc/sem/full/It_los_sem_026.c @@ -44,7 +44,7 @@ static VOID TaskF02(void) g_testCount++; ret = LOS_SemPend(g_semID, LOS_WAIT_FOREVER); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ICUNIT_TRACK_EQUAL(g_testCount, 2, g_testCount); // 2, Here, assert that g_testCount is equal to #endif g_testCount++; @@ -61,7 +61,7 @@ static VOID TaskF01(void) ret = LOS_SemPend(g_semID, LOS_WAIT_FOREVER); ICUNIT_ASSERT_EQUAL_VOID(ret, LOS_OK, ret); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ICUNIT_TRACK_EQUAL(g_testCount, 3, g_testCount); // 3, Here, assert that g_testCount is equal to #endif g_testCount++; diff --git a/testsuites/kernel/sample/kernel_base/ipc/sem/smp/It_smp_los_sem_030.c b/testsuites/kernel/sample/kernel_base/ipc/sem/smp/It_smp_los_sem_030.c index 742a1042..fdc8155b 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/sem/smp/It_smp_los_sem_030.c +++ b/testsuites/kernel/sample/kernel_base/ipc/sem/smp/It_smp_los_sem_030.c @@ -38,7 +38,7 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP static UINT32 g_ret1, g_ret2, g_ret3; static UINT32 g_szId[3] = {0}; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/It_extend_cpup.c b/testsuites/kernel/sample/kernel_extend/cpup/It_extend_cpup.c index f4217d4e..fc348ff5 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/It_extend_cpup.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/It_extend_cpup.c @@ -99,7 +99,7 @@ VOID ItSuiteExtendCpup(VOID) ItExtendCpup010(); #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP ItSmpExtendCpup001(); ItSmpExtendCpup002(); #ifdef LOSCFG_CPUP_INCLUDE_IRQ diff --git a/testsuites/kernel/sample/kernel_extend/cpup/It_extend_cpup.h b/testsuites/kernel/sample/kernel_extend/cpup/It_extend_cpup.h index 7e54b537..7a4d8eea 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/It_extend_cpup.h +++ b/testsuites/kernel/sample/kernel_extend/cpup/It_extend_cpup.h @@ -116,7 +116,7 @@ VOID ItExtendCpup009(VOID); VOID ItExtendCpup010(VOID); #endif -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP VOID ItSmpExtendCpup001(VOID); VOID ItSmpExtendCpup002(VOID); #ifdef LOSCFG_CPUP_INCLUDE_IRQ diff --git a/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_004.c b/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_004.c index 98cb5671..2643a713 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_004.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_004.c @@ -70,7 +70,7 @@ static UINT32 TaskF01(VOID) task1.pcName = "TestCpupTsk2"; task1.usTaskPrio = TASK_PRIO_TEST - 1; // 1, used to calculate the task priority. task1.uwResved = TASK_STATUS_UNDETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ICUNIT_ASSERT_EQUAL(g_cpupTestCount, 0, g_cpupTestCount); @@ -104,7 +104,7 @@ static UINT32 Testcase(VOID) task1.pcName = "TestCpupTsk1"; task1.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. task1.uwResved = TASK_STATUS_UNDETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_cpupTestCount = 0; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_005.c b/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_005.c index b47ac536..2e80bad8 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_005.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_005.c @@ -77,7 +77,7 @@ static UINT32 Testcase(VOID) task1.pcName = "TskTst1"; task1.usTaskPrio = TASK_PRIO_TEST - 1; // 1, used to calculate the task priority. task1.uwResved = TASK_STATUS_UNDETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_cpupTestCount = 0; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_006.c b/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_006.c index e90de96d..152f2e29 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_006.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_006.c @@ -71,7 +71,7 @@ static VOID TaskF01(VOID) task1.pcName = "TskTst2"; task1.usTaskPrio = TASK_PRIO_TEST - 1; // 1, used to calculate the task priority. task1.uwResved = TASK_STATUS_UNDETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ICUNIT_ASSERT_EQUAL_VOID(g_cpupTestCount, 0, g_cpupTestCount); @@ -114,7 +114,7 @@ static UINT32 Testcase(VOID) task1.pcName = "TskTst1"; task1.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. task1.uwResved = TASK_STATUS_UNDETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_cpupTestCount = 0; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_008.c b/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_008.c index 86e9e792..45188fd0 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_008.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/full/It_extend_cpup_008.c @@ -72,7 +72,7 @@ static UINT32 Testcase(VOID) task1.pcName = "TestCpupTsk1"; task1.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. task1.uwResved = TASK_STATUS_UNDETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP task1.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif g_cpupTestCount = 0; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_001.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_001.c index d72a879b..5efd147e 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_001.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_001.c @@ -76,7 +76,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task01"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* make sure that created test task is definitely on another core */ UINT32 currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); @@ -89,7 +89,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task02"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 1; // 1, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID02, &taskInitParam); diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_002.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_002.c index a05abf00..be0802cc 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_002.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_002.c @@ -68,7 +68,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup002_task01"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 1; // 1, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID01, &taskInitParam); diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_003.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_003.c index 4b476b9a..c3649397 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_003.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_003.c @@ -99,7 +99,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup003_task01"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* make sure that created test task is definitely on another core */ UINT32 currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); @@ -112,7 +112,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup003_task02"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 1; // 1, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID02, &taskInitParam); diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_004.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_004.c index 1fecac72..853a0643 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_004.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_004.c @@ -119,7 +119,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup004_task01"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* make sure that created test task is definitely on another core */ UINT32 currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); @@ -132,7 +132,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup004_task02"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 1; // 1, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID02, &taskInitParam); diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_005.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_005.c index 6b247384..72d12677 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_005.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_005.c @@ -68,7 +68,7 @@ static void Task01(void) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup005_task03"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID03, &taskInitParam); @@ -79,7 +79,7 @@ static void Task01(void) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup005_task04"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID04, &taskInitParam); @@ -142,7 +142,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup005_task01"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* make sure that created test task is definitely on another core */ UINT32 currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); @@ -155,7 +155,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup005_task02"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 1; // 1, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID02, &taskInitParam); diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_007.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_007.c index 6f596788..4b401738 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_007.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_007.c @@ -73,7 +73,7 @@ static UINT32 Testcase(VOID) taskInitParam.pcName = "SmpCpup007_task01"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. taskInitParam.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* make sure that created test task is definitely on another core */ UINT32 currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); @@ -86,7 +86,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup007_task02"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 1; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID02, &taskInitParam); diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_008.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_008.c index 3be498fc..3a961ac9 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_008.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_008.c @@ -72,7 +72,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup008_task01"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* make sure that created test task is definitely on another core */ UINT32 currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); @@ -85,7 +85,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup008_task02"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 1; // 1, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID02, &taskInitParam); diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_009.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_009.c index d64b8486..034ad59d 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_009.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_009.c @@ -56,7 +56,7 @@ static void Task01(void) taskInitParam.pcName = "SmpCpup009_task03"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. taskInitParam.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID03, &taskInitParam); @@ -96,7 +96,7 @@ static UINT32 Testcase(VOID) taskInitParam.pcName = "SmpCpup009_task01"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. taskInitParam.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* make sure that created test task is definitely on another core */ UINT32 currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); @@ -109,7 +109,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup009_task02"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 1; // 1, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID02, &taskInitParam); diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_010.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_010.c index d2037338..3bcbb4b5 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_010.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_010.c @@ -75,7 +75,7 @@ static UINT32 Testcase(VOID) taskInitParam.pcName = "SmpCpup001_task01"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. taskInitParam.uwResved = LOS_TASK_STATUS_DETACHED; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* make sure that created test task is definitely on another core */ UINT32 currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); @@ -88,7 +88,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task02"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 1; // 1, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID02, &taskInitParam); diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_011.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_011.c index b572f834..a4056e0e 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_011.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_011.c @@ -95,7 +95,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task01"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* make sure that created test task is definitely on another core */ UINT32 currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); @@ -108,7 +108,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task02"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 1; // 1, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID02, &taskInitParam); diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_012.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_012.c index 7a320ed6..42206fb7 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_012.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_012.c @@ -78,7 +78,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task01"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 2; // 2, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP /* make sure that created test task is definitely on another core */ UINT32 currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(currCpuid); @@ -91,7 +91,7 @@ static UINT32 Testcase(VOID) taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task02"; taskInitParam.usTaskPrio = TASK_PRIO_TEST - 1; // 1, used to calculate the task priority. -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif ret = LOS_TaskCreate(&g_testSmpCpupTaskID02, &taskInitParam); diff --git a/testsuites/kernel/sample/posix/mutex/It_posix_mutex.c b/testsuites/kernel/sample/posix/mutex/It_posix_mutex.c index da2a543f..c253061e 100644 --- a/testsuites/kernel/sample/posix/mutex/It_posix_mutex.c +++ b/testsuites/kernel/sample/posix/mutex/It_posix_mutex.c @@ -119,7 +119,7 @@ VOID ItSuitePosixMutex(void) ItPosixMux072(); ItPosixMux073(); ItPosixMux074(); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ItPosixMux075(); #endif ItPosixMux076(); diff --git a/testsuites/kernel/sample/posix/pthread/It_posix_pthread.c b/testsuites/kernel/sample/posix/pthread/It_posix_pthread.c index 160b5a5f..3607d837 100644 --- a/testsuites/kernel/sample/posix/pthread/It_posix_pthread.c +++ b/testsuites/kernel/sample/posix/pthread/It_posix_pthread.c @@ -251,7 +251,7 @@ VOID ItSuitePosixPthread() ItPosixPthread044(); ItPosixPthread045(); ItPosixPthread046(); -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP ItPosixPthread047(); // pthread preemption, may not happen on smp #endif ItPosixPthread048(); diff --git a/testsuites/kernel/sample/posix/pthread/full/It_posix_pthread_066.c b/testsuites/kernel/sample/posix/pthread/full/It_posix_pthread_066.c index a7e03f6c..76132c12 100644 --- a/testsuites/kernel/sample/posix/pthread/full/It_posix_pthread_066.c +++ b/testsuites/kernel/sample/posix/pthread/full/It_posix_pthread_066.c @@ -76,7 +76,7 @@ static VOID *PthreadF01(void *argument) ret = pthread_create(&g_newTh2, &attr, PthreadF02, NULL); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP while (g_testCount < 2) { // 2, delay until g_testCount is equal to 2. TestBusyTaskDelay(1); } diff --git a/testsuites/kernel/sample/posix/pthread/full/It_posix_pthread_068.c b/testsuites/kernel/sample/posix/pthread/full/It_posix_pthread_068.c index 6ced64b9..a71ec33b 100644 --- a/testsuites/kernel/sample/posix/pthread/full/It_posix_pthread_068.c +++ b/testsuites/kernel/sample/posix/pthread/full/It_posix_pthread_068.c @@ -74,7 +74,7 @@ static VOID *PthreadF01(VOID *argument) ret = pthread_create(&g_newTh2, &attr, PthreadF02, NULL); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP while (g_testCount < 2) { // 2, delay until g_testCount is equal to 2. TestBusyTaskDelay(1); } diff --git a/testsuites/kernel/src/iCunit.c b/testsuites/kernel/src/iCunit.c index 9b8b709a..1515ba2d 100644 --- a/testsuites/kernel/src/iCunit.c +++ b/testsuites/kernel/src/iCunit.c @@ -50,7 +50,7 @@ extern "C" { #define ARRAY_SIZE 2 -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP LITE_OS_SEC_BSS SPIN_LOCK_INIT(g_testSuitSpin); #endif @@ -125,13 +125,13 @@ u_long ICunitRand(void) void ICunitSaveErr(iiUINT32 line, iiUINT32 retCode) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP UINT32 intSave; TESTSUIT_LOCK(intSave); #endif g_iCunitErrCode = ((g_iCunitErrCode == 0) && (g_iCunitErrLineNo == 0)) ? (iiUINT32)retCode : g_iCunitErrCode; g_iCunitErrLineNo = (g_iCunitErrLineNo == 0) ? line : g_iCunitErrLineNo; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP TESTSUIT_UNLOCK(intSave); #endif } @@ -184,7 +184,7 @@ iUINT32 ICunitAddCase(const iCHAR *caseName, CASE_FUNCTION caseFunc, iUINT16 tes UINT32 g_cunitInitFlag = 0; iUINT32 ICunitInit(void) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP if (LOS_AtomicCmpXchg32bits(&g_cunitInitFlag, 1, 0)) { PRINTK("other core already done iCunitInit\n"); return (iUINT32)ICUNIT_SUCCESS; diff --git a/testsuites/kernel/src/osTest.c b/testsuites/kernel/src/osTest.c index a9762cec..5317ea77 100644 --- a/testsuites/kernel/src/osTest.c +++ b/testsuites/kernel/src/osTest.c @@ -259,7 +259,7 @@ void TestHwiTrigger(unsigned int irq) VOID TestExtraTaskDelay(UINT32 tick) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP // trigger task schedule may occor on another core // needs adding delay and checking status later LOS_TaskDelay(tick); @@ -327,7 +327,7 @@ VOID TestTestHwiDelete(unsigned int irq, VOID *devId) VOID TestDumpCpuid(VOID) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP PRINT_DEBUG("%d,cpuid = %d\n", LOS_CurTaskIDGet(), ArchCurrCpuid()); #endif return; @@ -530,7 +530,7 @@ void TestSystemInit(void) testProcess = OS_PCB_FROM_PID(pid); g_testTskHandle = testProcess->threadGroupID; -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP ((LosTaskCB *)OS_TCB_FROM_TID(g_testTskHandle))->cpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); #endif } diff --git a/testsuites/unittest/common/include/osTest.h b/testsuites/unittest/common/include/osTest.h index 5fa25e69..0623b40a 100644 --- a/testsuites/unittest/common/include/osTest.h +++ b/testsuites/unittest/common/include/osTest.h @@ -84,7 +84,7 @@ stTestTask.uwResved = LOS_TASK_STATUS_DETACHED; \ } while (0) -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP #define TEST_TASK_PARAM_INIT_AFFI(stTestTask, task_name, entry, prio, affi) \ TEST_TASK_PARAM_INIT(stTestTask, task_name, entry, prio) \ stTestTask.usCpuAffiMask = affi; diff --git a/testsuites/unittest/common/osTest.cpp b/testsuites/unittest/common/osTest.cpp index 6bcb34de..a771a147 100644 --- a/testsuites/unittest/common/osTest.cpp +++ b/testsuites/unittest/common/osTest.cpp @@ -162,7 +162,7 @@ UINT32 LosTaskDelay(UINT32 tick) VOID TestExtraTaskDelay(UINT32 uwTick) { -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP // trigger task schedule may occor on another core // needs adding delay and checking status later LosTaskDelay(uwTick); diff --git a/testsuites/unittest/fs/proc/It_vfs_proc.cpp b/testsuites/unittest/fs/proc/It_vfs_proc.cpp index df08e332..a4d42574 100644 --- a/testsuites/unittest/fs/proc/It_vfs_proc.cpp +++ b/testsuites/unittest/fs/proc/It_vfs_proc.cpp @@ -48,7 +48,7 @@ VOID ItSuiteVfsProc(VOID) #endif #if defined(LOSCFG_USER_TEST_PRESSURE) -#if(LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP #endif #endif } diff --git a/testsuites/unittest/posix/mqueue/full/It_posix_queue_124.cpp b/testsuites/unittest/posix/mqueue/full/It_posix_queue_124.cpp index a1e96331..774c8dd1 100644 --- a/testsuites/unittest/posix/mqueue/full/It_posix_queue_124.cpp +++ b/testsuites/unittest/posix/mqueue/full/It_posix_queue_124.cpp @@ -106,7 +106,7 @@ static UINT32 Testcase(VOID) uret = LOS_HwiCreate(HWI_NUM_TEST1, 1, 0, (HWI_PROC_FUNC)HwiF02, 0); ICUNIT_GOTO_EQUAL(uret, MQUEUE_NO_ERROR, uret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST1, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif @@ -117,7 +117,7 @@ static UINT32 Testcase(VOID) uret = LOS_HwiCreate(HWI_NUM_TEST, 1, 0, (HWI_PROC_FUNC)HwiF01, 0); ICUNIT_GOTO_EQUAL(uret, MQUEUE_NO_ERROR, uret, EXIT1); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP HalIrqSetAffinity(HWI_NUM_TEST, CPUID_TO_AFFI_MASK(ArchCurrCpuid())); #endif diff --git a/testsuites/unittest/posix/mqueue/posix_mqueue_test.cpp b/testsuites/unittest/posix/mqueue/posix_mqueue_test.cpp index 49475701..b49ce837 100644 --- a/testsuites/unittest/posix/mqueue/posix_mqueue_test.cpp +++ b/testsuites/unittest/posix/mqueue/posix_mqueue_test.cpp @@ -257,7 +257,7 @@ HWTEST_F(PosixMqueueTest, ItPosixQueue016, TestSize.Level0) ItPosixQueue016(); } -#if (LOSCFG_KERNEL_SMP != YES) +#ifndef LOSCFG_KERNEL_SMP /** * @tc.name: IT_POSIX_QUEUE_113 * @tc.desc: function for PosixMqueueTest diff --git a/testsuites/unittest/posix/pthread/full/It_posix_pthread_066.cpp b/testsuites/unittest/posix/pthread/full/It_posix_pthread_066.cpp index 260017e7..193faba3 100644 --- a/testsuites/unittest/posix/pthread/full/It_posix_pthread_066.cpp +++ b/testsuites/unittest/posix/pthread/full/It_posix_pthread_066.cpp @@ -71,7 +71,7 @@ static VOID *pthread_f01(void *argument) ret = pthread_create(&g_newTh2, &attr, pthread_f02, NULL); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); -#if (LOSCFG_KERNEL_SMP == YES) +#ifdef LOSCFG_KERNEL_SMP while (g_testCount < 2) { TestBusyTaskDelay(1); } diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index cc97cdfe..9c3923bd 100644 --- a/tools/build/mk/los_config.mk +++ b/tools/build/mk/los_config.mk @@ -185,12 +185,6 @@ ifeq ($(LOSCFG_KERNEL_CPUP), y) LITEOS_CPUP_INCLUDE := -I $(LITEOSTOPDIR)/kernel/extended/cpup endif -ifeq ($(LOSCFG_KERNEL_SCHED_STATISTICS), y) - LITEOS_CMACRO += -DLOSCFG_KERNEL_SCHED_STATISTICS=1 -else - LITEOS_CMACRO += -DLOSCFG_KERNEL_SCHED_STATISTICS=0 -endif - ifeq ($(LOSCFG_KERNEL_DYNLOAD), y) LITEOS_BASELIB += -ldynload LIB_SUBDIRS += kernel/extended/dynload From e57dc7762bddefe772a04a1d0985a34242f3505b Mon Sep 17 00:00:00 2001 From: vcbchang Date: Tue, 15 Jun 2021 09:10:25 +0800 Subject: [PATCH 07/43] =?UTF-8?q?test:=20=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=B3=BB=E7=BB=9F=E4=B8=ADjffs=E7=9A=84?= =?UTF-8?q?=E5=85=A8=E9=87=8F=E7=94=A8=E4=BE=8B=E5=92=8C=E5=8E=8B=E6=B5=8B?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E4=B8=AD=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【背景】当前的fs中的jffs用例存在运行不通过的问题，现将其一一修复。 【修改方案】 1. 默认storage文件夹没有文件，如果存在，删除后测试 2. BUG中存在判断不通过的情况，可能是移植过程中出现的变量判断错误，修改变量名正确通过 3. 移植过程中没有考虑现在falsh的大小，有时会出现写入量过多而容量不够的情况，则通过减少写入量来解决问题。 4. 为了尽量减少修改的内容，这里主要以更改全局宏大小或者在代码中修改变量的初始值。 【影响】 主要是jffs用例的写入flash的大小发生变化，其余没有影响。 Signed-off-by: vcbchang Change-Id: I878fe3ad855e0e430bf7f36e066120893f756828 --- testsuites/unittest/config.gni | 2 +- testsuites/unittest/fs/BUILD.gn | 8 +++--- testsuites/unittest/fs/jffs/It_vfs_jffs.h | 2 +- .../unittest/fs/jffs/full/It_jffs_011.cpp | 2 +- .../unittest/fs/jffs/full/It_jffs_012.cpp | 2 +- .../unittest/fs/jffs/full/It_vfs_jffs_045.cpp | 2 +- .../unittest/fs/jffs/full/It_vfs_jffs_077.cpp | 1 + .../unittest/fs/jffs/full/It_vfs_jffs_078.cpp | 2 +- .../unittest/fs/jffs/full/It_vfs_jffs_215.cpp | 2 +- .../unittest/fs/jffs/full/It_vfs_jffs_427.cpp | 6 ++--- .../pressure/It_fs_jffs_performance_009.cpp | 2 ++ .../jffs/pressure/It_fs_jffs_pressure_023.cpp | 9 ++++--- .../jffs/pressure/It_fs_jffs_pressure_026.cpp | 5 ++-- .../jffs/pressure/It_fs_jffs_pressure_033.cpp | 2 +- .../jffs/pressure/It_fs_jffs_pressure_047.cpp | 4 +-- .../jffs/pressure/It_fs_jffs_pressure_052.cpp | 3 ++- .../jffs/pressure/It_fs_jffs_pressure_310.cpp | 4 +-- .../jffs/pressure/It_fs_jffs_pressure_311.cpp | 5 ++-- .../pressure/It_vfs_jffs_multipthread_002.cpp | 27 ++++++++++--------- .../pressure/It_vfs_jffs_multipthread_014.cpp | 2 +- .../pressure/It_vfs_jffs_multipthread_015.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_016.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_017.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_018.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_019.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_020.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_021.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_022.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_023.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_024.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_025.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_036.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_038.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_039.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_040.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_041.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_042.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_043.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_044.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_045.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_046.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_047.cpp | 6 ++--- .../pressure/It_vfs_jffs_multipthread_052.cpp | 2 -- .../pressure/It_vfs_jffs_multipthread_053.cpp | 1 - .../pressure/It_vfs_jffs_multipthread_054.cpp | 1 - .../pressure/It_vfs_jffs_multipthread_055.cpp | 1 - .../pressure/It_vfs_jffs_multipthread_056.cpp | 1 - .../pressure/It_vfs_jffs_multipthread_057.cpp | 1 - .../pressure/It_vfs_jffs_multipthread_058.cpp | 1 - .../pressure/It_vfs_jffs_multipthread_059.cpp | 1 - .../pressure/It_vfs_jffs_multipthread_060.cpp | 1 - .../pressure/It_vfs_jffs_multipthread_061.cpp | 1 - .../pressure/It_vfs_jffs_multipthread_062.cpp | 1 - .../pressure/It_vfs_jffs_multipthread_063.cpp | 1 - testsuites/unittest/fs/jffs/vfs_jffs_test.cpp | 27 ++++++++----------- 55 files changed, 128 insertions(+), 136 deletions(-) diff --git a/testsuites/unittest/config.gni b/testsuites/unittest/config.gni index d7c6da1c..0520a702 100644 --- a/testsuites/unittest/config.gni +++ b/testsuites/unittest/config.gni @@ -73,4 +73,4 @@ LOSCFG_USER_TEST_SIGNAL = true LOSCFG_USER_TEST_SYS = true LOSCFG_USER_TEST_TIME_CLOCK = true LOSCFG_USER_TEST_TIME_TIMER = true -LOSCFG_USER_TEST_UTIL = true \ No newline at end of file +LOSCFG_USER_TEST_UTIL = true diff --git a/testsuites/unittest/fs/BUILD.gn b/testsuites/unittest/fs/BUILD.gn index 7fc066b3..bc1b6d76 100644 --- a/testsuites/unittest/fs/BUILD.gn +++ b/testsuites/unittest/fs/BUILD.gn @@ -55,7 +55,7 @@ sources_smoke = [ "jffs/smoke/It_vfs_jffs_035.cpp", "jffs/smoke/It_vfs_jffs_094.cpp", "jffs/smoke/It_vfs_jffs_095.cpp", - #"jffs/smoke/It_vfs_jffs_103.cpp", + "jffs/smoke/It_vfs_jffs_103.cpp", "jffs/smoke/It_vfs_jffs_535.cpp", "jffs/smoke/It_vfs_jffs_Dac_001.cpp", ] @@ -128,7 +128,7 @@ sources_pressure = [ "jffs/pressure/It_fs_jffs_pressure_053.cpp", "jffs/pressure/It_fs_jffs_pressure_301.cpp", "jffs/pressure/It_fs_jffs_pressure_302.cpp", - #"jffs/pressure/It_fs_jffs_pressure_303.cpp", + "jffs/pressure/It_fs_jffs_pressure_303.cpp", "jffs/pressure/It_fs_jffs_pressure_304.cpp", "jffs/pressure/It_fs_jffs_pressure_305.cpp", "jffs/pressure/It_fs_jffs_pressure_306.cpp", @@ -289,7 +289,7 @@ sources_full = [ "jffs/full/It_vfs_jffs_048.cpp", "jffs/full/It_vfs_jffs_049.cpp", "jffs/full/It_vfs_jffs_050.cpp", - #"jffs/full/It_vfs_jffs_051.cpp", + "jffs/full/It_vfs_jffs_051.cpp", "jffs/full/It_vfs_jffs_053.cpp", "jffs/full/It_vfs_jffs_055.cpp", "jffs/full/It_vfs_jffs_056.cpp", @@ -837,4 +837,4 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_HIGH) { configs = [ "..:public_config_for_pressure" ] deps = [ "//third_party/bounds_checking_function:libsec_shared" ] } -} \ No newline at end of file +} diff --git a/testsuites/unittest/fs/jffs/It_vfs_jffs.h b/testsuites/unittest/fs/jffs/It_vfs_jffs.h index f1fd0b30..a64eddb8 100644 --- a/testsuites/unittest/fs/jffs/It_vfs_jffs.h +++ b/testsuites/unittest/fs/jffs/It_vfs_jffs.h @@ -137,7 +137,7 @@ constexpr int JFFS_MAX_DEF_BUF_NUM = 21; constexpr int JFFS_FILE_LIMITTED_NUM = 200; constexpr int JFFS_FILE_SIZE_TEST = 100 * 1024 * 1024; // *1024 -constexpr int JFFS_PERFORMANCE_W_R_SIZE = 10 * 1024 * 1024; +constexpr int JFFS_PERFORMANCE_W_R_SIZE = 5 * 1024 * 1024; constexpr int JFFS_FILE_PER_WRITE_SIZE = 5 * 1024 * 1024; constexpr int JFFS_PRESSURE_W_R_SIZE1 = 1 * 1024 * 1024; constexpr int JFFS_PRESSURE_W_R_SIZE2 = 5 * 1024 * 1024; diff --git a/testsuites/unittest/fs/jffs/full/It_jffs_011.cpp b/testsuites/unittest/fs/jffs/full/It_jffs_011.cpp index 451e274a..df31ea3f 100644 --- a/testsuites/unittest/fs/jffs/full/It_jffs_011.cpp +++ b/testsuites/unittest/fs/jffs/full/It_jffs_011.cpp @@ -40,7 +40,7 @@ static UINT32 Testcase(VOID) CHAR *pfd = NULL; ret = chdir(pathname1); - ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT); pfd = mktemp(tempFile); ICUNIT_GOTO_NOT_EQUAL(pfd, NULL, pfd, EXIT1); diff --git a/testsuites/unittest/fs/jffs/full/It_jffs_012.cpp b/testsuites/unittest/fs/jffs/full/It_jffs_012.cpp index 29ea6a29..931adfd6 100644 --- a/testsuites/unittest/fs/jffs/full/It_jffs_012.cpp +++ b/testsuites/unittest/fs/jffs/full/It_jffs_012.cpp @@ -40,7 +40,7 @@ static UINT32 Testcase(VOID) CHAR *pfd = NULL; ret = chdir(pathname1); - ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT); pfd = mkdtemp(tempFile); ICUNIT_GOTO_NOT_EQUAL(pfd, NULL, pfd, EXIT1); diff --git a/testsuites/unittest/fs/jffs/full/It_vfs_jffs_045.cpp b/testsuites/unittest/fs/jffs/full/It_vfs_jffs_045.cpp index 650663b7..f99e7df8 100644 --- a/testsuites/unittest/fs/jffs/full/It_vfs_jffs_045.cpp +++ b/testsuites/unittest/fs/jffs/full/It_vfs_jffs_045.cpp @@ -55,7 +55,7 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_NOT_EQUAL(fd1, -1, fd1, EXIT3); len = read(fd1, readbuf, JFFS_STANDARD_NAME_LENGTH); - ICUNIT_GOTO_EQUAL(len, 0, len, EXIT3); + ICUNIT_GOTO_EQUAL(len, 10, len, EXIT3); // 10 means read size len = write(fd1, "abcde", 6); // 6 means write len ICUNIT_GOTO_EQUAL(len, 6, len, EXIT3); diff --git a/testsuites/unittest/fs/jffs/full/It_vfs_jffs_077.cpp b/testsuites/unittest/fs/jffs/full/It_vfs_jffs_077.cpp index 127ad1b7..0665026f 100644 --- a/testsuites/unittest/fs/jffs/full/It_vfs_jffs_077.cpp +++ b/testsuites/unittest/fs/jffs/full/It_vfs_jffs_077.cpp @@ -47,6 +47,7 @@ static UINT32 Testcase(VOID) ret = mkdir(pathname1, HIGHEST_AUTHORITY); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT1); + strcat_s(pathname2, sizeof(pathname2), "/test"); strcat_s(pathname2, sizeof(pathname2), "/test"); ret = mkdir(pathname2, HIGHEST_AUTHORITY); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT2); diff --git a/testsuites/unittest/fs/jffs/full/It_vfs_jffs_078.cpp b/testsuites/unittest/fs/jffs/full/It_vfs_jffs_078.cpp index 7399288b..c9d5c6d7 100644 --- a/testsuites/unittest/fs/jffs/full/It_vfs_jffs_078.cpp +++ b/testsuites/unittest/fs/jffs/full/It_vfs_jffs_078.cpp @@ -48,7 +48,7 @@ static UINT32 Testcase(VOID) fd1 = open(pathname1, O_NONBLOCK | O_CREAT | O_RDWR | O_EXCL, HIGHEST_AUTHORITY); ICUNIT_GOTO_NOT_EQUAL(fd1, -1, fd1, EXIT1); - strcat_s(pathname2, sizeof(pathname2), "/test"); + strcat_s(pathname2, sizeof(pathname2), "/TEst"); fd2 = open(pathname2, O_NONBLOCK | O_CREAT | O_RDWR | O_EXCL, HIGHEST_AUTHORITY); ICUNIT_GOTO_NOT_EQUAL(fd2, -1, fd2, EXIT2); diff --git a/testsuites/unittest/fs/jffs/full/It_vfs_jffs_215.cpp b/testsuites/unittest/fs/jffs/full/It_vfs_jffs_215.cpp index 70ad022a..6927fc30 100644 --- a/testsuites/unittest/fs/jffs/full/It_vfs_jffs_215.cpp +++ b/testsuites/unittest/fs/jffs/full/It_vfs_jffs_215.cpp @@ -48,7 +48,7 @@ static UINT32 TestCase(VOID) ICUNIT_GOTO_NOT_EQUAL(pret, NULL, pret, EXIT); ICUNIT_GOTO_STRING_EQUAL(buf, JFFS_PATH_NAME0, buf, EXIT); - pret = getcwd(buf, JFFS_STANDARD_NAME_LENGTH); + pret = getcwd(buf, 5); // 5 is less than path length ICUNIT_GOTO_EQUAL(pret, NULL, pret, EXIT); ICUNIT_GOTO_EQUAL(errno, ERANGE, errno, EXIT); diff --git a/testsuites/unittest/fs/jffs/full/It_vfs_jffs_427.cpp b/testsuites/unittest/fs/jffs/full/It_vfs_jffs_427.cpp index a36d242f..4f3b227c 100644 --- a/testsuites/unittest/fs/jffs/full/It_vfs_jffs_427.cpp +++ b/testsuites/unittest/fs/jffs/full/It_vfs_jffs_427.cpp @@ -105,12 +105,12 @@ static UINT32 Testcase(VOID) memset(bufW2, 0, JFFS_SHORT_ARRAY_LENGTH + 1); off = lseek(fd3, 0, SEEK_SET); - ICUNIT_GOTO_EQUAL(ret, JFFS_NO_ERROR, ret, EXIT6); + ICUNIT_GOTO_EQUAL(off, JFFS_NO_ERROR, off, EXIT6); g_jffsIov[0].iov_base = bufW1; - g_jffsIov[0].iov_len = 0xffff; + g_jffsIov[0].iov_len = JFFS_SHORT_ARRAY_LENGTH; g_jffsIov[1].iov_base = bufW2; - g_jffsIov[1].iov_len = 0xffff; + g_jffsIov[1].iov_len = JFFS_SHORT_ARRAY_LENGTH; lenV = readv(fd3, g_jffsIov, 2); // reads 2 buffers from the fd ICUNIT_GOTO_EQUAL(lenV, 20, lenV, EXIT6); // compare ret lenV to target 20 lenV diff --git a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_performance_009.cpp b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_performance_009.cpp index ac22734f..3d744ad5 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_performance_009.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_performance_009.cpp @@ -75,6 +75,8 @@ static UINT32 TestCase(VOID) len = write(fd[index], bufW, strlen(bufW)); if (len <= 0) { flag = 1; + ret = close(fd[index]); + ICUNIT_GOTO_EQUAL(ret, JFFS_NO_ERROR, ret, EXIT2); break; } diff --git a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_023.cpp b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_023.cpp index 2c827eeb..842ed161 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_023.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_023.cpp @@ -38,6 +38,7 @@ static UINT32 TestCase(VOID) INT32 i = 0; INT32 j = 0; INT32 k = JFFS_SHORT_ARRAY_LENGTH; + INT32 jffsPressureCycles = 4; // write size 4 * 1024 * 1024 signed long long offset; CHAR filebuf[FILE_BUF_SIZE] = @@ -101,11 +102,11 @@ static UINT32 TestCase(VOID) fd = open(pathname1, O_NONBLOCK | O_CREAT | O_RDWR | O_EXCL, HIGHEST_AUTHORITY); ICUNIT_GOTO_NOT_EQUAL(fd, -1, fd, EXIT2); - for (j = 0; j < JFFS_PRESSURE_CYCLES; j++) { + for (j = 0; j < jffsPressureCycles; j++) { off = lseek(fd, 0, SEEK_SET); ICUNIT_GOTO_EQUAL(off, 0, off, EXIT2); - for (i = 0; i < JFFS_PRESSURE_CYCLES; i++) { + for (i = 0; i < jffsPressureCycles; i++) { ret = write(fd, bufW, strlen(bufW)); printf("cnt=%d %d\n", i, j); ICUNIT_GOTO_EQUAL(ret, BYTES_PER_MBYTE, ret, EXIT2); @@ -115,8 +116,8 @@ static UINT32 TestCase(VOID) } ret = stat(pathname1, &statfile); ICUNIT_GOTO_EQUAL(ret, JFFS_NO_ERROR, ret, EXIT2); - // file size: 10 * 1024 * 1024 - ICUNIT_GOTO_EQUAL(statfile.st_size, 10 * 1024 * 1024, statfile.st_size, EXIT2); + // file size: 4 * 1024 * 1024 + ICUNIT_GOTO_EQUAL(statfile.st_size, 4 * 1024 * 1024, statfile.st_size, EXIT2); } ret = close(fd); diff --git a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_026.cpp b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_026.cpp index 8b4fb549..c0075f20 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_026.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_026.cpp @@ -44,7 +44,7 @@ static UINT32 TestCase(VOID) CHAR readbuf[JFFS_STANDARD_NAME_LENGTH] = "liteos"; CHAR bufname[JFFS_STANDARD_NAME_LENGTH] = "123"; CHAR pathname1[JFFS_STANDARD_NAME_LENGTH] = { JFFS_PATH_NAME0 }; - CHAR pathname2[JFFS_STANDARD_NAME_LENGTH] = { JFFS_PATH_NAME0 }; + CHAR pathname2[JFFS_NAME_LIMITTED_SIZE] = { JFFS_PATH_NAME0 }; CHAR pathname3[JFFS_SHORT_ARRAY_LENGTH][JFFS_NAME_LIMITTED_SIZE] = {0}; CHAR pathname4[JFFS_SHORT_ARRAY_LENGTH][JFFS_NAME_LIMITTED_SIZE] = {0}; CHAR pathname5[JFFS_SHORT_ARRAY_LENGTH][JFFS_NAME_LIMITTED_SIZE] = {0}; @@ -67,7 +67,8 @@ static UINT32 TestCase(VOID) for (i = 0; i < JFFS_SHORT_ARRAY_LENGTH; i++) { snprintf_s(bufname, JFFS_STANDARD_NAME_LENGTH, JFFS_STANDARD_NAME_LENGTH - 1, "/test%d", i); - strcat_s(pathname2, JFFS_STANDARD_NAME_LENGTH, bufname); + strcat_s(pathname2, JFFS_NAME_LIMITTED_SIZE, bufname); + strcpy_s(pathname3[i], JFFS_NAME_LIMITTED_SIZE, pathname2); ret = mkdir(pathname3[i], HIGHEST_AUTHORITY); diff --git a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_033.cpp b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_033.cpp index e6e486aa..04498908 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_033.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_033.cpp @@ -170,7 +170,7 @@ static VOID *PthreadF02(void *arg) CHAR *bufR = NULL; CHAR *bufW = NULL; off_t off; - INT32 bufRSize = 6075; // 6075: read length + INT32 bufRSize = 6074; // 6074: read length ret = pthread_mutex_lock(&g_jffs2GlobalLock1); printf("[%d] Thread2 Start frist get lock\n", __LINE__); diff --git a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_047.cpp b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_047.cpp index 10c0ebb0..2e207ae3 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_047.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_047.cpp @@ -34,7 +34,7 @@ static VOID *PthreadF01(void *arg) { INT32 ret, len; - UINT32 writeSize = JFFS_PRESSURE_W_R_SIZE2; + UINT32 writeSize = JFFS_PRESSURE_W_R_SIZE1; CHAR pathname1[JFFS_STANDARD_NAME_LENGTH] = { JFFS_PATH_NAME0 }; CHAR writebuf[JFFS_STANDARD_NAME_LENGTH] = "0123456789"; CHAR *writeBuf = NULL; @@ -66,7 +66,7 @@ static VOID *PthreadF01(void *arg) printf("[%d]lseek64 off64:%lld Fd:%d \n", __LINE__, off64, g_jffsFd); ICUNIT_GOTO_EQUAL(statbuf1.st_size, off64, statbuf1.st_size, EXIT1); - len = write(g_jffsFd, writebuf, strlen(writebuf)); + len = write(g_jffsFd, writeBuf, strlen(writeBuf)); printf("[%d]lseek64 len:%d Fd:%d, errno:%d\n", __LINE__, len, g_jffsFd, errno); ICUNIT_GOTO_EQUAL(len, JFFS_IS_ERROR, len, EXIT1); ICUNIT_GOTO_EQUAL(errno, ENOSPC, errno, EXIT1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_052.cpp b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_052.cpp index 06ea0f94..de6b6c9a 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_052.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_052.cpp @@ -98,8 +98,9 @@ static VOID *PthreadF01(void *arg) testSpeed); return NULL; -EXIT: +EXIT1: close(g_jffsFd); +EXIT: return NULL; } diff --git a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_310.cpp b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_310.cpp index 3549107e..bec8b3f2 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_310.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_310.cpp @@ -33,7 +33,8 @@ static UINT32 TestCase(VOID) { - INT32 ret, i; + INT32 ret; + INT32 i = 0; INT32 scandirCount = 0; CHAR pathname1[JFFS_STANDARD_NAME_LENGTH] = { JFFS_PATH_NAME0 }; CHAR pathname2[JFFS_NAME_LIMITTED_SIZE] = ""; @@ -52,7 +53,6 @@ static UINT32 TestCase(VOID) memset_s(pathname2, JFFS_NAME_LIMITTED_SIZE, 0, JFFS_NAME_LIMITTED_SIZE); memset_s(pathname3, JFFS_NAME_LIMITTED_SIZE, 0, JFFS_NAME_LIMITTED_SIZE); strcat_s(pathname6, JFFS_NAME_LIMITTED_SIZE, "/"); - // PATH_MAX test. The dirname has occupied 14 bytes. while (i < 241) { // loop times: 241 i++; diff --git a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_311.cpp b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_311.cpp index 5b36e4b7..40fa396c 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_311.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_fs_jffs_pressure_311.cpp @@ -33,7 +33,8 @@ static UINT32 TestCase(VOID) { - INT32 ret, i; + INT32 ret; + INT32 i = 0; INT32 fd = -1; INT32 scandirCount = 0; CHAR pathname1[JFFS_STANDARD_NAME_LENGTH] = { JFFS_MAIN_DIR0 }; @@ -82,7 +83,7 @@ static UINT32 TestCase(VOID) ICUNIT_GOTO_EQUAL(strlen(pathname3), 256, strlen(pathname3), EXIT); // pathname length: 256 fd = open(pathname3, O_NONBLOCK | O_CREAT | O_RDWR | O_EXCL, HIGHEST_AUTHORITY); ICUNIT_GOTO_EQUAL(fd, -1, fd, EXIT1); - ICUNIT_GOTO_EQUAL(errno, ENAMETOOLONG, errno, EXIT2); + ICUNIT_GOTO_EQUAL(errno, EINVAL, errno, EXIT2); ret = chdir("/"); ICUNIT_GOTO_EQUAL(ret, JFFS_NO_ERROR, ret, EXIT2); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_002.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_002.cpp index 98175ae3..f09d48cd 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_002.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_002.cpp @@ -40,6 +40,7 @@ static VOID *PthreadF01(void *arg) INT32 i = 0; INT32 j = 0; INT32 k = JFFS_SHORT_ARRAY_LENGTH; + INT32 jffsMaxCycles = 1; // 1 means 1 * 1024 * 1024 byte size CHAR filebuf[FILE_BUF_SIZE] = "abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123" "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" @@ -87,7 +88,7 @@ static VOID *PthreadF01(void *arg) strcat_s(pathname2, JFFS_STANDARD_NAME_LENGTH, "/004.txt"); // /storage/test/004.txt fd1 = open(pathname2, O_NONBLOCK | O_CREAT | O_RDWR | O_EXCL, HIGHEST_AUTHORITY); - ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT2); + ICUNIT_GOTO_NOT_EQUAL(fd1, JFFS_IS_ERROR, fd1, EXIT2); len = write(fd1, writebuf, strlen(writebuf)); ICUNIT_GOTO_EQUAL(len, strlen(writebuf), len, EXIT2); @@ -112,7 +113,7 @@ static VOID *PthreadF01(void *arg) off = lseek(fd, 0, SEEK_SET); ICUNIT_GOTO_EQUAL(off, JFFS_NO_ERROR, off, EXIT2); - for (i = 0; i < JFFS_MAX_CYCLES; i++) { + for (i = 0; i < jffsMaxCycles; i++) { ret = write(fd, bufW, strlen(bufW)); ICUNIT_GOTO_EQUAL(ret, BYTES_PER_MBYTE, ret, EXIT2); @@ -131,8 +132,8 @@ static VOID *PthreadF01(void *arg) ret = stat(pathname1, &statfile); ICUNIT_GOTO_EQUAL(ret, JFFS_NO_ERROR, ret, EXIT2); - // 5 * 1024 * 1024: filesize - ICUNIT_GOTO_EQUAL(statfile.st_size, 5 * 1024 * 1024, statfile.st_size, EXIT2); + // 1 * 1024 * 1024: filesize + ICUNIT_GOTO_EQUAL(statfile.st_size, 1 * 1024 * 1024, statfile.st_size, EXIT2); ret = close(fd); ICUNIT_GOTO_EQUAL(ret, JFFS_NO_ERROR, ret, EXIT2); @@ -167,6 +168,7 @@ static VOID *PthreadF02(void *arg) INT32 i = 0; INT32 j = 0; INT32 k = JFFS_SHORT_ARRAY_LENGTH; + INT32 jffsMaxCycles = 1; // 1 means 1 * 1024 * 1024 byte size CHAR filebuf[FILE_BUF_SIZE] = "abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123" "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" @@ -213,7 +215,7 @@ static VOID *PthreadF02(void *arg) strcat_s(pathname2, JFFS_STANDARD_NAME_LENGTH, "/005.txt"); fd1 = open(pathname2, O_NONBLOCK | O_CREAT | O_RDWR | O_EXCL, HIGHEST_AUTHORITY); - ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT2); + ICUNIT_GOTO_NOT_EQUAL(fd1, JFFS_IS_ERROR, fd1, EXIT2); len = write(fd1, writebuf, strlen(writebuf)); ICUNIT_GOTO_EQUAL(len, strlen(writebuf), len, EXIT2); @@ -238,7 +240,7 @@ static VOID *PthreadF02(void *arg) off = lseek(fd, 0, SEEK_SET); ICUNIT_GOTO_EQUAL(off, JFFS_NO_ERROR, off, EXIT2); - for (i = 0; i < JFFS_MAX_CYCLES; i++) { + for (i = 0; i < jffsMaxCycles; i++) { ret = write(fd, bufW, strlen(bufW)); ICUNIT_GOTO_EQUAL(ret, BYTES_PER_MBYTE, ret, EXIT2); @@ -257,8 +259,8 @@ static VOID *PthreadF02(void *arg) ret = stat(pathname1, &statfile); ICUNIT_GOTO_EQUAL(ret, JFFS_NO_ERROR, ret, EXIT2); - // 5 * 1024 * 1024: filesize - ICUNIT_GOTO_EQUAL(statfile.st_size, 5 * 1024 * 1024, statfile.st_size, EXIT2); + // 1 * 1024 * 1024: filesize + ICUNIT_GOTO_EQUAL(statfile.st_size, 1 * 1024 * 1024, statfile.st_size, EXIT2); ret = close(fd); ICUNIT_GOTO_EQUAL(ret, JFFS_NO_ERROR, ret, EXIT2); @@ -293,6 +295,7 @@ static VOID *PthreadF03(void *arg) INT32 i = 0; INT32 j = 0; INT32 k = JFFS_SHORT_ARRAY_LENGTH; + INT32 jffsMaxCycles = 1; // 1 means 1 * 1024 * 1024 byte size CHAR filebuf[FILE_BUF_SIZE] = "abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123" "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" @@ -339,7 +342,7 @@ static VOID *PthreadF03(void *arg) strcat_s(pathname2, JFFS_STANDARD_NAME_LENGTH, "/006.txt"); fd1 = open(pathname2, O_NONBLOCK | O_CREAT | O_RDWR | O_EXCL, HIGHEST_AUTHORITY); - ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT2); + ICUNIT_GOTO_NOT_EQUAL(fd1, JFFS_IS_ERROR, fd1, EXIT2); len = write(fd1, writebuf, strlen(writebuf)); ICUNIT_GOTO_EQUAL(len, strlen(writebuf), len, EXIT2); @@ -364,7 +367,7 @@ static VOID *PthreadF03(void *arg) off = lseek(fd, 0, SEEK_SET); ICUNIT_GOTO_EQUAL(off, JFFS_NO_ERROR, off, EXIT2); - for (i = 0; i < JFFS_MAX_CYCLES; i++) { + for (i = 0; i < jffsMaxCycles; i++) { ret = write(fd, bufW, strlen(bufW)); ICUNIT_GOTO_EQUAL(ret, BYTES_PER_MBYTE, ret, EXIT2); @@ -383,8 +386,8 @@ static VOID *PthreadF03(void *arg) ret = stat(pathname1, &statfile); ICUNIT_GOTO_EQUAL(ret, JFFS_NO_ERROR, ret, EXIT2); - // 5 * 1024 * 1024: filesize - ICUNIT_GOTO_EQUAL(statfile.st_size, 5 * 1024 * 1024, statfile.st_size, EXIT2); + // 1 * 1024 * 1024: filesize + ICUNIT_GOTO_EQUAL(statfile.st_size, 1 * 1024 * 1024, statfile.st_size, EXIT2); ret = close(fd); ICUNIT_GOTO_EQUAL(ret, JFFS_NO_ERROR, ret, EXIT2); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_014.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_014.cpp index 6173228a..da8bed12 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_014.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_014.cpp @@ -30,7 +30,7 @@ */ #include "It_vfs_jffs.h" -static INT32 g_testNum = 20; +static INT32 g_testNum = 2; static VOID *PthreadF01(void *arg) { diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_015.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_015.cpp index 0f963dfc..2c1b72f4 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_015.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_015.cpp @@ -48,7 +48,7 @@ static VOID *PthreadF01(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB + INT32 bufWLen = 4 * BYTES_PER_KBYTE; // 4 KB flag = 0; bufW = (CHAR *)malloc(BYTES_PER_MBYTE + 1); @@ -224,7 +224,7 @@ static VOID *PthreadF02(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB + INT32 bufWLen = 4 * BYTES_PER_KBYTE; // 4 KB flag = 0; bufW = (CHAR *)malloc(BYTES_PER_MBYTE + 1); @@ -400,7 +400,7 @@ static VOID *PthreadF03(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB + INT32 bufWLen = 4 * BYTES_PER_KBYTE; // 4 KB flag = 0; bufW = (CHAR *)malloc(BYTES_PER_MBYTE + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_016.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_016.cpp index 33752c4e..fde6104e 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_016.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_016.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 16 * BYTES_PER_KBYTE; // 16 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -219,7 +219,7 @@ static VOID *PthreadF02(void *arg) DIR *dirbuf[100] = {NULL}; struct stat buf1 = { 0 }; struct stat buf2 = { 0 }; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 16 * BYTES_PER_KBYTE; // 16 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -390,7 +390,7 @@ static VOID *PthreadF03(void *arg) DIR *dirbuf[100] = {NULL}; struct stat buf1 = { 0 }; struct stat buf2 = { 0 }; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 16 * BYTES_PER_KBYTE; // 16 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_017.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_017.cpp index 6600a7e2..63cad8e1 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_017.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_017.cpp @@ -47,7 +47,7 @@ static VOID *PthreadF01(void *arg) DIR *dirbuf[100] = {NULL}; struct stat buf1 = { 0 }; struct stat buf2 = { 0 }; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 128 * BYTES_PER_KBYTE; // 128 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -150,7 +150,7 @@ static VOID *PthreadF02(void *arg) DIR *dirbuf[100] = {NULL}; struct stat buf1 = { 0 }; struct stat buf2 = { 0 }; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 128 * BYTES_PER_KBYTE; // 128 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -256,7 +256,7 @@ static VOID *PthreadF03(void *arg) DIR *dirbuf[100] = {NULL}; struct stat buf1 = { 0 }; struct stat buf2 = { 0 }; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 128 * BYTES_PER_KBYTE; // 128 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_018.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_018.cpp index f4047664..6c097601 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_018.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_018.cpp @@ -49,7 +49,7 @@ static VOID *PthreadF01(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -217,7 +217,7 @@ static VOID *PthreadF02(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -388,7 +388,7 @@ static VOID *PthreadF03(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_019.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_019.cpp index cdfb448f..cd24c4cf 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_019.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_019.cpp @@ -45,7 +45,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -153,7 +153,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -262,7 +262,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_020.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_020.cpp index ff23eca5..079ada44 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_020.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_020.cpp @@ -45,7 +45,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -153,7 +153,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0000"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -260,7 +260,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0000"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_021.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_021.cpp index 4a1f5323..ef2ffbb7 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_021.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_021.cpp @@ -44,7 +44,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -151,7 +151,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0000"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -257,7 +257,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0000"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_022.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_022.cpp index 6d003662..59e7a066 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_022.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_022.cpp @@ -44,7 +44,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -151,7 +151,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0000"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -260,7 +260,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_023.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_023.cpp index 77dd872e..962a5d3c 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_023.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_023.cpp @@ -44,7 +44,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -153,7 +153,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0000"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -261,7 +261,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0000"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_024.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_024.cpp index 9ad59b44..c08fb7cb 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_024.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_024.cpp @@ -45,7 +45,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -153,7 +153,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0000"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -260,7 +260,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0000"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_025.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_025.cpp index 735e5276..047d1e90 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_025.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_025.cpp @@ -44,7 +44,7 @@ static VOID *PthreadF01(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB bufW = (CHAR *)malloc(bufWLen + 1); ICUNIT_ASSERT_NOT_EQUAL_NULL(bufW, NULL, NULL); @@ -107,7 +107,7 @@ static VOID *PthreadF02(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB bufW = (CHAR *)malloc(bufWLen + 1); ICUNIT_ASSERT_NOT_EQUAL_NULL(bufW, NULL, NULL); @@ -170,7 +170,7 @@ static VOID *PthreadF03(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB bufW = (CHAR *)malloc(bufWLen + 1); ICUNIT_ASSERT_NOT_EQUAL_NULL(bufW, NULL, NULL); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_036.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_036.cpp index a23040fd..13e106f0 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_036.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_036.cpp @@ -43,7 +43,7 @@ static VOID *PthreadF01(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -147,7 +147,7 @@ static VOID *PthreadF02(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -251,7 +251,7 @@ static VOID *PthreadF03(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_038.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_038.cpp index 93ed9ff7..55fb8abe 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_038.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_038.cpp @@ -43,7 +43,7 @@ static VOID *PthreadF01(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -148,7 +148,7 @@ static VOID *PthreadF02(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -253,7 +253,7 @@ static VOID *PthreadF03(void *arg) "456789abcedfghij9876543210abcdeabcde0123456789abcedfghij9876543210abcdeabcde0123456789abcedfgh" "ij9876543210abcdeabcde0123456789abcedfghij9876543210lalalalalalalala"; CHAR *bufW = NULL; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_039.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_039.cpp index 1137fe71..9d3ce6ce 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_039.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_039.cpp @@ -44,7 +44,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -156,7 +156,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -267,7 +267,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_040.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_040.cpp index 5709c906..d1eaae8d 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_040.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_040.cpp @@ -44,7 +44,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -156,7 +156,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -267,7 +267,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_041.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_041.cpp index 95b1a84d..516ac388 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_041.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_041.cpp @@ -44,7 +44,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -156,7 +156,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -267,7 +267,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_042.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_042.cpp index 73a96e72..5786640d 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_042.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_042.cpp @@ -45,7 +45,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -270,7 +270,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_043.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_043.cpp index d8297b09..b5d8dcf8 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_043.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_043.cpp @@ -45,7 +45,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -270,7 +270,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_044.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_044.cpp index 6330ae3d..543b261a 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_044.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_044.cpp @@ -45,7 +45,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -270,7 +270,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_045.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_045.cpp index 7ab2bf69..0ebe9c36 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_045.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_045.cpp @@ -45,7 +45,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -270,7 +270,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_046.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_046.cpp index 0ee85f36..a4269f45 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_046.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_046.cpp @@ -45,7 +45,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -270,7 +270,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_047.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_047.cpp index 9cb76484..b17c81f5 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_047.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_047.cpp @@ -45,7 +45,7 @@ static VOID *PthreadF01(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -158,7 +158,7 @@ static VOID *PthreadF02(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); @@ -270,7 +270,7 @@ static VOID *PthreadF03(void *arg) CHAR writebuf[20] = "0123456789"; CHAR *bufW = NULL; struct stat statbuf; - INT32 bufWLen = BYTES_PER_MBYTE; + INT32 bufWLen = 256 * BYTES_PER_KBYTE; // 256 KB flag = 0; bufW = (CHAR *)malloc(bufWLen + 1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_052.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_052.cpp index a4529fae..fe64c537 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_052.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_052.cpp @@ -71,8 +71,6 @@ static VOID *MutiJffs05202(void *arg) strcat_s(pathname, JFFS_STANDARD_NAME_LENGTH, "/test_52"); - ICUNIT_GOTO_EQUAL(g_TestCnt, 0, g_TestCnt, EXIT); - // file size: 1024, write size: 1024 ret = JffsMultiWrite(pathname, 1024, 1024, O_RDWR | O_CREAT, JFFS_WR_TYPE_TEST); ICUNIT_GOTO_EQUAL(ret, JFFS_NO_ERROR, ret, EXIT); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_053.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_053.cpp index 57639165..454c190c 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_053.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_053.cpp @@ -68,7 +68,6 @@ static VOID *MutiJffs05302(void *arg) dprintf(" start muti_jffs_053_02 1 \n"); strcat_s(pathname, JFFS_STANDARD_NAME_LENGTH, "/test_53"); - ICUNIT_GOTO_EQUAL(g_TestCnt, 0, g_TestCnt, EXIT); fd = open(pathname, O_RDONLY, HIGHEST_AUTHORITY); ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_054.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_054.cpp index b6edd489..0ca30aa1 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_054.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_054.cpp @@ -69,7 +69,6 @@ static VOID *MutiJffs05402(void *arg) dprintf(" start muti_jffs_054_02 1 \n"); strcat_s(pathname, JFFS_STANDARD_NAME_LENGTH, "/test_54"); - ICUNIT_GOTO_EQUAL(g_TestCnt, 0, g_TestCnt, EXIT); fd = open(pathname, O_WRONLY | O_CREAT, HIGHEST_AUTHORITY); ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_055.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_055.cpp index 083a137a..3c26506f 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_055.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_055.cpp @@ -68,7 +68,6 @@ static VOID *MutiJffs05502(void *arg) dprintf(" start muti_jffs_055_02 1 \n"); strcat_s(pathname, JFFS_STANDARD_NAME_LENGTH, "/test_55"); - ICUNIT_GOTO_EQUAL(g_TestCnt, 0, g_TestCnt, EXIT); fd = open(pathname, O_WRONLY | O_CREAT, HIGHEST_AUTHORITY); ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_056.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_056.cpp index 69bc0f79..7a3de5d9 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_056.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_056.cpp @@ -69,7 +69,6 @@ static VOID *MutiJffs05602(void *arg) strcat_s(pathname, JFFS_STANDARD_NAME_LENGTH, "/test_56"); strcat_s(pathname1, JFFS_STANDARD_NAME_LENGTH, "/test_56_rename"); - ICUNIT_GOTO_EQUAL(g_TestCnt, 0, g_TestCnt, EXIT); rename(pathname, pathname1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_057.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_057.cpp index eee55b4c..479eeb7b 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_057.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_057.cpp @@ -66,7 +66,6 @@ static VOID *MutiJffs05702(void *arg) dprintf(" start muti_jffs_057_02 1 \n"); strcat_s(pathname, JFFS_STANDARD_NAME_LENGTH, "/test_57"); - ICUNIT_GOTO_EQUAL(g_TestCnt, 0, g_TestCnt, EXIT); umount(pathname); mount(JFFS_DEV_PATH0, JFFS_MAIN_DIR0, JFFS_FILESYS_TYPE, 0, NULL); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_058.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_058.cpp index c7b92b9f..ffdc0c11 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_058.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_058.cpp @@ -66,7 +66,6 @@ static VOID *MutiJffs05802(void *arg) CHAR pathname[JFFS_STANDARD_NAME_LENGTH] = { JFFS_PATH_NAME0 }; dprintf(" start muti_jffs_058_02 1 \n"); strcat_s(pathname, JFFS_STANDARD_NAME_LENGTH, "/test_58"); - ICUNIT_GOTO_EQUAL(g_TestCnt, 0, g_TestCnt, EXIT); // file size: 1024, write size: 16 ret = JffsMultiWrite(pathname, 1024, 16, O_RDWR | O_CREAT, JFFS_WR_TYPE_TEST); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_059.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_059.cpp index bfc980c8..909e76f2 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_059.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_059.cpp @@ -70,7 +70,6 @@ static VOID *MutiJffs05902(void *arg) dprintf(" start muti_jffs_059_02 1 \n"); strcat_s(pathname, JFFS_STANDARD_NAME_LENGTH, "/test_59"); - ICUNIT_GOTO_EQUAL(g_TestCnt, 0, g_TestCnt, EXIT); fd = open(pathname, O_WRONLY | O_CREAT, HIGHEST_AUTHORITY); ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_060.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_060.cpp index b6649e5e..7e23e03f 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_060.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_060.cpp @@ -70,7 +70,6 @@ static VOID *MutiJffs06002(void *arg) dprintf(" start muti_jffs_060_02 1 \n"); strcat_s(pathname, JFFS_STANDARD_NAME_LENGTH, "/test_60"); - ICUNIT_GOTO_EQUAL(g_TestCnt, 0, g_TestCnt, EXIT); fd = open(pathname, O_RDONLY | O_CREAT, HIGHEST_AUTHORITY); ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_061.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_061.cpp index 453ff4b2..e9147dc8 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_061.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_061.cpp @@ -70,7 +70,6 @@ static VOID *MutiJffs06102(void *arg) dprintf(" start muti_jffs_061_02 1 \n"); strcat_s(pathname, JFFS_STANDARD_NAME_LENGTH, "/test_61"); - ICUNIT_GOTO_EQUAL(g_TestCnt, 0, g_TestCnt, EXIT); fd = open(pathname, O_RDONLY | O_CREAT, HIGHEST_AUTHORITY); ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_062.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_062.cpp index 0a213ffa..2bc77731 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_062.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_062.cpp @@ -71,7 +71,6 @@ static VOID *MutiJffs06202(void *arg) dprintf(" start muti_jffs_062_02 1 \n"); strcat_s(pathname, JFFS_STANDARD_NAME_LENGTH, "/test_62"); strcat_s(pathname1, JFFS_STANDARD_NAME_LENGTH, "/test_62_rename"); - ICUNIT_GOTO_EQUAL(g_TestCnt, 0, g_TestCnt, EXIT); rename(pathname, pathname1); diff --git a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_063.cpp b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_063.cpp index 92955888..e192c193 100644 --- a/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_063.cpp +++ b/testsuites/unittest/fs/jffs/pressure/It_vfs_jffs_multipthread_063.cpp @@ -67,7 +67,6 @@ static VOID *MutiJffs06302(void *arg) dprintf(" start muti_jffs_063_02 1 \n"); strcat_s(pathname, JFFS_STANDARD_NAME_LENGTH, "/test_63"); - ICUNIT_GOTO_EQUAL(g_TestCnt, 0, g_TestCnt, EXIT); umount(pathname); diff --git a/testsuites/unittest/fs/jffs/vfs_jffs_test.cpp b/testsuites/unittest/fs/jffs/vfs_jffs_test.cpp index 531fed81..ccd3ab4d 100644 --- a/testsuites/unittest/fs/jffs/vfs_jffs_test.cpp +++ b/testsuites/unittest/fs/jffs/vfs_jffs_test.cpp @@ -983,9 +983,19 @@ INT32 JffsStatfsPrintf(struct statfs buf) using namespace testing::ext; namespace OHOS { +#if defined(LOSCFG_USER_TEST_PRESSURE) +pthread_mutexattr_t mutex; +#endif class VfsJffsTest : public testing::Test { public: - static void SetUpTestCase(void) {} + static void SetUpTestCase(void) + { +#if defined(LOSCFG_USER_TEST_PRESSURE) + pthread_mutexattr_settype(&mutex, PTHREAD_MUTEX_NORMAL); + pthread_mutex_init(&g_jffs2GlobalLock1, &mutex); + pthread_mutex_init(&g_jffs2GlobalLock2, &mutex); +#endif + } static void TearDownTestCase(void) {} }; #if defined(LOSCFG_USER_TEST_FULL) @@ -7001,10 +7011,6 @@ HWTEST_F(VfsJffsTest, ItFsJffs535, TestSize.Level0) #endif #if defined(LOSCFG_USER_TEST_PRESSURE) -pthreadMutexattrT mutex; -PthreadMutexattrSettype(&mutex, PTHREAD_MUTEX_NORMAL); -PthreadMutexInit(&g_jffs2GlobalLock1, &mutex); -PthreadMutexInit(&g_jffs2GlobalLock2, &mutex); /* * * @tc.name: ItFsJffsPRESSURE_001 * @tc.desc: function for VfsJffsTest @@ -8481,17 +8487,6 @@ HWTEST_F(VfsJffsTest, ItFsJffsPerformance006, TestSize.Level0) ItFsJffsPerformance006(); } -/* * - * @tc.name: ItFsJffsPERFORMANCE_007 - * @tc.desc: function for VfsJffsTest - * @tc.type: FUNC - * @tc.require: AR000EEMQ9 - */ -HWTEST_F(VfsJffsTest, ItFsJffsPerformance007, TestSize.Level0) -{ - ItFsJffsPerformance007(); -} - /* * * @tc.name: ItFsJffsPERFORMANCE_008 * @tc.desc: function for VfsJffsTest From 23fd4e55a3a737454374c41561c0e4b3a4e39d85 Mon Sep 17 00:00:00 2001 From: kevin Date: Thu, 1 Jul 2021 20:24:46 +0800 Subject: [PATCH 08/43] add vibrator liteos defined Signed-off-by: kevin Change-Id: I0a73f0de3c25e427362fe9d96547c4d847448dda --- tools/build/config/debug/hispark_taurus_clang.config | 2 ++ tools/build/config/debug/hispark_taurus_clang_tee.config | 2 ++ tools/build/config/hispark_taurus_clang_release.config | 2 ++ tools/build/config/hispark_taurus_clang_release_tee.config | 2 ++ 4 files changed, 8 insertions(+) diff --git a/tools/build/config/debug/hispark_taurus_clang.config b/tools/build/config/debug/hispark_taurus_clang.config index b82c6764..ccc6dfda 100644 --- a/tools/build/config/debug/hispark_taurus_clang.config +++ b/tools/build/config/debug/hispark_taurus_clang.config @@ -40,6 +40,8 @@ LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y LOSCFG_DRIVERS_HDF_STORAGE=y +LOSCFG_DRIVERS_HDF_VIBRATOR=y +LOSCFG_DRIVERS_HDF_VIBRATOR_LINEAR=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/debug/hispark_taurus_clang_tee.config b/tools/build/config/debug/hispark_taurus_clang_tee.config index b61bc4e2..45276b37 100644 --- a/tools/build/config/debug/hispark_taurus_clang_tee.config +++ b/tools/build/config/debug/hispark_taurus_clang_tee.config @@ -40,6 +40,8 @@ LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y LOSCFG_DRIVERS_HDF_STORAGE=y +LOSCFG_DRIVERS_HDF_VIBRATOR=y +LOSCFG_DRIVERS_HDF_VIBRATOR_LINEAR=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_TZDRIVER=y diff --git a/tools/build/config/hispark_taurus_clang_release.config b/tools/build/config/hispark_taurus_clang_release.config index 3076dd4f..43b1143f 100644 --- a/tools/build/config/hispark_taurus_clang_release.config +++ b/tools/build/config/hispark_taurus_clang_release.config @@ -37,6 +37,8 @@ LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y LOSCFG_DRIVERS_HDF_STORAGE=y +LOSCFG_DRIVERS_HDF_VIBRATOR=y +LOSCFG_DRIVERS_HDF_VIBRATOR_LINEAR=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/hispark_taurus_clang_release_tee.config b/tools/build/config/hispark_taurus_clang_release_tee.config index dc2a5de8..f5600194 100644 --- a/tools/build/config/hispark_taurus_clang_release_tee.config +++ b/tools/build/config/hispark_taurus_clang_release_tee.config @@ -38,6 +38,8 @@ LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y LOSCFG_DRIVERS_HDF_STORAGE=y +LOSCFG_DRIVERS_HDF_VIBRATOR=y +LOSCFG_DRIVERS_HDF_VIBRATOR_LINEAR=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_TZDRIVER=y From e567a10d021c3e0fe02d6911dbe8687255c67ffa Mon Sep 17 00:00:00 2001 From: Kiita Date: Tue, 15 Jun 2021 21:14:49 +0800 Subject: [PATCH 09/43] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9Etoybox=20reboot?= =?UTF-8?q?=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【背景】liteos_a测试套需要reboot命令 【修改方案】 在third_party/toybox/porting新增reboot.c文件，并作自定义修改。 新增reboot命令的支持说明。 re #I3YQ7S Signed-off-by: yansira Change-Id: I686a535adbad78935eee04fc283a837a4a7f13f6 --- apps/toybox/liteos_a_custom.config | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/toybox/liteos_a_custom.config b/apps/toybox/liteos_a_custom.config index 2de92c6d..03dbae41 100644 --- a/apps/toybox/liteos_a_custom.config +++ b/apps/toybox/liteos_a_custom.config @@ -128,7 +128,6 @@ CONFIG_MDEV_CONF=y # CONFIG_READAHEAD is not set # CONFIG_READLINK is not set # CONFIG_REALPATH is not set -# CONFIG_REBOOT is not set # CONFIG_RESET is not set # CONFIG_REV is not set # CONFIG_RMMOD is not set From b1b4ddcc7decc7f21f753246bf22e60530855ccf Mon Sep 17 00:00:00 2001 From: kevin Date: Thu, 1 Jul 2021 20:24:46 +0800 Subject: [PATCH 10/43] feat:add hdf vibrator liteos definition Change-Id: I0a73f0de3c25e427362fe9d96547c4d847448dda Signed-off-by: kevin --- tools/build/config/debug/hispark_taurus_clang.config | 2 ++ tools/build/config/debug/hispark_taurus_clang_tee.config | 2 ++ tools/build/config/hispark_taurus_clang_release.config | 2 ++ tools/build/config/hispark_taurus_clang_release_tee.config | 2 ++ 4 files changed, 8 insertions(+) diff --git a/tools/build/config/debug/hispark_taurus_clang.config b/tools/build/config/debug/hispark_taurus_clang.config index b82c6764..ccc6dfda 100644 --- a/tools/build/config/debug/hispark_taurus_clang.config +++ b/tools/build/config/debug/hispark_taurus_clang.config @@ -40,6 +40,8 @@ LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y LOSCFG_DRIVERS_HDF_STORAGE=y +LOSCFG_DRIVERS_HDF_VIBRATOR=y +LOSCFG_DRIVERS_HDF_VIBRATOR_LINEAR=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/debug/hispark_taurus_clang_tee.config b/tools/build/config/debug/hispark_taurus_clang_tee.config index b61bc4e2..45276b37 100644 --- a/tools/build/config/debug/hispark_taurus_clang_tee.config +++ b/tools/build/config/debug/hispark_taurus_clang_tee.config @@ -40,6 +40,8 @@ LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y LOSCFG_DRIVERS_HDF_STORAGE=y +LOSCFG_DRIVERS_HDF_VIBRATOR=y +LOSCFG_DRIVERS_HDF_VIBRATOR_LINEAR=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_TZDRIVER=y diff --git a/tools/build/config/hispark_taurus_clang_release.config b/tools/build/config/hispark_taurus_clang_release.config index 3076dd4f..43b1143f 100644 --- a/tools/build/config/hispark_taurus_clang_release.config +++ b/tools/build/config/hispark_taurus_clang_release.config @@ -37,6 +37,8 @@ LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y LOSCFG_DRIVERS_HDF_STORAGE=y +LOSCFG_DRIVERS_HDF_VIBRATOR=y +LOSCFG_DRIVERS_HDF_VIBRATOR_LINEAR=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/hispark_taurus_clang_release_tee.config b/tools/build/config/hispark_taurus_clang_release_tee.config index dc2a5de8..f5600194 100644 --- a/tools/build/config/hispark_taurus_clang_release_tee.config +++ b/tools/build/config/hispark_taurus_clang_release_tee.config @@ -38,6 +38,8 @@ LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y LOSCFG_DRIVERS_HDF_STORAGE=y +LOSCFG_DRIVERS_HDF_VIBRATOR=y +LOSCFG_DRIVERS_HDF_VIBRATOR_LINEAR=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_TZDRIVER=y From 56a95b9ec903f815f9199ac65ca318e00a83b2ed Mon Sep 17 00:00:00 2001 From: chenjing Date: Mon, 5 Jul 2021 16:03:16 +0800 Subject: [PATCH 11/43] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=86=85?= =?UTF-8?q?=E6=A0=B8access=20chmod=20chown=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、修复内核的access chmod chown功能； 2、此三个接口的syscall直接调用内核态接口执行操作。 close #I3Z5L6 Signed-off-by: chenjing Change-Id: I301f00fb341252b697b04b9970db86f0e7f978df --- fs/vfs/operation/fs_other.c | 60 +++++++++++++++++++++++++++++++------ syscall/fs_syscall.c | 44 +++------------------------ 2 files changed, 55 insertions(+), 49 deletions(-) diff --git a/fs/vfs/operation/fs_other.c b/fs/vfs/operation/fs_other.c index 791accb9..bb5b0e55 100644 --- a/fs/vfs/operation/fs_other.c +++ b/fs/vfs/operation/fs_other.c @@ -35,7 +35,9 @@ #include "dirent.h" #include "unistd.h" #include "sys/select.h" +#include "sys/mount.h" #include "sys/stat.h" +#include "sys/statfs.h" #include "sys/prctl.h" #include "fs/fd_table.h" #include "fs/file.h" @@ -256,30 +258,70 @@ char *getcwd(char *buf, size_t n) int chmod(const char *path, mode_t mode) { - int result; - struct stat buf; + struct IATTR attr = {0}; + attr.attr_chg_mode = mode; + attr.attr_chg_valid = CHG_MODE; /* change mode */ + int ret; - result = stat(path, &buf); - if (result != ENOERR) { + ret = chattr(path, &attr); + if (ret < 0) { + return VFS_ERROR; + } + + return OK; +} + +int chown(const char *pathname, uid_t owner, gid_t group) +{ + struct IATTR attr = {0}; + attr.attr_chg_valid = 0; + int ret; + + if (owner != (uid_t)-1) { + attr.attr_chg_uid = owner; + attr.attr_chg_valid |= CHG_UID; + } + if (group != (gid_t)-1) { + attr.attr_chg_gid = group; + attr.attr_chg_valid |= CHG_GID; + } + ret = chattr(pathname, &attr); + if (ret < 0) { return VFS_ERROR; } - /* no access/permission control for files now, just return OK if stat is okay*/ return OK; } int access(const char *path, int amode) { - int result; + int ret; struct stat buf; + struct statfs fsBuf; - result = stat(path, &buf); + ret = statfs(path, &fsBuf); + if (ret != 0) { + if (get_errno() != ENOSYS) { + return VFS_ERROR; + } + /* dev has no statfs ops, need devfs to handle this in feature */ + } - if (result != ENOERR) { + if ((fsBuf.f_flags & MS_RDONLY) && ((unsigned int)amode & W_OK)) { + set_errno(EROFS); + return VFS_ERROR; + } + + ret = stat(path, &buf); + if (ret != 0) { + return VFS_ERROR; + } + + if (VfsPermissionCheck(buf.st_uid, buf.st_gid, buf.st_mode, amode)) { + set_errno(EACCES); return VFS_ERROR; } - /* no access/permission control for files now, just return OK if stat is okay*/ return OK; } diff --git a/syscall/fs_syscall.c b/syscall/fs_syscall.c index 9bb01f3a..b424b05b 100644 --- a/syscall/fs_syscall.c +++ b/syscall/fs_syscall.c @@ -703,8 +703,6 @@ OUT: int SysAccess(const char *path, int amode) { int ret; - struct stat buf; - struct statfs fsBuf; char *pathRet = NULL; if (path != NULL) { @@ -714,30 +712,9 @@ int SysAccess(const char *path, int amode) } } - ret = statfs((path ? pathRet : NULL), &fsBuf); - if (ret != 0) { + ret = access(pathRet, amode); + if (ret < 0) { ret = -get_errno(); - if (ret != -ENOSYS) { - goto OUT; - } else { - /* dev has no statfs ops, need devfs to handle this in feature */ - ret = LOS_OK; - } - } - - if ((fsBuf.f_flags & MS_RDONLY) && ((unsigned int)amode & W_OK)) { - ret = -EROFS; - goto OUT; - } - - ret = stat((path ? pathRet : NULL), &buf); - if (ret != 0) { - ret = -get_errno(); - goto OUT; - } - - if (VfsPermissionCheck(buf.st_uid, buf.st_gid, buf.st_mode, amode)) { - ret = -EACCES; } OUT: @@ -2149,9 +2126,6 @@ OUT: int SysChmod(const char *pathname, mode_t mode) { - struct IATTR attr = {0}; - attr.attr_chg_mode = mode; - attr.attr_chg_valid = CHG_MODE; /* change mode */ int ret; char *pathRet = NULL; @@ -2162,7 +2136,7 @@ int SysChmod(const char *pathname, mode_t mode) } } - ret = chattr((pathname ? pathRet : NULL), &attr); + ret = chmod(pathRet, mode); if (ret < 0) { ret = -get_errno(); } @@ -2176,8 +2150,6 @@ OUT: int SysChown(const char *pathname, uid_t owner, gid_t group) { - struct IATTR attr = {0}; - attr.attr_chg_valid = 0; int ret; char *pathRet = NULL; @@ -2188,15 +2160,7 @@ int SysChown(const char *pathname, uid_t owner, gid_t group) } } - if (owner != (uid_t)-1) { - attr.attr_chg_uid = owner; - attr.attr_chg_valid |= CHG_UID; - } - if (group != (gid_t)-1) { - attr.attr_chg_gid = group; - attr.attr_chg_valid |= CHG_GID; - } - ret = chattr((pathname ? pathRet : NULL), &attr); + ret = chown(pathRet, owner, group); if (ret < 0) { ret = -get_errno(); } From 425975e4811023e31a520979c20ea2562224d9d0 Mon Sep 17 00:00:00 2001 From: qidechun Date: Tue, 6 Jul 2021 07:49:59 +0800 Subject: [PATCH 12/43] feat: add blackbox for liteos_a MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、在内核增加BlackBox核心框架，对外提供模块回调接口注册和故障处理接口。 2、增加默认的系统模块适配层，处理通用内核态和用户态故障日志抓取和保存。 Close #I3NN7V Signed-off-by: qidechun --- Kconfig | 4 +- arch/arm/arm/src/los_exc.c | 14 + kernel/base/misc/task_shellcmd.c | 6 + kernel/common/blackbox/Kconfig | 11 + kernel/common/blackbox/Makefile | 14 + kernel/common/blackbox/los_blackbox.h | 95 ++++ kernel/common/blackbox/los_blackbox_common.c | 101 ++++ kernel/common/blackbox/los_blackbox_common.h | 65 +++ kernel/common/blackbox/los_blackbox_core.c | 454 ++++++++++++++++++ .../common/blackbox/los_blackbox_detector.c | 63 +++ .../common/blackbox/los_blackbox_detector.h | 55 +++ .../blackbox/los_blackbox_system_adapter.c | 247 ++++++++++ .../blackbox/los_blackbox_system_adapter.h | 55 +++ kernel/common/los_excinfo.c | 59 +++ kernel/common/los_excinfo_pri.h | 3 + tools/build/mk/liteos_tables_ldflags.mk | 4 +- tools/build/mk/los_config.mk | 9 +- 17 files changed, 1256 insertions(+), 3 deletions(-) create mode 100644 kernel/common/blackbox/Kconfig create mode 100644 kernel/common/blackbox/Makefile create mode 100644 kernel/common/blackbox/los_blackbox.h create mode 100644 kernel/common/blackbox/los_blackbox_common.c create mode 100644 kernel/common/blackbox/los_blackbox_common.h create mode 100644 kernel/common/blackbox/los_blackbox_core.c create mode 100644 kernel/common/blackbox/los_blackbox_detector.c create mode 100644 kernel/common/blackbox/los_blackbox_detector.h create mode 100644 kernel/common/blackbox/los_blackbox_system_adapter.c create mode 100644 kernel/common/blackbox/los_blackbox_system_adapter.h diff --git a/Kconfig b/Kconfig index 8bce9860..491abbe2 100644 --- a/Kconfig +++ b/Kconfig @@ -61,6 +61,8 @@ source "../../kernel/liteos_a/arch/Kconfig" source "../../kernel/liteos_a/kernel/common/Kconfig" ######################### config options of patchfs ##################### source "../../kernel/liteos_a/kernel/common/patchfs/Kconfig" +######################### config options of blackbox ##################### +source "../../kernel/liteos_a/kernel/common/blackbox/Kconfig" config QUICK_START bool "Enable QUICK_START" @@ -175,7 +177,7 @@ config PLATFORM_DVFS config SAVE_EXCINFO bool "Enable Saving Exception Information" - default n + default y if BLACKBOX help Answer Y to enable LiteOS support saving exception information to storage medium. diff --git a/arch/arm/arm/src/los_exc.c b/arch/arm/arm/src/los_exc.c index d944caaf..06bbdb39 100644 --- a/arch/arm/arm/src/los_exc.c +++ b/arch/arm/arm/src/los_exc.c @@ -62,6 +62,9 @@ #ifdef LOSCFG_FS_VFS #include "console.h" #endif +#ifdef LOSCFG_BLACKBOX +#include "los_blackbox.h" +#endif #define INVALID_CPUID 0xFFFF @@ -589,6 +592,9 @@ STATIC VOID OsUserExcHandle(ExcContext *excBufAddr) /* Exception handling All operations should be kept prior to that operation */ OsExcRestore(); /* kill user exc process */ +#ifdef LOSCFG_BLACKBOX + BBoxNotifyError("USER_CRASH", MODULE_SYSTEM, "Crash in user", 0); +#endif LOS_Exit(OS_PRO_EXIT_OK); } @@ -1058,6 +1064,9 @@ LITE_OS_SEC_TEXT VOID STATIC OsExcPriorDisposal(ExcContext *excBufAddr) LITE_OS_SEC_TEXT_INIT STATIC VOID OsPrintExcHead(UINT32 far) { +#ifdef LOSCFG_BLACKBOX + SetExcInfoIndex(0); +#endif #ifdef LOSCFG_KERNEL_VM /* You are not allowed to add any other print information before this exception information */ if (g_excFromUserMode[ArchCurrCpuid()] == TRUE) { @@ -1125,7 +1134,9 @@ LITE_OS_SEC_TEXT_INIT VOID OsExcHandleEntry(UINT32 excType, ExcContext *excBufAd if (g_curNestCount[ArchCurrCpuid()] == 1) { #ifdef LOSCFG_SAVE_EXCINFO if (func != NULL) { +#ifndef LOSCFG_BLACKBOX SetExcInfoIndex(0); +#endif OsSysStateSave(&intCount, &lockCount); OsRecordExcInfoTime(); OsSysStateRestore(intCount, lockCount); @@ -1154,6 +1165,9 @@ LITE_OS_SEC_TEXT_INIT VOID OsExcHandleEntry(UINT32 excType, ExcContext *excBufAd } #endif +#ifdef LOSCFG_BLACKBOX + BBoxNotifyError(EVENT_PANIC, MODULE_SYSTEM, "Crash in kernel", 1); +#endif while (1) {} } diff --git a/kernel/base/misc/task_shellcmd.c b/kernel/base/misc/task_shellcmd.c index 05623a56..9b0d678e 100644 --- a/kernel/base/misc/task_shellcmd.c +++ b/kernel/base/misc/task_shellcmd.c @@ -85,12 +85,18 @@ STATIC UINT32 *taskWaterLine = NULL; #define OS_TASK_ALL_INFO_LEN (g_taskMaxNum * (sizeof(LosTaskCB) + sizeof(UINT32))) #ifdef LOSCFG_FS_VFS +#ifdef LOSCFG_BLACKBOX +#define SaveExcInfo(arg, ...) WriteExcInfoToBuf(arg, ##__VA_ARGS__) +#else +#define SaveExcInfo(arg, ...) +#endif #define PROCESS_INFO_SHOW(seqBuf, arg...) do { \ if (seqBuf != NULL) { \ (void)LosBufPrintf((struct SeqBuf *)seqBuf, ##arg); \ } else { \ PRINTK(arg); \ } \ + SaveExcInfo(arg); \ } while (0) #else #define PROCESS_INFO_SHOW(seqBuf, arg...) PRINTK(arg) diff --git a/kernel/common/blackbox/Kconfig b/kernel/common/blackbox/Kconfig new file mode 100644 index 00000000..0c1e4f07 --- /dev/null +++ b/kernel/common/blackbox/Kconfig @@ -0,0 +1,11 @@ +config BLACKBOX + bool "Enable BlackBox" + default y + help + Answer Y to enable LiteOS support blackbox + +config LOG_ROOT_PATH + string + default "/storage/data/log" if BLACKBOX + help + define the default log path of blackbox \ No newline at end of file diff --git a/kernel/common/blackbox/Makefile b/kernel/common/blackbox/Makefile new file mode 100644 index 00000000..e67f8794 --- /dev/null +++ b/kernel/common/blackbox/Makefile @@ -0,0 +1,14 @@ +include $(LITEOSTOPDIR)/config.mk + +MODULE_NAME := $(notdir $(shell pwd)) + +LOCAL_SRCS := $(wildcard *.c) + +LOCAL_INCLUDE := \ + -I $(LITEOSTOPDIR)/kernel/common \ + -I $(LITEOSTOPDIR)/kernel/common/blackbox \ + -I $(LITEOSTOPDIR)/syscall \ + +LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS) + +include $(MODULE) diff --git a/kernel/common/blackbox/los_blackbox.h b/kernel/common/blackbox/los_blackbox.h new file mode 100644 index 00000000..b60460ca --- /dev/null +++ b/kernel/common/blackbox/los_blackbox.h @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef LOS_BLACKBOX_H +#define LOS_BLACKBOX_H + +#ifdef __cplusplus +#if __cplusplus +extern "C" { +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#ifndef __user +#define __user +#endif + +#include "stdarg.h" +#include "los_typedef.h" + +#define PATH_MAX_LEN 256 +#define EVENT_MAX_LEN 32 +#define MODULE_MAX_LEN 32 +#define ERROR_DESC_MAX_LEN 512 +#ifndef LOSCFG_LOG_ROOT_PATH +#define LOSCFG_LOG_ROOT_PATH "/storage/data/log" +#endif +#define KERNEL_FAULT_LOG_PATH LOSCFG_LOG_ROOT_PATH "/kernel_fault.log" +#define USER_FAULT_LOG_PATH LOSCFG_LOG_ROOT_PATH "/user_fault.log" + +#define MODULE_SYSTEM "SYSTEM" +#define EVENT_SYSREBOOT "SYSREBOOT" +#define EVENT_LONGPRESS "LONGPRESS" +#define EVENT_COMBINATIONKEY "COMBINATIONKEY" +#define EVENT_SUBSYSREBOOT "SUBSYSREBOOT" +#define EVENT_POWEROFF "POWEROFF" +#define EVENT_PANIC "PANIC" +#define EVENT_SYS_WATCHDOG "SYSWATCHDOG" +#define EVENT_HUNGTASK "HUNGTASK" +#define EVENT_BOOTFAIL "BOOTFAIL" + +struct ErrorInfo { + char event[EVENT_MAX_LEN]; + char module[MODULE_MAX_LEN]; + char errorDesc[ERROR_DESC_MAX_LEN]; +}; + +struct ModuleOps { + char module[MODULE_MAX_LEN]; + void (*Dump)(const char *logDir, struct ErrorInfo *info); + void (*Reset)(struct ErrorInfo *info); + int (*GetLastLogInfo)(struct ErrorInfo *info); + int (*SaveLastLog)(const char *logDir, struct ErrorInfo *info); +}; + +int BBoxRegisterModuleOps(struct ModuleOps *ops); +int BBoxNotifyError(const char event[EVENT_MAX_LEN], + const char module[MODULE_MAX_LEN], + const char errorDesc[ERROR_DESC_MAX_LEN], + int needSysReset); +int OsBBoxDriverInit(void); + +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#endif \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_common.c b/kernel/common/blackbox/los_blackbox_common.c new file mode 100644 index 00000000..074f7e7d --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_common.c @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* ------------ includes ------------ */ +#include "los_blackbox_common.h" +#ifdef LOSCFG_LIB_LIBC +#include "stdlib.h" +#include "unistd.h" +#endif +#include "fs/fs.h" +#include "securec.h" +#include "los_memory.h" + +/* ------------ local macroes ------------ */ +/* ------------ local prototypes ------------ */ +/* ------------ local function declarations ------------ */ +/* ------------ global function declarations ------------ */ +/* ------------ local variables ------------ */ +/* ------------ function definitions ------------ */ +int FullWriteFile(const char *filePath, const char *buf, size_t bufSize, int isAppend) +{ + int fd; + int totalToWrite = (int)bufSize; + int totalWrite = 0; + + if (filePath == NULL || buf == NULL || bufSize == 0) { + BBOX_PRINT_ERR("filePath: %p, buf: %p, bufSize: %lu!\n", filePath, buf, bufSize); + return -1; + } + + fd = open(filePath, O_CREAT | O_RDWR | (isAppend ? O_APPEND : O_TRUNC), 0644); + if (fd < 0) { + BBOX_PRINT_ERR("Create file [%s] failed, fd: %d!\n", filePath, fd); + return -1; + } + while (totalToWrite > 0) { + int writeThisTime = write(fd, buf, totalToWrite); + if (writeThisTime < 0) { + BBOX_PRINT_ERR("Failed to write file [%s]!\n", filePath); + (void)close(fd); + return -1; + } + buf += writeThisTime; + totalToWrite -= writeThisTime; + totalWrite += writeThisTime; + } + (void)close(fd); + + return (totalWrite == (int)bufSize) ? 0 : -1; +} + +int SaveBasicErrorInfo(const char *filePath, struct ErrorInfo *info) +{ + char *buf; + + if (filePath == NULL || info == NULL) { + BBOX_PRINT_ERR("filePath: %p, event: %p!\n", filePath, info); + return -1; + } + + buf = LOS_MemAlloc(m_aucSysMem1, ERROR_INFO_MAX_LEN); + if (buf == NULL) { + BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); + return -1; + } + (void)memset_s(buf, ERROR_INFO_MAX_LEN, 0, ERROR_INFO_MAX_LEN); + (void)snprintf_s(buf, ERROR_INFO_MAX_LEN, ERROR_INFO_MAX_LEN - 1, + ERROR_INFO_HEADER ERROR_INFO_HEADER_FORMAT, info->event, info->module, info->errorDesc); + *(buf + ERROR_INFO_MAX_LEN - 1) = '\0'; + (void)FullWriteFile(filePath, buf, strlen(buf), 0); + (void)LOS_MemFree(m_aucSysMem1, buf); + + return 0; +} \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_common.h b/kernel/common/blackbox/los_blackbox_common.h new file mode 100644 index 00000000..b6e76e9d --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_common.h @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef LOS_BLACKBOX_COMMON_H +#define LOS_BLACKBOX_COMMON_H + +#ifdef __cplusplus +#if __cplusplus +extern "C" { +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#ifndef __user +#define __user +#endif + +#include "los_blackbox.h" +#include "los_printf.h" +#include "los_typedef.h" + +#define ERROR_INFO_HEADER "#### error info ####\n" +#define ERROR_INFO_HEADER_FORMAT "event: %s\nmodule: %s\nerrorDesc: %s\n" +#define ERROR_INFO_MAX_LEN 768 +#define Min(a, b) (((a) > (b)) ? (b) : (a)) +#define BBOX_PRINT_ERR(format, ...) PRINTK("bbox: func: %s, line: %d, Err: " \ + format, __func__, __LINE__, ##__VA_ARGS__) +#define BBOX_PRINT_INFO(format, ...) PRINTK("bbox: Info: " format, ##__VA_ARGS__) + +int FullWriteFile(const char *filePath, const char *buf, size_t bufSize, int isAppend); +int SaveBasicErrorInfo(const char *filePath, struct ErrorInfo *info); + +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#endif \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_core.c b/kernel/common/blackbox/los_blackbox_core.c new file mode 100644 index 00000000..64199683 --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_core.c @@ -0,0 +1,454 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* ------------ includes ------------ */ +#include "los_blackbox.h" +#include "los_blackbox_common.h" +#include "los_blackbox_detector.h" +#ifdef LOSCFG_LIB_LIBC +#include "stdlib.h" +#include "unistd.h" +#endif +#include "los_base.h" +#include "los_config.h" +#include "los_excinfo_pri.h" +#include "los_hw.h" +#include "los_init.h" +#include "los_memory.h" +#include "los_sem.h" +#include "los_syscall.h" +#include "securec.h" +#include "sys/reboot.h" + +/* ------------ local macroes ------------ */ +#define LOG_WAIT_TIMES 10 +#define LOG_PART_WAIT_TIME 1000 + +/* ------------ local prototypes ------------ */ +typedef struct BBoxOps { + LOS_DL_LIST opsList; + struct ModuleOps ops; +} BBoxOps; + +/* ------------ local function declarations ------------ */ +/* ------------ global function declarations ------------ */ +/* ------------ local variables ------------ */ +static UINT32 g_opsListSem = 0; +static UINT32 g_tempErrInfoSem = 0; +static LOS_DL_LIST_HEAD(g_opsList); +struct ErrorInfo *g_tempErrInfo; + +/* ------------ function definitions ------------ */ +static void FormatErrorInfo(struct ErrorInfo *info, + const char event[EVENT_MAX_LEN], + const char module[MODULE_MAX_LEN], + const char errorDesc[ERROR_DESC_MAX_LEN]) +{ + if (info == NULL || event == NULL || module == NULL || errorDesc == NULL) { + BBOX_PRINT_ERR("info: %p, event: %p, module: %p, errorDesc: %p!\n", info, event, module, errorDesc); + return; + } + + (void)memset_s(info, sizeof(*info), 0, sizeof(*info)); + (void)strncpy_s(info->event, sizeof(info->event), event, Min(strlen(event), sizeof(info->event) - 1)); + info->event[sizeof(info->event) - 1] = '\0'; + (void)strncpy_s(info->module, sizeof(info->module), module, Min(strlen(module), sizeof(info->module) - 1)); + info->module[sizeof(info->module) - 1] = '\0'; + (void)strncpy_s(info->errorDesc, sizeof(info->errorDesc), errorDesc, + Min(strlen(errorDesc), sizeof(info->errorDesc) - 1)); + info->errorDesc[sizeof(info->errorDesc) - 1] = '\0'; +} + +#ifdef LOSCFG_FS_VFS +static bool IsLogPartReady(void) +{ + return access(LOSCFG_LOG_ROOT_PATH, 0) == 0; +} + +static void WaitForLogPart(void) +{ + BBOX_PRINT_INFO("wait for log part [%s] begin!\n", LOSCFG_LOG_ROOT_PATH); + while (!IsLogPartReady()) { + LOS_Msleep(LOG_PART_WAIT_TIME); + } + BBOX_PRINT_INFO("wait for log part [%s] end!\n", LOSCFG_LOG_ROOT_PATH); +} +#else +static bool IsLogPartReady(void) +{ + return TRUE; +} + +static void WaitForLogPart(void) +{ + int i = 0; + + BBOX_PRINT_INFO("wait for log part [%s] begin!\n", LOSCFG_LOG_ROOT_PATH); + while (i++ < LOG_WAIT_TIMES) { + LOS_Msleep(LOG_PART_WAIT_TIME); + } + BBOX_PRINT_INFO("wait for log part [%s] end!\n", LOSCFG_LOG_ROOT_PATH); +} +#endif + +static bool FindModuleOps(struct ErrorInfo *info, BBoxOps **ops) +{ + bool found = false; + + if (info == NULL || ops == NULL) { + BBOX_PRINT_ERR("info: %p, ops: %p!\n", info, ops); + return found; + } + + LOS_DL_LIST_FOR_EACH_ENTRY(*ops, &g_opsList, BBoxOps, opsList) { + if (*ops != NULL && strcmp((*ops)->ops.module, info->module) == 0) { + found = true; + break; + } + } + if (!found) { + BBOX_PRINT_ERR("[%s] hasn't been registered!\n", info->module); + } + + return found; +} + +static void InvokeModuleOps(struct ErrorInfo *info, BBoxOps *ops) +{ + if (info == NULL || ops == NULL) { + BBOX_PRINT_ERR("info: %p, ops: %p!\n", info, ops); + return; + } + + if (ops->ops.Dump != NULL) { + BBOX_PRINT_INFO("[%s] starts dumping log!\n", ops->ops.module); + ops->ops.Dump(LOSCFG_LOG_ROOT_PATH, info); + BBOX_PRINT_INFO("[%s] ends dumping log!\n", ops->ops.module); + } + if (ops->ops.Reset != NULL) { + BBOX_PRINT_INFO("[%s] starts resetting!\n", ops->ops.module); + ops->ops.Reset(info); + BBOX_PRINT_INFO("[%s] ends resetting!\n", ops->ops.module); + } +} + +static void SaveLastLog(const char *logDir) +{ + struct ErrorInfo *info; + BBoxOps *ops; + + info = LOS_MemAlloc(m_aucSysMem1, sizeof(*info)); + if (info == NULL) { + BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); + return; + } + + if (LOS_SemPend(g_opsListSem, LOS_WAIT_FOREVER) != LOS_OK) { + BBOX_PRINT_ERR("Request g_opsListSem failed!\n"); + (void)LOS_MemFree(m_aucSysMem1, info); + return; + } + + LOS_DL_LIST_FOR_EACH_ENTRY(ops, &g_opsList, BBoxOps, opsList) { + if (ops == NULL) { + BBOX_PRINT_ERR("ops: NULL, please check it!\n"); + continue; + } + if (ops->ops.GetLastLogInfo != NULL && ops->ops.SaveLastLog != NULL) { + (void)memset_s(info, sizeof(*info), 0, sizeof(*info)); + if (ops->ops.GetLastLogInfo(info) != 0) { + BBOX_PRINT_ERR("[%s] failed to get log info!\n", ops->ops.module); + continue; + } + BBOX_PRINT_INFO("[%s] starts saving log!\n", ops->ops.module); + if (ops->ops.SaveLastLog(logDir, info) != 0) { + BBOX_PRINT_ERR("[%s] failed to save log!\n", ops->ops.module); + } else { + BBOX_PRINT_INFO("[%s] ends saving log!\n", ops->ops.module); + BBOX_PRINT_INFO("[%s] starts uploading event [%s]\n", info->module, info->event); +#ifdef LOSCFG_FS_VFS + (void)UploadEventByFile(KERNEL_FAULT_LOG_PATH); +#else + BBOX_PRINT_INFO("LOSCFG_FS_VFS isn't defined!\n"); +#endif + BBOX_PRINT_INFO("[%s] ends uploading event [%s]\n", info->module, info->event); + } + } else { + BBOX_PRINT_ERR("module [%s], GetLastLogInfo: %p, SaveLastLog: %p!\n", + ops->ops.module, ops->ops.GetLastLogInfo, ops->ops.SaveLastLog); + } + } + (void)LOS_SemPost(g_opsListSem); + (void)LOS_MemFree(m_aucSysMem1, info); +} + +static void SaveLogWithoutReset(struct ErrorInfo *info) +{ + BBoxOps *ops; + + if (info == NULL) { + BBOX_PRINT_ERR("info: %p!\n", info); + return; + } + + if (LOS_SemPend(g_opsListSem, LOS_WAIT_FOREVER) != LOS_OK) { + BBOX_PRINT_ERR("Request g_opsListSem failed!\n"); + return; + } + if (!FindModuleOps(info, &ops)) { + (void)LOS_SemPost(g_opsListSem); + return; + } + if (ops->ops.Dump == NULL && ops->ops.Reset == NULL) { + (void)LOS_SemPost(g_opsListSem); + if (SaveBasicErrorInfo(USER_FAULT_LOG_PATH, info) == 0) { + BBOX_PRINT_INFO("[%s] starts uploading event [%s]\n", info->module, info->event); +#ifdef LOSCFG_FS_VFS + (void)UploadEventByFile(USER_FAULT_LOG_PATH); +#else + BBOX_PRINT_INFO("LOSCFG_FS_VFS isn't defined!\n"); +#endif + BBOX_PRINT_INFO("[%s] ends uploading event [%s]\n", info->module, info->event); + } + return; + } + InvokeModuleOps(info, ops); + (void)LOS_SemPost(g_opsListSem); +} + +static void SaveTempErrorLog(void) +{ + if (LOS_SemPend(g_tempErrInfoSem, LOS_WAIT_FOREVER) != LOS_OK) { + BBOX_PRINT_ERR("Request g_tempErrInfoSem failed!\n"); + return; + } + if (g_tempErrInfo == NULL) { + BBOX_PRINT_ERR("g_tempErrInfo: %p!\n", g_tempErrInfo); + (void)LOS_SemPost(g_tempErrInfoSem); + return; + } + if (strlen(g_tempErrInfo->event) != 0) { + SaveLogWithoutReset(g_tempErrInfo); + } + (void)LOS_MemFree(m_aucSysMem1, g_tempErrInfo); + g_tempErrInfo = NULL; + (void)LOS_SemPost(g_tempErrInfoSem); +} + +static void SaveLogWithReset(struct ErrorInfo *info) +{ + int ret; + BBoxOps *ops; + + if (info == NULL) { + BBOX_PRINT_ERR("info: %p!\n", info); + return; + } + + if (!FindModuleOps(info, &ops)) { + return; + } + InvokeModuleOps(info, ops); + ret = SysReboot(0, 0, RB_AUTOBOOT); + BBOX_PRINT_INFO("SysReboot, ret: %d\n", ret); +} + +static void SaveTempErrorInfo(const char event[EVENT_MAX_LEN], + const char module[MODULE_MAX_LEN], + const char errorDesc[ERROR_DESC_MAX_LEN]) +{ + if (event == NULL || module == NULL || errorDesc == NULL) { + BBOX_PRINT_ERR("event: %p, module: %p, errorDesc: %p!\n", event, module, errorDesc); + return; + } + if (LOS_SemPend(g_tempErrInfoSem, LOS_WAIT_FOREVER) != LOS_OK) { + BBOX_PRINT_ERR("Request g_tempErrInfoSem failed!\n"); + return; + } + FormatErrorInfo(g_tempErrInfo, event, module, errorDesc); + (void)LOS_SemPost(g_tempErrInfoSem); +} + +static int SaveErrorLog(UINTPTR uwParam1, UINTPTR uwParam2, UINTPTR uwParam3, UINTPTR uwParam4) +{ + const char *logDir = (const char *)uwParam1; + (void)uwParam2; + (void)uwParam3; + (void)uwParam4; + +#ifdef LOSCFG_FS_VFS + WaitForLogPart(); +#endif + SaveLastLog(logDir); + SaveTempErrorLog(); + + return 0; +} + +#ifdef LOSCFG_BLACKBOX_DEBUG +static void PrintModuleOps(void) +{ + struct BBoxOps *ops; + + BBOX_PRINT_INFO("The following modules have been registered!\n"); + LOS_DL_LIST_FOR_EACH_ENTRY(ops, &g_opsList, BBoxOps, opsList) { + if (ops == NULL) { + continue; + } + BBOX_PRINT_INFO("module: %s, Dump: %p, Reset: %p, GetLastLogInfo: %p, SaveLastLog: %p\n", + ops->ops.module, ops->ops.Dump, ops->ops.Reset, ops->ops.GetLastLogInfo, ops->ops.SaveLastLog); + } +} +#endif + +int BBoxRegisterModuleOps(struct ModuleOps *ops) +{ + BBoxOps *newOps; + BBoxOps *temp; + + if (ops == NULL) { + BBOX_PRINT_ERR("ops: %p!\n", ops); + return -1; + } + + newOps = LOS_MemAlloc(m_aucSysMem1, sizeof(*newOps)); + if (newOps == NULL) { + BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); + return -1; + } + (void)memset_s(newOps, sizeof(*newOps), 0, sizeof(*newOps)); + (void)memcpy_s(&newOps->ops, sizeof(newOps->ops), ops, sizeof(*ops)); + if (LOS_SemPend(g_opsListSem, LOS_WAIT_FOREVER) != LOS_OK) { + BBOX_PRINT_ERR("Request g_opsListSem failed!\n"); + (void)LOS_MemFree(m_aucSysMem1, newOps); + return -1; + } + if (LOS_ListEmpty(&g_opsList)) { + goto __out; + } + + LOS_DL_LIST_FOR_EACH_ENTRY(temp, &g_opsList, BBoxOps, opsList) { + if (temp == NULL) { + continue; + } + if (strcmp(temp->ops.module, ops->module) == 0) { + BBOX_PRINT_ERR("module [%s] has been registered!\n", ops->module); + (void)LOS_SemPost(g_opsListSem); + (void)LOS_MemFree(m_aucSysMem1, newOps); + return -1; + } + } + +__out: + LOS_ListTailInsert(&g_opsList, &newOps->opsList); + (void)LOS_SemPost(g_opsListSem); + BBOX_PRINT_INFO("module [%s] is registered successfully!\n", ops->module); +#ifdef LOSCFG_BLACKBOX_DEBUG + PrintModuleOps(); +#endif + + return 0; +} + +int BBoxNotifyError(const char event[EVENT_MAX_LEN], + const char module[MODULE_MAX_LEN], + const char errorDesc[ERROR_DESC_MAX_LEN], + int needSysReset) +{ + struct ErrorInfo *info; + + if (event == NULL || module == NULL || errorDesc == NULL) { + BBOX_PRINT_ERR("event: %p, module: %p, errorDesc: %p!\n", event, module, errorDesc); + return -1; + } + info = LOS_MemAlloc(m_aucSysMem1, sizeof(*info)); + if (info == NULL) { + BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); + return -1; + } + FormatErrorInfo(info, event, module, errorDesc); + if (needSysReset == 0) { + if (!IsLogPartReady()) { + SaveTempErrorInfo(event, module, errorDesc); + } else { + SaveLogWithoutReset(info); + } + } else { + SaveLogWithReset(info); + } + (void)LOS_MemFree(m_aucSysMem1, info); + + return 0; +} + +int OsBBoxDriverInit(void) +{ + UINT32 taskID; + TSK_INIT_PARAM_S taskParam; + + if (LOS_BinarySemCreate(1, &g_opsListSem) != LOS_OK) { + BBOX_PRINT_ERR("Create g_opsListSem failed!\n"); + return -1; + } + if (LOS_BinarySemCreate(1, &g_tempErrInfoSem) != LOS_OK) { + BBOX_PRINT_ERR("Create g_tempErrInfoSem failed!\n"); + goto __err; + } + LOS_ListInit(&g_opsList); + g_tempErrInfo = LOS_MemAlloc(m_aucSysMem1, sizeof(*g_tempErrInfo)); + if (g_tempErrInfo == NULL) { + BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); + goto __err; + } + (void)memset_s(g_tempErrInfo, sizeof(*g_tempErrInfo), 0, sizeof(*g_tempErrInfo)); + (void)memset_s(&taskParam, sizeof(taskParam), 0, sizeof(taskParam)); + taskParam.auwArgs[0] = (UINTPTR)LOSCFG_LOG_ROOT_PATH; + taskParam.pfnTaskEntry = (TSK_ENTRY_FUNC)SaveErrorLog; + taskParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; + taskParam.pcName = "SaveErrorLog"; + taskParam.usTaskPrio = LOSCFG_BASE_CORE_TSK_DEFAULT_PRIO; + taskParam.uwResved = LOS_TASK_STATUS_DETACHED; +#ifdef LOSCFG_KERNEL_SMP + taskParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); +#endif + (void)LOS_TaskCreate(&taskID, &taskParam); + return 0; + +__err: + if (g_opsListSem != 0) { + (void)LOS_SemDelete(g_opsListSem); + } + if (g_tempErrInfoSem != 0) { + (void)LOS_SemDelete(g_tempErrInfoSem); + } + + return -1; +} +LOS_MODULE_INIT(OsBBoxDriverInit, LOS_INIT_LEVEL_ARCH); \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_detector.c b/kernel/common/blackbox/los_blackbox_detector.c new file mode 100644 index 00000000..5d91ef9d --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_detector.c @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* ------------ includes ------------ */ +#include "los_blackbox_detector.h" +#include "los_blackbox_common.h" +#ifdef LOSCFG_LIB_LIBC +#include "stdlib.h" +#include "unistd.h" +#endif + +/* ------------ local macroes ------------ */ +/* ------------ local prototypes ------------ */ +/* ------------ local function declarations ------------ */ +/* ------------ global function declarations ------------ */ +/* ------------ local variables ------------ */ +/* ------------ function definitions ------------ */ +int UploadEventByFile(const char *filePath) +{ + if (filePath == NULL) { + BBOX_PRINT_ERR("filePath: %p\n", filePath); + return -1; + } + + return 0; +} + +int UploadEventByStream(const char *buf, size_t bufSize) +{ + if (buf == NULL || bufSize == 0) { + BBOX_PRINT_ERR("buf: %p, bufSize: %u\n", buf, (UINT32)bufSize); + return -1; + } + + return 0; +} \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_detector.h b/kernel/common/blackbox/los_blackbox_detector.h new file mode 100644 index 00000000..a424f7a6 --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_detector.h @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef LOS_BLACKBOX_DETECTOR_H +#define LOS_BLACKBOX_DETECTOR_H + +#ifdef __cplusplus +#if __cplusplus +extern "C" { +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#ifndef __user +#define __user +#endif + +#include "los_typedef.h" + +int UploadEventByFile(const char *filePath); +int UploadEventByStream(const char *buf, size_t bufSize); + +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#endif \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_system_adapter.c b/kernel/common/blackbox/los_blackbox_system_adapter.c new file mode 100644 index 00000000..11a85907 --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_system_adapter.c @@ -0,0 +1,247 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* ------------ includes ------------ */ +#include "los_blackbox_system_adapter.h" +#include "los_blackbox_common.h" +#include "los_blackbox_detector.h" +#ifdef LOSCFG_LIB_LIBC +#include "stdlib.h" +#include "unistd.h" +#endif +#include "los_base.h" +#include "los_config.h" +#include "los_excinfo_pri.h" +#include "los_hw.h" +#include "los_init.h" +#include "los_memory.h" +#include "los_vm_phys.h" +#include "fs/fs.h" +#include "securec.h" + +/* ------------ local macroes ------------ */ +#define MEM_OVERLAP_COUNT 50 +#define LOG_FLAG "GOODLOG" +#define FAULT_LOG_SIZE 0x4000 /* 16KB */ + +/* ------------ local prototypes ------------ */ +struct FaultLogInfo { + char flag[8]; /* 8 is the length of the flag */ + int len; /* length of the fault log saved by the module excinfo */ + struct ErrorInfo info; +}; + +/* ------------ local function declarations ------------ */ +/* ------------ global function declarations ------------ */ +/* ------------ local variables ------------ */ +static char *g_logBuffer = NULL; + +/* ------------ function definitions ------------ */ +static void SaveFaultLog(const char *filePath, const char *dataBuf, size_t bufSize, struct ErrorInfo *info) +{ + (void)SaveBasicErrorInfo(filePath, info); + (void)FullWriteFile(filePath, dataBuf, bufSize, 1); +} + +static void WriteExcFile(UINT32 startAddr, UINT32 space, UINT32 rwFlag, char *buf) +{ + (void)startAddr; + (void)space; + (void)rwFlag; + (void)buf; +} + +static void RegisterExcInfoHook(void) +{ + if (g_logBuffer != NULL) { + LOS_ExcInfoRegHook(0, FAULT_LOG_SIZE - sizeof(struct FaultLogInfo), + g_logBuffer + sizeof(struct FaultLogInfo), WriteExcFile); + } else { + BBOX_PRINT_ERR("Alloc mem failed!\n"); + } +} + +static INT32 AllocLogBuffer(void) +{ + INT32 i; + size_t nPages = ROUNDUP(FAULT_LOG_SIZE, PAGE_SIZE) >> PAGE_SHIFT; + void *tempBuffer[MEM_OVERLAP_COUNT]; + + for (i = 0; i < MEM_OVERLAP_COUNT; i++) { + g_logBuffer = LOS_PhysPagesAllocContiguous(nPages); + tempBuffer[i] = g_logBuffer; + } + for (i = 0; i < MEM_OVERLAP_COUNT - 1; i++) { + LOS_PhysPagesFreeContiguous(tempBuffer[i], nPages); + } + + return (g_logBuffer != NULL) ? 0 : -1; +} + +static void Dump(const char *logDir, struct ErrorInfo *info) +{ + struct FaultLogInfo *pInfo; + + if (logDir == NULL || info == NULL) { + BBOX_PRINT_ERR("logDir: %p, info: %p!\n", logDir, info); + return; + } + if (g_logBuffer == NULL) { + BBOX_PRINT_ERR("g_logBuffer: %p!\n", g_logBuffer); + return; + } + + if (strcmp(info->event, EVENT_PANIC) == 0) { + pInfo = (struct FaultLogInfo *)g_logBuffer; + (void)memset_s(pInfo, sizeof(*pInfo), 0, sizeof(*pInfo)); + pInfo->len = GetExcInfoLen(); + (void)memcpy_s(&pInfo->flag, sizeof(pInfo->flag), LOG_FLAG, strlen(LOG_FLAG)); + (void)memcpy_s(&pInfo->info, sizeof(pInfo->info), info, sizeof(*info)); + DCacheFlushRange((UINTPTR)g_logBuffer, (UINTPTR)(g_logBuffer + FAULT_LOG_SIZE)); + } else { + SaveFaultLog(USER_FAULT_LOG_PATH, g_logBuffer + sizeof(struct FaultLogInfo), + Min(FAULT_LOG_SIZE - sizeof(struct FaultLogInfo), GetExcInfoLen()), info); + } +} + +static void Reset(struct ErrorInfo *info) +{ + if (info == NULL) { + BBOX_PRINT_ERR("info: %p!\n", info); + return; + } + + if (strcmp(info->event, EVENT_PANIC) != 0) { + BBOX_PRINT_INFO("[%s] starts uploading event [%s]\n", info->module, info->event); + (void)UploadEventByFile(USER_FAULT_LOG_PATH); + BBOX_PRINT_INFO("[%s] ends uploading event [%s]\n", info->module, info->event); + } +} + +static int GetLastLogInfo(struct ErrorInfo *info) +{ + struct FaultLogInfo *pInfo; + + if (info == NULL) { + BBOX_PRINT_ERR("info: %p!\n", info); + return -1; + } + if (g_logBuffer == NULL) { + BBOX_PRINT_ERR("Alloc physical page failed!\n"); + return -1; + } + + pInfo = (struct FaultLogInfo *)g_logBuffer; + if (memcmp(pInfo->flag, LOG_FLAG, strlen(LOG_FLAG)) == 0) { + (void)memcpy_s(info, sizeof(*info), &pInfo->info, sizeof(pInfo->info)); + return 0; + } + + return -1; +} + +static int SaveLastLog(const char *logDir, struct ErrorInfo *info) +{ +#ifdef LOSCFG_FS_VFS + struct FaultLogInfo *pInfo; + + if (logDir == NULL || info == NULL) { + BBOX_PRINT_ERR("logDir: %p, info: %p!\n", logDir, info); + return -1; + } + if (g_logBuffer == NULL) { + BBOX_PRINT_ERR("Alloc physical page failed!\n"); + return -1; + } + + pInfo = (struct FaultLogInfo *)g_logBuffer; + if (memcmp(pInfo->flag, LOG_FLAG, strlen(LOG_FLAG)) == 0) { + SaveFaultLog(KERNEL_FAULT_LOG_PATH, g_logBuffer + sizeof(*pInfo), + Min(FAULT_LOG_SIZE - sizeof(*pInfo), pInfo->len), info); + } +#endif + (void)memset_s(g_logBuffer, FAULT_LOG_SIZE, 0, FAULT_LOG_SIZE); + BBOX_PRINT_INFO("[%s] starts uploading event [%s]\n", info->module, info->event); + (void)UploadEventByFile(KERNEL_FAULT_LOG_PATH); + BBOX_PRINT_INFO("[%s] ends uploading event [%s]\n", info->module, info->event); + + return 0; +} + +#ifdef LOSCFG_BLACKBOX_TEST +static void BBoxTest(void) +{ + struct ModuleOps ops = { + .module = "MODULE_TEST", + .Dump = NULL, + .Reset = NULL, + .GetLastLogInfo = NULL, + .SaveLastLog = NULL, + }; + + if (BBoxRegisterModuleOps(&ops) != 0) { + BBOX_PRINT_ERR("BBoxRegisterModuleOps failed!\n"); + return; + } + BBoxNotifyError("EVENT_TEST1", "MODULE_TEST", "Test BBoxNotifyError111", 0); +} +#endif + +int OsBBoxSystemAdapterInit(void) +{ + struct ModuleOps ops = { + .module = MODULE_SYSTEM, + .Dump = Dump, + .Reset = Reset, + .GetLastLogInfo = GetLastLogInfo, + .SaveLastLog = SaveLastLog, + }; + + /* allocate buffer for kmsg */ + if (AllocLogBuffer() == 0) { + BBOX_PRINT_INFO("g_logBuffer: %p for blackbox!\n", g_logBuffer); + RegisterExcInfoHook(); + if (BBoxRegisterModuleOps(&ops) != 0) { + BBOX_PRINT_ERR("BBoxRegisterModuleOps failed!\n"); + LOS_PhysPagesFreeContiguous(g_logBuffer, ROUNDUP(FAULT_LOG_SIZE, PAGE_SIZE) >> PAGE_SHIFT); + g_logBuffer = NULL; + return -1; + } + } else { + BBOX_PRINT_ERR("AllocLogBuffer failed!\n"); + } + +#ifdef LOSCFG_BLACKBOX_TEST + BBoxTest(); +#endif + + return 0; +} +LOS_MODULE_INIT(OsBBoxSystemAdapterInit, LOS_INIT_LEVEL_ARCH); \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_system_adapter.h b/kernel/common/blackbox/los_blackbox_system_adapter.h new file mode 100644 index 00000000..e4fbf2cc --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_system_adapter.h @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef LOS_BLACKBOX_SYSTEM_ADAPTER_H +#define LOS_BLACKBOX_SYSTEM_ADAPTER_H + +#ifdef __cplusplus +#if __cplusplus +extern "C" { +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#ifndef __user +#define __user +#endif + +#include "los_blackbox.h" +#include "los_blackbox_common.h" + +int OsBBoxSystemAdapterInit(void); + +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#endif \ No newline at end of file diff --git a/kernel/common/los_excinfo.c b/kernel/common/los_excinfo.c index b18ee23b..f605c186 100644 --- a/kernel/common/los_excinfo.c +++ b/kernel/common/los_excinfo.c @@ -34,13 +34,29 @@ #ifdef LOSCFG_SHELL #include "shcmd.h" #endif +#ifdef LOSCFG_BLACKBOX +#include "fs/fs.h" +#include "fs/fs_operation.h" +#endif + +#ifdef LOSCFG_BLACKBOX +#define TEMP_EXC_INFO_SIZE 0x400 +#endif #ifdef LOSCFG_SAVE_EXCINFO STATIC log_read_write_fn g_excInfoRW = NULL; /* the hook of read-writing exception information */ STATIC CHAR *g_excInfoBuf = NULL; /* pointer to the buffer for storing the exception information */ +#ifdef LOSCFG_BLACKBOX +STATIC UINT32 g_excInfoIndex = 0; /* the index of the buffer for storing the exception information */ +#else STATIC UINT32 g_excInfoIndex = 0xFFFFFFFF; /* the index of the buffer for storing the exception information */ +#endif STATIC UINT32 g_recordAddr = 0; /* the address of storing the exception information */ STATIC UINT32 g_recordSpace = 0; /* the size of storing the exception information */ +#ifdef LOSCFG_BLACKBOX +STATIC UINT32 g_excLogLen = 0; /* the length of the exception information */ +STATIC CHAR *g_tempExcInfoBuf = NULL; /* pointer to the buffer for storing the temp exception information */ +#endif VOID SetExcInfoRW(log_read_write_fn func) { @@ -65,6 +81,11 @@ CHAR *GetExcInfoBuf(VOID) VOID SetExcInfoIndex(UINT32 index) { g_excInfoIndex = index; +#ifdef LOSCFG_BLACKBOX + if (g_excInfoIndex == 0) { + g_excLogLen = 0; + } +#endif } UINT32 GetExcInfoIndex(VOID) @@ -72,6 +93,13 @@ UINT32 GetExcInfoIndex(VOID) return g_excInfoIndex; } +#ifdef LOSCFG_BLACKBOX +UINT32 GetExcInfoLen(VOID) +{ + return g_excLogLen; +} +#endif + VOID SetRecordAddr(UINT32 addr) { g_recordAddr = addr; @@ -92,8 +120,35 @@ UINT32 GetRecordSpace(VOID) return g_recordSpace; } +#ifdef LOSCFG_BLACKBOX +STATIC VOID SaveExcInfoUnsafe(CHAR *buf, INT32 size) +{ + for (INT32 i = 0; i < size; i++) { + *(g_excInfoBuf + g_excInfoIndex) = *(buf + i); + g_excInfoIndex++; + if (g_excLogLen < g_recordSpace) { + g_excLogLen++; + } + if (g_excInfoIndex >= g_recordSpace) { + g_excInfoIndex = 0; + } + } +} +#endif + VOID WriteExcBufVa(const CHAR *format, va_list arglist) { +#ifdef LOSCFG_BLACKBOX + if (g_tempExcInfoBuf != NULL) { + (VOID)memset_s(g_tempExcInfoBuf, TEMP_EXC_INFO_SIZE, 0, TEMP_EXC_INFO_SIZE); + INT32 ret = vsnprintf_s(g_tempExcInfoBuf, TEMP_EXC_INFO_SIZE, TEMP_EXC_INFO_SIZE - 1, format, arglist); + if (ret == -1) { + PRINT_ERR("g_tempExcInfoBuf is not enough or vsnprintf_s is error.\n"); + return; + } + SaveExcInfoUnsafe(g_tempExcInfoBuf, ret); + } +#else errno_t ret; if (g_recordSpace > g_excInfoIndex) { @@ -105,6 +160,7 @@ VOID WriteExcBufVa(const CHAR *format, va_list arglist) } g_excInfoIndex += ret; } +#endif } VOID WriteExcInfoToBuf(const CHAR *format, ...) @@ -131,6 +187,9 @@ VOID LOS_ExcInfoRegHook(UINT32 startAddr, UINT32 space, CHAR *buf, log_read_writ #ifdef LOSCFG_FS_VFS los_vfs_init(); #endif +#ifdef LOSCFG_BLACKBOX + g_tempExcInfoBuf = LOS_VMalloc(TEMP_EXC_INFO_SIZE); +#endif } /* Be called in the exception. */ diff --git a/kernel/common/los_excinfo_pri.h b/kernel/common/los_excinfo_pri.h index ba68d5f4..a30597d1 100644 --- a/kernel/common/los_excinfo_pri.h +++ b/kernel/common/los_excinfo_pri.h @@ -47,6 +47,9 @@ extern VOID SetExcInfoBuf(CHAR *buf); extern CHAR *GetExcInfoBuf(VOID); extern VOID SetExcInfoIndex(UINT32 index); extern UINT32 GetExcInfoIndex(VOID); +#ifdef LOSCFG_BLACKBOX +extern UINT32 GetExcInfoLen(VOID); +#endif extern VOID SetRecordAddr(UINT32 addr); extern UINT32 GetRecordAddr(VOID); extern VOID SetRecordSpace(UINT32 space); diff --git a/tools/build/mk/liteos_tables_ldflags.mk b/tools/build/mk/liteos_tables_ldflags.mk index dd670571..af5aa945 100644 --- a/tools/build/mk/liteos_tables_ldflags.mk +++ b/tools/build/mk/liteos_tables_ldflags.mk @@ -135,7 +135,9 @@ LITEOS_TABLES_KERNEL_INIT_LDFLAGS := \ -uOsCpupGuardCreator \ -uOsMpInit \ -uOsResourceFreeTaskCreate \ - -uOsSystemInit + -uOsSystemInit \ + -uOsBBoxSystemAdapterInit \ + -uOsBBoxDriverInit LITEOS_TABLES_DRIVER_LDFLAGS := \ -ui2c_init \ diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index 9c3923bd..ad304b7f 100644 --- a/tools/build/mk/los_config.mk +++ b/tools/build/mk/los_config.mk @@ -441,6 +441,12 @@ ifeq ($(LOSCFG_BASE_CORE_HILOG), y) LITEOS_HILOG_INCLUDE += -I $(LITEOSTOPDIR)/../../base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog LITEOS_CMACRO += -DLOSCFG_BASE_CORE_HILOG endif +ifeq ($(LOSCFG_BLACKBOX), y) + LITEOS_BASELIB += -lblackbox + LIB_SUBDIRS += $(LITEOSTOPDIR)/kernel/common/blackbox + LITEOS_BLACKBOX_INCLUDE += -I $(LITEOSTOPDIR)/kernel/common/blackbox + LITEOS_CMACRO += -DLOSCFG_BLACKBOX +endif ############################## Dfx Option End ####################################### ############################# Tools && Debug Option Begin ############################## @@ -637,7 +643,8 @@ LITEOS_DRIVERS_INCLUDE := $(LITEOS_CELLWISE_INCLUDE) $(LITEOS_GPIO_INCLUDE $(LITEOS_DRIVERS_HDF_INCLUDE) $(LITEOS_TZDRIVER_INCLUDE) \ $(LITEOS_HIEVENT_INCLUDE) $(LITEOS_DEV_MEM_INCLUDE) \ $(LITEOS_DEV_QUICKSTART_INCLUDE) -LITEOS_DFX_INCLUDE := $(LITEOS_HILOG_INCLUDE) +LITEOS_DFX_INCLUDE := $(LITEOS_HILOG_INCLUDE) \ + $(LITEOS_BLACKBOX_INCLUDE) LITEOS_SECURITY_INCLUDE := $(LITEOS_SECURITY_CAP_INC) $(LITEOS_SECURITY_VID_INC) LOSCFG_TOOLS_DEBUG_INCLUDE := $(LITEOS_SHELL_INCLUDE) $(LITEOS_UART_INCLUDE) \ From ac8c2c6d5b9ede0e46b48212f0b3447605a613c4 Mon Sep 17 00:00:00 2001 From: Caoruihong Date: Wed, 7 Jul 2021 00:03:12 +0800 Subject: [PATCH 13/43] fix: minimal compile fix compile errors in minimal compilation Signed-off-by: Caoruihong Change-Id: I48f4f7b27c684e2c747c1949776c5c4f9e383dec --- apps/module.mk | 2 ++ arch/arm/arm/src/los_exc.c | 2 +- fs/proc/os_adapt/kernel_trace_proc.c | 2 +- kernel/base/core/los_task.c | 2 ++ kernel/base/include/los_task_pri.h | 2 ++ kernel/base/ipc/los_signal.c | 2 ++ kernel/base/vm/los_vm_filemap.c | 2 ++ syscall/los_syscall.h | 2 ++ .../mini_qemu_liteos_a_clang.config} | 1 + .../mini_qemu_liteos_a_clang_release.config | 15 +++++++++++++++ tools/build/mk/los_config.mk | 2 ++ 11 files changed, 32 insertions(+), 2 deletions(-) rename tools/build/config/{qemu_arm_virt_mini.config => debug/mini_qemu_liteos_a_clang.config} (94%) create mode 100644 tools/build/config/mini_qemu_liteos_a_clang_release.config diff --git a/apps/module.mk b/apps/module.mk index e2d014d6..b3df0fc2 100644 --- a/apps/module.mk +++ b/apps/module.mk @@ -45,6 +45,8 @@ endif #only enable for qemu now ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y) +ifeq ($(LOSCFG_SHELL), y) APP_SUBDIRS += mksh APP_SUBDIRS += toybox endif +endif diff --git a/arch/arm/arm/src/los_exc.c b/arch/arm/arm/src/los_exc.c index 06bbdb39..5c1b10a7 100644 --- a/arch/arm/arm/src/los_exc.c +++ b/arch/arm/arm/src/los_exc.c @@ -1182,7 +1182,7 @@ __attribute__((noinline)) VOID LOS_Panic(const CHAR *fmt, ...) } /* stack protector */ -UINT32 __stack_chk_guard = 0xd00a0dff; +USED UINT32 __stack_chk_guard = 0xd00a0dff; VOID __stack_chk_fail(VOID) { diff --git a/fs/proc/os_adapt/kernel_trace_proc.c b/fs/proc/os_adapt/kernel_trace_proc.c index dbb77853..16445b81 100644 --- a/fs/proc/os_adapt/kernel_trace_proc.c +++ b/fs/proc/os_adapt/kernel_trace_proc.c @@ -32,9 +32,9 @@ #include #include #include "proc_fs.h" -#include "los_trace.h" #ifdef LOSCFG_KERNEL_TRACE +#include "los_trace.h" static int KernelTraceProcFill(struct SeqBuf *m, void *v) { (void)v; diff --git a/kernel/base/core/los_task.c b/kernel/base/core/los_task.c index 0eadc9db..f7b3b1a9 100644 --- a/kernel/base/core/los_task.c +++ b/kernel/base/core/los_task.c @@ -1413,6 +1413,7 @@ STATIC VOID OsExitGroupActiveTaskKilled(LosProcessCB *processCB, LosTaskCB *task LOS_MpSchedule(taskCB->currCpu); } else #endif +#ifdef LOSCFG_KERNEL_VM { ret = OsTaskKillUnsafe(taskCB->taskID, SIGKILL); if (ret != LOS_OK) { @@ -1420,6 +1421,7 @@ STATIC VOID OsExitGroupActiveTaskKilled(LosProcessCB *processCB, LosTaskCB *task taskCB->processID, OsCurrTaskGet()->taskID, taskCB->taskID, ret); } } +#endif if (!(taskCB->taskStatus & OS_TASK_FLAG_PTHREAD_JOIN)) { taskCB->taskStatus |= OS_TASK_FLAG_PTHREAD_JOIN; diff --git a/kernel/base/include/los_task_pri.h b/kernel/base/include/los_task_pri.h index b19f74e8..e2e33c02 100644 --- a/kernel/base/include/los_task_pri.h +++ b/kernel/base/include/los_task_pri.h @@ -45,7 +45,9 @@ #include "los_cpup_pri.h" #endif +#ifdef LOSCFG_KERNEL_TRACE #include "los_trace.h" +#endif #ifdef __cplusplus #if __cplusplus diff --git a/kernel/base/ipc/los_signal.c b/kernel/base/ipc/los_signal.c index 06fee687..5366e56e 100644 --- a/kernel/base/ipc/los_signal.c +++ b/kernel/base/ipc/los_signal.c @@ -101,11 +101,13 @@ STATIC UINT32 OsPendingTaskWake(LosTaskCB *taskCB, INT32 signo) case OS_TASK_WAIT_SIGNAL: OsSigWaitTaskWake(taskCB, signo); break; +#ifdef LOSCFG_KERNEL_LITEIPC case OS_TASK_WAIT_LITEIPC: taskCB->ipcStatus &= ~IPC_THREAD_STATUS_PEND; OsTaskWakeClearPendMask(taskCB); OsSchedTaskWake(taskCB); break; +#endif case OS_TASK_WAIT_FUTEX: OsFutexNodeDeleteFromFutexHash(&taskCB->futex, TRUE, NULL, NULL); OsTaskWakeClearPendMask(taskCB); diff --git a/kernel/base/vm/los_vm_filemap.c b/kernel/base/vm/los_vm_filemap.c index 9a6ec2ce..c248d3de 100644 --- a/kernel/base/vm/los_vm_filemap.c +++ b/kernel/base/vm/los_vm_filemap.c @@ -41,7 +41,9 @@ #include "los_vm_fault.h" #include "los_process_pri.h" #include "los_vm_lock.h" +#ifdef LOSCFG_FS_VFS #include "vnode.h" +#endif #ifndef UNUSED #define UNUSED(x) (VOID)x diff --git a/syscall/los_syscall.h b/syscall/los_syscall.h index 14995d43..37429b88 100644 --- a/syscall/los_syscall.h +++ b/syscall/los_syscall.h @@ -62,7 +62,9 @@ #endif #include #include "sys/resource.h" +#ifdef LOSCFG_FS_VFS #include "vnode.h" +#endif /* process */ extern unsigned int SysGetGroupId(void); diff --git a/tools/build/config/qemu_arm_virt_mini.config b/tools/build/config/debug/mini_qemu_liteos_a_clang.config similarity index 94% rename from tools/build/config/qemu_arm_virt_mini.config rename to tools/build/config/debug/mini_qemu_liteos_a_clang.config index 1300f151..6670fbb1 100644 --- a/tools/build/config/qemu_arm_virt_mini.config +++ b/tools/build/config/debug/mini_qemu_liteos_a_clang.config @@ -2,6 +2,7 @@ LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7=y LOSCFG_BOARD_CONFIG_PATH="device/qemu/arm_virt/liteos_a/config/board" # LOSCFG_HRTIMER_ENABLE is not set # LOSCFG_IRQ_USE_STANDALONE_STACK is not set +# LOSCFG_BLACKBOX is not set # LOSCFG_KERNEL_MMU is not set # LOSCFG_KERNEL_EXTKERNEL is not set # LOSCFG_BASE_CORE_HILOG is not set diff --git a/tools/build/config/mini_qemu_liteos_a_clang_release.config b/tools/build/config/mini_qemu_liteos_a_clang_release.config new file mode 100644 index 00000000..6670fbb1 --- /dev/null +++ b/tools/build/config/mini_qemu_liteos_a_clang_release.config @@ -0,0 +1,15 @@ +LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7=y +LOSCFG_BOARD_CONFIG_PATH="device/qemu/arm_virt/liteos_a/config/board" +# LOSCFG_HRTIMER_ENABLE is not set +# LOSCFG_IRQ_USE_STANDALONE_STACK is not set +# LOSCFG_BLACKBOX is not set +# LOSCFG_KERNEL_MMU is not set +# LOSCFG_KERNEL_EXTKERNEL is not set +# LOSCFG_BASE_CORE_HILOG is not set +# LOSCFG_LIB_ZLIB is not set +# LOSCFG_FS_VFS is not set +# LOSCFG_NET_LWIP_SACK is not set +# LOSCFG_PLATFORM_ADAPT is not set +# LOSCFG_ENABLE_MAGICKEY is not set +# LOSCFG_DRIVERS is not set +# LOSCFG_SECURITY is not set diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index ad304b7f..93f4e3b2 100644 --- a/tools/build/mk/los_config.mk +++ b/tools/build/mk/los_config.mk @@ -198,9 +198,11 @@ ifeq ($(LOSCFG_KERNEL_VDSO), y) LITEOS_VDSO_INCLUDE += -I $(LITEOSTOPDIR)/kernel/extended/vdso/include endif +ifeq ($(LOSCFG_KERNEL_TRACE), y) LITEOS_BASELIB += -ltrace LIB_SUBDIRS += kernel/extended/trace LITEOS_TRACE_INCLUDE += -I $(LITEOSTOPDIR)/kernel/extended/trace +endif ifeq ($(LOSCFG_KERNEL_LITEIPC), y) LITEOS_BASELIB += -lliteipc From 55e5e29005111110aa6ce69ec7c2de418fd8cf4f Mon Sep 17 00:00:00 2001 From: Denny Date: Wed, 7 Jul 2021 10:29:43 +0800 Subject: [PATCH 14/43] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!4?= =?UTF-8?q?01=20:=20=E3=80=90DFX=E5=AD=90=E7=B3=BB=E7=BB=9F=E3=80=91?= =?UTF-8?q?=E3=80=90BBoxDetector=E3=80=91LiteOS=5FA=E6=AD=BB=E6=9C=BA?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E7=BB=B4=E6=B5=8B=E6=A1=86=E6=9E=B6'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Kconfig | 4 +- arch/arm/arm/src/los_exc.c | 14 - kernel/base/misc/task_shellcmd.c | 6 - kernel/common/blackbox/Kconfig | 11 - kernel/common/blackbox/Makefile | 14 - kernel/common/blackbox/los_blackbox.h | 95 ---- kernel/common/blackbox/los_blackbox_common.c | 101 ---- kernel/common/blackbox/los_blackbox_common.h | 65 --- kernel/common/blackbox/los_blackbox_core.c | 454 ------------------ .../common/blackbox/los_blackbox_detector.c | 63 --- .../common/blackbox/los_blackbox_detector.h | 55 --- .../blackbox/los_blackbox_system_adapter.c | 247 ---------- .../blackbox/los_blackbox_system_adapter.h | 55 --- kernel/common/los_excinfo.c | 59 --- kernel/common/los_excinfo_pri.h | 3 - tools/build/mk/liteos_tables_ldflags.mk | 4 +- tools/build/mk/los_config.mk | 9 +- 17 files changed, 3 insertions(+), 1256 deletions(-) delete mode 100644 kernel/common/blackbox/Kconfig delete mode 100644 kernel/common/blackbox/Makefile delete mode 100644 kernel/common/blackbox/los_blackbox.h delete mode 100644 kernel/common/blackbox/los_blackbox_common.c delete mode 100644 kernel/common/blackbox/los_blackbox_common.h delete mode 100644 kernel/common/blackbox/los_blackbox_core.c delete mode 100644 kernel/common/blackbox/los_blackbox_detector.c delete mode 100644 kernel/common/blackbox/los_blackbox_detector.h delete mode 100644 kernel/common/blackbox/los_blackbox_system_adapter.c delete mode 100644 kernel/common/blackbox/los_blackbox_system_adapter.h diff --git a/Kconfig b/Kconfig index 491abbe2..8bce9860 100644 --- a/Kconfig +++ b/Kconfig @@ -61,8 +61,6 @@ source "../../kernel/liteos_a/arch/Kconfig" source "../../kernel/liteos_a/kernel/common/Kconfig" ######################### config options of patchfs ##################### source "../../kernel/liteos_a/kernel/common/patchfs/Kconfig" -######################### config options of blackbox ##################### -source "../../kernel/liteos_a/kernel/common/blackbox/Kconfig" config QUICK_START bool "Enable QUICK_START" @@ -177,7 +175,7 @@ config PLATFORM_DVFS config SAVE_EXCINFO bool "Enable Saving Exception Information" - default y if BLACKBOX + default n help Answer Y to enable LiteOS support saving exception information to storage medium. diff --git a/arch/arm/arm/src/los_exc.c b/arch/arm/arm/src/los_exc.c index 06bbdb39..d944caaf 100644 --- a/arch/arm/arm/src/los_exc.c +++ b/arch/arm/arm/src/los_exc.c @@ -62,9 +62,6 @@ #ifdef LOSCFG_FS_VFS #include "console.h" #endif -#ifdef LOSCFG_BLACKBOX -#include "los_blackbox.h" -#endif #define INVALID_CPUID 0xFFFF @@ -592,9 +589,6 @@ STATIC VOID OsUserExcHandle(ExcContext *excBufAddr) /* Exception handling All operations should be kept prior to that operation */ OsExcRestore(); /* kill user exc process */ -#ifdef LOSCFG_BLACKBOX - BBoxNotifyError("USER_CRASH", MODULE_SYSTEM, "Crash in user", 0); -#endif LOS_Exit(OS_PRO_EXIT_OK); } @@ -1064,9 +1058,6 @@ LITE_OS_SEC_TEXT VOID STATIC OsExcPriorDisposal(ExcContext *excBufAddr) LITE_OS_SEC_TEXT_INIT STATIC VOID OsPrintExcHead(UINT32 far) { -#ifdef LOSCFG_BLACKBOX - SetExcInfoIndex(0); -#endif #ifdef LOSCFG_KERNEL_VM /* You are not allowed to add any other print information before this exception information */ if (g_excFromUserMode[ArchCurrCpuid()] == TRUE) { @@ -1134,9 +1125,7 @@ LITE_OS_SEC_TEXT_INIT VOID OsExcHandleEntry(UINT32 excType, ExcContext *excBufAd if (g_curNestCount[ArchCurrCpuid()] == 1) { #ifdef LOSCFG_SAVE_EXCINFO if (func != NULL) { -#ifndef LOSCFG_BLACKBOX SetExcInfoIndex(0); -#endif OsSysStateSave(&intCount, &lockCount); OsRecordExcInfoTime(); OsSysStateRestore(intCount, lockCount); @@ -1165,9 +1154,6 @@ LITE_OS_SEC_TEXT_INIT VOID OsExcHandleEntry(UINT32 excType, ExcContext *excBufAd } #endif -#ifdef LOSCFG_BLACKBOX - BBoxNotifyError(EVENT_PANIC, MODULE_SYSTEM, "Crash in kernel", 1); -#endif while (1) {} } diff --git a/kernel/base/misc/task_shellcmd.c b/kernel/base/misc/task_shellcmd.c index 9b0d678e..05623a56 100644 --- a/kernel/base/misc/task_shellcmd.c +++ b/kernel/base/misc/task_shellcmd.c @@ -85,18 +85,12 @@ STATIC UINT32 *taskWaterLine = NULL; #define OS_TASK_ALL_INFO_LEN (g_taskMaxNum * (sizeof(LosTaskCB) + sizeof(UINT32))) #ifdef LOSCFG_FS_VFS -#ifdef LOSCFG_BLACKBOX -#define SaveExcInfo(arg, ...) WriteExcInfoToBuf(arg, ##__VA_ARGS__) -#else -#define SaveExcInfo(arg, ...) -#endif #define PROCESS_INFO_SHOW(seqBuf, arg...) do { \ if (seqBuf != NULL) { \ (void)LosBufPrintf((struct SeqBuf *)seqBuf, ##arg); \ } else { \ PRINTK(arg); \ } \ - SaveExcInfo(arg); \ } while (0) #else #define PROCESS_INFO_SHOW(seqBuf, arg...) PRINTK(arg) diff --git a/kernel/common/blackbox/Kconfig b/kernel/common/blackbox/Kconfig deleted file mode 100644 index 0c1e4f07..00000000 --- a/kernel/common/blackbox/Kconfig +++ /dev/null @@ -1,11 +0,0 @@ -config BLACKBOX - bool "Enable BlackBox" - default y - help - Answer Y to enable LiteOS support blackbox - -config LOG_ROOT_PATH - string - default "/storage/data/log" if BLACKBOX - help - define the default log path of blackbox \ No newline at end of file diff --git a/kernel/common/blackbox/Makefile b/kernel/common/blackbox/Makefile deleted file mode 100644 index e67f8794..00000000 --- a/kernel/common/blackbox/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -include $(LITEOSTOPDIR)/config.mk - -MODULE_NAME := $(notdir $(shell pwd)) - -LOCAL_SRCS := $(wildcard *.c) - -LOCAL_INCLUDE := \ - -I $(LITEOSTOPDIR)/kernel/common \ - -I $(LITEOSTOPDIR)/kernel/common/blackbox \ - -I $(LITEOSTOPDIR)/syscall \ - -LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS) - -include $(MODULE) diff --git a/kernel/common/blackbox/los_blackbox.h b/kernel/common/blackbox/los_blackbox.h deleted file mode 100644 index b60460ca..00000000 --- a/kernel/common/blackbox/los_blackbox.h +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef LOS_BLACKBOX_H -#define LOS_BLACKBOX_H - -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - -#ifndef __user -#define __user -#endif - -#include "stdarg.h" -#include "los_typedef.h" - -#define PATH_MAX_LEN 256 -#define EVENT_MAX_LEN 32 -#define MODULE_MAX_LEN 32 -#define ERROR_DESC_MAX_LEN 512 -#ifndef LOSCFG_LOG_ROOT_PATH -#define LOSCFG_LOG_ROOT_PATH "/storage/data/log" -#endif -#define KERNEL_FAULT_LOG_PATH LOSCFG_LOG_ROOT_PATH "/kernel_fault.log" -#define USER_FAULT_LOG_PATH LOSCFG_LOG_ROOT_PATH "/user_fault.log" - -#define MODULE_SYSTEM "SYSTEM" -#define EVENT_SYSREBOOT "SYSREBOOT" -#define EVENT_LONGPRESS "LONGPRESS" -#define EVENT_COMBINATIONKEY "COMBINATIONKEY" -#define EVENT_SUBSYSREBOOT "SUBSYSREBOOT" -#define EVENT_POWEROFF "POWEROFF" -#define EVENT_PANIC "PANIC" -#define EVENT_SYS_WATCHDOG "SYSWATCHDOG" -#define EVENT_HUNGTASK "HUNGTASK" -#define EVENT_BOOTFAIL "BOOTFAIL" - -struct ErrorInfo { - char event[EVENT_MAX_LEN]; - char module[MODULE_MAX_LEN]; - char errorDesc[ERROR_DESC_MAX_LEN]; -}; - -struct ModuleOps { - char module[MODULE_MAX_LEN]; - void (*Dump)(const char *logDir, struct ErrorInfo *info); - void (*Reset)(struct ErrorInfo *info); - int (*GetLastLogInfo)(struct ErrorInfo *info); - int (*SaveLastLog)(const char *logDir, struct ErrorInfo *info); -}; - -int BBoxRegisterModuleOps(struct ModuleOps *ops); -int BBoxNotifyError(const char event[EVENT_MAX_LEN], - const char module[MODULE_MAX_LEN], - const char errorDesc[ERROR_DESC_MAX_LEN], - int needSysReset); -int OsBBoxDriverInit(void); - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ - -#endif \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_common.c b/kernel/common/blackbox/los_blackbox_common.c deleted file mode 100644 index 074f7e7d..00000000 --- a/kernel/common/blackbox/los_blackbox_common.c +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* ------------ includes ------------ */ -#include "los_blackbox_common.h" -#ifdef LOSCFG_LIB_LIBC -#include "stdlib.h" -#include "unistd.h" -#endif -#include "fs/fs.h" -#include "securec.h" -#include "los_memory.h" - -/* ------------ local macroes ------------ */ -/* ------------ local prototypes ------------ */ -/* ------------ local function declarations ------------ */ -/* ------------ global function declarations ------------ */ -/* ------------ local variables ------------ */ -/* ------------ function definitions ------------ */ -int FullWriteFile(const char *filePath, const char *buf, size_t bufSize, int isAppend) -{ - int fd; - int totalToWrite = (int)bufSize; - int totalWrite = 0; - - if (filePath == NULL || buf == NULL || bufSize == 0) { - BBOX_PRINT_ERR("filePath: %p, buf: %p, bufSize: %lu!\n", filePath, buf, bufSize); - return -1; - } - - fd = open(filePath, O_CREAT | O_RDWR | (isAppend ? O_APPEND : O_TRUNC), 0644); - if (fd < 0) { - BBOX_PRINT_ERR("Create file [%s] failed, fd: %d!\n", filePath, fd); - return -1; - } - while (totalToWrite > 0) { - int writeThisTime = write(fd, buf, totalToWrite); - if (writeThisTime < 0) { - BBOX_PRINT_ERR("Failed to write file [%s]!\n", filePath); - (void)close(fd); - return -1; - } - buf += writeThisTime; - totalToWrite -= writeThisTime; - totalWrite += writeThisTime; - } - (void)close(fd); - - return (totalWrite == (int)bufSize) ? 0 : -1; -} - -int SaveBasicErrorInfo(const char *filePath, struct ErrorInfo *info) -{ - char *buf; - - if (filePath == NULL || info == NULL) { - BBOX_PRINT_ERR("filePath: %p, event: %p!\n", filePath, info); - return -1; - } - - buf = LOS_MemAlloc(m_aucSysMem1, ERROR_INFO_MAX_LEN); - if (buf == NULL) { - BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); - return -1; - } - (void)memset_s(buf, ERROR_INFO_MAX_LEN, 0, ERROR_INFO_MAX_LEN); - (void)snprintf_s(buf, ERROR_INFO_MAX_LEN, ERROR_INFO_MAX_LEN - 1, - ERROR_INFO_HEADER ERROR_INFO_HEADER_FORMAT, info->event, info->module, info->errorDesc); - *(buf + ERROR_INFO_MAX_LEN - 1) = '\0'; - (void)FullWriteFile(filePath, buf, strlen(buf), 0); - (void)LOS_MemFree(m_aucSysMem1, buf); - - return 0; -} \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_common.h b/kernel/common/blackbox/los_blackbox_common.h deleted file mode 100644 index b6e76e9d..00000000 --- a/kernel/common/blackbox/los_blackbox_common.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef LOS_BLACKBOX_COMMON_H -#define LOS_BLACKBOX_COMMON_H - -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - -#ifndef __user -#define __user -#endif - -#include "los_blackbox.h" -#include "los_printf.h" -#include "los_typedef.h" - -#define ERROR_INFO_HEADER "#### error info ####\n" -#define ERROR_INFO_HEADER_FORMAT "event: %s\nmodule: %s\nerrorDesc: %s\n" -#define ERROR_INFO_MAX_LEN 768 -#define Min(a, b) (((a) > (b)) ? (b) : (a)) -#define BBOX_PRINT_ERR(format, ...) PRINTK("bbox: func: %s, line: %d, Err: " \ - format, __func__, __LINE__, ##__VA_ARGS__) -#define BBOX_PRINT_INFO(format, ...) PRINTK("bbox: Info: " format, ##__VA_ARGS__) - -int FullWriteFile(const char *filePath, const char *buf, size_t bufSize, int isAppend); -int SaveBasicErrorInfo(const char *filePath, struct ErrorInfo *info); - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ - -#endif \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_core.c b/kernel/common/blackbox/los_blackbox_core.c deleted file mode 100644 index 64199683..00000000 --- a/kernel/common/blackbox/los_blackbox_core.c +++ /dev/null @@ -1,454 +0,0 @@ -/* - * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* ------------ includes ------------ */ -#include "los_blackbox.h" -#include "los_blackbox_common.h" -#include "los_blackbox_detector.h" -#ifdef LOSCFG_LIB_LIBC -#include "stdlib.h" -#include "unistd.h" -#endif -#include "los_base.h" -#include "los_config.h" -#include "los_excinfo_pri.h" -#include "los_hw.h" -#include "los_init.h" -#include "los_memory.h" -#include "los_sem.h" -#include "los_syscall.h" -#include "securec.h" -#include "sys/reboot.h" - -/* ------------ local macroes ------------ */ -#define LOG_WAIT_TIMES 10 -#define LOG_PART_WAIT_TIME 1000 - -/* ------------ local prototypes ------------ */ -typedef struct BBoxOps { - LOS_DL_LIST opsList; - struct ModuleOps ops; -} BBoxOps; - -/* ------------ local function declarations ------------ */ -/* ------------ global function declarations ------------ */ -/* ------------ local variables ------------ */ -static UINT32 g_opsListSem = 0; -static UINT32 g_tempErrInfoSem = 0; -static LOS_DL_LIST_HEAD(g_opsList); -struct ErrorInfo *g_tempErrInfo; - -/* ------------ function definitions ------------ */ -static void FormatErrorInfo(struct ErrorInfo *info, - const char event[EVENT_MAX_LEN], - const char module[MODULE_MAX_LEN], - const char errorDesc[ERROR_DESC_MAX_LEN]) -{ - if (info == NULL || event == NULL || module == NULL || errorDesc == NULL) { - BBOX_PRINT_ERR("info: %p, event: %p, module: %p, errorDesc: %p!\n", info, event, module, errorDesc); - return; - } - - (void)memset_s(info, sizeof(*info), 0, sizeof(*info)); - (void)strncpy_s(info->event, sizeof(info->event), event, Min(strlen(event), sizeof(info->event) - 1)); - info->event[sizeof(info->event) - 1] = '\0'; - (void)strncpy_s(info->module, sizeof(info->module), module, Min(strlen(module), sizeof(info->module) - 1)); - info->module[sizeof(info->module) - 1] = '\0'; - (void)strncpy_s(info->errorDesc, sizeof(info->errorDesc), errorDesc, - Min(strlen(errorDesc), sizeof(info->errorDesc) - 1)); - info->errorDesc[sizeof(info->errorDesc) - 1] = '\0'; -} - -#ifdef LOSCFG_FS_VFS -static bool IsLogPartReady(void) -{ - return access(LOSCFG_LOG_ROOT_PATH, 0) == 0; -} - -static void WaitForLogPart(void) -{ - BBOX_PRINT_INFO("wait for log part [%s] begin!\n", LOSCFG_LOG_ROOT_PATH); - while (!IsLogPartReady()) { - LOS_Msleep(LOG_PART_WAIT_TIME); - } - BBOX_PRINT_INFO("wait for log part [%s] end!\n", LOSCFG_LOG_ROOT_PATH); -} -#else -static bool IsLogPartReady(void) -{ - return TRUE; -} - -static void WaitForLogPart(void) -{ - int i = 0; - - BBOX_PRINT_INFO("wait for log part [%s] begin!\n", LOSCFG_LOG_ROOT_PATH); - while (i++ < LOG_WAIT_TIMES) { - LOS_Msleep(LOG_PART_WAIT_TIME); - } - BBOX_PRINT_INFO("wait for log part [%s] end!\n", LOSCFG_LOG_ROOT_PATH); -} -#endif - -static bool FindModuleOps(struct ErrorInfo *info, BBoxOps **ops) -{ - bool found = false; - - if (info == NULL || ops == NULL) { - BBOX_PRINT_ERR("info: %p, ops: %p!\n", info, ops); - return found; - } - - LOS_DL_LIST_FOR_EACH_ENTRY(*ops, &g_opsList, BBoxOps, opsList) { - if (*ops != NULL && strcmp((*ops)->ops.module, info->module) == 0) { - found = true; - break; - } - } - if (!found) { - BBOX_PRINT_ERR("[%s] hasn't been registered!\n", info->module); - } - - return found; -} - -static void InvokeModuleOps(struct ErrorInfo *info, BBoxOps *ops) -{ - if (info == NULL || ops == NULL) { - BBOX_PRINT_ERR("info: %p, ops: %p!\n", info, ops); - return; - } - - if (ops->ops.Dump != NULL) { - BBOX_PRINT_INFO("[%s] starts dumping log!\n", ops->ops.module); - ops->ops.Dump(LOSCFG_LOG_ROOT_PATH, info); - BBOX_PRINT_INFO("[%s] ends dumping log!\n", ops->ops.module); - } - if (ops->ops.Reset != NULL) { - BBOX_PRINT_INFO("[%s] starts resetting!\n", ops->ops.module); - ops->ops.Reset(info); - BBOX_PRINT_INFO("[%s] ends resetting!\n", ops->ops.module); - } -} - -static void SaveLastLog(const char *logDir) -{ - struct ErrorInfo *info; - BBoxOps *ops; - - info = LOS_MemAlloc(m_aucSysMem1, sizeof(*info)); - if (info == NULL) { - BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); - return; - } - - if (LOS_SemPend(g_opsListSem, LOS_WAIT_FOREVER) != LOS_OK) { - BBOX_PRINT_ERR("Request g_opsListSem failed!\n"); - (void)LOS_MemFree(m_aucSysMem1, info); - return; - } - - LOS_DL_LIST_FOR_EACH_ENTRY(ops, &g_opsList, BBoxOps, opsList) { - if (ops == NULL) { - BBOX_PRINT_ERR("ops: NULL, please check it!\n"); - continue; - } - if (ops->ops.GetLastLogInfo != NULL && ops->ops.SaveLastLog != NULL) { - (void)memset_s(info, sizeof(*info), 0, sizeof(*info)); - if (ops->ops.GetLastLogInfo(info) != 0) { - BBOX_PRINT_ERR("[%s] failed to get log info!\n", ops->ops.module); - continue; - } - BBOX_PRINT_INFO("[%s] starts saving log!\n", ops->ops.module); - if (ops->ops.SaveLastLog(logDir, info) != 0) { - BBOX_PRINT_ERR("[%s] failed to save log!\n", ops->ops.module); - } else { - BBOX_PRINT_INFO("[%s] ends saving log!\n", ops->ops.module); - BBOX_PRINT_INFO("[%s] starts uploading event [%s]\n", info->module, info->event); -#ifdef LOSCFG_FS_VFS - (void)UploadEventByFile(KERNEL_FAULT_LOG_PATH); -#else - BBOX_PRINT_INFO("LOSCFG_FS_VFS isn't defined!\n"); -#endif - BBOX_PRINT_INFO("[%s] ends uploading event [%s]\n", info->module, info->event); - } - } else { - BBOX_PRINT_ERR("module [%s], GetLastLogInfo: %p, SaveLastLog: %p!\n", - ops->ops.module, ops->ops.GetLastLogInfo, ops->ops.SaveLastLog); - } - } - (void)LOS_SemPost(g_opsListSem); - (void)LOS_MemFree(m_aucSysMem1, info); -} - -static void SaveLogWithoutReset(struct ErrorInfo *info) -{ - BBoxOps *ops; - - if (info == NULL) { - BBOX_PRINT_ERR("info: %p!\n", info); - return; - } - - if (LOS_SemPend(g_opsListSem, LOS_WAIT_FOREVER) != LOS_OK) { - BBOX_PRINT_ERR("Request g_opsListSem failed!\n"); - return; - } - if (!FindModuleOps(info, &ops)) { - (void)LOS_SemPost(g_opsListSem); - return; - } - if (ops->ops.Dump == NULL && ops->ops.Reset == NULL) { - (void)LOS_SemPost(g_opsListSem); - if (SaveBasicErrorInfo(USER_FAULT_LOG_PATH, info) == 0) { - BBOX_PRINT_INFO("[%s] starts uploading event [%s]\n", info->module, info->event); -#ifdef LOSCFG_FS_VFS - (void)UploadEventByFile(USER_FAULT_LOG_PATH); -#else - BBOX_PRINT_INFO("LOSCFG_FS_VFS isn't defined!\n"); -#endif - BBOX_PRINT_INFO("[%s] ends uploading event [%s]\n", info->module, info->event); - } - return; - } - InvokeModuleOps(info, ops); - (void)LOS_SemPost(g_opsListSem); -} - -static void SaveTempErrorLog(void) -{ - if (LOS_SemPend(g_tempErrInfoSem, LOS_WAIT_FOREVER) != LOS_OK) { - BBOX_PRINT_ERR("Request g_tempErrInfoSem failed!\n"); - return; - } - if (g_tempErrInfo == NULL) { - BBOX_PRINT_ERR("g_tempErrInfo: %p!\n", g_tempErrInfo); - (void)LOS_SemPost(g_tempErrInfoSem); - return; - } - if (strlen(g_tempErrInfo->event) != 0) { - SaveLogWithoutReset(g_tempErrInfo); - } - (void)LOS_MemFree(m_aucSysMem1, g_tempErrInfo); - g_tempErrInfo = NULL; - (void)LOS_SemPost(g_tempErrInfoSem); -} - -static void SaveLogWithReset(struct ErrorInfo *info) -{ - int ret; - BBoxOps *ops; - - if (info == NULL) { - BBOX_PRINT_ERR("info: %p!\n", info); - return; - } - - if (!FindModuleOps(info, &ops)) { - return; - } - InvokeModuleOps(info, ops); - ret = SysReboot(0, 0, RB_AUTOBOOT); - BBOX_PRINT_INFO("SysReboot, ret: %d\n", ret); -} - -static void SaveTempErrorInfo(const char event[EVENT_MAX_LEN], - const char module[MODULE_MAX_LEN], - const char errorDesc[ERROR_DESC_MAX_LEN]) -{ - if (event == NULL || module == NULL || errorDesc == NULL) { - BBOX_PRINT_ERR("event: %p, module: %p, errorDesc: %p!\n", event, module, errorDesc); - return; - } - if (LOS_SemPend(g_tempErrInfoSem, LOS_WAIT_FOREVER) != LOS_OK) { - BBOX_PRINT_ERR("Request g_tempErrInfoSem failed!\n"); - return; - } - FormatErrorInfo(g_tempErrInfo, event, module, errorDesc); - (void)LOS_SemPost(g_tempErrInfoSem); -} - -static int SaveErrorLog(UINTPTR uwParam1, UINTPTR uwParam2, UINTPTR uwParam3, UINTPTR uwParam4) -{ - const char *logDir = (const char *)uwParam1; - (void)uwParam2; - (void)uwParam3; - (void)uwParam4; - -#ifdef LOSCFG_FS_VFS - WaitForLogPart(); -#endif - SaveLastLog(logDir); - SaveTempErrorLog(); - - return 0; -} - -#ifdef LOSCFG_BLACKBOX_DEBUG -static void PrintModuleOps(void) -{ - struct BBoxOps *ops; - - BBOX_PRINT_INFO("The following modules have been registered!\n"); - LOS_DL_LIST_FOR_EACH_ENTRY(ops, &g_opsList, BBoxOps, opsList) { - if (ops == NULL) { - continue; - } - BBOX_PRINT_INFO("module: %s, Dump: %p, Reset: %p, GetLastLogInfo: %p, SaveLastLog: %p\n", - ops->ops.module, ops->ops.Dump, ops->ops.Reset, ops->ops.GetLastLogInfo, ops->ops.SaveLastLog); - } -} -#endif - -int BBoxRegisterModuleOps(struct ModuleOps *ops) -{ - BBoxOps *newOps; - BBoxOps *temp; - - if (ops == NULL) { - BBOX_PRINT_ERR("ops: %p!\n", ops); - return -1; - } - - newOps = LOS_MemAlloc(m_aucSysMem1, sizeof(*newOps)); - if (newOps == NULL) { - BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); - return -1; - } - (void)memset_s(newOps, sizeof(*newOps), 0, sizeof(*newOps)); - (void)memcpy_s(&newOps->ops, sizeof(newOps->ops), ops, sizeof(*ops)); - if (LOS_SemPend(g_opsListSem, LOS_WAIT_FOREVER) != LOS_OK) { - BBOX_PRINT_ERR("Request g_opsListSem failed!\n"); - (void)LOS_MemFree(m_aucSysMem1, newOps); - return -1; - } - if (LOS_ListEmpty(&g_opsList)) { - goto __out; - } - - LOS_DL_LIST_FOR_EACH_ENTRY(temp, &g_opsList, BBoxOps, opsList) { - if (temp == NULL) { - continue; - } - if (strcmp(temp->ops.module, ops->module) == 0) { - BBOX_PRINT_ERR("module [%s] has been registered!\n", ops->module); - (void)LOS_SemPost(g_opsListSem); - (void)LOS_MemFree(m_aucSysMem1, newOps); - return -1; - } - } - -__out: - LOS_ListTailInsert(&g_opsList, &newOps->opsList); - (void)LOS_SemPost(g_opsListSem); - BBOX_PRINT_INFO("module [%s] is registered successfully!\n", ops->module); -#ifdef LOSCFG_BLACKBOX_DEBUG - PrintModuleOps(); -#endif - - return 0; -} - -int BBoxNotifyError(const char event[EVENT_MAX_LEN], - const char module[MODULE_MAX_LEN], - const char errorDesc[ERROR_DESC_MAX_LEN], - int needSysReset) -{ - struct ErrorInfo *info; - - if (event == NULL || module == NULL || errorDesc == NULL) { - BBOX_PRINT_ERR("event: %p, module: %p, errorDesc: %p!\n", event, module, errorDesc); - return -1; - } - info = LOS_MemAlloc(m_aucSysMem1, sizeof(*info)); - if (info == NULL) { - BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); - return -1; - } - FormatErrorInfo(info, event, module, errorDesc); - if (needSysReset == 0) { - if (!IsLogPartReady()) { - SaveTempErrorInfo(event, module, errorDesc); - } else { - SaveLogWithoutReset(info); - } - } else { - SaveLogWithReset(info); - } - (void)LOS_MemFree(m_aucSysMem1, info); - - return 0; -} - -int OsBBoxDriverInit(void) -{ - UINT32 taskID; - TSK_INIT_PARAM_S taskParam; - - if (LOS_BinarySemCreate(1, &g_opsListSem) != LOS_OK) { - BBOX_PRINT_ERR("Create g_opsListSem failed!\n"); - return -1; - } - if (LOS_BinarySemCreate(1, &g_tempErrInfoSem) != LOS_OK) { - BBOX_PRINT_ERR("Create g_tempErrInfoSem failed!\n"); - goto __err; - } - LOS_ListInit(&g_opsList); - g_tempErrInfo = LOS_MemAlloc(m_aucSysMem1, sizeof(*g_tempErrInfo)); - if (g_tempErrInfo == NULL) { - BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); - goto __err; - } - (void)memset_s(g_tempErrInfo, sizeof(*g_tempErrInfo), 0, sizeof(*g_tempErrInfo)); - (void)memset_s(&taskParam, sizeof(taskParam), 0, sizeof(taskParam)); - taskParam.auwArgs[0] = (UINTPTR)LOSCFG_LOG_ROOT_PATH; - taskParam.pfnTaskEntry = (TSK_ENTRY_FUNC)SaveErrorLog; - taskParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; - taskParam.pcName = "SaveErrorLog"; - taskParam.usTaskPrio = LOSCFG_BASE_CORE_TSK_DEFAULT_PRIO; - taskParam.uwResved = LOS_TASK_STATUS_DETACHED; -#ifdef LOSCFG_KERNEL_SMP - taskParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); -#endif - (void)LOS_TaskCreate(&taskID, &taskParam); - return 0; - -__err: - if (g_opsListSem != 0) { - (void)LOS_SemDelete(g_opsListSem); - } - if (g_tempErrInfoSem != 0) { - (void)LOS_SemDelete(g_tempErrInfoSem); - } - - return -1; -} -LOS_MODULE_INIT(OsBBoxDriverInit, LOS_INIT_LEVEL_ARCH); \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_detector.c b/kernel/common/blackbox/los_blackbox_detector.c deleted file mode 100644 index 5d91ef9d..00000000 --- a/kernel/common/blackbox/los_blackbox_detector.c +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* ------------ includes ------------ */ -#include "los_blackbox_detector.h" -#include "los_blackbox_common.h" -#ifdef LOSCFG_LIB_LIBC -#include "stdlib.h" -#include "unistd.h" -#endif - -/* ------------ local macroes ------------ */ -/* ------------ local prototypes ------------ */ -/* ------------ local function declarations ------------ */ -/* ------------ global function declarations ------------ */ -/* ------------ local variables ------------ */ -/* ------------ function definitions ------------ */ -int UploadEventByFile(const char *filePath) -{ - if (filePath == NULL) { - BBOX_PRINT_ERR("filePath: %p\n", filePath); - return -1; - } - - return 0; -} - -int UploadEventByStream(const char *buf, size_t bufSize) -{ - if (buf == NULL || bufSize == 0) { - BBOX_PRINT_ERR("buf: %p, bufSize: %u\n", buf, (UINT32)bufSize); - return -1; - } - - return 0; -} \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_detector.h b/kernel/common/blackbox/los_blackbox_detector.h deleted file mode 100644 index a424f7a6..00000000 --- a/kernel/common/blackbox/los_blackbox_detector.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef LOS_BLACKBOX_DETECTOR_H -#define LOS_BLACKBOX_DETECTOR_H - -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - -#ifndef __user -#define __user -#endif - -#include "los_typedef.h" - -int UploadEventByFile(const char *filePath); -int UploadEventByStream(const char *buf, size_t bufSize); - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ - -#endif \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_system_adapter.c b/kernel/common/blackbox/los_blackbox_system_adapter.c deleted file mode 100644 index 11a85907..00000000 --- a/kernel/common/blackbox/los_blackbox_system_adapter.c +++ /dev/null @@ -1,247 +0,0 @@ -/* - * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* ------------ includes ------------ */ -#include "los_blackbox_system_adapter.h" -#include "los_blackbox_common.h" -#include "los_blackbox_detector.h" -#ifdef LOSCFG_LIB_LIBC -#include "stdlib.h" -#include "unistd.h" -#endif -#include "los_base.h" -#include "los_config.h" -#include "los_excinfo_pri.h" -#include "los_hw.h" -#include "los_init.h" -#include "los_memory.h" -#include "los_vm_phys.h" -#include "fs/fs.h" -#include "securec.h" - -/* ------------ local macroes ------------ */ -#define MEM_OVERLAP_COUNT 50 -#define LOG_FLAG "GOODLOG" -#define FAULT_LOG_SIZE 0x4000 /* 16KB */ - -/* ------------ local prototypes ------------ */ -struct FaultLogInfo { - char flag[8]; /* 8 is the length of the flag */ - int len; /* length of the fault log saved by the module excinfo */ - struct ErrorInfo info; -}; - -/* ------------ local function declarations ------------ */ -/* ------------ global function declarations ------------ */ -/* ------------ local variables ------------ */ -static char *g_logBuffer = NULL; - -/* ------------ function definitions ------------ */ -static void SaveFaultLog(const char *filePath, const char *dataBuf, size_t bufSize, struct ErrorInfo *info) -{ - (void)SaveBasicErrorInfo(filePath, info); - (void)FullWriteFile(filePath, dataBuf, bufSize, 1); -} - -static void WriteExcFile(UINT32 startAddr, UINT32 space, UINT32 rwFlag, char *buf) -{ - (void)startAddr; - (void)space; - (void)rwFlag; - (void)buf; -} - -static void RegisterExcInfoHook(void) -{ - if (g_logBuffer != NULL) { - LOS_ExcInfoRegHook(0, FAULT_LOG_SIZE - sizeof(struct FaultLogInfo), - g_logBuffer + sizeof(struct FaultLogInfo), WriteExcFile); - } else { - BBOX_PRINT_ERR("Alloc mem failed!\n"); - } -} - -static INT32 AllocLogBuffer(void) -{ - INT32 i; - size_t nPages = ROUNDUP(FAULT_LOG_SIZE, PAGE_SIZE) >> PAGE_SHIFT; - void *tempBuffer[MEM_OVERLAP_COUNT]; - - for (i = 0; i < MEM_OVERLAP_COUNT; i++) { - g_logBuffer = LOS_PhysPagesAllocContiguous(nPages); - tempBuffer[i] = g_logBuffer; - } - for (i = 0; i < MEM_OVERLAP_COUNT - 1; i++) { - LOS_PhysPagesFreeContiguous(tempBuffer[i], nPages); - } - - return (g_logBuffer != NULL) ? 0 : -1; -} - -static void Dump(const char *logDir, struct ErrorInfo *info) -{ - struct FaultLogInfo *pInfo; - - if (logDir == NULL || info == NULL) { - BBOX_PRINT_ERR("logDir: %p, info: %p!\n", logDir, info); - return; - } - if (g_logBuffer == NULL) { - BBOX_PRINT_ERR("g_logBuffer: %p!\n", g_logBuffer); - return; - } - - if (strcmp(info->event, EVENT_PANIC) == 0) { - pInfo = (struct FaultLogInfo *)g_logBuffer; - (void)memset_s(pInfo, sizeof(*pInfo), 0, sizeof(*pInfo)); - pInfo->len = GetExcInfoLen(); - (void)memcpy_s(&pInfo->flag, sizeof(pInfo->flag), LOG_FLAG, strlen(LOG_FLAG)); - (void)memcpy_s(&pInfo->info, sizeof(pInfo->info), info, sizeof(*info)); - DCacheFlushRange((UINTPTR)g_logBuffer, (UINTPTR)(g_logBuffer + FAULT_LOG_SIZE)); - } else { - SaveFaultLog(USER_FAULT_LOG_PATH, g_logBuffer + sizeof(struct FaultLogInfo), - Min(FAULT_LOG_SIZE - sizeof(struct FaultLogInfo), GetExcInfoLen()), info); - } -} - -static void Reset(struct ErrorInfo *info) -{ - if (info == NULL) { - BBOX_PRINT_ERR("info: %p!\n", info); - return; - } - - if (strcmp(info->event, EVENT_PANIC) != 0) { - BBOX_PRINT_INFO("[%s] starts uploading event [%s]\n", info->module, info->event); - (void)UploadEventByFile(USER_FAULT_LOG_PATH); - BBOX_PRINT_INFO("[%s] ends uploading event [%s]\n", info->module, info->event); - } -} - -static int GetLastLogInfo(struct ErrorInfo *info) -{ - struct FaultLogInfo *pInfo; - - if (info == NULL) { - BBOX_PRINT_ERR("info: %p!\n", info); - return -1; - } - if (g_logBuffer == NULL) { - BBOX_PRINT_ERR("Alloc physical page failed!\n"); - return -1; - } - - pInfo = (struct FaultLogInfo *)g_logBuffer; - if (memcmp(pInfo->flag, LOG_FLAG, strlen(LOG_FLAG)) == 0) { - (void)memcpy_s(info, sizeof(*info), &pInfo->info, sizeof(pInfo->info)); - return 0; - } - - return -1; -} - -static int SaveLastLog(const char *logDir, struct ErrorInfo *info) -{ -#ifdef LOSCFG_FS_VFS - struct FaultLogInfo *pInfo; - - if (logDir == NULL || info == NULL) { - BBOX_PRINT_ERR("logDir: %p, info: %p!\n", logDir, info); - return -1; - } - if (g_logBuffer == NULL) { - BBOX_PRINT_ERR("Alloc physical page failed!\n"); - return -1; - } - - pInfo = (struct FaultLogInfo *)g_logBuffer; - if (memcmp(pInfo->flag, LOG_FLAG, strlen(LOG_FLAG)) == 0) { - SaveFaultLog(KERNEL_FAULT_LOG_PATH, g_logBuffer + sizeof(*pInfo), - Min(FAULT_LOG_SIZE - sizeof(*pInfo), pInfo->len), info); - } -#endif - (void)memset_s(g_logBuffer, FAULT_LOG_SIZE, 0, FAULT_LOG_SIZE); - BBOX_PRINT_INFO("[%s] starts uploading event [%s]\n", info->module, info->event); - (void)UploadEventByFile(KERNEL_FAULT_LOG_PATH); - BBOX_PRINT_INFO("[%s] ends uploading event [%s]\n", info->module, info->event); - - return 0; -} - -#ifdef LOSCFG_BLACKBOX_TEST -static void BBoxTest(void) -{ - struct ModuleOps ops = { - .module = "MODULE_TEST", - .Dump = NULL, - .Reset = NULL, - .GetLastLogInfo = NULL, - .SaveLastLog = NULL, - }; - - if (BBoxRegisterModuleOps(&ops) != 0) { - BBOX_PRINT_ERR("BBoxRegisterModuleOps failed!\n"); - return; - } - BBoxNotifyError("EVENT_TEST1", "MODULE_TEST", "Test BBoxNotifyError111", 0); -} -#endif - -int OsBBoxSystemAdapterInit(void) -{ - struct ModuleOps ops = { - .module = MODULE_SYSTEM, - .Dump = Dump, - .Reset = Reset, - .GetLastLogInfo = GetLastLogInfo, - .SaveLastLog = SaveLastLog, - }; - - /* allocate buffer for kmsg */ - if (AllocLogBuffer() == 0) { - BBOX_PRINT_INFO("g_logBuffer: %p for blackbox!\n", g_logBuffer); - RegisterExcInfoHook(); - if (BBoxRegisterModuleOps(&ops) != 0) { - BBOX_PRINT_ERR("BBoxRegisterModuleOps failed!\n"); - LOS_PhysPagesFreeContiguous(g_logBuffer, ROUNDUP(FAULT_LOG_SIZE, PAGE_SIZE) >> PAGE_SHIFT); - g_logBuffer = NULL; - return -1; - } - } else { - BBOX_PRINT_ERR("AllocLogBuffer failed!\n"); - } - -#ifdef LOSCFG_BLACKBOX_TEST - BBoxTest(); -#endif - - return 0; -} -LOS_MODULE_INIT(OsBBoxSystemAdapterInit, LOS_INIT_LEVEL_ARCH); \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_system_adapter.h b/kernel/common/blackbox/los_blackbox_system_adapter.h deleted file mode 100644 index e4fbf2cc..00000000 --- a/kernel/common/blackbox/los_blackbox_system_adapter.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef LOS_BLACKBOX_SYSTEM_ADAPTER_H -#define LOS_BLACKBOX_SYSTEM_ADAPTER_H - -#ifdef __cplusplus -#if __cplusplus -extern "C" { -#endif /* __cplusplus */ -#endif /* __cplusplus */ - -#ifndef __user -#define __user -#endif - -#include "los_blackbox.h" -#include "los_blackbox_common.h" - -int OsBBoxSystemAdapterInit(void); - -#ifdef __cplusplus -#if __cplusplus -} -#endif /* __cplusplus */ -#endif /* __cplusplus */ - -#endif \ No newline at end of file diff --git a/kernel/common/los_excinfo.c b/kernel/common/los_excinfo.c index f605c186..b18ee23b 100644 --- a/kernel/common/los_excinfo.c +++ b/kernel/common/los_excinfo.c @@ -34,29 +34,13 @@ #ifdef LOSCFG_SHELL #include "shcmd.h" #endif -#ifdef LOSCFG_BLACKBOX -#include "fs/fs.h" -#include "fs/fs_operation.h" -#endif - -#ifdef LOSCFG_BLACKBOX -#define TEMP_EXC_INFO_SIZE 0x400 -#endif #ifdef LOSCFG_SAVE_EXCINFO STATIC log_read_write_fn g_excInfoRW = NULL; /* the hook of read-writing exception information */ STATIC CHAR *g_excInfoBuf = NULL; /* pointer to the buffer for storing the exception information */ -#ifdef LOSCFG_BLACKBOX -STATIC UINT32 g_excInfoIndex = 0; /* the index of the buffer for storing the exception information */ -#else STATIC UINT32 g_excInfoIndex = 0xFFFFFFFF; /* the index of the buffer for storing the exception information */ -#endif STATIC UINT32 g_recordAddr = 0; /* the address of storing the exception information */ STATIC UINT32 g_recordSpace = 0; /* the size of storing the exception information */ -#ifdef LOSCFG_BLACKBOX -STATIC UINT32 g_excLogLen = 0; /* the length of the exception information */ -STATIC CHAR *g_tempExcInfoBuf = NULL; /* pointer to the buffer for storing the temp exception information */ -#endif VOID SetExcInfoRW(log_read_write_fn func) { @@ -81,11 +65,6 @@ CHAR *GetExcInfoBuf(VOID) VOID SetExcInfoIndex(UINT32 index) { g_excInfoIndex = index; -#ifdef LOSCFG_BLACKBOX - if (g_excInfoIndex == 0) { - g_excLogLen = 0; - } -#endif } UINT32 GetExcInfoIndex(VOID) @@ -93,13 +72,6 @@ UINT32 GetExcInfoIndex(VOID) return g_excInfoIndex; } -#ifdef LOSCFG_BLACKBOX -UINT32 GetExcInfoLen(VOID) -{ - return g_excLogLen; -} -#endif - VOID SetRecordAddr(UINT32 addr) { g_recordAddr = addr; @@ -120,35 +92,8 @@ UINT32 GetRecordSpace(VOID) return g_recordSpace; } -#ifdef LOSCFG_BLACKBOX -STATIC VOID SaveExcInfoUnsafe(CHAR *buf, INT32 size) -{ - for (INT32 i = 0; i < size; i++) { - *(g_excInfoBuf + g_excInfoIndex) = *(buf + i); - g_excInfoIndex++; - if (g_excLogLen < g_recordSpace) { - g_excLogLen++; - } - if (g_excInfoIndex >= g_recordSpace) { - g_excInfoIndex = 0; - } - } -} -#endif - VOID WriteExcBufVa(const CHAR *format, va_list arglist) { -#ifdef LOSCFG_BLACKBOX - if (g_tempExcInfoBuf != NULL) { - (VOID)memset_s(g_tempExcInfoBuf, TEMP_EXC_INFO_SIZE, 0, TEMP_EXC_INFO_SIZE); - INT32 ret = vsnprintf_s(g_tempExcInfoBuf, TEMP_EXC_INFO_SIZE, TEMP_EXC_INFO_SIZE - 1, format, arglist); - if (ret == -1) { - PRINT_ERR("g_tempExcInfoBuf is not enough or vsnprintf_s is error.\n"); - return; - } - SaveExcInfoUnsafe(g_tempExcInfoBuf, ret); - } -#else errno_t ret; if (g_recordSpace > g_excInfoIndex) { @@ -160,7 +105,6 @@ VOID WriteExcBufVa(const CHAR *format, va_list arglist) } g_excInfoIndex += ret; } -#endif } VOID WriteExcInfoToBuf(const CHAR *format, ...) @@ -187,9 +131,6 @@ VOID LOS_ExcInfoRegHook(UINT32 startAddr, UINT32 space, CHAR *buf, log_read_writ #ifdef LOSCFG_FS_VFS los_vfs_init(); #endif -#ifdef LOSCFG_BLACKBOX - g_tempExcInfoBuf = LOS_VMalloc(TEMP_EXC_INFO_SIZE); -#endif } /* Be called in the exception. */ diff --git a/kernel/common/los_excinfo_pri.h b/kernel/common/los_excinfo_pri.h index a30597d1..ba68d5f4 100644 --- a/kernel/common/los_excinfo_pri.h +++ b/kernel/common/los_excinfo_pri.h @@ -47,9 +47,6 @@ extern VOID SetExcInfoBuf(CHAR *buf); extern CHAR *GetExcInfoBuf(VOID); extern VOID SetExcInfoIndex(UINT32 index); extern UINT32 GetExcInfoIndex(VOID); -#ifdef LOSCFG_BLACKBOX -extern UINT32 GetExcInfoLen(VOID); -#endif extern VOID SetRecordAddr(UINT32 addr); extern UINT32 GetRecordAddr(VOID); extern VOID SetRecordSpace(UINT32 space); diff --git a/tools/build/mk/liteos_tables_ldflags.mk b/tools/build/mk/liteos_tables_ldflags.mk index af5aa945..dd670571 100644 --- a/tools/build/mk/liteos_tables_ldflags.mk +++ b/tools/build/mk/liteos_tables_ldflags.mk @@ -135,9 +135,7 @@ LITEOS_TABLES_KERNEL_INIT_LDFLAGS := \ -uOsCpupGuardCreator \ -uOsMpInit \ -uOsResourceFreeTaskCreate \ - -uOsSystemInit \ - -uOsBBoxSystemAdapterInit \ - -uOsBBoxDriverInit + -uOsSystemInit LITEOS_TABLES_DRIVER_LDFLAGS := \ -ui2c_init \ diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index ad304b7f..9c3923bd 100644 --- a/tools/build/mk/los_config.mk +++ b/tools/build/mk/los_config.mk @@ -441,12 +441,6 @@ ifeq ($(LOSCFG_BASE_CORE_HILOG), y) LITEOS_HILOG_INCLUDE += -I $(LITEOSTOPDIR)/../../base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog LITEOS_CMACRO += -DLOSCFG_BASE_CORE_HILOG endif -ifeq ($(LOSCFG_BLACKBOX), y) - LITEOS_BASELIB += -lblackbox - LIB_SUBDIRS += $(LITEOSTOPDIR)/kernel/common/blackbox - LITEOS_BLACKBOX_INCLUDE += -I $(LITEOSTOPDIR)/kernel/common/blackbox - LITEOS_CMACRO += -DLOSCFG_BLACKBOX -endif ############################## Dfx Option End ####################################### ############################# Tools && Debug Option Begin ############################## @@ -643,8 +637,7 @@ LITEOS_DRIVERS_INCLUDE := $(LITEOS_CELLWISE_INCLUDE) $(LITEOS_GPIO_INCLUDE $(LITEOS_DRIVERS_HDF_INCLUDE) $(LITEOS_TZDRIVER_INCLUDE) \ $(LITEOS_HIEVENT_INCLUDE) $(LITEOS_DEV_MEM_INCLUDE) \ $(LITEOS_DEV_QUICKSTART_INCLUDE) -LITEOS_DFX_INCLUDE := $(LITEOS_HILOG_INCLUDE) \ - $(LITEOS_BLACKBOX_INCLUDE) +LITEOS_DFX_INCLUDE := $(LITEOS_HILOG_INCLUDE) LITEOS_SECURITY_INCLUDE := $(LITEOS_SECURITY_CAP_INC) $(LITEOS_SECURITY_VID_INC) LOSCFG_TOOLS_DEBUG_INCLUDE := $(LITEOS_SHELL_INCLUDE) $(LITEOS_UART_INCLUDE) \ From d8263b1e91d76706d52df321ef642c1c8297e8e4 Mon Sep 17 00:00:00 2001 From: Guangyao Ma Date: Wed, 7 Jul 2021 16:24:54 +0800 Subject: [PATCH 15/43] fix: mksh compile bug fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 编译框架整改，需要所有交叉编译指定sysroot以及arch相关的编译选项，用来在编译链 接过程中在指定的sysroot路径下，寻找符合arch要求的依赖库。往往，sysroot选项和 arch选项需要同时出现在编译链接选项中。 close #I3ZMR7 Signed-off-by: Guangyao Ma Change-Id: If2249721e0e35615b95f5525e57241aae910c212 --- apps/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/config.mk b/apps/config.mk index 21410057..417446cb 100644 --- a/apps/config.mk +++ b/apps/config.mk @@ -44,7 +44,7 @@ CFLAGS := -std=c99 -fno-exceptions $(BASE_OPTS) $(LITEOS_COPTS_OPTMIZE) CXXFLAGS := -std=c++11 -fexceptions -fpermissive -frtti $(BASE_OPTS) $(LITEOS_COPTS_OPTMIZE) LDCFLAGS := -lc ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y) -LLVM_SYSROOT := --sysroot=$(SYSROOT_PATH) +LLVM_SYSROOT := --sysroot=$(SYSROOT_PATH) $(ARCH_CFLAGS) LDCXXFLGS := -lc++ -lc++abi -lc else BASE_OPTS += -Wl,-z,relro,-z,now From 878469468647a19f704e7ee2af696b0ba8ab775a Mon Sep 17 00:00:00 2001 From: Caoruihong Date: Wed, 7 Jul 2021 20:20:09 +0800 Subject: [PATCH 16/43] feat: using kconfiglib instead of kconfig kconfiglib support the kconfig macro language, we need this feature to handle product related Kconfig configuration. Signed-off-by: Caoruihong Change-Id: I6bb521e93aab6c67b8bc3ac664b64f5e52089a45 --- .gitignore | 6 ++-- BUILD.gn | 4 ++- Kconfig | 52 ++++++++++++++++++----------------- Makefile | 38 ++++++++++--------------- bsd/dev/usb/Kconfig | 2 +- build.sh | 9 ++++-- net/Kconfig | 2 +- tools/build/mk/los_config.mk | 4 +-- tools/menuconfig/conf | Bin 119040 -> 0 bytes tools/menuconfig/mconf | Bin 164472 -> 0 bytes 10 files changed, 58 insertions(+), 59 deletions(-) delete mode 100755 tools/menuconfig/conf delete mode 100755 tools/menuconfig/mconf diff --git a/.gitignore b/.gitignore index fc87f6d3..23b64f81 100644 --- a/.gitignore +++ b/.gitignore @@ -16,9 +16,9 @@ cscope* tags # Menuconfig temp files -/include/config -/include/generated -.config* +/config.h +.config +.config.old # Build temp files /platform/board.ld diff --git a/BUILD.gn b/BUILD.gn index 696f2219..af86842e 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -80,5 +80,7 @@ build_ext_component("make") { outdir = rebase_path(get_path_info(".", "out_dir")) sysroot_path = rebase_path(ohos_current_sysroot) arch_cflags = string_join(" ", target_arch_cflags) - command = "./build.sh ${board_name} ${ohos_build_compiler} ${root_build_dir} ${ohos_build_type} ${tee_enable} \"${device_company}\" \"${product_path}\" $outdir \"${ohos_version}\" ${sysroot_path} \"${arch_cflags}\"" + command = "./build.sh ${board_name} ${ohos_build_compiler} ${root_build_dir} ${ohos_build_type} ${tee_enable}" + command += " \"${device_company}\" \"${product_path}\" $outdir \"${ohos_version}\" ${sysroot_path} \"${arch_cflags}\"" + command += " \"${device_path}\"" } diff --git a/Kconfig b/Kconfig index 8bce9860..d8cbaa97 100644 --- a/Kconfig +++ b/Kconfig @@ -52,15 +52,15 @@ endmenu menu "Platform" ######################### config options of bsp ##################### -source "../../kernel/liteos_a/platform/Kconfig" +source "platform/Kconfig" ######################### config options of cpu arch ################ -source "../../kernel/liteos_a/arch/Kconfig" +source "arch/Kconfig" ######################### config options of rootfs ##################### -source "../../kernel/liteos_a/kernel/common/Kconfig" +source "kernel/common/Kconfig" ######################### config options of patchfs ##################### -source "../../kernel/liteos_a/kernel/common/patchfs/Kconfig" +source "kernel/common/patchfs/Kconfig" config QUICK_START bool "Enable QUICK_START" @@ -71,27 +71,24 @@ config QUICK_START endmenu ######################### config options of kernel ##################### -source "../../kernel/liteos_a/kernel/Kconfig" +source "kernel/Kconfig" ######################### config options of lib ######################## -source "../../kernel/liteos_a/lib/Kconfig" +source "lib/Kconfig" ######################### config options of compatibility ############## menu "Compat" -source "../../kernel/liteos_a/compat/posix/Kconfig" -source "../../kernel/liteos_a/bsd/Kconfig" +source "compat/posix/Kconfig" +source "bsd/Kconfig" endmenu -######################### config options of framework ################## -#source "../../frameworks/m2mcomm/Kconfig" - ######################## config options of filesystem ################## menu "FileSystem" -source "../../kernel/liteos_a/fs/vfs/Kconfig" -source "../../kernel/liteos_a/fs/fat/Kconfig" -source "../../kernel/liteos_a/fs/ramfs/Kconfig" -source "../../kernel/liteos_a/fs/romfs/Kconfig" -source "../../kernel/liteos_a/fs/nfs/Kconfig" -source "../../kernel/liteos_a/fs/proc/Kconfig" -source "../../kernel/liteos_a/fs/jffs2/Kconfig" +source "fs/vfs/Kconfig" +source "fs/fat/Kconfig" +source "fs/ramfs/Kconfig" +source "fs/romfs/Kconfig" +source "fs/nfs/Kconfig" +source "fs/proc/Kconfig" +source "fs/jffs2/Kconfig" config ENABLE_READ_BUFFER bool "Enable read buffer Option" default n @@ -117,7 +114,7 @@ config MAX_PATH_CACHE_SIZE endmenu ######################## config options of net ############################ -source "../../kernel/liteos_a/net/Kconfig" +source "net/Kconfig" ######################## config options of debug ######################## menu "Debug" @@ -219,14 +216,14 @@ config DEBUG_SEMAPHORE help Answer Y to enable debug semaphore. -source "../../kernel/liteos_a/shell/Kconfig" +source "shell/Kconfig" config NET_LWIP_SACK_TFTP bool "Enable Tftp" default y depends on SHELL && NET_LWIP_SACK && DEBUG_VERSION help Answer Y to enable LiteOS support tftp cmd and tftp tool. -source "../../kernel/liteos_a/net/telnet/Kconfig" +source "net/telnet/Kconfig" config SCHED_DEBUG bool "Enable sched debug Feature" default n @@ -265,7 +262,7 @@ config MEM_LEAKCHECK help Answer Y to enable record the LR of Function call stack of Mem operation, it can check the mem leak through the infomations of mem node. config BASE_MEM_NODE_INTEGRITY_CHECK - bool "Enable integrity check or not " + bool "Enable integrity check or not" default n depends on DEBUG_VERSION && MEM_DEBUG config MEM_WATERLINE @@ -290,20 +287,25 @@ config DRIVERS help Answer Y to enable LiteOS support driver. -source "../../kernel/liteos_a/bsd/dev/usb/Kconfig" +source "bsd/dev/usb/Kconfig" source "../../drivers/adapter/khdf/liteos/Kconfig" +# Device driver Kconfig import +osource "$(DEVICE_PATH)/Kconfig" +osource "$(DEVICE_PATH)/config/Kconfig" + source "drivers/char/mem/Kconfig" source "drivers/char/quickstart/Kconfig" source "drivers/char/random/Kconfig" -source "../../drivers/liteos/tzdriver/Kconfig" source "drivers/char/video/Kconfig" + +source "../../drivers/liteos/tzdriver/Kconfig" source "../../drivers/liteos/hievent/Kconfig" endmenu menu "Security" -source "../../kernel/liteos_a/security/Kconfig" +source "security/Kconfig" endmenu menu "Test" diff --git a/Makefile b/Makefile index 5653d002..ff3bf7c9 100644 --- a/Makefile +++ b/Makefile @@ -47,22 +47,17 @@ ROOTFS = rootfs LITEOS_TARGET = liteos LITEOS_LIBS_TARGET = libs_target -LITEOS_MENUCONFIG_H = $(LITEOSTOPDIR)/include/generated/autoconf.h LITEOS_PLATFORM_BASE = $(LITEOSTOPDIR)/platform export CONFIG_=LOSCFG_ -MENUCONFIG_PATH = $(LITEOSTOPDIR)/tools/menuconfig -KCONFIG_FILE_PATH = $(LITEOSTOPDIR)/Kconfig - -ifeq ($(OS), Linux) -MENUCONFIG_MCONF := $(MENUCONFIG_PATH)/mconf -MENUCONFIG_CONF := $(MENUCONFIG_PATH)/conf -else -MENUCONFIG_MCONF := $(MENUCONFIG_PATH)/kconfig-mconf.exe -MENUCONFIG_CONF := $(MENUCONFIG_PATH)/kconfig-conf.exe +ifeq ($(PRODUCT_PATH),) +export PRODUCT_PATH=$(LITEOSTOPDIR)/../../device/hisilicon/drivers endif -$(shell env CONFIG_=$(CONFIG_) $(MENUCONFIG_CONF) -s --olddefconfig $(KCONFIG_FILE_PATH)) +ifeq ($(shell which menuconfig),) +$(shell pip install --user kconfiglib >/dev/null) +endif +$(shell env CONFIG_=$(CONFIG_) PRODUCT_PATH=$(PRODUCT_PATH) olddefconfig >/dev/null) -include $(LITEOSTOPDIR)/tools/build/config.mk @@ -148,17 +143,12 @@ $(LITEOS_LIBS_TARGET): $(__LIBS) sysroot $(HIDE)echo "=============== make lib done ===============" ##### make menuconfig ##### -menuconfig:$(MENUCONFIG_MCONF) - $< $(KCONFIG_FILE_PATH) - -genconfig:$(MENUCONFIG_CONF) - $(HIDE)mkdir -p include/config include/generated - $< --olddefconfig $(KCONFIG_FILE_PATH) - $< --silentoldconfig $(KCONFIG_FILE_PATH) +menuconfig: + $(HIDE)menuconfig ##### menuconfig end ####### $(LITEOS_MENUCONFIG_H): .config - $(HIDE)$(MAKE) genconfig + $(HIDE)genconfig $(LITEOS_TARGET): $(__LIBS) sysroot $(HIDE)touch $(LOSCFG_ENTRY_SRC) @@ -223,11 +213,11 @@ update_all_config: $(HIDE)shopt -s globstar && for f in tools/build/config/**/*.config ; \ do \ echo updating $$f; \ - test -f $$f && cp $$f .config && $(MENUCONFIG_CONF) -s --olddefconfig $(KCONFIG_FILE_PATH) && $(MENUCONFIG_CONF) --savedefconfig $$f $(KCONFIG_FILE_PATH); \ + test -f $$f && cp $$f .config && olddefconfig && savedefconfig --out $$f; \ done -%.config: - $(HIDE)test -f tools/build/config/$@ && cp tools/build/config/$@ .config && $(MENUCONFIG_MCONF) $(KCONFIG_FILE_PATH) && $(MENUCONFIG_CONF) --savedefconfig tools/build/config/$@ $(KCONFIG_FILE_PATH) +update_config: + $(HIDE)test -f "$(CONFIG)" && cp "$(CONFIG)" .config && menuconfig && savedefconfig --out "$(CONFIG)" -.PHONY: all lib clean cleanall $(LITEOS_TARGET) debug release help update_all_config -.PHONY: prepare sysroot cleanrootfs $(ROOTFS) $(ROOTFSDIR) $(APPS) menuconfig genconfig $(LITEOS_LIBS_TARGET) $(__LIBS) $(OUT) +.PHONY: all lib clean cleanall $(LITEOS_TARGET) debug release help update_all_config update_config +.PHONY: prepare sysroot cleanrootfs $(ROOTFS) $(ROOTFSDIR) $(APPS) menuconfig $(LITEOS_LIBS_TARGET) $(__LIBS) $(OUT) diff --git a/bsd/dev/usb/Kconfig b/bsd/dev/usb/Kconfig index 2bdac15f..6d365d5e 100644 --- a/bsd/dev/usb/Kconfig +++ b/bsd/dev/usb/Kconfig @@ -15,7 +15,7 @@ config DRIVERS_USB_HOST_DRIVER choice depends on DRIVERS_USB_HOST_DRIVER prompt "USB HCD" - default y + default DRIVERS_USB_HOST_EHCI help Enable EHCI for USB 2.0. Enable XHCI for USB 3.0 diff --git a/build.sh b/build.sh index be60ebf0..70ffc687 100755 --- a/build.sh +++ b/build.sh @@ -41,6 +41,7 @@ outdir=${8} ohos_version=${9} sysroot_path=${10} arch_cflags=${11} +device_path=${12} echo "${board_name}" "${device_company}" echo "sh param:" "$@" @@ -95,6 +96,10 @@ if [ "x" != "x${arch_cflags}" ]; then export ARCH_CFLAGS="${arch_cflags}" fi +export OUTDIR="${outdir}" +export PRODUCT_PATH="${product_path}" +export DEVICE_PATH="${device_path}" + main && \ -make clean OUTDIR="${outdir}" PRODUCT_PATH="${product_path}" && \ -make -j rootfs VERSION="${ohos_version}" OUTDIR="${outdir}" PRODUCT_PATH="${product_path}" +make clean && \ +make -j rootfs VERSION="${ohos_version}" diff --git a/net/Kconfig b/net/Kconfig index 36a9e16b..ca7f8458 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -17,7 +17,7 @@ config NET_LWIP_SACK choice depends on NET_LWIP_SACK prompt "Lwipsack" - default y + default NET_LWIP_SACK_2_1 help Enable Lwipsack for 2.x diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index c508de67..cbefe9c7 100644 --- a/tools/build/mk/los_config.mk +++ b/tools/build/mk/los_config.mk @@ -121,7 +121,7 @@ CXX_PATH = $(LITEOSTOPDIR)/lib/cxxstl JFFS_PATH = $(LITEOSTOPDIR)/fs/jffs2 LITEOS_SCRIPTPATH ?= $(LITEOSTOPDIR)/tools/scripts LITEOS_LIB_BIGODIR = $(OUT)/lib/obj -LITEOS_MENUCONFIG_H = $(LITEOSTOPDIR)/include/generated/autoconf.h +LITEOS_MENUCONFIG_H = $(LITEOSTOPDIR)/config.h LOSCFG_ENTRY_SRC = $(LITEOSTOPDIR)/kernel/common/los_config.c ### include variable @@ -668,7 +668,7 @@ LITEOS_COPTS_EXTRA_INTERWORK := $(LITEOS_COPTS_EXTRA) endif # kernel configuration macros -LITEOS_CMACRO += -imacros $(LITEOS_MENUCONFIG_H) +LITEOS_CMACRO += -imacros "$(LITEOS_MENUCONFIG_H)" ifneq ($(LOSCFG_COMPILER_CLANG_LLVM), y) LITEOS_LD_OPTS += -nostartfiles diff --git a/tools/menuconfig/conf b/tools/menuconfig/conf deleted file mode 100755 index 6f76e9d26e6b96cd3dffbcaadee68cc86fa1cb3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119040 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 P?=-1bB*4&cM9cpVqeA0C From e4ff04586f6543e50dd8e67cf85d692cba8ee316 Mon Sep 17 00:00:00 2001 From: x_xiny <1301913191@qq.com> Date: Tue, 6 Jul 2021 16:37:10 +0800 Subject: [PATCH 17/43] =?UTF-8?q?=20fix:=E6=B6=88=E9=99=A4=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【背景】 消除编译告警 【修改方案】 消除编译告警 re #I3ZC1R Change-Id: I594d0f57e4cbbdb246a6bef1c978a38228123a34 Signed-off-by: x-xiny <1301913191@qq.com> Change-Id: I1d75cdcdcf9d06ec28e541cdfea77300da7c6bb1 --- arch/arm/arm/src/los_arch_mmu.c | 12 ++++++------ arch/arm/arm/src/los_exc.c | 5 ++--- compat/posix/src/time.c | 6 +++--- fs/fat/os_adapt/fatfs.c | 5 +++-- fs/include/fs/file.h | 2 +- fs/vfs/operation/fs_file.c | 2 +- kernel/base/ipc/los_signal.c | 4 ++-- kernel/base/vm/los_vm_filemap.c | 2 +- kernel/base/vm/los_vm_iomap.c | 1 - kernel/common/console.c | 6 +++--- kernel/common/los_config.c | 2 +- kernel/common/los_magickey.c | 2 +- syscall/misc_syscall.c | 1 - 13 files changed, 24 insertions(+), 26 deletions(-) diff --git a/arch/arm/arm/src/los_arch_mmu.c b/arch/arm/arm/src/los_arch_mmu.c index 435dcfaf..ccefd5ba 100644 --- a/arch/arm/arm/src/los_arch_mmu.c +++ b/arch/arm/arm/src/los_arch_mmu.c @@ -871,7 +871,7 @@ STATIC VOID OsSetKSectionAttr(UINTPTR virtAddr, BOOL uncached) kSpace->archMmu.virtTtb = (PTE_T *)g_firstPageTable; kSpace->archMmu.physTtb = LOS_PaddrQuery(kSpace->archMmu.virtTtb); status = LOS_ArchMmuUnmap(&kSpace->archMmu, virtAddr, - (bssEndBoundary - virtAddr) >> MMU_DESCRIPTOR_L2_SMALL_SHIFT); + (bssEndBoundary - virtAddr) >> MMU_DESCRIPTOR_L2_SMALL_SHIFT); if (status != ((bssEndBoundary - virtAddr) >> MMU_DESCRIPTOR_L2_SMALL_SHIFT)) { VM_ERR("unmap failed, status: %d", status); return; @@ -882,8 +882,8 @@ STATIC VOID OsSetKSectionAttr(UINTPTR virtAddr, BOOL uncached) flags |= VM_MAP_REGION_FLAG_UNCACHED; } status = LOS_ArchMmuMap(&kSpace->archMmu, virtAddr, SYS_MEM_BASE, - (textStart - virtAddr) >> MMU_DESCRIPTOR_L2_SMALL_SHIFT, - flags); + (textStart - virtAddr) >> MMU_DESCRIPTOR_L2_SMALL_SHIFT, + flags); if (status != ((textStart - virtAddr) >> MMU_DESCRIPTOR_L2_SMALL_SHIFT)) { VM_ERR("mmap failed, status: %d", status); return; @@ -910,9 +910,9 @@ STATIC VOID OsSetKSectionAttr(UINTPTR virtAddr, BOOL uncached) flags |= VM_MAP_REGION_FLAG_UNCACHED; } status = LOS_ArchMmuMap(&kSpace->archMmu, bssEndBoundary, - SYS_MEM_BASE + bssEndBoundary - virtAddr, - kmallocLength >> MMU_DESCRIPTOR_L2_SMALL_SHIFT, - flags); + SYS_MEM_BASE + bssEndBoundary - virtAddr, + kmallocLength >> MMU_DESCRIPTOR_L2_SMALL_SHIFT, + flags); if (status != (kmallocLength >> MMU_DESCRIPTOR_L2_SMALL_SHIFT)) { VM_ERR("mmap failed, status: %d", status); return; diff --git a/arch/arm/arm/src/los_exc.c b/arch/arm/arm/src/los_exc.c index 1c0c89cd..bdaa4f09 100644 --- a/arch/arm/arm/src/los_exc.c +++ b/arch/arm/arm/src/los_exc.c @@ -38,7 +38,6 @@ #include "los_excinfo_pri.h" #endif #include "los_sys_stack_pri.h" -#include "los_stackinfo_pri.h" #ifdef LOSCFG_COREDUMP #include "los_coredump.h" #endif @@ -723,7 +722,7 @@ VOID BackTraceSub(UINTPTR regFP) } backLR = *(UINTPTR *)(UINTPTR)kvaddr; #else - backLR = *(UINTPTR *)(UINTPTR)kvaddr; + backLR = *(UINTPTR *)(UINTPTR)kvaddr; if (IsValidFP(tmpFP - POINTER_SIZE, stackStart, stackEnd, &kvaddr) == FALSE) { PrintExcInfo("traceback backFP check failed, backFP: 0x%x\n", tmpFP - POINTER_SIZE); return; @@ -1007,7 +1006,7 @@ STATIC VOID OsCheckAllCpuStatus(VOID) OsWaitOtherCoresHandleExcEnd(currCpuID); } else { - if (g_excFromUserMode[g_currHandleExcCpuID] == TRUE) { + if ((g_currHandleExcCpuID < LOSCFG_KERNEL_CORE_NUM) && (g_excFromUserMode[g_currHandleExcCpuID] == TRUE)) { g_currHandleExcCpuID = currCpuID; LOS_SpinUnlock(&g_excSerializerSpin); target = (UINT32)(OS_MP_CPU_ALL & ~CPUID_TO_AFFI_MASK(currCpuID)); diff --git a/compat/posix/src/time.c b/compat/posix/src/time.c index 71870721..865f8dbd 100644 --- a/compat/posix/src/time.c +++ b/compat/posix/src/time.c @@ -456,7 +456,7 @@ static int PthreadGetCputime(clockid_t clockID, struct timespec *ats) { uint64_t runtime; UINT32 intSave; - UINT32 tid = ((UINT32) ~((clockID) >> CPUCLOCK_ID_OFFSET)); + UINT32 tid = ((UINT32) ~((UINT32)(clockID) >> CPUCLOCK_ID_OFFSET)); if (OS_TID_CHECK_INVALID(tid)) { return -EINVAL; @@ -482,7 +482,7 @@ static int ProcessGetCputime(clockid_t clockID, struct timespec *ats) { UINT64 runtime; UINT32 intSave; - const pid_t pid = ((pid_t) ~((clockID) >> CPUCLOCK_ID_OFFSET)); + const pid_t pid = ((pid_t) ~((UINT32)(clockID) >> CPUCLOCK_ID_OFFSET)); LosProcessCB *spcb = NULL; if (OsProcessIDUserCheckInvalid(pid) || pid < 0) { @@ -524,7 +524,7 @@ static int GetCputime(clockid_t clockID, struct timespec *tp) static int CheckClock(const clockid_t clockID) { int error = 0; - const pid_t pid = ((pid_t) ~((clockID) >> CPUCLOCK_ID_OFFSET)); + const pid_t pid = ((pid_t) ~((UINT32)(clockID) >> CPUCLOCK_ID_OFFSET)); if (!((UINT32)clockID & CPUCLOCK_PERTHREAD_MASK)) { LosProcessCB *spcb = NULL; diff --git a/fs/fat/os_adapt/fatfs.c b/fs/fat/os_adapt/fatfs.c index 06c33d57..0330388e 100644 --- a/fs/fat/os_adapt/fatfs.c +++ b/fs/fat/os_adapt/fatfs.c @@ -238,7 +238,8 @@ static mode_t fatfs_get_mode(BYTE attribute, mode_t fs_mode) return fs_mode; } -static enum VnodeType fatfstype_2_vnodetype(BYTE type) { +static enum VnodeType fatfstype_2_vnodetype(BYTE type) +{ switch (type) { case AM_ARC: return VNODE_TYPE_REG; @@ -286,7 +287,7 @@ static FRESULT init_cluster(DIR_FILE *pdfp, DIR *dp_new, FATFS *fs, int type, co mem_set(dir, 0, SS(fs)); if (type == AM_LNK && target) { /* Write target to symlink */ - strcpy_s((char *)dir, SS(fs), target); + (void)strcpy_s((char *)dir, SS(fs), target); } else { /* Write the dir cluster */ mem_set(dir, 0, SS(fs)); diff --git a/fs/include/fs/file.h b/fs/include/fs/file.h index cb05f0bc..11b78782 100644 --- a/fs/include/fs/file.h +++ b/fs/include/fs/file.h @@ -473,7 +473,7 @@ off64_t file_seek64(struct file *filep, off64_t offset, int whence); * ****************************************************************************/ -int files_allocate(struct Vnode *vnode, int oflags, off_t pos,void *priv, int minfd); +int files_allocate(struct Vnode *vnode, int oflags, off_t pos, void *priv, int minfd); /**************************************************************************** * Name: files_close diff --git a/fs/vfs/operation/fs_file.c b/fs/vfs/operation/fs_file.c index 245d8f5d..1e600bbb 100644 --- a/fs/vfs/operation/fs_file.c +++ b/fs/vfs/operation/fs_file.c @@ -406,7 +406,7 @@ int CopyFdToProc(int fd, unsigned int targetPid) return -ESRCH; } - procFd = AssignProcessFd(fdt, 3); + procFd = AssignProcessFd(fdt, 3); // minfd is 3 if (procFd < 0) { if (sem_post(&semId) == -1) { PRINT_ERR("sem_post error, errno %d \n", get_errno()); diff --git a/kernel/base/ipc/los_signal.c b/kernel/base/ipc/los_signal.c index 06fee687..e30f29df 100644 --- a/kernel/base/ipc/los_signal.c +++ b/kernel/base/ipc/los_signal.c @@ -132,7 +132,7 @@ int OsTcbDispatch(LosTaskCB *stcb, siginfo_t *info) if (masked) { /* If signal is in wait list and mask list, need unblock it */ if (LOS_ListEmpty(&sigcb->waitList) || - (!LOS_ListEmpty(&sigcb->waitList) && !OsSigIsMember(&sigcb->sigwaitmask, info->si_signo))) { + (!LOS_ListEmpty(&sigcb->waitList) && !OsSigIsMember(&sigcb->sigwaitmask, info->si_signo))) { OsSigAddSet(&sigcb->sigPendFlag, info->si_signo); } } else { @@ -308,7 +308,7 @@ int OsSigProcessSend(LosProcessCB *spcb, siginfo_t *sigInfo) .receivedTcb = NULL }; - if (info.sigInfo == NULL){ + if (info.sigInfo == NULL) { return -EFAULT; } diff --git a/kernel/base/vm/los_vm_filemap.c b/kernel/base/vm/los_vm_filemap.c index 9a6ec2ce..81a74900 100644 --- a/kernel/base/vm/los_vm_filemap.c +++ b/kernel/base/vm/los_vm_filemap.c @@ -44,7 +44,7 @@ #include "vnode.h" #ifndef UNUSED -#define UNUSED(x) (VOID)x +#define UNUSED(x) (VOID)(x) #endif #ifdef LOSCFG_DEBUG_VERSION diff --git a/kernel/base/vm/los_vm_iomap.c b/kernel/base/vm/los_vm_iomap.c index dde9e472..5acc88fd 100644 --- a/kernel/base/vm/los_vm_iomap.c +++ b/kernel/base/vm/los_vm_iomap.c @@ -34,7 +34,6 @@ #include "los_vm_zone.h" #include "los_vm_common.h" #include "los_vm_map.h" -#include "los_vm_lock.h" #include "los_memory.h" diff --git a/kernel/common/console.c b/kernel/common/console.c index c70466c3..36ccb5ba 100644 --- a/kernel/common/console.c +++ b/kernel/common/console.c @@ -437,10 +437,10 @@ STATIC VOID StoreReadChar(CONSOLE_CB *consoleCB, char ch, INT32 readcount) VOID KillPgrp() { - INT32 consoleId = -1; + INT32 consoleId; LosProcessCB *process = OsCurrProcessGet(); - if ((process->consoleID > CONSOLE_NUM -1 ) || (process->consoleID < 0)) { + if ((process->consoleID > CONSOLE_NUM - 1) || (process->consoleID < 0)) { return; } @@ -872,7 +872,7 @@ STATIC INT32 ConsoleGetTermios(unsigned long arg) return -EFAULT; } - if(LOS_ArchCopyToUser((VOID *)arg, &consoleCB->consoleTermios, sizeof(struct termios)) != 0) { + if (LOS_ArchCopyToUser((VOID *)arg, &consoleCB->consoleTermios, sizeof(struct termios)) != 0) { return -EFAULT; } else { return LOS_OK; diff --git a/kernel/common/los_config.c b/kernel/common/los_config.c index afd45a78..0757fc83 100644 --- a/kernel/common/los_config.c +++ b/kernel/common/los_config.c @@ -83,7 +83,7 @@ LITE_OS_SEC_TEXT_INIT STATIC UINT32 EarliestInit(VOID) LITE_OS_SEC_TEXT_INIT STATIC UINT32 ArchEarlyInit(VOID) { - UINT32 ret = LOS_OK; + UINT32 ret; /* set system counter freq */ #ifndef LOSCFG_TEE_ENABLE diff --git a/kernel/common/los_magickey.c b/kernel/common/los_magickey.c index 7e5f00ee..9368f77f 100644 --- a/kernel/common/los_magickey.c +++ b/kernel/common/los_magickey.c @@ -137,7 +137,7 @@ INT32 CheckMagicKey(CHAR key) PRINTK("Magic key off\n"); } return 1; - } else if (key == 0x03){ /* ctrl + c */ + } else if (key == 0x03) { /* ctrl + c */ KillPgrp(); return 0; } diff --git a/syscall/misc_syscall.c b/syscall/misc_syscall.c index 29b571d9..936d48cc 100644 --- a/syscall/misc_syscall.c +++ b/syscall/misc_syscall.c @@ -35,7 +35,6 @@ #include "sys/resource.h" #include "sys/times.h" #include "sys/utsname.h" -#include "time.h" #include "capability_type.h" #include "capability_api.h" #include "los_process_pri.h" From cacb4f0103ecb2d1b7af54d84957f88d3e9443d2 Mon Sep 17 00:00:00 2001 From: Guangyao Ma Date: Tue, 15 Jun 2021 09:57:03 +0800 Subject: [PATCH 18/43] feat: active mksh & toybox Close #I3VEOG Change-Id: Ibc73aacf68c65e64b88084edfd3549b3137dde07 Signed-off-by: Guangyao Ma --- apps/module.mk | 10 ++-------- tools/scripts/make_rootfs/rootfsdir.sh | 13 +++++++------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/apps/module.mk b/apps/module.mk index b3df0fc2..5b246a45 100644 --- a/apps/module.mk +++ b/apps/module.mk @@ -33,6 +33,8 @@ APP_SUBDIRS := ifeq ($(LOSCFG_SHELL), y) APP_SUBDIRS += shell +APP_SUBDIRS += mksh +APP_SUBDIRS += toybox endif ifeq ($(LOSCFG_USER_INIT_DEBUG), y) @@ -42,11 +44,3 @@ endif ifeq ($(LOSCFG_NET_LWIP_SACK_TFTP), y) APP_SUBDIRS += tftp endif - -#only enable for qemu now -ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y) -ifeq ($(LOSCFG_SHELL), y) -APP_SUBDIRS += mksh -APP_SUBDIRS += toybox -endif -endif diff --git a/tools/scripts/make_rootfs/rootfsdir.sh b/tools/scripts/make_rootfs/rootfsdir.sh index ed3f690a..35c553e4 100755 --- a/tools/scripts/make_rootfs/rootfsdir.sh +++ b/tools/scripts/make_rootfs/rootfsdir.sh @@ -34,17 +34,18 @@ BIN_DIR=$1 LIB_DIR=$2 ROOTFS_DIR=$3 OUT_DIR=$4 +NEED_COPYTO_OUTDIR=(shell toybox mksh tftp) mkdir -p ${ROOTFS_DIR}/bin ${ROOTFS_DIR}/lib ${ROOTFS_DIR}/usr/bin ${ROOTFS_DIR}/usr/lib ${ROOTFS_DIR}/etc \ ${ROOTFS_DIR}/app ${ROOTFS_DIR}/data ${ROOTFS_DIR}/proc ${ROOTFS_DIR}/dev ${ROOTFS_DIR}/data/system ${ROOTFS_DIR}/data/system/param \ ${ROOTFS_DIR}/system ${ROOTFS_DIR}/system/internal ${ROOTFS_DIR}/system/external ${OUT_DIR}/bin ${OUT_DIR}/libs if [ -d "${BIN_DIR}" ] && [ "$(ls -A "${BIN_DIR}")" != "" ]; then cp -f ${BIN_DIR}/* ${ROOTFS_DIR}/bin - if [ -e ${BIN_DIR}/shell ] && [ "${BIN_DIR}/shell" != "${OUT_DIR}/bin/shell" ]; then - cp -f ${BIN_DIR}/shell ${OUT_DIR}/bin/shell - fi - if [ -e ${BIN_DIR}/tftp ] && [ "${BIN_DIR}/tftp" != "${OUT_DIR}/bin/tftp" ]; then - cp -f ${BIN_DIR}/tftp ${OUT_DIR}/bin/tftp - fi + for el in ${NEED_COPYTO_OUTDIR[@]} + do + if [ -e ${BIN_DIR}/$el ] && [ "${BIN_DIR}/$el" != "${OUT_DIR}/bin/$el" ]; then + cp -f ${BIN_DIR}/$el ${OUT_DIR}/bin/$el + fi + done fi cp -f ${LIB_DIR}/* ${ROOTFS_DIR}/lib cp -f ${LIB_DIR}/* ${OUT_DIR}/libs From 40f239a7d4673dc740c853b1011b5072e48385b7 Mon Sep 17 00:00:00 2001 From: Guangyao Ma Date: Thu, 1 Jul 2021 10:16:02 +0800 Subject: [PATCH 19/43] fix: Ctrl-C move out of LOS_MAGIC_KEY_ENABLE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 由于没有tty，当前的Ctrl-C实现基于uart回调特定函数实现，后续tty实现后 可以重新考虑Ctrl-C设计实现。本次将Ctrl-C移除LOS_MAGIC_KEY_ENABLE，保 证任意情况下可以生效。 Change-Id: I4e1e51b2d92535879bbdbbfa91b0229119d0e90e Signed-off-by: Guangyao Ma --- kernel/common/los_magickey.c | 18 ++++++------------ .../debug/mini_qemu_liteos_a_clang.config | 1 - .../build/config/hispark_aries_release.config | 1 - .../build/config/hispark_taurus_release.config | 1 - .../config/hispark_taurus_release_tee.config | 1 - .../ipcamera_hi3516dv300_liteos_release.config | 1 - ...amera_hi3516dv300_liteos_release_tee.config | 1 - .../ipcamera_hi3518ev300_liteos_release.config | 1 - .../config/qemu_arm_virt_debug_shell.config | 1 - 9 files changed, 6 insertions(+), 20 deletions(-) diff --git a/kernel/common/los_magickey.c b/kernel/common/los_magickey.c index 9368f77f..1db5c88c 100644 --- a/kernel/common/los_magickey.c +++ b/kernel/common/los_magickey.c @@ -66,12 +66,6 @@ STATIC MagicKeyOp g_magicHelpOp = { .magicKey = 0x1a /* ctrl + z */ }; -STATIC MagicKeyOp g_magicKillPgrp = { - .opHandler = KillPgrp, - .helpMsg = "Show all magic op key(ctrl+c) ", - .magicKey = 0x03 /* ctrl + c */ -}; - /* * NOTICE:Suggest don't use * ctrl+h/backspace=0x8, @@ -87,7 +81,7 @@ STATIC MagicKeyOp *g_magicOpTable[MAGIC_KEY_NUM] = { &g_magicPanicOp, /* ctrl + p */ &g_magicTaskShowOp, /* ctrl + t */ &g_magicHelpOp, /* ctrl + z */ - &g_magicKillPgrp /* ctrl + c */ + NULL }; STATIC VOID OsMagicHelp(VOID) @@ -129,7 +123,11 @@ INT32 CheckMagicKey(CHAR key) #ifdef LOSCFG_ENABLE_MAGICKEY INT32 i; STATIC UINT32 magicKeySwitch = 0; - if (key == 0x12) { /* ctrl + r */ + + if (key == 0x03) { /* ctrl + c */ + KillPgrp(); + return 0; + } else if (key == 0x12) { /* ctrl + r */ magicKeySwitch = ~magicKeySwitch; if (magicKeySwitch != 0) { PRINTK("Magic key on\n"); @@ -137,11 +135,7 @@ INT32 CheckMagicKey(CHAR key) PRINTK("Magic key off\n"); } return 1; - } else if (key == 0x03) { /* ctrl + c */ - KillPgrp(); - return 0; } - if (magicKeySwitch != 0) { for (i = 0; i < MAGIC_KEY_NUM; i++) { if (g_magicOpTable[i] != NULL && key == g_magicOpTable[i]->magicKey) { diff --git a/tools/build/config/debug/mini_qemu_liteos_a_clang.config b/tools/build/config/debug/mini_qemu_liteos_a_clang.config index 6670fbb1..f5ab9aa4 100644 --- a/tools/build/config/debug/mini_qemu_liteos_a_clang.config +++ b/tools/build/config/debug/mini_qemu_liteos_a_clang.config @@ -10,6 +10,5 @@ LOSCFG_BOARD_CONFIG_PATH="device/qemu/arm_virt/liteos_a/config/board" # LOSCFG_FS_VFS is not set # LOSCFG_NET_LWIP_SACK is not set # LOSCFG_PLATFORM_ADAPT is not set -# LOSCFG_ENABLE_MAGICKEY is not set # LOSCFG_DRIVERS is not set # LOSCFG_SECURITY is not set diff --git a/tools/build/config/hispark_aries_release.config b/tools/build/config/hispark_aries_release.config index 2bdc4dea..36fba84b 100644 --- a/tools/build/config/hispark_aries_release.config +++ b/tools/build/config/hispark_aries_release.config @@ -8,7 +8,6 @@ LOSCFG_FS_VFS_BLOCK_DEVICE=y LOSCFG_FS_FAT_CACHE_SYNC_THREAD=y LOSCFG_FS_FAT_VIRTUAL_PARTITION=y LOSCFG_ENABLE_OOM_LOOP_TASK=y -# LOSCFG_ENABLE_MAGICKEY is not set LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_WIRELESS=y diff --git a/tools/build/config/hispark_taurus_release.config b/tools/build/config/hispark_taurus_release.config index 83d0d4f0..8b510ac2 100644 --- a/tools/build/config/hispark_taurus_release.config +++ b/tools/build/config/hispark_taurus_release.config @@ -9,7 +9,6 @@ LOSCFG_KERNEL_VDSO=y LOSCFG_FS_VFS_BLOCK_DEVICE=y LOSCFG_FS_FAT_VIRTUAL_PARTITION=y LOSCFG_ENABLE_OOM_LOOP_TASK=y -# LOSCFG_ENABLE_MAGICKEY is not set LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_WIRELESS=y diff --git a/tools/build/config/hispark_taurus_release_tee.config b/tools/build/config/hispark_taurus_release_tee.config index 46a2d492..f5b6eba8 100644 --- a/tools/build/config/hispark_taurus_release_tee.config +++ b/tools/build/config/hispark_taurus_release_tee.config @@ -10,7 +10,6 @@ LOSCFG_KERNEL_VDSO=y LOSCFG_FS_VFS_BLOCK_DEVICE=y LOSCFG_FS_FAT_VIRTUAL_PARTITION=y LOSCFG_ENABLE_OOM_LOOP_TASK=y -# LOSCFG_ENABLE_MAGICKEY is not set LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_WIRELESS=y diff --git a/tools/build/config/ipcamera_hi3516dv300_liteos_release.config b/tools/build/config/ipcamera_hi3516dv300_liteos_release.config index c62d4cb8..f0c14d2b 100644 --- a/tools/build/config/ipcamera_hi3516dv300_liteos_release.config +++ b/tools/build/config/ipcamera_hi3516dv300_liteos_release.config @@ -9,7 +9,6 @@ LOSCFG_FS_VFS_BLOCK_DEVICE=y LOSCFG_FS_FAT_VIRTUAL_PARTITION=y LOSCFG_NET_LWIP_SACK_2_0=y LOSCFG_ENABLE_OOM_LOOP_TASK=y -# LOSCFG_ENABLE_MAGICKEY is not set LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_WIRELESS=y diff --git a/tools/build/config/ipcamera_hi3516dv300_liteos_release_tee.config b/tools/build/config/ipcamera_hi3516dv300_liteos_release_tee.config index c62d4cb8..f0c14d2b 100644 --- a/tools/build/config/ipcamera_hi3516dv300_liteos_release_tee.config +++ b/tools/build/config/ipcamera_hi3516dv300_liteos_release_tee.config @@ -9,7 +9,6 @@ LOSCFG_FS_VFS_BLOCK_DEVICE=y LOSCFG_FS_FAT_VIRTUAL_PARTITION=y LOSCFG_NET_LWIP_SACK_2_0=y LOSCFG_ENABLE_OOM_LOOP_TASK=y -# LOSCFG_ENABLE_MAGICKEY is not set LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_WIRELESS=y diff --git a/tools/build/config/ipcamera_hi3518ev300_liteos_release.config b/tools/build/config/ipcamera_hi3518ev300_liteos_release.config index f323e791..805febf4 100644 --- a/tools/build/config/ipcamera_hi3518ev300_liteos_release.config +++ b/tools/build/config/ipcamera_hi3518ev300_liteos_release.config @@ -8,7 +8,6 @@ LOSCFG_FS_FAT_CACHE_SYNC_THREAD=y LOSCFG_FS_FAT_VIRTUAL_PARTITION=y LOSCFG_NET_LWIP_SACK_2_0=y LOSCFG_ENABLE_OOM_LOOP_TASK=y -# LOSCFG_ENABLE_MAGICKEY is not set LOSCFG_DRIVERS_USB_HOST_XHCI=y LOSCFG_DRIVERS_USB_ETHERNET=y LOSCFG_DRIVERS_USB_WIRELESS=y diff --git a/tools/build/config/qemu_arm_virt_debug_shell.config b/tools/build/config/qemu_arm_virt_debug_shell.config index cef8fbb3..0efa46b2 100644 --- a/tools/build/config/qemu_arm_virt_debug_shell.config +++ b/tools/build/config/qemu_arm_virt_debug_shell.config @@ -6,7 +6,6 @@ LOSCFG_FS_FAT=y LOSCFG_FS_FAT_DISK=y LOSCFG_FS_FAT_VIRTUAL_PARTITION=y LOSCFG_FS_VFS_BLOCK_DEVICE=y -LOSCFG_ENABLE_MAGICKEY=y LOSCFG_DEBUG_VERSION=y # LOSCFG_SHELL_LK is not set LOSCFG_USER_INIT_DEBUG=y From 6d948a42bbc2f952e2cd8bb5273b629f3343df8b Mon Sep 17 00:00:00 2001 From: Caoruihong Date: Sat, 10 Jul 2021 19:36:44 +0800 Subject: [PATCH 20/43] chore: place .config files under config dir of products place .config files under config dir of products Signed-off-by: Caoruihong Change-Id: I80c6641ae462d4888a6f3124f92b4c9d7fa1567b --- BUILD.gn | 6 +----- build.sh | 33 +++++++++++---------------------- kernel_test.sources | 1 - 3 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 kernel_test.sources diff --git a/BUILD.gn b/BUILD.gn index af86842e..df7704a6 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -73,14 +73,10 @@ lite_subsystem("kernel") { build_ext_component("make") { exec_path = rebase_path(".", root_build_dir) - tee_enable = "false" - if (board_name == "hi3516dv300" && enable_tee_ree) { - tee_enable = "tee" - } outdir = rebase_path(get_path_info(".", "out_dir")) sysroot_path = rebase_path(ohos_current_sysroot) arch_cflags = string_join(" ", target_arch_cflags) - command = "./build.sh ${board_name} ${ohos_build_compiler} ${root_build_dir} ${ohos_build_type} ${tee_enable}" + command = "./build.sh ${board_name} ${ohos_build_compiler} ${root_build_dir} ${ohos_build_type} \"${tee_enable}\"" command += " \"${device_company}\" \"${product_path}\" $outdir \"${ohos_version}\" ${sysroot_path} \"${arch_cflags}\"" command += " \"${device_path}\"" } diff --git a/build.sh b/build.sh index 70ffc687..16794d13 100755 --- a/build.sh +++ b/build.sh @@ -48,44 +48,33 @@ echo "sh param:" "$@" function main() { destination=".config" - config_file="" tee="" - if [ "${tee_enable}" = "tee" ]; then + if [ "${tee_enable}" = "true" ]; then tee="_tee" fi + + config_file="${product_path}/config/${ohos_build_type}${tee}.config" + if [ -f "${config_file}" ]; then + cp "${config_file}" "${destination}" + return + fi + product_name=$(basename "${product_path}") - source="tools/build/config/${product_name}_release.config" + config_file="${product_name}_release.config" if [ "${ohos_build_compiler}" = "clang" ]; then if [ "${ohos_build_type}" = "debug" ]; then - config_file="${product_name}_${ohos_build_compiler}${tee}.config" - source="tools/build/config/debug/${config_file}" + config_file="debug/${product_name}_${ohos_build_compiler}${tee}.config" else config_file="${product_name}_${ohos_build_compiler}_release${tee}.config" - source="tools/build/config/${config_file}" fi elif [ "${ohos_build_compiler}" = "gcc" ]; then if [ "${ohos_build_type}" = "debug" ]; then config_file="${product_name}_debug_shell${tee}.config" - source="tools/build/config/${config_file}" else config_file="${product_name}_release${tee}.config" - source="tools/build/config/${config_file}" fi fi - if [ -d "./out" ]; then - rm -rf ./out - fi - if [ -f "${destination}" ]; then - rm -rf ${destination} - fi - if [ ! -f "${source}" ]; then - source="${product_path}/config/sys/${config_file}" - fi - cp "${source}" ${destination} - - test_info_outdir="../..${root_build_dir}/test_info/gen/kernel/test" - mkdir -p "${test_info_outdir}" - cp kernel_test.sources "${test_info_outdir}" + cp "tools/build/config/${config_file}" "${destination}" } if [ "x" != "x${sysroot_path}" ]; then diff --git a/kernel_test.sources b/kernel_test.sources deleted file mode 100644 index cab52bfd..00000000 --- a/kernel_test.sources +++ /dev/null @@ -1 +0,0 @@ -../../kernel/liteos_a/test/apps/src/osTest.c From 92d7672b1938ab2bfc5d1b96107c9a804ccd9e9f Mon Sep 17 00:00:00 2001 From: Caoruihong Date: Mon, 12 Jul 2021 18:26:37 +0800 Subject: [PATCH 21/43] chore: remove unused dead symlink files remove unused dead symlink files Signed-off-by: Caoruihong Change-Id: I8dd3bf4496173fd20bfcd728c256d429fb4fa077 --- bsd/compat/linuxkpi/include/linux/mtd/mtd.h | 1 - bsd/compat/linuxkpi/include/linux/mtd/mtd_list.h | 1 - 2 files changed, 2 deletions(-) delete mode 120000 bsd/compat/linuxkpi/include/linux/mtd/mtd.h delete mode 120000 bsd/compat/linuxkpi/include/linux/mtd/mtd_list.h diff --git a/bsd/compat/linuxkpi/include/linux/mtd/mtd.h b/bsd/compat/linuxkpi/include/linux/mtd/mtd.h deleted file mode 120000 index 89878fc8..00000000 --- a/bsd/compat/linuxkpi/include/linux/mtd/mtd.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../third_party/Linux_Kernel/fs/jffs2/mtd.h \ No newline at end of file diff --git a/bsd/compat/linuxkpi/include/linux/mtd/mtd_list.h b/bsd/compat/linuxkpi/include/linux/mtd/mtd_list.h deleted file mode 120000 index d7004259..00000000 --- a/bsd/compat/linuxkpi/include/linux/mtd/mtd_list.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../third_party/Linux_Kernel/fs/jffs2/mtd_list.h \ No newline at end of file From ec977a1c7e9ba4ea6621ceb1d0d10e586148208d Mon Sep 17 00:00:00 2001 From: wangchen <253227059@qq.com> Date: Mon, 12 Jul 2021 20:06:58 +0800 Subject: [PATCH 22/43] =?UTF-8?q?fix:=20A=E6=A0=B8codex=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【背景】A核codex扫描告警消除。 【修改方案】 1. 将不可屏蔽告警进行修复。 【影响】 对现有的产品编译不会有影响。 re #I40B1S Signed-off-by: wangchen <253227059@qq.com> --- fs/jffs2/src/vfs_jffs2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/jffs2/src/vfs_jffs2.c b/fs/jffs2/src/vfs_jffs2.c index 5fa6a156..234c435a 100644 --- a/fs/jffs2/src/vfs_jffs2.c +++ b/fs/jffs2/src/vfs_jffs2.c @@ -717,14 +717,17 @@ ssize_t VfsJffs2Readlink(struct Vnode *vnode, char *buffer, size_t bufLen) int VfsJffs2Unlink(struct Vnode *parentVnode, struct Vnode *targetVnode, const char *path) { int ret; - struct jffs2_inode *parentInode = (struct jffs2_inode *)parentVnode->data; - struct jffs2_inode *targetInode = (struct jffs2_inode *)targetVnode->data; + struct jffs2_inode *parentInode = NULL; + struct jffs2_inode *targetInode = NULL; if (!parentVnode || !targetVnode) { PRINTK("%s-%d parentVnode=%x, targetVnode=%x\n", __FUNCTION__, __LINE__, parentVnode, targetVnode); return -EINVAL; } + parentInode = (struct jffs2_inode *)parentVnode->data; + targetInode = (struct jffs2_inode *)targetVnode->data; + LOS_MuxLock(&g_jffs2FsLock, (uint32_t)JFFS2_WAITING_FOREVER); ret = jffs2_unlink(parentInode, targetInode, (const unsigned char *)path); From 33f5c70e6c8781758d2bfde0f60ca3d6ec7d543f Mon Sep 17 00:00:00 2001 From: Far Date: Mon, 12 Jul 2021 21:05:19 +0800 Subject: [PATCH 23/43] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DFATFS=E4=B8=AD?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E5=86=85=E9=83=A8=E6=8E=A5=E5=8F=A3=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81FAT12/FAT16=20FAT=E8=A1=A8=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=A0=87=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FATFS内部接口中，仅对FAT32的FAT表结束符0x0FFFFFFF做了判断，而忽略了FAT12和FAT16的结束标志。 这会导致子在FAT12/FAT16中，部分功能异常。 Close #I409R6 Signed-off-by: Far --- fs/fat/os_adapt/fatfs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/fat/os_adapt/fatfs.c b/fs/fat/os_adapt/fatfs.c index 0330388e..1876af94 100644 --- a/fs/fat/os_adapt/fatfs.c +++ b/fs/fat/os_adapt/fatfs.c @@ -904,11 +904,13 @@ int fatfs_fallocate64(struct file *filep, int mode, off64_t offset, off64_t len) return -EBUSY; } result = f_expand(fp, (FSIZE_t)offset, (FSIZE_t)len, 1); - if (result == FR_OK && finfo->sclst == 0) { - finfo->sclst = fp->obj.sclust; + if (result == FR_OK) { + if (finfo->sclst == 0) { + finfo->sclst = fp->obj.sclust; + } + result = f_sync(fp); } - result = f_sync(fp); - unlock_fs(fs, FR_OK); + unlock_fs(fs, result); return -fatfs_2_vfs(result); } From fd6f91bc9f8321e646ab371858db33baa645c391 Mon Sep 17 00:00:00 2001 From: vcbchang Date: Fri, 2 Jul 2021 15:56:13 +0800 Subject: [PATCH 24/43] =?UTF-8?q?test:=20=E4=BF=AE=E5=A4=8Dsignal=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=85=B3=E4=BA=8Epipe=E9=83=A8=E5=88=86=E7=9A=84?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【背景】signal模块中的pipe用例存在无法通过测试的问题，经查找，pipe用例存在多处bug，这里做以修复 【修改方案】 1 ItPosixPipe002用例存在pipe存在在父进程中没有关闭写端，父进程判断处有编码问题等 2 删掉了一些用例多余的close函数，精简了用例的结构 3 原来用例主子进程依靠延时来实现进程同步，这里更改为使用共享内存的方法来实现 re #I3YPQ8 Signed-off-by: vcbchang Change-Id: Ic0d0ab20521c9af5e5f1d75e76e047162d978464 --- .../unittest/signal/full/It_ipc_fdclr_001.cpp | 2 +- .../unittest/signal/full/It_ipc_fdset_001.cpp | 2 +- .../signal/full/It_ipc_fdzero_001.cpp | 2 +- .../unittest/signal/full/It_ipc_pipe_002.cpp | 17 ++++- .../unittest/signal/full/It_ipc_pipe_003.cpp | 21 +++++-- .../unittest/signal/full/pipe_test_005.cpp | 62 ++++++++++--------- testsuites/unittest/signal/signal_test.cpp | 11 ++++ .../signal/smoke/It_ipc_fdisset_001.cpp | 2 +- .../unittest/signal/smoke/pipe_test_002.cpp | 35 ++++++++--- 9 files changed, 105 insertions(+), 49 deletions(-) diff --git a/testsuites/unittest/signal/full/It_ipc_fdclr_001.cpp b/testsuites/unittest/signal/full/It_ipc_fdclr_001.cpp index 0a1f1897..13fd61a4 100644 --- a/testsuites/unittest/signal/full/It_ipc_fdclr_001.cpp +++ b/testsuites/unittest/signal/full/It_ipc_fdclr_001.cpp @@ -46,7 +46,7 @@ static UINT32 Testcase(VOID) ret = pipe(pipeFd[i]); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); fdmax = pipeFd[i][1] > fdmax ? pipeFd[i][1] : fdmax; - ret = write(pipeFd[i][1], "hello world", TAR_STR_LEN); + ret = write(pipeFd[i][1], "aloha world", TAR_STR_LEN); printf("write first status: %d\n", ret); ICUNIT_GOTO_EQUAL(ret, TAR_STR_LEN, ret, EXIT); } diff --git a/testsuites/unittest/signal/full/It_ipc_fdset_001.cpp b/testsuites/unittest/signal/full/It_ipc_fdset_001.cpp index f244971b..dda0395b 100644 --- a/testsuites/unittest/signal/full/It_ipc_fdset_001.cpp +++ b/testsuites/unittest/signal/full/It_ipc_fdset_001.cpp @@ -49,7 +49,7 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); fdmax = pipeFd[i][1] > fdmax ? pipeFd[i][1] : fdmax; fdmax = pipeFd[i][0] > fdmax ? pipeFd[i][0] : fdmax; - ret = write(pipeFd[i][1], "hello world", TAR_STR_LEN); + ret = write(pipeFd[i][1], "Aloha World", TAR_STR_LEN); printf("write first status: %d\n", ret); ICUNIT_GOTO_EQUAL(ret, TAR_STR_LEN, ret, EXIT); } diff --git a/testsuites/unittest/signal/full/It_ipc_fdzero_001.cpp b/testsuites/unittest/signal/full/It_ipc_fdzero_001.cpp index 34d14f83..33a45823 100644 --- a/testsuites/unittest/signal/full/It_ipc_fdzero_001.cpp +++ b/testsuites/unittest/signal/full/It_ipc_fdzero_001.cpp @@ -48,7 +48,7 @@ static UINT32 Testcase(VOID) ret = pipe(pipeFd[i]); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); fdmax = pipeFd[i][1] > fdmax ? pipeFd[i][1] : fdmax; - ret = write(pipeFd[i][1], "hello world", TAR_STR_LEN); + ret = write(pipeFd[i][1], "Aloha world", TAR_STR_LEN); printf("write first status: %d\n", ret); ICUNIT_GOTO_EQUAL(ret, TAR_STR_LEN, ret, EXIT); } diff --git a/testsuites/unittest/signal/full/It_ipc_pipe_002.cpp b/testsuites/unittest/signal/full/It_ipc_pipe_002.cpp index f5dfbc21..be0e2578 100644 --- a/testsuites/unittest/signal/full/It_ipc_pipe_002.cpp +++ b/testsuites/unittest/signal/full/It_ipc_pipe_002.cpp @@ -29,28 +29,41 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "it_test_signal.h" - +#include "sys/shm.h" static UINT32 Testcase(VOID) { int pipeFd[2], ret, spid; // 2, pipe return 2 file descripter char buffer[20]; // 20, target buffer size + int *sharedflag = NULL; + int shmid; + ret = pipe(pipeFd); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT1); + shmid = shmget((key_t)IPC_PRIVATE, sizeof(int), 0666 | IPC_CREAT); // 0666 the authority of the shm + ICUNIT_ASSERT_NOT_EQUAL(shmid, -1, shmid); + sharedflag = (int *)shmat(shmid, NULL, 0); + *sharedflag = 0; + spid = fork(); ICUNIT_GOTO_NOT_EQUAL(spid, -1, spid, EXIT1); if (spid == 0) { + sharedflag = (int *)shmat(shmid, NULL, 0); close(pipeFd[0]); - sleep(10); // 10, sleep 10 second. ret = write(pipeFd[1], "hello world", 12); // 12, "hello world" length and '\0' printf("write first status: %d\n", ret); if (ret != 12) { // 12, "hello world" length and '\0' exit(11); // 11, the value of son process unexpect exit, convenient to debug } + *sharedflag = 1; close(pipeFd[1]); exit(RED_FLAG); } close(pipeFd[1]); + // waitting for the sub process has written the sentence + while (*sharedflag != 1) { + usleep(1); + } ret = read(pipeFd[0], buffer, 12); // 12, "hello world" length and '\0' ICUNIT_GOTO_EQUAL(ret, 12, ret, EXIT); // 12, "hello world" length and '\0' ret = strcmp(buffer, "hello world"); diff --git a/testsuites/unittest/signal/full/It_ipc_pipe_003.cpp b/testsuites/unittest/signal/full/It_ipc_pipe_003.cpp index d4e697a1..e19417f8 100644 --- a/testsuites/unittest/signal/full/It_ipc_pipe_003.cpp +++ b/testsuites/unittest/signal/full/It_ipc_pipe_003.cpp @@ -29,7 +29,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "it_test_signal.h" - +#include "sys/shm.h" static const int TAR_STR_LEN = 12; @@ -37,25 +37,38 @@ static UINT32 Testcase(VOID) { int pipeFd[2], ret, spid; // 2, pipe return 2 file descripter char buffer[20]; // 20, target buffer size + int *sharedflag = NULL; + int shmid; + ret = pipe(pipeFd); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT1); + shmid = shmget((key_t)IPC_PRIVATE, sizeof(int), 0666 | IPC_CREAT); // 0666 the authority of the shm + ICUNIT_ASSERT_NOT_EQUAL(shmid, -1, shmid); + sharedflag = (int *)shmat(shmid, NULL, 0); + *sharedflag = 0; + spid = fork(); ICUNIT_GOTO_NOT_EQUAL(spid, -1, spid, EXIT1); if (spid == 0) { + sharedflag = (int *)shmat(shmid, NULL, 0); close(pipeFd[0]); - ret = write(pipeFd[1], "hello world", TAR_STR_LEN); + ret = write(pipeFd[1], "Hello world", TAR_STR_LEN); printf("write first status: %d\n", ret); if (ret != TAR_STR_LEN) { exit(11); // 11, the value of son process unexpect exit, convenient to debug } + *sharedflag = 1; close(pipeFd[1]); exit(RED_FLAG); } close(pipeFd[1]); - sleep(2); // 2, sleep 2 second + // waitting for the sub process has written the sentence + while (*sharedflag != 1) { + usleep(1); + } ret = read(pipeFd[0], buffer, TAR_STR_LEN); ICUNIT_GOTO_EQUAL(ret, TAR_STR_LEN, ret, EXIT); - ret = strcmp(buffer, "hello world"); + ret = strcmp(buffer, "Hello world"); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); printf("read pipe success: %s\n", buffer); wait(&ret); diff --git a/testsuites/unittest/signal/full/pipe_test_005.cpp b/testsuites/unittest/signal/full/pipe_test_005.cpp index f17964ef..9b490529 100644 --- a/testsuites/unittest/signal/full/pipe_test_005.cpp +++ b/testsuites/unittest/signal/full/pipe_test_005.cpp @@ -28,6 +28,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "sys/shm.h" #include "it_test_signal.h" #include "signal.h" @@ -41,58 +42,59 @@ static int PipecommonWrite() int pipefd[2]; // 2, array subscript pid_t pid; int retValue = -1; - retValue = pipe(pipefd); - ICUNIT_ASSERT_EQUAL(retValue, 0, retValue); - - signal(SIGPIPE, SigPrint); - + int *sharedflag = NULL; + int shmid; int *readFd = &pipefd[0]; int *writeFd = &pipefd[1]; - char sentence[] = "Hello World"; char readbuffer[100]; int status, ret; + retValue = pipe(pipefd); + ICUNIT_ASSERT_EQUAL(retValue, 0, retValue); + if (signal(SIGPIPE, SigPrint) == SIG_ERR) { + printf("signal error\n"); + } + + shmid = shmget((key_t)IPC_PRIVATE, sizeof(int), 0666 | IPC_CREAT); // 0666 the authority of the shm + ICUNIT_ASSERT_NOT_EQUAL(shmid, -1, shmid); + sharedflag = (int *)shmat(shmid, NULL, 0); + *sharedflag = 0; + pid = fork(); if (pid == -1) { printf("Fork Error!\n"); return -1; } else if (pid == 0) { - for (int i = 0; i < 3; i++) { // 3, Number of cycles - close(*readFd); - retValue = write(*writeFd, sentence, strlen(sentence) + 1); - - if (i == 0) { - if (retValue != strlen(sentence) + 1) { - exit(retValue); - } - } else { - if (retValue != -1) { - exit(retValue); - } - if (errno != EPIPE) { - exit(errno); - } - } - usleep(150000); // 150000, Used to calculate the delay time. + sharedflag = (int *)shmat(shmid, NULL, 0); + close(*readFd); + retValue = write(*writeFd, sentence, strlen(sentence) + 1); + ICUNIT_ASSERT_EQUAL(retValue, strlen(sentence) + 1, retValue); + *sharedflag = 1; + // 2 waitting for the father process close the pipe's read port + while (*sharedflag != 2) { + usleep(1); } + retValue = write(*writeFd, sentence, strlen(sentence) + 1); + ICUNIT_ASSERT_EQUAL(retValue, -1, retValue); + ICUNIT_ASSERT_EQUAL(errno, EPIPE, errno); exit(0); } else { - usleep(10000); // 10000, Used to calculate the delay time. - for (int i = 0; i < 3; i++) { // 3, Number of cycles - close(*readFd); + close(*writeFd); + // 1 waitting for the sub process has written the sentence first + while (*sharedflag != 1) { + usleep(1); } + close(*readFd); + // 2 father process close the pipe's read port + *sharedflag = 2; ret = waitpid(pid, &status, 0); ICUNIT_ASSERT_EQUAL(ret, pid, ret); ICUNIT_ASSERT_EQUAL(WEXITSTATUS(status), 0, WEXITSTATUS(status)); } - - close(*readFd); - close(*writeFd); return 0; } - void ItPosixPipe005(void) { TEST_ADD_CASE(__FUNCTION__, PipecommonWrite, TEST_POSIX, TEST_MEM, TEST_LEVEL0, TEST_FUNCTION); diff --git a/testsuites/unittest/signal/signal_test.cpp b/testsuites/unittest/signal/signal_test.cpp index 959457a5..7ddd1a97 100644 --- a/testsuites/unittest/signal/signal_test.cpp +++ b/testsuites/unittest/signal/signal_test.cpp @@ -627,6 +627,17 @@ HWTEST_F(SignalTest, ItPosixPipe003, TestSize.Level0) ItPosixPipe003(); } +/* * + * @tc.name: ItPosixPipe004 + * @tc.desc: function for SignalTest + * @tc.type: FUNC + * @tc.require: AR000EEMQ9 + */ +HWTEST_F(SignalTest, ItPosixPipe004, TestSize.Level0) +{ + ItPosixPipe004(); +} + /* * * @tc.name: ItPosixPipe005 * @tc.desc: function for SignalTest diff --git a/testsuites/unittest/signal/smoke/It_ipc_fdisset_001.cpp b/testsuites/unittest/signal/smoke/It_ipc_fdisset_001.cpp index 21205390..806f38d0 100644 --- a/testsuites/unittest/signal/smoke/It_ipc_fdisset_001.cpp +++ b/testsuites/unittest/signal/smoke/It_ipc_fdisset_001.cpp @@ -39,7 +39,7 @@ static UINT32 Testcase(VOID) fd_set reads; ret = pipe(pipeFd); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); - ret = write(pipeFd[1], "hello world", TAR_STR_LEN); + ret = write(pipeFd[1], "Hello World", TAR_STR_LEN); printf("write first status: %d\n", ret); ICUNIT_GOTO_EQUAL(ret, TAR_STR_LEN, ret, EXIT); FD_ZERO(&reads); diff --git a/testsuites/unittest/signal/smoke/pipe_test_002.cpp b/testsuites/unittest/signal/smoke/pipe_test_002.cpp index ccbcfbc6..fafa5f3b 100644 --- a/testsuites/unittest/signal/smoke/pipe_test_002.cpp +++ b/testsuites/unittest/signal/smoke/pipe_test_002.cpp @@ -31,6 +31,7 @@ #include "it_test_signal.h" #include "signal.h" #include "fcntl.h" +#include "sys/shm.h" static int TestPipeMultiProcess() { @@ -42,46 +43,62 @@ static int TestPipeMultiProcess() int *readFd = &pipefd[0]; int *writeFd = &pipefd[1]; - - char readbuffer[100]; + char readbuffer[100] = {0}; int status, ret; int totalNum = 3; + int *sharedflag = NULL; + int shmid; int flag = fcntl(*readFd, F_GETFL); fcntl(*readFd, F_SETFL, flag | O_NONBLOCK); + shmid = shmget((key_t)IPC_PRIVATE, sizeof(int), 0666 | IPC_CREAT); // 0666 the authority of the shm + ICUNIT_ASSERT_NOT_EQUAL(shmid, -1, shmid); + sharedflag = (int *)shmat(shmid, NULL, 0); + *sharedflag = 0; pid = fork(); if (pid == -1) { printf("Fork Error!\n"); return -1; } else if (pid == 0) { + sharedflag = (int *)shmat(shmid, NULL, 0); + close(pipefd[0]); for (int i = 0; i < totalNum; i++) { errno = 0; char sentence1[15] = "Hello World"; - char a[4] = {0}; + char a[2] = {0}; sprintf(a, "%d", i); strcat(sentence1, a); int ret = write(*writeFd, sentence1, strlen(sentence1) + 1); + ICUNIT_ASSERT_EQUAL(ret, strlen(sentence1) + 1, ret); usleep(10000); // 10000, Used to calculate the delay time. } + *sharedflag = 1; + ret = close(pipefd[1]); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); exit(0); } else { + close(pipefd[1]); + // waitting for the sub process has written the sentence first + while (*sharedflag != 1) { + usleep(1); + } for (int i = 0; i < totalNum; i++) { printf("read\n"); char sentence1[15] = "Hello World"; - char a[4] = {0}; + char a[2] = {0}; + sprintf(a, "%d", i); + strcat(sentence1, a); memset(readbuffer, 0, sizeof(readbuffer)); - retValue = read(*readFd, readbuffer, sizeof(readbuffer)); - printf("Receive %d bytes data : %s,%d\n", retValue, readbuffer, errno); - ICUNIT_ASSERT_SIZE_STRING_EQUAL(readbuffer, readbuffer, strlen(sentence1), errno); + retValue = read(*readFd, readbuffer, strlen(sentence1) + 1); + printf("Receive %d bytes data : %s, errno : %d\n", retValue, readbuffer, errno); + ICUNIT_ASSERT_SIZE_STRING_EQUAL(readbuffer, sentence1, strlen(sentence1), errno); } } ret = waitpid(pid, &status, 0); ICUNIT_ASSERT_EQUAL(ret, pid, ret); ret = close(pipefd[0]); ICUNIT_ASSERT_EQUAL(ret, 0, ret); - ret = close(pipefd[1]); - ICUNIT_ASSERT_EQUAL(ret, 0, ret); return 0; } From e7c4b1963a1f11cb976d1ebdf6e48d8eb2eb84d2 Mon Sep 17 00:00:00 2001 From: vcbchang Date: Tue, 6 Jul 2021 21:55:38 +0800 Subject: [PATCH 25/43] =?UTF-8?q?test:=20=E4=BF=AE=E5=A4=8Dmqueue=5Funitte?= =?UTF-8?q?st=E5=85=A8=E9=87=8F=E7=94=A8=E4=BE=8BItPosixQueue075=E4=B8=8EI?= =?UTF-8?q?tPosixQueue097,=E5=86=92=E7=83=9F=E7=94=A8=E4=BE=8B=20ItPosixQu?= =?UTF-8?q?eue053=E7=94=A8=E4=BE=8B=E5=AD=98=E5=9C=A8=E5=81=B6=E5=B0=94?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【背景】mqueue_unittest用例ItPosixQueue075、ItPosixQueue053 与ItPosixQueue097用例存在偶尔无法通过的问题，现在将其修复 【修改方案】ItPosixQueue075中原来是通过延时来实现线程同步，现在更改为静态全局变量实现； ItPosixQueue097中的关于g_testCount利用延时来置标志位，实现线程同步。这里通过延时来期望线程调度，写的不合理，这里更改为等待标志位来实现线程同步。 re #I3Z9H9 Signed-off-by: vcbchang Change-Id: Ib1bb945a5393cb03f4d92e4332e20acd82eb1845 --- testsuites/unittest/common/include/osTest.h | 1 + testsuites/unittest/common/osTest.cpp | 7 +++++++ .../unittest/posix/mqueue/full/It_posix_queue_075.cpp | 9 +++++++-- .../unittest/posix/mqueue/full/It_posix_queue_097.cpp | 5 +---- .../unittest/posix/mqueue/smoke/It_posix_queue_053.cpp | 10 +++------- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/testsuites/unittest/common/include/osTest.h b/testsuites/unittest/common/include/osTest.h index 0623b40a..3ee6fb5d 100644 --- a/testsuites/unittest/common/include/osTest.h +++ b/testsuites/unittest/common/include/osTest.h @@ -132,6 +132,7 @@ extern void TestBusyTaskDelay(UINT32 tick); extern void *malloc(size_t size); extern void TEST_DumpCpuid(void); extern u_long T_random(void); +extern VOID TestAssertWaitDelay(UINT32 *testCount, UINT32 flag); UINT32 LosTaskDelay(UINT32 tick); #define TEST_HwiDelete(ID) TEST_TEST_HwiDelete(ID, NULL) diff --git a/testsuites/unittest/common/osTest.cpp b/testsuites/unittest/common/osTest.cpp index a771a147..0c02e5e6 100644 --- a/testsuites/unittest/common/osTest.cpp +++ b/testsuites/unittest/common/osTest.cpp @@ -215,6 +215,13 @@ VOID TestAssertBusyTaskDelay(UINT32 timeout, UINT32 flag) } } +VOID TestAssertWaitDelay(UINT32 *testCount, UINT32 flag) +{ + while (*testCount != flag) { + usleep(1); + } +} + UINT32 PosixPthreadInit(pthread_attr_t *attr, int pri) { UINT32 uwRet = 0; diff --git a/testsuites/unittest/posix/mqueue/full/It_posix_queue_075.cpp b/testsuites/unittest/posix/mqueue/full/It_posix_queue_075.cpp index 137b60a2..2fea2090 100644 --- a/testsuites/unittest/posix/mqueue/full/It_posix_queue_075.cpp +++ b/testsuites/unittest/posix/mqueue/full/It_posix_queue_075.cpp @@ -29,6 +29,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "It_posix_queue.h" +static int g_testFlag = 0; static VOID *PthreadF01(VOID *arg) { @@ -37,12 +38,12 @@ static VOID *PthreadF01(VOID *arg) CHAR msgrcd[MQUEUE_STANDARD_NAME_LENGTH] = {0}; struct timespec ts = { 0 }; ts.tv_sec = 0xffff; - for (i = 0; i < MQUEUE_STANDARD_NAME_LENGTH * 2; i++) { // 2, The loop frequency name length. ret = mq_timedreceive(g_gqueue, msgrcd, MQUEUE_STANDARD_NAME_LENGTH, NULL, &ts); ICUNIT_GOTO_EQUAL(ret, MQUEUE_SHORT_ARRAY_LENGTH, ret, EXIT); ICUNIT_GOTO_STRING_EQUAL(msgrcd, MQUEUE_SEND_STRING_TEST, msgrcd, EXIT); } + g_testFlag = 0; // 0 means the sub thread has executed return NULL; EXIT: return NULL; @@ -62,6 +63,7 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; + g_testFlag = 1; // 1 initialize the flag LOS_TaskLock(); snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq075_%d", LosCurTaskIDGet()); @@ -85,7 +87,10 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT1); } - TestExtraTaskDelay(10); // 10, Set delay time. + // waitting for the flag is 0, means the sub thread has executed + while (g_testFlag) { + usleep(1); + } ret = mq_close(g_gqueue); ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT1); diff --git a/testsuites/unittest/posix/mqueue/full/It_posix_queue_097.cpp b/testsuites/unittest/posix/mqueue/full/It_posix_queue_097.cpp index e11c5034..00fad7b1 100644 --- a/testsuites/unittest/posix/mqueue/full/It_posix_queue_097.cpp +++ b/testsuites/unittest/posix/mqueue/full/It_posix_queue_097.cpp @@ -107,9 +107,6 @@ static UINT32 Testcase(VOID) ret = pthread_create(&newTh, &attr1, PthreadF01, NULL); ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT1); - LosTaskDelay(1); - ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT1); - ret = PosixPthreadInit(&attr1, MQUEUE_PTHREAD_PRIORITY_TEST2); ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT2); @@ -119,7 +116,7 @@ static UINT32 Testcase(VOID) ret = LosTaskDelay(10); // 10, Set delay time. ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT2); - ICUNIT_GOTO_EQUAL(g_testCount, 4, g_testCount, EXIT2); // 4, Here, assert the g_testCount. + TestAssertWaitDelay(&g_testCount, 4); // 4, Here, assert the g_testCount. ret = PosixPthreadDestroy(&attr1, newTh2); ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT2); diff --git a/testsuites/unittest/posix/mqueue/smoke/It_posix_queue_053.cpp b/testsuites/unittest/posix/mqueue/smoke/It_posix_queue_053.cpp index 2308073d..01dd6aa2 100644 --- a/testsuites/unittest/posix/mqueue/smoke/It_posix_queue_053.cpp +++ b/testsuites/unittest/posix/mqueue/smoke/It_posix_queue_053.cpp @@ -37,10 +37,7 @@ static VOID *PthreadF01(VOID *argument) g_testCount = 1; - ret = LosTaskDelay(5); // 5, Set the timeout of task delay; - ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT); - - ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT); // 3, Here, assert the g_testCount. + TestAssertWaitDelay(&g_testCount, 3); // 3, Here, assert the g_testCount. ret = mq_send(g_gqueue, msgptr, strlen(msgptr), 0); ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT); @@ -105,8 +102,7 @@ static UINT32 Testcase(VOID) ret = pthread_create(&newTh1, &attr1, PthreadF01, NULL); ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT1); - LosTaskDelay(1); - ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT1); + TestAssertWaitDelay(&g_testCount, 1); ret = PosixPthreadInit(&attr1, MQUEUE_PTHREAD_PRIORITY_TEST2); ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT2); @@ -121,7 +117,7 @@ static UINT32 Testcase(VOID) #endif ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT2); - ICUNIT_GOTO_EQUAL(g_testCount, 4, g_testCount, EXIT2); // 4, Here, assert the g_testCount. + TestAssertWaitDelay(&g_testCount, 4); // 4, Here, assert the g_testCount. ret = PosixPthreadDestroy(&attr1, newTh2); ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT2); From 1157c4a28997e877a6e5e4da76f6095bddb12c51 Mon Sep 17 00:00:00 2001 From: zhushengle Date: Sat, 10 Jul 2021 17:36:56 +0800 Subject: [PATCH 26/43] =?UTF-8?q?fix=20:=20futex=20requeue=E6=9C=BA?= =?UTF-8?q?=E5=88=B6=E4=B8=AD=EF=BC=8C=E5=A4=B4=E8=8A=82=E7=82=B9=E7=9A=84?= =?UTF-8?q?queueList=20=E4=B8=BANULL,=20=E5=AF=BC=E8=87=B4=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit queuelist中的普通节点在调整为futexList的节点时， 未校验其queueList的有效性，导致queueList未初始化， 出现访问空指针；且在从旧链表迁移节点到新链表时， 节点从旧链表删除之后又插入到另一个链表中，导致对 旧链表的为NULL判断出错。 Close #I4024F Change-Id: I506a10fc5740ce16e682c2c419b9d92a82000b86 Signed-off-by: zhushengle --- kernel/base/ipc/los_futex.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/kernel/base/ipc/los_futex.c b/kernel/base/ipc/los_futex.c index 9e720e2f..d831a7c5 100644 --- a/kernel/base/ipc/los_futex.c +++ b/kernel/base/ipc/los_futex.c @@ -199,6 +199,9 @@ STATIC INLINE VOID OsFutexReplaceQueueListHeadNode(FutexNode *oldHeadNode, Futex LOS_DL_LIST *futexList = oldHeadNode->futexList.pstPrev; LOS_ListDelete(&oldHeadNode->futexList); LOS_ListHeadInsert(futexList, &newHeadNode->futexList); + if ((newHeadNode->queueList.pstNext == NULL) || (newHeadNode->queueList.pstPrev == NULL)) { + LOS_ListInit(&newHeadNode->queueList); + } } STATIC INLINE VOID OsFutexDeleteKeyFromFutexList(FutexNode *node) @@ -319,11 +322,10 @@ STATIC VOID OsFutexInsertNewFutexKeyToHash(FutexNode *node) futexList != &(hashNode->lockList); futexList = futexList->pstNext) { headNode = OS_FUTEX_FROM_FUTEXLIST(futexList); - if (node->key <= headNode->key) { + if (node->key <= headNode->key) { LOS_ListTailInsert(&(headNode->futexList), &(node->futexList)); break; } - } EXIT: @@ -797,6 +799,7 @@ EXIT_UNLOCK_ERR: STATIC INT32 OsFutexRequeueInsertNewKey(UINTPTR newFutexKey, INT32 newIndex, FutexNode *oldHeadNode) { + BOOL queueListIsEmpty = FALSE; INT32 ret; UINT32 intSave; LosTaskCB *task = NULL; @@ -817,25 +820,33 @@ STATIC INT32 OsFutexRequeueInsertNewKey(UINTPTR newFutexKey, INT32 newIndex, Fut nextNode = OS_FUTEX_FROM_QUEUELIST(queueList); SCHEDULER_LOCK(intSave); if (LOS_ListEmpty(&nextNode->pendList)) { - queueList = queueList->pstNext; + if (LOS_ListEmpty(queueList)) { + queueListIsEmpty = TRUE; + } else { + queueList = queueList->pstNext; + } OsFutexDeinitFutexNode(nextNode); SCHEDULER_UNLOCK(intSave); - if (queueList->pstNext != NULL) { - continue; - } else { + if (queueListIsEmpty) { return LOS_OK; } + + continue; } task = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(nextNode->pendList))); - queueList = queueList->pstNext; + if (LOS_ListEmpty(queueList)) { + queueListIsEmpty = TRUE; + } else { + queueList = queueList->pstNext; + } LOS_ListDelete(&nextNode->queueList); ret = OsFutexInsertTasktoPendList(&newHeadNode, nextNode, task); SCHEDULER_UNLOCK(intSave); if (ret != LOS_OK) { PRINT_ERR("Futex requeue insert new key failed!\n"); } - } while (queueList->pstNext != NULL); + } while (!queueListIsEmpty); return LOS_OK; } From a195aac9fb60b0163f9eebb29084287d226bd14c Mon Sep 17 00:00:00 2001 From: qidechun Date: Fri, 9 Jul 2021 18:46:19 +0800 Subject: [PATCH 27/43] feat: add blackbox for liteos_a MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、在内核增加BlackBox核心框架，对外提供模块回调接口注册和故障处理接口。 2、增加默认的系统模块适配层，处理通用内核态和用户态故障日志抓取和保存。 3、BBOX特性默认关闭，若想使用此特性，请在内核配置文件中增加如下编译选项： LOSCFG_BLACKBOX=y LOSCFG_SAVE_EXCINFO=y LOSCFG_SAVE_EXCINFO可以帮助抓取更多的故障日志。 4、若已经打开BBOX特性，想快速验证此特性，请添加如下编译选项： LOSCFG_HIDUMPER=y Close #I406NP Signed-off-by: qidechun --- Kconfig | 2 + arch/arm/arm/src/los_exc.c | 16 + kernel/base/misc/task_shellcmd.c | 6 + kernel/common/blackbox/Kconfig | 10 + kernel/common/blackbox/Makefile | 14 + kernel/common/blackbox/los_blackbox.h | 91 ++++ kernel/common/blackbox/los_blackbox_common.c | 127 +++++ kernel/common/blackbox/los_blackbox_common.h | 61 +++ kernel/common/blackbox/los_blackbox_core.c | 458 ++++++++++++++++++ .../common/blackbox/los_blackbox_detector.c | 63 +++ .../common/blackbox/los_blackbox_detector.h | 51 ++ .../blackbox/los_blackbox_system_adapter.c | 265 ++++++++++ .../blackbox/los_blackbox_system_adapter.h | 51 ++ kernel/common/los_excinfo.c | 4 + tools/build/mk/liteos_tables_ldflags.mk | 4 +- tools/build/mk/los_config.mk | 8 +- 16 files changed, 1229 insertions(+), 2 deletions(-) create mode 100644 kernel/common/blackbox/Kconfig create mode 100644 kernel/common/blackbox/Makefile create mode 100644 kernel/common/blackbox/los_blackbox.h create mode 100644 kernel/common/blackbox/los_blackbox_common.c create mode 100644 kernel/common/blackbox/los_blackbox_common.h create mode 100644 kernel/common/blackbox/los_blackbox_core.c create mode 100644 kernel/common/blackbox/los_blackbox_detector.c create mode 100644 kernel/common/blackbox/los_blackbox_detector.h create mode 100644 kernel/common/blackbox/los_blackbox_system_adapter.c create mode 100644 kernel/common/blackbox/los_blackbox_system_adapter.h diff --git a/Kconfig b/Kconfig index d8cbaa97..d9f60a40 100644 --- a/Kconfig +++ b/Kconfig @@ -61,6 +61,8 @@ source "arch/Kconfig" source "kernel/common/Kconfig" ######################### config options of patchfs ##################### source "kernel/common/patchfs/Kconfig" +######################### config options of blackbox ##################### +source "kernel/common/blackbox/Kconfig" config QUICK_START bool "Enable QUICK_START" diff --git a/arch/arm/arm/src/los_exc.c b/arch/arm/arm/src/los_exc.c index 2c05b21a..c90f591f 100644 --- a/arch/arm/arm/src/los_exc.c +++ b/arch/arm/arm/src/los_exc.c @@ -61,6 +61,9 @@ #ifdef LOSCFG_FS_VFS #include "console.h" #endif +#ifdef LOSCFG_BLACKBOX +#include "los_blackbox.h" +#endif #define INVALID_CPUID 0xFFFF @@ -568,6 +571,9 @@ STATIC VOID OsUserExcHandle(ExcContext *excBufAddr) #endif #endif +#ifdef LOSCFG_BLACKBOX + BBoxNotifyError("USER_CRASH", MODULE_SYSTEM, "Crash in user", 0); +#endif SCHEDULER_LOCK(intSave); #ifdef LOSCFG_SAVE_EXCINFO OsProcessExitCodeCoreDumpSet(runProcess); @@ -1057,6 +1063,11 @@ LITE_OS_SEC_TEXT VOID STATIC OsExcPriorDisposal(ExcContext *excBufAddr) LITE_OS_SEC_TEXT_INIT STATIC VOID OsPrintExcHead(UINT32 far) { +#ifdef LOSCFG_BLACKBOX +#ifdef LOSCFG_SAVE_EXCINFO + SetExcInfoIndex(0); +#endif +#endif #ifdef LOSCFG_KERNEL_VM /* You are not allowed to add any other print information before this exception information */ if (g_excFromUserMode[ArchCurrCpuid()] == TRUE) { @@ -1124,7 +1135,9 @@ LITE_OS_SEC_TEXT_INIT VOID OsExcHandleEntry(UINT32 excType, ExcContext *excBufAd if (g_curNestCount[ArchCurrCpuid()] == 1) { #ifdef LOSCFG_SAVE_EXCINFO if (func != NULL) { +#ifndef LOSCFG_BLACKBOX SetExcInfoIndex(0); +#endif OsSysStateSave(&intCount, &lockCount); OsRecordExcInfoTime(); OsSysStateRestore(intCount, lockCount); @@ -1153,6 +1166,9 @@ LITE_OS_SEC_TEXT_INIT VOID OsExcHandleEntry(UINT32 excType, ExcContext *excBufAd } #endif +#ifdef LOSCFG_BLACKBOX + BBoxNotifyError(EVENT_PANIC, MODULE_SYSTEM, "Crash in kernel", 1); +#endif while (1) {} } diff --git a/kernel/base/misc/task_shellcmd.c b/kernel/base/misc/task_shellcmd.c index 05623a56..854e2d6c 100644 --- a/kernel/base/misc/task_shellcmd.c +++ b/kernel/base/misc/task_shellcmd.c @@ -85,12 +85,18 @@ STATIC UINT32 *taskWaterLine = NULL; #define OS_TASK_ALL_INFO_LEN (g_taskMaxNum * (sizeof(LosTaskCB) + sizeof(UINT32))) #ifdef LOSCFG_FS_VFS +#if defined(LOSCFG_BLACKBOX) && defined(LOSCFG_SAVE_EXCINFO) +#define SaveExcInfo(arg, ...) WriteExcInfoToBuf(arg, ##__VA_ARGS__) +#else +#define SaveExcInfo(arg, ...) +#endif #define PROCESS_INFO_SHOW(seqBuf, arg...) do { \ if (seqBuf != NULL) { \ (void)LosBufPrintf((struct SeqBuf *)seqBuf, ##arg); \ } else { \ PRINTK(arg); \ } \ + SaveExcInfo(arg); \ } while (0) #else #define PROCESS_INFO_SHOW(seqBuf, arg...) PRINTK(arg) diff --git a/kernel/common/blackbox/Kconfig b/kernel/common/blackbox/Kconfig new file mode 100644 index 00000000..8298b923 --- /dev/null +++ b/kernel/common/blackbox/Kconfig @@ -0,0 +1,10 @@ +config BLACKBOX + bool "Enable BlackBox" + default n + help + Answer Y to enable LiteOS support blackbox + +config LOG_ROOT_PATH + string "unknown" + help + define the default log path of blackbox \ No newline at end of file diff --git a/kernel/common/blackbox/Makefile b/kernel/common/blackbox/Makefile new file mode 100644 index 00000000..3e611c90 --- /dev/null +++ b/kernel/common/blackbox/Makefile @@ -0,0 +1,14 @@ +include $(LITEOSTOPDIR)/config.mk + +MODULE_NAME := $(notdir $(shell pwd)) + +LOCAL_SRCS := $(wildcard *.c) + +LOCAL_INCLUDE := \ + -I $(LITEOSTOPDIR)/kernel/common \ + -I $(LITEOSTOPDIR)/kernel/common/blackbox \ + -I $(LITEOSTOPDIR)/syscall + +LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS) + +include $(MODULE) diff --git a/kernel/common/blackbox/los_blackbox.h b/kernel/common/blackbox/los_blackbox.h new file mode 100644 index 00000000..36a69820 --- /dev/null +++ b/kernel/common/blackbox/los_blackbox.h @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef LOS_BLACKBOX_H +#define LOS_BLACKBOX_H + +#ifdef __cplusplus +#if __cplusplus +extern "C" { +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#include "stdarg.h" +#include "los_typedef.h" + +#define PATH_MAX_LEN 256 +#define EVENT_MAX_LEN 32 +#define MODULE_MAX_LEN 32 +#define ERROR_DESC_MAX_LEN 512 +#ifndef LOSCFG_LOG_ROOT_PATH +#define LOSCFG_LOG_ROOT_PATH "/storage/data/log" +#endif +#define KERNEL_FAULT_LOG_PATH LOSCFG_LOG_ROOT_PATH "/kernel_fault.log" +#define USER_FAULT_LOG_PATH LOSCFG_LOG_ROOT_PATH "/user_fault.log" + +#define MODULE_SYSTEM "SYSTEM" +#define EVENT_SYSREBOOT "SYSREBOOT" +#define EVENT_LONGPRESS "LONGPRESS" +#define EVENT_COMBINATIONKEY "COMBINATIONKEY" +#define EVENT_SUBSYSREBOOT "SUBSYSREBOOT" +#define EVENT_POWEROFF "POWEROFF" +#define EVENT_PANIC "PANIC" +#define EVENT_SYS_WATCHDOG "SYSWATCHDOG" +#define EVENT_HUNGTASK "HUNGTASK" +#define EVENT_BOOTFAIL "BOOTFAIL" + +struct ErrorInfo { + char event[EVENT_MAX_LEN]; + char module[MODULE_MAX_LEN]; + char errorDesc[ERROR_DESC_MAX_LEN]; +}; + +struct ModuleOps { + char module[MODULE_MAX_LEN]; + void (*Dump)(const char *logDir, struct ErrorInfo *info); + void (*Reset)(struct ErrorInfo *info); + int (*GetLastLogInfo)(struct ErrorInfo *info); + int (*SaveLastLog)(const char *logDir, struct ErrorInfo *info); +}; + +int BBoxRegisterModuleOps(struct ModuleOps *ops); +int BBoxNotifyError(const char event[EVENT_MAX_LEN], + const char module[MODULE_MAX_LEN], + const char errorDesc[ERROR_DESC_MAX_LEN], + int needSysReset); +int OsBBoxDriverInit(void); + +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#endif \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_common.c b/kernel/common/blackbox/los_blackbox_common.c new file mode 100644 index 00000000..c7ae0795 --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_common.c @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* ------------ includes ------------ */ +#include "los_blackbox_common.h" +#ifdef LOSCFG_LIB_LIBC +#include "stdlib.h" +#include "unistd.h" +#endif +#ifdef LOSCFG_FS_VFS +#include "fs/fs.h" +#endif +#include "securec.h" +#include "los_memory.h" + +/* ------------ local macroes ------------ */ +/* ------------ local prototypes ------------ */ +/* ------------ local function declarations ------------ */ +/* ------------ global function declarations ------------ */ +/* ------------ local variables ------------ */ +/* ------------ function definitions ------------ */ +int FullWriteFile(const char *filePath, const char *buf, size_t bufSize, int isAppend) +{ +#ifdef LOSCFG_FS_VFS + int fd; + int totalToWrite = (int)bufSize; + int totalWrite = 0; + + if (filePath == NULL || buf == NULL || bufSize == 0) { + BBOX_PRINT_ERR("filePath: %p, buf: %p, bufSize: %lu!\n", filePath, buf, bufSize); + return -1; + } + + if (!IsLogPartReady()) { + BBOX_PRINT_ERR("log path [%s] isn't ready to be written!\n", LOSCFG_LOG_ROOT_PATH); + return -1; + } + fd = open(filePath, O_CREAT | O_RDWR | (isAppend ? O_APPEND : O_TRUNC), 0644); + if (fd < 0) { + BBOX_PRINT_ERR("Create file [%s] failed, fd: %d!\n", filePath, fd); + return -1; + } + while (totalToWrite > 0) { + int writeThisTime = write(fd, buf, totalToWrite); + if (writeThisTime < 0) { + BBOX_PRINT_ERR("Failed to write file [%s]!\n", filePath); + (void)close(fd); + return -1; + } + buf += writeThisTime; + totalToWrite -= writeThisTime; + totalWrite += writeThisTime; + } + (void)close(fd); + + return (totalWrite == (int)bufSize) ? 0 : -1; +#else + (VOID)filePath; + (VOID)buf; + (VOID)bufSize; + (VOID)isAppend; + return -1; +#endif +} + +int SaveBasicErrorInfo(const char *filePath, struct ErrorInfo *info) +{ + char *buf = NULL; + + if (filePath == NULL || info == NULL) { + BBOX_PRINT_ERR("filePath: %p, event: %p!\n", filePath, info); + return -1; + } + + buf = LOS_MemAlloc(m_aucSysMem1, ERROR_INFO_MAX_LEN); + if (buf == NULL) { + BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); + return -1; + } + (void)memset_s(buf, ERROR_INFO_MAX_LEN, 0, ERROR_INFO_MAX_LEN); + (void)snprintf_s(buf, ERROR_INFO_MAX_LEN, ERROR_INFO_MAX_LEN - 1, + ERROR_INFO_HEADER_FORMAT, info->event, info->module, info->errorDesc); + *(buf + ERROR_INFO_MAX_LEN - 1) = '\0'; + (void)FullWriteFile(filePath, buf, strlen(buf), 0); + (void)LOS_MemFree(m_aucSysMem1, buf); + + return 0; +} + +#ifdef LOSCFG_FS_VFS +bool IsLogPartReady(void) +{ + return access(LOSCFG_LOG_ROOT_PATH, W_OK) == 0; +} +#else +bool IsLogPartReady(void) +{ + return TRUE; +} +#endif \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_common.h b/kernel/common/blackbox/los_blackbox_common.h new file mode 100644 index 00000000..6d20a934 --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_common.h @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef LOS_BLACKBOX_COMMON_H +#define LOS_BLACKBOX_COMMON_H + +#ifdef __cplusplus +#if __cplusplus +extern "C" { +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#include "los_blackbox.h" +#include "los_printf.h" +#include "los_typedef.h" + +#define ERROR_INFO_HEADER_FORMAT "#### error info ####\nevent: %s\nmodule: %s\nerrorDesc: %s\n" +#define ERROR_INFO_MAX_LEN 768 +#define Min(a, b) (((a) > (b)) ? (b) : (a)) +#define BBOX_PRINT_ERR(format, ...) PRINTK("bbox: func: %s, line: %d, Err: " \ + format, __func__, __LINE__, ##__VA_ARGS__) +#define BBOX_PRINT_INFO(format, ...) PRINTK("bbox: Info: " format, ##__VA_ARGS__) + +int FullWriteFile(const char *filePath, const char *buf, size_t bufSize, int isAppend); +int SaveBasicErrorInfo(const char *filePath, struct ErrorInfo *info); +bool IsLogPartReady(void); + +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#endif \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_core.c b/kernel/common/blackbox/los_blackbox_core.c new file mode 100644 index 00000000..1e283fea --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_core.c @@ -0,0 +1,458 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* ------------ includes ------------ */ +#include "los_blackbox.h" +#include "los_blackbox_common.h" +#include "los_blackbox_detector.h" +#ifdef LOSCFG_LIB_LIBC +#include "stdlib.h" +#include "unistd.h" +#endif +#include "los_base.h" +#include "los_config.h" +#include "los_excinfo_pri.h" +#include "los_hw.h" +#include "los_init.h" +#include "los_memory.h" +#include "los_sem.h" +#include "los_syscall.h" +#include "los_task_pri.h" +#include "securec.h" +#include "sys/reboot.h" + +/* ------------ local macroes ------------ */ +#define LOG_WAIT_TIMES 10 +#define LOG_PART_WAIT_TIME 1000 + +/* ------------ local prototypes ------------ */ +typedef struct BBoxOps { + LOS_DL_LIST opsList; + struct ModuleOps ops; +} BBoxOps; + +/* ------------ local function declarations ------------ */ +/* ------------ global function declarations ------------ */ +/* ------------ local variables ------------ */ +static bool g_bboxInitSucc = FALSE; +static UINT32 g_opsListSem = 0; +static UINT32 g_tempErrInfoSem = 0; +static UINT32 g_tempErrLogSaveSem = 0; +static LOS_DL_LIST_HEAD(g_opsList); +struct ErrorInfo *g_tempErrInfo; + +/* ------------ function definitions ------------ */ +static void FormatErrorInfo(struct ErrorInfo *info, + const char event[EVENT_MAX_LEN], + const char module[MODULE_MAX_LEN], + const char errorDesc[ERROR_DESC_MAX_LEN]) +{ + if (info == NULL || event == NULL || module == NULL || errorDesc == NULL) { + BBOX_PRINT_ERR("info: %p, event: %p, module: %p, errorDesc: %p!\n", info, event, module, errorDesc); + return; + } + + (void)memset_s(info, sizeof(*info), 0, sizeof(*info)); + (void)strncpy_s(info->event, sizeof(info->event), event, Min(strlen(event), sizeof(info->event) - 1)); + (void)strncpy_s(info->module, sizeof(info->module), module, Min(strlen(module), sizeof(info->module) - 1)); + (void)strncpy_s(info->errorDesc, sizeof(info->errorDesc), errorDesc, + Min(strlen(errorDesc), sizeof(info->errorDesc) - 1)); +} + +#ifdef LOSCFG_FS_VFS +static void WaitForLogPart(void) +{ + BBOX_PRINT_INFO("wait for log part [%s] begin!\n", LOSCFG_LOG_ROOT_PATH); + while (!IsLogPartReady()) { + LOS_Msleep(LOG_PART_WAIT_TIME); + } + BBOX_PRINT_INFO("wait for log part [%s] end!\n", LOSCFG_LOG_ROOT_PATH); +} +#else +static void WaitForLogPart(void) +{ + int i = 0; + + BBOX_PRINT_INFO("wait for log part [%s] begin!\n", LOSCFG_LOG_ROOT_PATH); + while (i++ < LOG_WAIT_TIMES) { + LOS_Msleep(LOG_PART_WAIT_TIME); + } + BBOX_PRINT_INFO("wait for log part [%s] end!\n", LOSCFG_LOG_ROOT_PATH); +} +#endif + +static bool FindModuleOps(struct ErrorInfo *info, BBoxOps **ops) +{ + bool found = false; + + if (info == NULL || ops == NULL) { + BBOX_PRINT_ERR("info: %p, ops: %p!\n", info, ops); + return found; + } + + LOS_DL_LIST_FOR_EACH_ENTRY(*ops, &g_opsList, BBoxOps, opsList) { + if (*ops != NULL && strcmp((*ops)->ops.module, info->module) == 0) { + found = true; + break; + } + } + if (!found) { + BBOX_PRINT_ERR("[%s] hasn't been registered!\n", info->module); + } + + return found; +} + +static void InvokeModuleOps(struct ErrorInfo *info, BBoxOps *ops) +{ + if (info == NULL || ops == NULL) { + BBOX_PRINT_ERR("info: %p, ops: %p!\n", info, ops); + return; + } + + if (ops->ops.Dump != NULL) { + BBOX_PRINT_INFO("[%s] starts dumping log!\n", ops->ops.module); + ops->ops.Dump(LOSCFG_LOG_ROOT_PATH, info); + BBOX_PRINT_INFO("[%s] ends dumping log!\n", ops->ops.module); + } + if (ops->ops.Reset != NULL) { + BBOX_PRINT_INFO("[%s] starts resetting!\n", ops->ops.module); + ops->ops.Reset(info); + BBOX_PRINT_INFO("[%s] ends resetting!\n", ops->ops.module); + } +} + +static void SaveLastLog(const char *logDir) +{ + struct ErrorInfo *info = NULL; + BBoxOps *ops = NULL; + + info = LOS_MemAlloc(m_aucSysMem1, sizeof(*info)); + if (info == NULL) { + BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); + return; + } + + if (LOS_SemPend(g_opsListSem, LOS_WAIT_FOREVER) != LOS_OK) { + BBOX_PRINT_ERR("Request g_opsListSem failed!\n"); + (void)LOS_MemFree(m_aucSysMem1, info); + return; + } + + LOS_DL_LIST_FOR_EACH_ENTRY(ops, &g_opsList, BBoxOps, opsList) { + if (ops == NULL) { + BBOX_PRINT_ERR("ops: NULL, please check it!\n"); + continue; + } + if (ops->ops.GetLastLogInfo != NULL && ops->ops.SaveLastLog != NULL) { + (void)memset_s(info, sizeof(*info), 0, sizeof(*info)); + if (ops->ops.GetLastLogInfo(info) != 0) { + BBOX_PRINT_ERR("[%s] failed to get log info!\n", ops->ops.module); + continue; + } + BBOX_PRINT_INFO("[%s] starts saving log!\n", ops->ops.module); + if (ops->ops.SaveLastLog(logDir, info) != 0) { + BBOX_PRINT_ERR("[%s] failed to save log!\n", ops->ops.module); + } else { + BBOX_PRINT_INFO("[%s] ends saving log!\n", ops->ops.module); + BBOX_PRINT_INFO("[%s] starts uploading event [%s]\n", info->module, info->event); +#ifdef LOSCFG_FS_VFS + (void)UploadEventByFile(KERNEL_FAULT_LOG_PATH); +#else + BBOX_PRINT_INFO("LOSCFG_FS_VFS isn't defined!\n"); +#endif + BBOX_PRINT_INFO("[%s] ends uploading event [%s]\n", info->module, info->event); + } + } else { + BBOX_PRINT_ERR("module [%s], GetLastLogInfo: %p, SaveLastLog: %p!\n", + ops->ops.module, ops->ops.GetLastLogInfo, ops->ops.SaveLastLog); + } + } + (void)LOS_SemPost(g_opsListSem); + (void)LOS_MemFree(m_aucSysMem1, info); +} + +static void SaveLogWithoutReset(struct ErrorInfo *info) +{ + BBoxOps *ops = NULL; + + if (info == NULL) { + BBOX_PRINT_ERR("info is NULL!\n"); + return; + } + + if (LOS_SemPend(g_opsListSem, LOS_WAIT_FOREVER) != LOS_OK) { + BBOX_PRINT_ERR("Request g_opsListSem failed!\n"); + return; + } + if (!FindModuleOps(info, &ops)) { + (void)LOS_SemPost(g_opsListSem); + return; + } + if (ops->ops.Dump == NULL && ops->ops.Reset == NULL) { + (void)LOS_SemPost(g_opsListSem); + if (SaveBasicErrorInfo(USER_FAULT_LOG_PATH, info) == 0) { + BBOX_PRINT_INFO("[%s] starts uploading event [%s]\n", info->module, info->event); +#ifdef LOSCFG_FS_VFS + (void)UploadEventByFile(USER_FAULT_LOG_PATH); +#else + BBOX_PRINT_INFO("LOSCFG_FS_VFS isn't defined!\n"); +#endif + BBOX_PRINT_INFO("[%s] ends uploading event [%s]\n", info->module, info->event); + } + return; + } + InvokeModuleOps(info, ops); + (void)LOS_SemPost(g_opsListSem); +} + +static void SaveTempErrorLog(void) +{ + if (LOS_SemPend(g_tempErrInfoSem, LOS_WAIT_FOREVER) != LOS_OK) { + BBOX_PRINT_ERR("Request g_tempErrInfoSem failed!\n"); + return; + } + if (g_tempErrInfo == NULL) { + BBOX_PRINT_ERR("g_tempErrInfo is NULL!\n"); + (void)LOS_SemPost(g_tempErrInfoSem); + return; + } + if (strlen(g_tempErrInfo->event) != 0) { + SaveLogWithoutReset(g_tempErrInfo); + } + (void)LOS_SemPost(g_tempErrInfoSem); +} + +static void SaveLogWithReset(struct ErrorInfo *info) +{ + int ret; + BBoxOps *ops = NULL; + + if (info == NULL) { + BBOX_PRINT_ERR("info is NULL!\n"); + return; + } + + if (!FindModuleOps(info, &ops)) { + return; + } + InvokeModuleOps(info, ops); + ret = SysReboot(0, 0, RB_AUTOBOOT); + BBOX_PRINT_INFO("SysReboot, ret: %d\n", ret); +} + +static void SaveTempErrorInfo(const char event[EVENT_MAX_LEN], + const char module[MODULE_MAX_LEN], + const char errorDesc[ERROR_DESC_MAX_LEN]) +{ + if (event == NULL || module == NULL || errorDesc == NULL) { + BBOX_PRINT_ERR("event: %p, module: %p, errorDesc: %p!\n", event, module, errorDesc); + return; + } + if (LOS_SemPend(g_tempErrInfoSem, LOS_NO_WAIT) != LOS_OK) { + BBOX_PRINT_ERR("Request g_tempErrInfoSem failed!\n"); + return; + } + FormatErrorInfo(g_tempErrInfo, event, module, errorDesc); + (void)LOS_SemPost(g_tempErrInfoSem); +} + +static int SaveErrorLog(UINTPTR uwParam1, UINTPTR uwParam2, UINTPTR uwParam3, UINTPTR uwParam4) +{ + const char *logDir = (const char *)uwParam1; + (void)uwParam2; + (void)uwParam3; + (void)uwParam4; + +#ifdef LOSCFG_FS_VFS + WaitForLogPart(); +#endif + SaveLastLog(logDir); + while (1) { + if (LOS_SemPend(g_tempErrLogSaveSem, LOS_WAIT_FOREVER) != LOS_OK) { + BBOX_PRINT_ERR("Request g_tempErrLogSaveSem failed!\n"); + continue; + } + SaveTempErrorLog(); + } + return 0; +} + +#ifdef LOSCFG_BLACKBOX_DEBUG +static void PrintModuleOps(void) +{ + struct BBoxOps *ops = NULL; + + BBOX_PRINT_INFO("The following modules have been registered!\n"); + LOS_DL_LIST_FOR_EACH_ENTRY(ops, &g_opsList, BBoxOps, opsList) { + if (ops == NULL) { + continue; + } + BBOX_PRINT_INFO("module: %s, Dump: %p, Reset: %p, GetLastLogInfo: %p, SaveLastLog: %p\n", + ops->ops.module, ops->ops.Dump, ops->ops.Reset, ops->ops.GetLastLogInfo, ops->ops.SaveLastLog); + } +} +#endif + +int BBoxRegisterModuleOps(struct ModuleOps *ops) +{ + BBoxOps *newOps = NULL; + BBoxOps *temp = NULL; + + if (!g_bboxInitSucc) { + BBOX_PRINT_ERR("BlackBox isn't initialized successfully!\n"); + return -1; + } + if (ops == NULL) { + BBOX_PRINT_ERR("ops is NULL!\n"); + return -1; + } + + newOps = LOS_MemAlloc(m_aucSysMem1, sizeof(*newOps)); + if (newOps == NULL) { + BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); + return -1; + } + (void)memset_s(newOps, sizeof(*newOps), 0, sizeof(*newOps)); + (void)memcpy_s(&newOps->ops, sizeof(newOps->ops), ops, sizeof(*ops)); + if (LOS_SemPend(g_opsListSem, LOS_WAIT_FOREVER) != LOS_OK) { + BBOX_PRINT_ERR("Request g_opsListSem failed!\n"); + (void)LOS_MemFree(m_aucSysMem1, newOps); + return -1; + } + if (LOS_ListEmpty(&g_opsList)) { + goto __out; + } + + LOS_DL_LIST_FOR_EACH_ENTRY(temp, &g_opsList, BBoxOps, opsList) { + if (temp == NULL) { + continue; + } + if (strcmp(temp->ops.module, ops->module) == 0) { + BBOX_PRINT_ERR("module [%s] has been registered!\n", ops->module); + (void)LOS_SemPost(g_opsListSem); + (void)LOS_MemFree(m_aucSysMem1, newOps); + return -1; + } + } + +__out: + LOS_ListTailInsert(&g_opsList, &newOps->opsList); + (void)LOS_SemPost(g_opsListSem); + BBOX_PRINT_INFO("module [%s] is registered successfully!\n", ops->module); +#ifdef LOSCFG_BLACKBOX_DEBUG + PrintModuleOps(); +#endif + + return 0; +} + +int BBoxNotifyError(const char event[EVENT_MAX_LEN], + const char module[MODULE_MAX_LEN], + const char errorDesc[ERROR_DESC_MAX_LEN], + int needSysReset) +{ + if (event == NULL || module == NULL || errorDesc == NULL) { + BBOX_PRINT_ERR("event: %p, module: %p, errorDesc: %p!\n", event, module, errorDesc); + return -1; + } + if (!g_bboxInitSucc) { + BBOX_PRINT_ERR("BlackBox isn't initialized successfully!\n"); + return -1; + } + + if (needSysReset == 0) { + SaveTempErrorInfo(event, module, errorDesc); + (void)LOS_SemPost(g_tempErrLogSaveSem); + } else { + struct ErrorInfo *info = LOS_MemAlloc(m_aucSysMem1, sizeof(struct ErrorInfo)); + if (info == NULL) { + BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); + return -1; + } + FormatErrorInfo(info, event, module, errorDesc); + SaveLogWithReset(info); + (void)LOS_MemFree(m_aucSysMem1, info); + } + + return 0; +} + +int OsBBoxDriverInit(void) +{ + UINT32 taskID; + TSK_INIT_PARAM_S taskParam; + + if (LOS_BinarySemCreate(1, &g_opsListSem) != LOS_OK) { + BBOX_PRINT_ERR("Create g_opsListSem failed!\n"); + return LOS_NOK; + } + if (LOS_BinarySemCreate(1, &g_tempErrInfoSem) != LOS_OK) { + BBOX_PRINT_ERR("Create g_tempErrInfoSem failed!\n"); + goto __err; + } + if (LOS_BinarySemCreate(0, &g_tempErrLogSaveSem) != LOS_OK) { + BBOX_PRINT_ERR("Create g_tempErrLogSaveSem failed!\n"); + goto __err; + } + LOS_ListInit(&g_opsList); + g_tempErrInfo = LOS_MemAlloc(m_aucSysMem1, sizeof(*g_tempErrInfo)); + if (g_tempErrInfo == NULL) { + BBOX_PRINT_ERR("LOS_MemAlloc failed!\n"); + goto __err; + } + (void)memset_s(g_tempErrInfo, sizeof(*g_tempErrInfo), 0, sizeof(*g_tempErrInfo)); + (void)memset_s(&taskParam, sizeof(taskParam), 0, sizeof(taskParam)); + taskParam.auwArgs[0] = (UINTPTR)LOSCFG_LOG_ROOT_PATH; + taskParam.pfnTaskEntry = (TSK_ENTRY_FUNC)SaveErrorLog; + taskParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; + taskParam.pcName = "SaveErrorLog"; + taskParam.usTaskPrio = LOSCFG_BASE_CORE_TSK_DEFAULT_PRIO; + taskParam.uwResved = LOS_TASK_STATUS_DETACHED; +#ifdef LOSCFG_KERNEL_SMP + taskParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid()); +#endif + (void)LOS_TaskCreate(&taskID, &taskParam); + g_bboxInitSucc = TRUE; + return LOS_OK; + +__err: + if (g_opsListSem != 0) { + (void)LOS_SemDelete(g_opsListSem); + } + if (g_tempErrInfoSem != 0) { + (void)LOS_SemDelete(g_tempErrInfoSem); + } + if (g_tempErrLogSaveSem != 0) { + (void)LOS_SemDelete(g_tempErrLogSaveSem); + } + return LOS_NOK; +} +LOS_MODULE_INIT(OsBBoxDriverInit, LOS_INIT_LEVEL_ARCH); \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_detector.c b/kernel/common/blackbox/los_blackbox_detector.c new file mode 100644 index 00000000..ea14c9ea --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_detector.c @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* ------------ includes ------------ */ +#include "los_blackbox_detector.h" +#include "los_blackbox_common.h" +#ifdef LOSCFG_LIB_LIBC +#include "stdlib.h" +#include "unistd.h" +#endif + +/* ------------ local macroes ------------ */ +/* ------------ local prototypes ------------ */ +/* ------------ local function declarations ------------ */ +/* ------------ global function declarations ------------ */ +/* ------------ local variables ------------ */ +/* ------------ function definitions ------------ */ +int UploadEventByFile(const char *filePath) +{ + if (filePath == NULL) { + BBOX_PRINT_ERR("filePath is NULL\n"); + return -1; + } + + return 0; +} + +int UploadEventByStream(const char *buf, size_t bufSize) +{ + if (buf == NULL || bufSize == 0) { + BBOX_PRINT_ERR("buf: %p, bufSize: %u\n", buf, (UINT32)bufSize); + return -1; + } + + return 0; +} \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_detector.h b/kernel/common/blackbox/los_blackbox_detector.h new file mode 100644 index 00000000..f6714aad --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_detector.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef LOS_BLACKBOX_DETECTOR_H +#define LOS_BLACKBOX_DETECTOR_H + +#ifdef __cplusplus +#if __cplusplus +extern "C" { +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#include "los_typedef.h" + +int UploadEventByFile(const char *filePath); +int UploadEventByStream(const char *buf, size_t bufSize); + +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#endif \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_system_adapter.c b/kernel/common/blackbox/los_blackbox_system_adapter.c new file mode 100644 index 00000000..6e5b87d6 --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_system_adapter.c @@ -0,0 +1,265 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* ------------ includes ------------ */ +#include "los_blackbox_system_adapter.h" +#include "los_blackbox_common.h" +#include "los_blackbox_detector.h" +#ifdef LOSCFG_LIB_LIBC +#include "stdlib.h" +#include "unistd.h" +#endif +#include "los_base.h" +#include "los_config.h" +#ifdef LOSCFG_SAVE_EXCINFO +#include "los_excinfo_pri.h" +#endif +#include "los_hw.h" +#include "los_init.h" +#include "los_memory.h" +#include "los_vm_phys.h" +#include "los_vm_common.h" +#include "securec.h" + +/* ------------ local macroes ------------ */ +#define MEM_OVERLAP_COUNT 50 +#define LOG_FLAG "GOODLOG" +#define FAULT_LOG_SIZE 0x4000 /* 16KB */ + +/* ------------ local prototypes ------------ */ +struct FaultLogInfo { + char flag[8]; /* 8 is the length of the flag */ + int len; /* length of the fault log saved by the module excinfo */ + struct ErrorInfo info; +}; + +/* ------------ local function declarations ------------ */ +/* ------------ global function declarations ------------ */ +/* ------------ local variables ------------ */ +static char *g_logBuffer = NULL; + +/* ------------ function definitions ------------ */ +static void SaveFaultLog(const char *filePath, const char *dataBuf, size_t bufSize, struct ErrorInfo *info) +{ + (void)SaveBasicErrorInfo(filePath, info); + (void)FullWriteFile(filePath, dataBuf, bufSize, 1); +} + +#ifdef LOSCFG_SAVE_EXCINFO +static void WriteExcFile(UINT32 startAddr, UINT32 space, UINT32 rwFlag, char *buf) +{ + (void)startAddr; + (void)space; + (void)rwFlag; + (void)buf; +} +#endif + +static void RegisterExcInfoHook(void) +{ + if (g_logBuffer != NULL) { +#ifdef LOSCFG_SAVE_EXCINFO + LOS_ExcInfoRegHook(0, FAULT_LOG_SIZE - sizeof(struct FaultLogInfo), + g_logBuffer + sizeof(struct FaultLogInfo), WriteExcFile); +#endif + } else { + BBOX_PRINT_ERR("Alloc mem failed!\n"); + } +} + +static int AllocLogBuffer(void) +{ + int i = 0; + size_t nPages = ROUNDUP(FAULT_LOG_SIZE, PAGE_SIZE) >> PAGE_SHIFT; + void *tempBuffer[MEM_OVERLAP_COUNT] = { NULL }; + + for (i = 0; i < MEM_OVERLAP_COUNT; i++) { + tempBuffer[i] = LOS_PhysPagesAllocContiguous(nPages); + } + for (i = 0; i < (MEM_OVERLAP_COUNT - 1); i++) { + LOS_PhysPagesFreeContiguous(tempBuffer[i], nPages); + } + g_logBuffer = tempBuffer[i]; + BBOX_PRINT_INFO("g_logBuffer: %p for blackbox!\n", g_logBuffer); + + return (g_logBuffer != NULL) ? 0 : -1; +} + +static void Dump(const char *logDir, struct ErrorInfo *info) +{ + struct FaultLogInfo *pLogInfo = NULL; + + if (logDir == NULL || info == NULL) { + BBOX_PRINT_ERR("logDir: %p, info: %p!\n", logDir, info); + return; + } + if (g_logBuffer == NULL) { + BBOX_PRINT_ERR("g_logBuffer is NULL, alloc physical pages failed!\n"); + return; + } + + if (strcmp(info->event, EVENT_PANIC) == 0) { + pLogInfo = (struct FaultLogInfo *)g_logBuffer; + (void)memset_s(pLogInfo, sizeof(*pLogInfo), 0, sizeof(*pLogInfo)); +#ifdef LOSCFG_SAVE_EXCINFO + pLogInfo->len = GetExcInfoIndex(); +#else + pLogInfo->len = 0; +#endif + (void)memcpy_s(&pLogInfo->flag, sizeof(pLogInfo->flag), LOG_FLAG, strlen(LOG_FLAG)); + (void)memcpy_s(&pLogInfo->info, sizeof(pLogInfo->info), info, sizeof(*info)); + DCacheFlushRange((UINTPTR)g_logBuffer, (UINTPTR)(g_logBuffer + FAULT_LOG_SIZE)); + } else { +#ifdef LOSCFG_SAVE_EXCINFO + SaveFaultLog(USER_FAULT_LOG_PATH, g_logBuffer + sizeof(struct FaultLogInfo), + Min(FAULT_LOG_SIZE - sizeof(struct FaultLogInfo), GetExcInfoIndex()), info); +#else + SaveFaultLog(USER_FAULT_LOG_PATH, g_logBuffer + sizeof(struct FaultLogInfo), 0, info); +#endif + } +} + +static void Reset(struct ErrorInfo *info) +{ + if (info == NULL) { + BBOX_PRINT_ERR("info is NULL!\n"); + return; + } + + if (strcmp(info->event, EVENT_PANIC) != 0) { + BBOX_PRINT_INFO("[%s] starts uploading event [%s]\n", info->module, info->event); + (void)UploadEventByFile(USER_FAULT_LOG_PATH); + BBOX_PRINT_INFO("[%s] ends uploading event [%s]\n", info->module, info->event); + } +} + +static int GetLastLogInfo(struct ErrorInfo *info) +{ + struct FaultLogInfo *pLogInfo = NULL; + + if (info == NULL) { + BBOX_PRINT_ERR("info is NULL!\n"); + return -1; + } + if (g_logBuffer == NULL) { + BBOX_PRINT_ERR("g_logBuffer is NULL, alloc physical pages failed!\n"); + return -1; + } + + pLogInfo = (struct FaultLogInfo *)g_logBuffer; + if (memcmp(pLogInfo->flag, LOG_FLAG, strlen(LOG_FLAG)) == 0) { + (void)memcpy_s(info, sizeof(*info), &pLogInfo->info, sizeof(pLogInfo->info)); + return 0; + } + + return -1; +} + +static int SaveLastLog(const char *logDir, struct ErrorInfo *info) +{ +#ifdef LOSCFG_FS_VFS + struct FaultLogInfo *pLogInfo = NULL; + + if (logDir == NULL || info == NULL) { + BBOX_PRINT_ERR("logDir: %p, info: %p!\n", logDir, info); + return -1; + } + if (g_logBuffer == NULL) { + BBOX_PRINT_ERR("g_logBuffer is NULL, alloc physical pages failed!\n"); + return -1; + } + + pLogInfo = (struct FaultLogInfo *)g_logBuffer; + if (memcmp(pLogInfo->flag, LOG_FLAG, strlen(LOG_FLAG)) == 0) { + SaveFaultLog(KERNEL_FAULT_LOG_PATH, g_logBuffer + sizeof(*pLogInfo), + Min(FAULT_LOG_SIZE - sizeof(*pLogInfo), pLogInfo->len), info); + } + (void)memset_s(g_logBuffer, FAULT_LOG_SIZE, 0, FAULT_LOG_SIZE); + BBOX_PRINT_INFO("[%s] starts uploading event [%s]\n", info->module, info->event); + (void)UploadEventByFile(KERNEL_FAULT_LOG_PATH); + BBOX_PRINT_INFO("[%s] ends uploading event [%s]\n", info->module, info->event); + return 0; +#else + (VOID)logDir; + (VOID)info; + BBOX_PRINT_ERR("LOSCFG_FS_VFS isn't defined!\n"); + return -1; +#endif +} + +#ifdef LOSCFG_BLACKBOX_TEST +static void BBoxTest(void) +{ + struct ModuleOps ops = { + .module = "MODULE_TEST", + .Dump = NULL, + .Reset = NULL, + .GetLastLogInfo = NULL, + .SaveLastLog = NULL, + }; + + if (BBoxRegisterModuleOps(&ops) != 0) { + BBOX_PRINT_ERR("BBoxRegisterModuleOps failed!\n"); + return; + } + BBoxNotifyError("EVENT_TEST1", "MODULE_TEST", "Test BBoxNotifyError111", 0); +} +#endif + +int OsBBoxSystemAdapterInit(void) +{ + struct ModuleOps ops = { + .module = MODULE_SYSTEM, + .Dump = Dump, + .Reset = Reset, + .GetLastLogInfo = GetLastLogInfo, + .SaveLastLog = SaveLastLog, + }; + + /* allocate buffer for kmsg */ + if (AllocLogBuffer() == 0) { + RegisterExcInfoHook(); + if (BBoxRegisterModuleOps(&ops) != 0) { + BBOX_PRINT_ERR("BBoxRegisterModuleOps failed!\n"); + LOS_PhysPagesFreeContiguous(g_logBuffer, ROUNDUP(FAULT_LOG_SIZE, PAGE_SIZE) >> PAGE_SHIFT); + g_logBuffer = NULL; + return LOS_NOK; + } + } else { + BBOX_PRINT_ERR("AllocLogBuffer failed!\n"); + } + +#ifdef LOSCFG_BLACKBOX_TEST + BBoxTest(); +#endif + + return LOS_OK; +} +LOS_MODULE_INIT(OsBBoxSystemAdapterInit, LOS_INIT_LEVEL_PLATFORM); \ No newline at end of file diff --git a/kernel/common/blackbox/los_blackbox_system_adapter.h b/kernel/common/blackbox/los_blackbox_system_adapter.h new file mode 100644 index 00000000..eb61bf83 --- /dev/null +++ b/kernel/common/blackbox/los_blackbox_system_adapter.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef LOS_BLACKBOX_SYSTEM_ADAPTER_H +#define LOS_BLACKBOX_SYSTEM_ADAPTER_H + +#ifdef __cplusplus +#if __cplusplus +extern "C" { +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#include "los_blackbox.h" +#include "los_blackbox_common.h" + +int OsBBoxSystemAdapterInit(void); + +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#endif \ No newline at end of file diff --git a/kernel/common/los_excinfo.c b/kernel/common/los_excinfo.c index b18ee23b..7bf01236 100644 --- a/kernel/common/los_excinfo.c +++ b/kernel/common/los_excinfo.c @@ -34,6 +34,10 @@ #ifdef LOSCFG_SHELL #include "shcmd.h" #endif +#ifdef LOSCFG_FS_VFS +#include "fs/fs.h" +#include "fs/fs_operation.h" +#endif #ifdef LOSCFG_SAVE_EXCINFO STATIC log_read_write_fn g_excInfoRW = NULL; /* the hook of read-writing exception information */ diff --git a/tools/build/mk/liteos_tables_ldflags.mk b/tools/build/mk/liteos_tables_ldflags.mk index dd670571..db8b93c9 100644 --- a/tools/build/mk/liteos_tables_ldflags.mk +++ b/tools/build/mk/liteos_tables_ldflags.mk @@ -135,7 +135,9 @@ LITEOS_TABLES_KERNEL_INIT_LDFLAGS := \ -uOsCpupGuardCreator \ -uOsMpInit \ -uOsResourceFreeTaskCreate \ - -uOsSystemInit + -uOsSystemInit \ + -uOsBBoxDriverInit \ + -uOsBBoxSystemAdapterInit LITEOS_TABLES_DRIVER_LDFLAGS := \ -ui2c_init \ diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index cbefe9c7..902f770a 100644 --- a/tools/build/mk/los_config.mk +++ b/tools/build/mk/los_config.mk @@ -443,6 +443,11 @@ ifeq ($(LOSCFG_BASE_CORE_HILOG), y) LITEOS_HILOG_INCLUDE += -I $(LITEOSTOPDIR)/../../base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog LITEOS_CMACRO += -DLOSCFG_BASE_CORE_HILOG endif +ifeq ($(LOSCFG_BLACKBOX), y) + LITEOS_BASELIB += -lblackbox + LIB_SUBDIRS += $(LITEOSTOPDIR)/kernel/common/blackbox + LITEOS_BLACKBOX_INCLUDE += -I $(LITEOSTOPDIR)/kernel/common/blackbox +endif ############################## Dfx Option End ####################################### ############################# Tools && Debug Option Begin ############################## @@ -639,7 +644,8 @@ LITEOS_DRIVERS_INCLUDE := $(LITEOS_CELLWISE_INCLUDE) $(LITEOS_GPIO_INCLUDE $(LITEOS_DRIVERS_HDF_INCLUDE) $(LITEOS_TZDRIVER_INCLUDE) \ $(LITEOS_HIEVENT_INCLUDE) $(LITEOS_DEV_MEM_INCLUDE) \ $(LITEOS_DEV_QUICKSTART_INCLUDE) -LITEOS_DFX_INCLUDE := $(LITEOS_HILOG_INCLUDE) +LITEOS_DFX_INCLUDE := $(LITEOS_HILOG_INCLUDE) \ + $(LITEOS_BLACKBOX_INCLUDE) LITEOS_SECURITY_INCLUDE := $(LITEOS_SECURITY_CAP_INC) $(LITEOS_SECURITY_VID_INC) LOSCFG_TOOLS_DEBUG_INCLUDE := $(LITEOS_SHELL_INCLUDE) $(LITEOS_UART_INCLUDE) \ From 09c491ca1fd6d3110eafb0d07e45b25bdc3bd5d0 Mon Sep 17 00:00:00 2001 From: Guangyao Ma Date: Wed, 14 Jul 2021 14:40:38 +0800 Subject: [PATCH 28/43] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=AA=97=E5=8F=A3=E5=AE=BD=E5=BA=A6=E5=88=B0400?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 由于内核暂不支持tty，窗口默认宽度写死的为80。在流水线中，往往有时候需要更宽的 窗口宽度。在tty支持动态获取和设置大小之前，先调整大小为400。 re #I40LQX Signed-off-by: Guangyao Ma Change-Id: Ic21a8b7098f47b7d608762678eebb7b8ecb67ce4 --- kernel/common/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/common/console.c b/kernel/common/console.c index 353e98c3..4e09335f 100644 --- a/kernel/common/console.c +++ b/kernel/common/console.c @@ -842,7 +842,7 @@ STATIC INT32 ConsoleSetSW(CONSOLE_CB *consoleCB, unsigned long arg) return LOS_OK; } -#define DEFAULT_WINDOW_SIZE_COL 80 +#define DEFAULT_WINDOW_SIZE_COL 400 #define DEFAULT_WINDOW_SIZE_ROW 24 STATIC INT32 ConsoleGetWinSize(unsigned long arg) { From cb17fa50ed28e6e8f59b7d68ede13c759b983311 Mon Sep 17 00:00:00 2001 From: qidechun Date: Wed, 14 Jul 2021 10:27:02 +0800 Subject: [PATCH 29/43] =?UTF-8?q?feat:=20=E7=BB=99=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E8=80=85=E6=8F=90=E4=BE=9B=E7=B3=BB=E7=BB=9F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=87=BAHidumper=E5=B7=A5=E5=85=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 给开发者提供系统信息DUMP机制，帮助开发者观察系统功能状态，发现潜在问题。 Close #I3NN7D Signed-off-by: qidechun --- Kconfig | 2 + kernel/common/hidumper/Kconfig | 5 + kernel/common/hidumper/Makefile | 13 + kernel/common/hidumper/los_hidumper.c | 381 ++++++++++++++++++++++++ kernel/common/hidumper/los_hidumper.h | 88 ++++++ tools/build/mk/liteos_tables_ldflags.mk | 3 +- tools/build/mk/los_config.mk | 8 +- 7 files changed, 498 insertions(+), 2 deletions(-) create mode 100644 kernel/common/hidumper/Kconfig create mode 100644 kernel/common/hidumper/Makefile create mode 100644 kernel/common/hidumper/los_hidumper.c create mode 100644 kernel/common/hidumper/los_hidumper.h diff --git a/Kconfig b/Kconfig index d9f60a40..1b3a174e 100644 --- a/Kconfig +++ b/Kconfig @@ -63,6 +63,8 @@ source "kernel/common/Kconfig" source "kernel/common/patchfs/Kconfig" ######################### config options of blackbox ##################### source "kernel/common/blackbox/Kconfig" +######################### config options of hidumper ##################### +source "kernel/common/hidumper/Kconfig" config QUICK_START bool "Enable QUICK_START" diff --git a/kernel/common/hidumper/Kconfig b/kernel/common/hidumper/Kconfig new file mode 100644 index 00000000..b15d50a8 --- /dev/null +++ b/kernel/common/hidumper/Kconfig @@ -0,0 +1,5 @@ +config HIDUMPER + bool "Enable hidumper" + default n + help + Answer Y to enable LiteOS support hidumper diff --git a/kernel/common/hidumper/Makefile b/kernel/common/hidumper/Makefile new file mode 100644 index 00000000..230c1d8a --- /dev/null +++ b/kernel/common/hidumper/Makefile @@ -0,0 +1,13 @@ +include $(LITEOSTOPDIR)/config.mk + +MODULE_NAME := $(notdir $(shell pwd)) + +LOCAL_SRCS := $(wildcard *.c) + +LOCAL_INCLUDE := \ + -I $(LITEOSTOPDIR)/kernel/common \ + -I $(LITEOSTOPDIR)/kernel/common/hidumper \ + +LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS) + +include $(MODULE) diff --git a/kernel/common/hidumper/los_hidumper.c b/kernel/common/hidumper/los_hidumper.c new file mode 100644 index 00000000..d04647db --- /dev/null +++ b/kernel/common/hidumper/los_hidumper.c @@ -0,0 +1,381 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* ------------ includes ------------ */ +#include "los_hidumper.h" +#ifdef LOSCFG_BLACKBOX +#include "los_blackbox.h" +#endif +#ifdef LOSCFG_CPUP_INCLUDE_IRQ +#include "los_cpup_pri.h" +#endif +#include "los_hwi_pri.h" +#include "los_init.h" +#include "los_mp.h" +#include "los_mux.h" +#include "los_printf.h" +#include "los_process_pri.h" +#include "los_task_pri.h" +#include "los_vm_dump.h" +#include "los_vm_lock.h" +#include "los_vm_map.h" +#ifdef LOSCFG_FS_VFS +#include "fs/file.h" +#endif +#include "fs/driver.h" +#include "securec.h" +#ifdef LOSCFG_LIB_LIBC +#include "unistd.h" +#endif +#include "user_copy.h" + +/* ------------ local macroes ------------ */ +#define CPUP_TYPE_COUNT 3 +#define HIDUMPER_DEVICE "/dev/hidumper" +#define HIDUMPER_DEVICE_MODE 0666 +#define KERNEL_FAULT_ADDR 0x1 +#define KERNEL_FAULT_VALUE 0x2 +#define READ_BUF_SIZE 128 +#define SYS_INFO_HEADER "************ sys info ***********" +#define CPU_USAGE_HEADER "************ cpu usage ***********" +#define MEM_USAGE_HEADER "************ mem usage ***********" +#define PAGE_USAGE_HEADER "************ physical page usage ***********" +#define TASK_INFO_HEADER "************ task info ***********" +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) +#endif +#define REPLACE_INTERFACE(dst, src, type, func) {\ + if (((type *)src)->func != NULL) {\ + ((type *)dst)->func = ((type *)src)->func;\ + } else {\ + PRINT_ERR("%s->%s is NULL!\n", #src, #func);\ + }\ +} +#define INVOKE_INTERFACE(adapter, type, func) {\ + if (((type *)adapter)->func != NULL) {\ + ((type *)adapter)->func();\ + } else {\ + PRINT_ERR("%s->%s is NULL!\n", #adapter, #func);\ + }\ +} + +/* ------------ local prototypes ------------ */ +/* ------------ local function declarations ------------ */ +STATIC INT32 HiDumperOpen(struct file *filep); +STATIC INT32 HiDumperClose(struct file *filep); +STATIC INT32 HiDumperIoctl(struct file *filep, INT32 cmd, unsigned long arg); + +/* ------------ global function declarations ------------ */ +#ifdef LOSCFG_SHELL +extern VOID OsShellCmdSystemInfoGet(VOID); +extern UINT32 OsShellCmdFree(INT32 argc, const CHAR *argv[]); +extern UINT32 OsShellCmdUname(INT32 argc, const CHAR *argv[]); +extern UINT32 OsShellCmdDumpPmm(VOID); +#endif + +/* ------------ local variables ------------ */ +static struct HiDumperAdapter g_adapter; +STATIC struct file_operations_vfs g_hidumperDevOps = { + HiDumperOpen, /* open */ + HiDumperClose, /* close */ + NULL, /* read */ + NULL, /* write */ + NULL, /* seek */ + HiDumperIoctl, /* ioctl */ + NULL, /* mmap */ +#ifndef CONFIG_DISABLE_POLL + NULL, /* poll */ +#endif + NULL, /* unlink */ +}; + +/* ------------ function definitions ------------ */ +STATIC INT32 HiDumperOpen(struct file *filep) +{ + (VOID)filep; + return 0; +} + +STATIC INT32 HiDumperClose(struct file *filep) +{ + (VOID)filep; + return 0; +} + +static void DumpSysInfo(void) +{ + PRINTK("\n%s\n", SYS_INFO_HEADER); +#ifdef LOSCFG_SHELL + const char *argv[1] = {"-a"}; + (VOID)OsShellCmdUname(ARRAY_SIZE(argv), &argv[0]); + (VOID)OsShellCmdSystemInfoGet(); +#else + PRINTK("\nUnsupported!\n"); +#endif +} + +#ifdef LOSCFG_KERNEL_CPUP +static void DoDumpCpuUsageUnsafe(CPUP_INFO_S *processCpupAll, + CPUP_INFO_S *processCpup10s, + CPUP_INFO_S *processCpup1s) +{ + UINT32 pid; + + PRINTK("%-32s PID CPUUSE CPUUSE10S CPUUSE1S\n", "PName"); + for (pid = 0; pid < g_processMaxNum; pid++) { + LosProcessCB *processCB = g_processCBArray + pid; + if (OsProcessIsUnused(processCB)) { + continue; + } + PRINTK("%-32s %u %5u.%1u%8u.%1u%7u.%-1u\n", + processCB->processName, processCB->processID, + processCpupAll[pid].usage / LOS_CPUP_PRECISION_MULT, + processCpupAll[pid].usage % LOS_CPUP_PRECISION_MULT, + processCpup10s[pid].usage / LOS_CPUP_PRECISION_MULT, + processCpup10s[pid].usage % LOS_CPUP_PRECISION_MULT, + processCpup1s[pid].usage / LOS_CPUP_PRECISION_MULT, + processCpup1s[pid].usage % LOS_CPUP_PRECISION_MULT); + } +} +#endif + +static void DumpCpuUsageUnsafe(void) +{ + PRINTK("\n%s\n", CPU_USAGE_HEADER); +#ifdef LOSCFG_KERNEL_CPUP + UINT32 size; + CPUP_INFO_S *processCpup = NULL; + CPUP_INFO_S *processCpupAll = NULL; + CPUP_INFO_S *processCpup10s = NULL; + CPUP_INFO_S *processCpup1s = NULL; + + size = sizeof(*processCpup) * g_processMaxNum * CPUP_TYPE_COUNT; + processCpup = LOS_MemAlloc(m_aucSysMem1, size); + if (processCpup == NULL) { + PRINT_ERR("func: %s, LOS_MemAlloc failed, Line: %d\n", __func__, __LINE__); + return; + } + processCpupAll = processCpup; + processCpup10s = processCpupAll + g_processMaxNum; + processCpup1s = processCpup10s + g_processMaxNum; + (VOID)memset_s(processCpup, size, 0, size); + LOS_GetAllProcessCpuUsage(CPUP_ALL_TIME, processCpupAll, g_processMaxNum * sizeof(CPUP_INFO_S)); + LOS_GetAllProcessCpuUsage(CPUP_LAST_TEN_SECONDS, processCpup10s, g_processMaxNum * sizeof(CPUP_INFO_S)); + LOS_GetAllProcessCpuUsage(CPUP_LAST_ONE_SECONDS, processCpup1s, g_processMaxNum * sizeof(CPUP_INFO_S)); + DoDumpCpuUsageUnsafe(processCpupAll, processCpup10s, processCpup1s); + (VOID)LOS_MemFree(m_aucSysMem1, processCpup); +#else + PRINTK("\nUnsupported!\n"); +#endif +} + +static void DumpMemUsage(void) +{ + PRINTK("\n%s\n", MEM_USAGE_HEADER); +#ifdef LOSCFG_SHELL + PRINTK("Unit: KB\n"); + const char *argv[1] = {"-k"}; + (VOID)OsShellCmdFree(ARRAY_SIZE(argv), &argv[0]); + PRINTK("%s\n", PAGE_USAGE_HEADER); + (VOID)OsShellCmdDumpPmm(); +#else + PRINTK("\nUnsupported!\n"); +#endif +} + +static void DumpTaskInfo(void) +{ + PRINTK("\n%s\n", TASK_INFO_HEADER); +#ifdef LOSCFG_SHELL + (VOID)OsShellCmdTskInfoGet(OS_ALL_TASK_MASK, NULL, OS_PROCESS_INFO_ALL); +#else + PRINTK("\nUnsupported!\n"); +#endif +} + +#ifdef LOSCFG_BLACKBOX +static void PrintFileData(INT32 fd) +{ +#ifdef LOSCFG_FS_VFS + CHAR buf[READ_BUF_SIZE]; + + if (fd < 0) { + PRINT_ERR("fd: %d!\n", fd); + return; + } + + (void)memset_s(buf, sizeof(buf), 0, sizeof(buf)); + while (read(fd, buf, sizeof(buf) - 1) > 0) { + PRINTK("%s", buf); + (void)memset_s(buf, sizeof(buf), 0, sizeof(buf)); + } +#else + (VOID)fd; + PRINT_ERR("LOSCFG_FS_VFS isn't defined!\n"); +#endif +} + +static void PrintFile(const char *filePath, const char *pHeader) +{ +#ifdef LOSCFG_FS_VFS + int fd; + + if (filePath == NULL || pHeader == NULL) { + PRINT_ERR("filePath: %p, pHeader: %p\n", filePath, pHeader); + return; + } + + fd = open(filePath, O_RDONLY); + if (fd >= 0) { + PRINTK("\n%s\n", pHeader); + PrintFileData(fd); + (void)close(fd); + } else { + PRINT_ERR("Open [%s] failed or there's no fault log!\n", filePath); + } +#else + (VOID)filePath; + (VOID)pHeader; + PRINT_ERR("LOSCFG_FS_VFS isn't defined!\n"); +#endif +} +#endif + +static void DumpFaultLog(void) +{ +#ifdef LOSCFG_BLACKBOX + PrintFile(KERNEL_FAULT_LOG_PATH, "************kernel fault info************"); + PrintFile(USER_FAULT_LOG_PATH, "************user fault info************"); +#endif +} + +static void DumpMemData(struct MemDumpParam *param) +{ + PRINTK("\nDumpType: %d\n", param->type); + PRINTK("Unsupported now!\n"); +} + +static void InjectKernelCrash(void) +{ +#ifdef LOSCFG_DEBUG_VERSION + *((INT32 *)KERNEL_FAULT_ADDR) = KERNEL_FAULT_VALUE; +#else + PRINTK("\nUnsupported!\n"); +#endif +} + +static INT32 HiDumperIoctl(struct file *filep, INT32 cmd, unsigned long arg) +{ + INT32 ret = 0; + + switch (cmd) { + case HIDUMPER_DUMP_ALL: + INVOKE_INTERFACE(&g_adapter, struct HiDumperAdapter, DumpSysInfo); + INVOKE_INTERFACE(&g_adapter, struct HiDumperAdapter, DumpCpuUsage); + INVOKE_INTERFACE(&g_adapter, struct HiDumperAdapter, DumpMemUsage); + INVOKE_INTERFACE(&g_adapter, struct HiDumperAdapter, DumpTaskInfo); + break; + case HIDUMPER_CPU_USAGE: + INVOKE_INTERFACE(&g_adapter, struct HiDumperAdapter, DumpCpuUsage); + break; + case HIDUMPER_MEM_USAGE: + INVOKE_INTERFACE(&g_adapter, struct HiDumperAdapter, DumpMemUsage); + break; + case HIDUMPER_TASK_INFO: + INVOKE_INTERFACE(&g_adapter, struct HiDumperAdapter, DumpTaskInfo); + break; + case HIDUMPER_INJECT_KERNEL_CRASH: + INVOKE_INTERFACE(&g_adapter, struct HiDumperAdapter, InjectKernelCrash); + break; + case HIDUMPER_DUMP_FAULT_LOG: + INVOKE_INTERFACE(&g_adapter, struct HiDumperAdapter, DumpFaultLog); + break; + case HIDUMPER_MEM_DATA: + if (g_adapter.DumpMemData != NULL) { + g_adapter.DumpMemData((struct MemDumpParam *)arg); + } + break; + default: + ret = EPERM; + PRINTK("Invalid CMD: 0x%x\n", (UINT32)cmd); + break; + } + + return ret; +} + +static void RegisterCommonAdapter(void) +{ + struct HiDumperAdapter adapter; + + adapter.DumpSysInfo = DumpSysInfo; + adapter.DumpCpuUsage = DumpCpuUsageUnsafe; + adapter.DumpMemUsage = DumpMemUsage; + adapter.DumpTaskInfo = DumpTaskInfo; + adapter.DumpFaultLog = DumpFaultLog; + adapter.DumpMemData = DumpMemData; + adapter.InjectKernelCrash = InjectKernelCrash; + HiDumperRegisterAdapter(&adapter); +} + +int HiDumperRegisterAdapter(struct HiDumperAdapter *pAdapter) +{ + if (pAdapter == NULL) { + PRINT_ERR("pAdapter: %p\n", pAdapter); + return -1; + } + + REPLACE_INTERFACE(&g_adapter, pAdapter, struct HiDumperAdapter, DumpSysInfo); + REPLACE_INTERFACE(&g_adapter, pAdapter, struct HiDumperAdapter, DumpCpuUsage); + REPLACE_INTERFACE(&g_adapter, pAdapter, struct HiDumperAdapter, DumpMemUsage); + REPLACE_INTERFACE(&g_adapter, pAdapter, struct HiDumperAdapter, DumpTaskInfo); + REPLACE_INTERFACE(&g_adapter, pAdapter, struct HiDumperAdapter, DumpFaultLog); + REPLACE_INTERFACE(&g_adapter, pAdapter, struct HiDumperAdapter, DumpMemData); + REPLACE_INTERFACE(&g_adapter, pAdapter, struct HiDumperAdapter, InjectKernelCrash); + + return 0; +} + +int OsHiDumperDriverInit(void) +{ + INT32 ret; + +#ifdef LOSCFG_DEBUG_VERSION + RegisterCommonAdapter(); + ret = register_driver(HIDUMPER_DEVICE, &g_hidumperDevOps, HIDUMPER_DEVICE_MODE, NULL); + if (ret != 0) { + PRINT_ERR("Hidumper register driver failed!\n"); + return -1; + } +#endif + + return 0; +} +LOS_MODULE_INIT(OsHiDumperDriverInit, LOS_INIT_LEVEL_KMOD_EXTENDED); diff --git a/kernel/common/hidumper/los_hidumper.h b/kernel/common/hidumper/los_hidumper.h new file mode 100644 index 00000000..ab48f302 --- /dev/null +++ b/kernel/common/hidumper/los_hidumper.h @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef LOS_HIDUMPER_H +#define LOS_HIDUMPER_H + +#ifdef __cplusplus +#if __cplusplus +extern "C" { +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#ifndef __user +#define __user +#endif + +#define PATH_MAX_LEN 256 + +enum MemDumpType { + DUMP_TO_STDOUT, + DUMP_REGION_TO_STDOUT, + DUMP_TO_FILE, + DUMP_REGION_TO_FILE +}; + +struct MemDumpParam { + enum MemDumpType type; + unsigned long long start; + unsigned long long size; + char filePath[PATH_MAX_LEN]; +}; + +struct HiDumperAdapter { + void (*DumpSysInfo)(void); + void (*DumpCpuUsage)(void); + void (*DumpMemUsage)(void); + void (*DumpTaskInfo)(void); + void (*DumpFaultLog)(void); + void (*DumpMemData)(struct MemDumpParam *param); + void (*InjectKernelCrash)(void); +}; + +#define HIDUMPER_IOC_BASE 'd' +#define HIDUMPER_DUMP_ALL _IO(HIDUMPER_IOC_BASE, 1) +#define HIDUMPER_CPU_USAGE _IO(HIDUMPER_IOC_BASE, 2) +#define HIDUMPER_MEM_USAGE _IO(HIDUMPER_IOC_BASE, 3) +#define HIDUMPER_TASK_INFO _IO(HIDUMPER_IOC_BASE, 4) +#define HIDUMPER_INJECT_KERNEL_CRASH _IO(HIDUMPER_IOC_BASE, 5) +#define HIDUMPER_DUMP_FAULT_LOG _IO(HIDUMPER_IOC_BASE, 6) +#define HIDUMPER_MEM_DATA _IOW(HIDUMPER_IOC_BASE, 7, struct MemDumpParam) + +int HiDumperRegisterAdapter(struct HiDumperAdapter *pAdapter); +int OsHiDumperDriverInit(void); + +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ + +#endif \ No newline at end of file diff --git a/tools/build/mk/liteos_tables_ldflags.mk b/tools/build/mk/liteos_tables_ldflags.mk index db8b93c9..eed3a4b9 100644 --- a/tools/build/mk/liteos_tables_ldflags.mk +++ b/tools/build/mk/liteos_tables_ldflags.mk @@ -137,7 +137,8 @@ LITEOS_TABLES_KERNEL_INIT_LDFLAGS := \ -uOsResourceFreeTaskCreate \ -uOsSystemInit \ -uOsBBoxDriverInit \ - -uOsBBoxSystemAdapterInit + -uOsBBoxSystemAdapterInit \ + -uOsHiDumperDriverInit LITEOS_TABLES_DRIVER_LDFLAGS := \ -ui2c_init \ diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index 902f770a..b332f723 100644 --- a/tools/build/mk/los_config.mk +++ b/tools/build/mk/los_config.mk @@ -448,6 +448,11 @@ ifeq ($(LOSCFG_BLACKBOX), y) LIB_SUBDIRS += $(LITEOSTOPDIR)/kernel/common/blackbox LITEOS_BLACKBOX_INCLUDE += -I $(LITEOSTOPDIR)/kernel/common/blackbox endif +ifeq ($(LOSCFG_HIDUMPER), y) + LITEOS_BASELIB += -lhidumper + LIB_SUBDIRS += $(LITEOSTOPDIR)/kernel/common/hidumper + LITEOS_HIDUMPER_INCLUDE += -I $(LITEOSTOPDIR)/kernel/common/hidumper +endif ############################## Dfx Option End ####################################### ############################# Tools && Debug Option Begin ############################## @@ -645,7 +650,8 @@ LITEOS_DRIVERS_INCLUDE := $(LITEOS_CELLWISE_INCLUDE) $(LITEOS_GPIO_INCLUDE $(LITEOS_HIEVENT_INCLUDE) $(LITEOS_DEV_MEM_INCLUDE) \ $(LITEOS_DEV_QUICKSTART_INCLUDE) LITEOS_DFX_INCLUDE := $(LITEOS_HILOG_INCLUDE) \ - $(LITEOS_BLACKBOX_INCLUDE) + $(LITEOS_BLACKBOX_INCLUDE) \ + $(LITEOS_HIDUMPER_INCLUDE) LITEOS_SECURITY_INCLUDE := $(LITEOS_SECURITY_CAP_INC) $(LITEOS_SECURITY_VID_INC) LOSCFG_TOOLS_DEBUG_INCLUDE := $(LITEOS_SHELL_INCLUDE) $(LITEOS_UART_INCLUDE) \ From 9547133e6488d65e8a2ebf365a3411b861d14718 Mon Sep 17 00:00:00 2001 From: Haryslee Date: Thu, 15 Jul 2021 19:19:56 +0800 Subject: [PATCH 30/43] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dllvm?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E7=8E=AF=E5=A2=83=E4=B8=8B=E5=86=85=E6=A0=B8?= =?UTF-8?q?=E6=80=81=E5=86=85=E5=AD=98=E8=B0=83=E6=B5=8B=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=A0=88=E4=BF=A1=E6=81=AF=E8=A7=A3=E6=9E=90=E6=9C=89=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 背景：内核态内存调测调用栈信息在gcc编译环境下是准确的，但是llvm 编译环境下是错误的，分析知，gcc和llvm编译环境下fp和lr的对应关系 是有区别的。 修复：增加llvm编译环境下对lr解析的逻辑，并用编译宏控制。 close #I40TQS Signed-off-by: Haryslee Change-Id: If2a7b7a286d91e78dcff2bdeb136fda71e656a79 --- arch/arm/arm/src/los_exc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/arm/src/los_exc.c b/arch/arm/arm/src/los_exc.c index c90f591f..297a061b 100644 --- a/arch/arm/arm/src/los_exc.c +++ b/arch/arm/arm/src/los_exc.c @@ -721,7 +721,7 @@ VOID BackTraceSub(UINTPTR regFP) while (IsValidFP(backFP, stackStart, stackEnd, &kvaddr) == TRUE) { tmpFP = backFP; #ifdef LOSCFG_COMPILER_CLANG_LLVM - backFP = *(UINTPTR *)(UINTPTR)kvaddr; + backFP = *(UINTPTR *)(UINTPTR)kvaddr; if (IsValidFP(tmpFP + POINTER_SIZE, stackStart, stackEnd, &kvaddr) == FALSE) { PrintExcInfo("traceback backLR check failed, backLP: 0x%x\n", tmpFP + POINTER_SIZE); return; @@ -1215,7 +1215,11 @@ VOID LOS_RecordLR(UINTPTR *LR, UINT32 LRSize, UINT32 recordCount, UINT32 jumpCou framePtr = Get_Fp(); while ((framePtr > stackStart) && (framePtr < stackEnd) && IS_ALIGNED(framePtr, sizeof(CHAR *))) { tmpFramePtr = framePtr; +#ifdef LOSCFG_COMPILER_CLANG_LLVM + linkReg = *(UINTPTR *)(tmpFramePtr + sizeof(UINTPTR)); +#else linkReg = *(UINTPTR *)framePtr; +#endif if (index >= jumpCount) { LR[count++] = linkReg; if (count == recordCount) { @@ -1223,7 +1227,11 @@ VOID LOS_RecordLR(UINTPTR *LR, UINT32 LRSize, UINT32 recordCount, UINT32 jumpCou } } index++; +#ifdef LOSCFG_COMPILER_CLANG_LLVM + framePtr = *(UINTPTR *)framePtr; +#else framePtr = *(UINTPTR *)(tmpFramePtr - sizeof(UINTPTR)); +#endif } /* if linkReg is not enough,clean up the last of the effective LR as the end. */ From 7a6e4c815547be64c594ec0919998d0315925a5f Mon Sep 17 00:00:00 2001 From: JerryH1011 Date: Mon, 19 Jul 2021 14:37:36 +0800 Subject: [PATCH 31/43] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=85=B1?= =?UTF-8?q?=E4=BA=AB=E5=86=85=E5=AD=98shmat=E5=92=8Cshmdt=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=B9=8B=E9=97=B4=E5=AD=98=E5=9C=A8=E7=9A=84=E6=AD=BB?= =?UTF-8?q?=E9=94=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit close #I40QOM Change-Id: Ib3783f5d6b1095bf2100ab024fe0235a64355823 Signed-off-by: JerryH1011 --- kernel/base/vm/shm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/base/vm/shm.c b/kernel/base/vm/shm.c index 577eb160..035a456f 100644 --- a/kernel/base/vm/shm.c +++ b/kernel/base/vm/shm.c @@ -742,6 +742,7 @@ INT32 ShmDt(const VOID *shmaddr) /* remove it from aspace */ LOS_RbDelNode(&space->regionRbTree, ®ion->rbNode); LOS_ArchMmuUnmap(&space->archMmu, region->range.base, region->range.size >> PAGE_SHIFT); + (VOID)LOS_MuxRelease(&space->regionMux); /* free it */ free(region); @@ -750,7 +751,7 @@ INT32 ShmDt(const VOID *shmaddr) if (seg == NULL) { ret = EINVAL; SYSV_SHM_UNLOCK(); - goto ERROR_WITH_LOCK; + goto ERROR; } ShmPagesRefDec(seg); @@ -763,7 +764,7 @@ INT32 ShmDt(const VOID *shmaddr) seg->ds.shm_lpid = LOS_GetCurrProcessID(); } SYSV_SHM_UNLOCK(); - (VOID)LOS_MuxRelease(&space->regionMux); + return 0; ERROR_WITH_LOCK: From 80473f0975fe6fd4c4eae3a8a473674ad2dd1293 Mon Sep 17 00:00:00 2001 From: chenjing Date: Mon, 19 Jul 2021 15:18:16 +0800 Subject: [PATCH 32/43] =?UTF-8?q?fix:=20bootargs=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E4=B8=8Erootfs=E6=8C=82=E8=BD=BD=E8=A7=A3=E8=80=A6=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89bootargs?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、bootargs解析与rootfs挂载进行解耦； 2、支持开发者自定义bootargs参数，内核存储bootargs中所有参数； 3、开发者可获取bootargs中的参数内容，并自行解析。 close #I41CL8 Change-Id: If384476714854ba0cf64eb70b785eb26737dd3d2 Signed-off-by: chenjing --- drivers/block/disk/include/disk.h | 3 + drivers/block/disk/src/disk.c | 16 + kernel/common/Makefile | 2 +- kernel/common/los_bootargs.c | 246 ++++++++++ kernel/common/los_bootargs.h | 58 +++ kernel/common/los_rootfs.c | 725 ++++++++++-------------------- kernel/common/los_rootfs.h | 69 +-- platform/Makefile | 2 +- 8 files changed, 595 insertions(+), 526 deletions(-) create mode 100644 kernel/common/los_bootargs.c create mode 100644 kernel/common/los_bootargs.h diff --git a/drivers/block/disk/include/disk.h b/drivers/block/disk/include/disk.h index 851aa563..b1f6884b 100644 --- a/drivers/block/disk/include/disk.h +++ b/drivers/block/disk/include/disk.h @@ -725,6 +725,9 @@ INT32 los_alloc_diskid_byname(const CHAR *diskName); */ INT32 los_get_diskid_byname(const CHAR *diskName); + +los_disk *los_get_mmcdisk_bytype(UINT8 type); + #ifdef __cplusplus #if __cplusplus } diff --git a/drivers/block/disk/src/disk.c b/drivers/block/disk/src/disk.c index 6c9681c6..34f48d47 100644 --- a/drivers/block/disk/src/disk.c +++ b/drivers/block/disk/src/disk.c @@ -187,6 +187,22 @@ INT32 los_get_diskid_byname(const CHAR *diskName) return diskID; } +los_disk *los_get_mmcdisk_bytype(UINT8 type) +{ + const CHAR *mmcDevHead = "/dev/mmcblk"; + + for (INT32 diskId = 0; diskId < SYS_MAX_DISK; diskId++) { + los_disk *disk = get_disk(diskId); + if (disk == NULL) { + continue; + } else if ((disk->type == type) && (strncmp(disk->disk_name, mmcDevHead, strlen(mmcDevHead)) == 0)) { + return disk; + } + } + PRINT_ERR("Cannot find the mmc disk!\n"); + return NULL; +} + VOID OsSetUsbStatus(UINT32 diskID) { if (diskID < SYS_MAX_DISK) { diff --git a/kernel/common/Makefile b/kernel/common/Makefile index 662f496e..6762cab4 100644 --- a/kernel/common/Makefile +++ b/kernel/common/Makefile @@ -31,7 +31,7 @@ include $(LITEOSTOPDIR)/config.mk MODULE_NAME := rootfs -LOCAL_SRCS := $(wildcard los_rootfs.c) +LOCAL_SRCS := $(wildcard los_rootfs.c los_bootargs.c) LOCAL_INCLUDE := \ -I $(LITEOSTOPDIR)/kernel/common \ diff --git a/kernel/common/los_bootargs.c b/kernel/common/los_bootargs.c new file mode 100644 index 00000000..03868dc7 --- /dev/null +++ b/kernel/common/los_bootargs.c @@ -0,0 +1,246 @@ +/* + * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "los_bootargs.h" +#include "los_base.h" +#include "string.h" + +#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) || defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7) +#include "mtd_list.h" +#endif + +#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7 +#include "cfiflash.h" +#endif + +#ifdef LOSCFG_STORAGE_EMMC +#include "disk.h" +#endif + +STATIC CHAR *g_cmdLine = NULL; +STATIC UINT64 g_alignSize = 0; +STATIC struct BootArgs g_bootArgs[MAX_ARGS_NUM] = {0}; + +INT32 LOS_GetCmdLine() { + int ret = 0; + + g_cmdLine = (CHAR *)malloc(COMMAND_LINE_SIZE); + if (g_cmdLine == NULL) { + PRINT_ERR("Malloc g_cmdLine space error!\n"); + return LOS_NOK; + } + +#ifdef LOSCFG_STORAGE_EMMC + los_disk *emmcDisk = los_get_mmcdisk_bytype(EMMC); + if (emmcDisk == NULL) { + PRINT_ERR("Get EMMC disk failed!\n"); + goto ERROUT; + } + g_alignSize = EMMC_SEC_SIZE; + ret = los_disk_read(emmcDisk->disk_id, g_cmdLine, COMMAND_LINE_ADDR / EMMC_SEC_SIZE, + COMMAND_LINE_SIZE / EMMC_SEC_SIZE, TRUE); + if (ret == 0) { + return LOS_OK; + } +#endif + +#ifdef LOSCFG_STORAGE_SPINOR + struct MtdDev *mtd = GetMtd("spinor"); + if (mtd == NULL) { + PRINT_ERR("Get spinor mtd failed!\n"); + goto ERROUT; + } + g_alignSize = mtd->eraseSize; + ret = mtd->read(mtd, COMMAND_LINE_ADDR, COMMAND_LINE_SIZE, g_cmdLine); + if (ret == COMMAND_LINE_SIZE) { + return LOS_OK; + } +#endif + +#ifdef LOSCFG_STORAGE_SPINAND + struct MtdDev *mtd = GetMtd("nand"); + if (mtd == NULL) { + PRINT_ERR("Get nand mtd failed!\n"); + goto ERROUT; + } + g_alignSize = mtd->eraseSize; + ret = mtd->read(mtd, COMMAND_LINE_ADDR, COMMAND_LINE_SIZE, g_cmdLine); + if (ret == COMMAND_LINE_SIZE) { + return LOS_OK; + } +#endif + +#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7 + struct MtdDev *mtd = GetCfiMtdDev(); + if (mtd == NULL) { + PRINT_ERR("Get CFI mtd failed!\n"); + goto ERROUT; + } + g_alignSize = mtd->eraseSize; + ret = mtd->read(mtd, CFIFLASH_BOOTARGS_ADDR, COMMAND_LINE_SIZE, g_cmdLine); + if (ret == COMMAND_LINE_SIZE) { + return LOS_OK; + } +#endif + + PRINT_ERR("Read cmdline error!\n"); +ERROUT: + free(g_cmdLine); + g_cmdLine = NULL; + return LOS_NOK; +} + +VOID LOS_FreeCmdLine() { + if (g_cmdLine != NULL) { + free(g_cmdLine); + g_cmdLine = NULL; + } +} + +STATIC INT32 GetBootargs(CHAR **args) +{ +#ifdef LOSCFG_BOOTENV_RAM + *args = OsGetArgsAddr(); + return LOS_OK; +#else + INT32 i; + INT32 len = 0; + CHAR *tmp = NULL; + const CHAR *bootargsName = "bootargs="; + + if (g_cmdLine == NULL) { + PRINT_ERR("Should call LOS_GetCmdLine() first!\n"); + return LOS_NOK; + } + + for (i = 0; i < COMMAND_LINE_SIZE; i += len + 1) { + len = strlen(g_cmdLine + i); + tmp = strstr(g_cmdLine + i, bootargsName); + if (tmp != NULL) { + *args = tmp + strlen(bootargsName); + return LOS_OK; + } + } + PRINT_ERR("Cannot find bootargs!\n"); + return LOS_NOK; +#endif +} + +INT32 LOS_ParseBootargs() { + INT32 idx = 0; + INT32 ret; + CHAR *args; + CHAR *argName; + CHAR *argValue; + + ret = GetBootargs(&args); + if (ret != LOS_OK) { + return LOS_NOK; + } + + while ((argValue = strsep(&args, " ")) != NULL) { + argName = strsep(&argValue, "="); + if (argValue == NULL) { + /* If the argument is not compliance with the format 'foo=bar' */ + g_bootArgs[idx].argName = argName; + g_bootArgs[idx].argValue = argName; + } else { + g_bootArgs[idx].argName = argName; + g_bootArgs[idx].argValue = argValue; + } + if (++idx >= MAX_ARGS_NUM) { + /* Discard the rest arguments */ + break; + } + } + return LOS_OK; +} + +INT32 LOS_GetArgValue(CHAR *argName, CHAR **argValue) { + INT32 idx = 0; + + while (idx < MAX_ARGS_NUM) { + if (g_bootArgs[idx].argName == NULL) { + break; + } + if (strcmp(argName, g_bootArgs[idx].argName) == 0) { + *argValue = g_bootArgs[idx].argValue; + return LOS_OK; + } + idx++; + } + + return LOS_NOK; +} + + +UINT64 LOS_GetAlignsize() { + return g_alignSize; +} + +UINT64 LOS_SizeStrToNum(CHAR *value) +{ + UINT64 num = 0; + + /* If the string is a hexadecimal value */ + if (sscanf_s(value, "0x%x", &num) > 0) { + value += strlen("0x"); + if (strspn(value, "0123456789abcdefABCDEF") < strlen(value)) { + goto ERROUT; + } + return num; + } + + /* If the string is a decimal value in unit *Bytes */ + INT32 ret = sscanf_s(value, "%d", &num); + INT32 decOffset = strspn(value, "0123456789"); + CHAR *endPos = value + decOffset; + if ((ret <= 0) || (decOffset < (strlen(value) - 1))) { + goto ERROUT; + } + + if (strlen(endPos) == 0) { + return num; + } else if (strcasecmp(endPos, "k") == 0) { + num = num * BYTES_PER_KBYTE; + } else if (strcasecmp(endPos, "m") == 0) { + num = num * BYTES_PER_MBYTE; + } else if (strcasecmp(endPos, "g") == 0) { + num = num * BYTES_PER_GBYTE; + } else { + goto ERROUT; + } + + return num; + +ERROUT: + PRINT_ERR("Invalid value string \"%s\"!\n", value); + return num; +} \ No newline at end of file diff --git a/kernel/common/los_bootargs.h b/kernel/common/los_bootargs.h new file mode 100644 index 00000000..caae9d70 --- /dev/null +++ b/kernel/common/los_bootargs.h @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LOS_BOOTARGS_H +#define _LOS_BOOTARGS_H + +#include "los_typedef.h" + +#define BYTES_PER_GBYTE (1 << 30) +#define BYTES_PER_MBYTE (1 << 20) +#define BYTES_PER_KBYTE (1 << 10) +#define COMMAND_LINE_ADDR (LOSCFG_BOOTENV_ADDR * BYTES_PER_KBYTE) +#define COMMAND_LINE_SIZE 1024 +#define MAX_ARGS_NUM 100 +#ifdef LOSCFG_STORAGE_EMMC +#define EMMC_SEC_SIZE 512 +#endif + +struct BootArgs { + CHAR *argName; + CHAR *argValue; +}; + +INT32 LOS_GetCmdLine(VOID); +VOID LOS_FreeCmdLine(VOID); +INT32 LOS_ParseBootargs(VOID); +INT32 LOS_GetArgValue(CHAR *argName, CHAR **argValue); +UINT64 LOS_GetAlignsize(VOID); +UINT64 LOS_SizeStrToNum(CHAR *value); + +#endif /* _LOS_BOOTARGS_H */ \ No newline at end of file diff --git a/kernel/common/los_rootfs.c b/kernel/common/los_rootfs.c index a1e442fe..8369f709 100644 --- a/kernel/common/los_rootfs.c +++ b/kernel/common/los_rootfs.c @@ -28,555 +28,294 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + +#include "los_rootfs.h" +#include "los_bootargs.h" #include "los_base.h" -#include "los_typedef.h" #include "string.h" -#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) +#include "sys/mount.h" +#include "sys/stat.h" +#include "sys/types.h" + +#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) || defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7) +#include "mtd_list.h" #include "mtd_partition.h" #endif -#ifdef LOSCFG_DRIVERS_MMC -#include "disk.h" -#endif -#include "sys/mount.h" -#ifdef LOSCFG_PLATFORM_ROOTFS -#include "los_rootfs.h" -#endif -#include "mtd_list.h" -#include "fs/driver.h" #ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7 -#include "mtd_partition.h" #include "cfiflash.h" -#define DEV_STORAGE_PATH "/dev/cfiflash1" -#define SECOND_MTD_PART_NUM 1 -#define STORAGE_SIZE 0x1400000 -#endif - -#ifdef LOSCFG_STORAGE_SPINOR -#define DEV_STORAGE_PATH "/dev/spinorblk2" -#define SECOND_MTD_PART_NUM 2 -#define STORAGE_SIZE 0x80000 -#endif - -#ifdef LOSCFG_STORAGE_SPINAND -#define DEV_STORAGE_PATH "/dev/nandblk2" -#define SECOND_MTD_PART_NUM 2 -#define STORAGE_SIZE 0xa00000 #endif #ifdef LOSCFG_STORAGE_EMMC +#include "disk.h" #include "ff.h" -#define STORAGE_SIZE 0x3200000 -STATIC los_disk *g_emmcDisk = NULL; #endif -#ifndef LOSCFG_SECURITY_BOOT -STATIC INT32 g_alignSize = 0; -#endif - -#define VFAT_STORAGE_MOUNT_DIR_MODE 0777 -#define DEFAULT_STORAGE_MOUNT_DIR_MODE 0755 - -#ifdef LOSCFG_DRIVERS_MMC -los_disk *GetMmcDisk(UINT8 type) -{ - const CHAR *mmcDevHead = "/dev/mmcblk"; - - for (INT32 diskId = 0; diskId < SYS_MAX_DISK; diskId++) { - los_disk *disk = get_disk(diskId); - if (disk == NULL) { - continue; - } else if (disk->disk_name == NULL) { - continue; - } else if (strncmp(disk->disk_name, mmcDevHead, strlen(mmcDevHead))) { - continue; - } else { - if (disk->type == type) { - return disk; - } - } - } - PRINT_ERR("Cannot find the mmc disk!\n"); - return NULL; -} -#endif - #ifdef LOSCFG_STORAGE_EMMC struct disk_divide_info *StorageBlockGetEmmc(void); struct block_operations *StorageBlockGetMmcOps(void); char *StorageBlockGetEmmcNodeName(void *block); -STATIC const CHAR *AddEmmcRootfsPart(INT32 rootAddr, INT32 rootSize, INT32 userAddr, INT32 userSize) +STATIC INT32 AddEmmcParts(INT32 rootAddr, INT32 rootSize, INT32 userAddr, INT32 userSize) { INT32 ret; - void *block = ((struct drv_data *)g_emmcDisk->dev->data)->priv; + los_disk *emmcDisk = los_get_mmcdisk_bytype(EMMC); + if (emmcDisk == NULL) { + PRINT_ERR("Get EMMC disk failed!\n"); + return LOS_NOK; + } + + void *block = ((struct drv_data *)emmcDisk->dev->data)->priv; const char *node_name = StorageBlockGetEmmcNodeName(block); - if (los_disk_deinit(g_emmcDisk->disk_id) != ENOERR) { + if (los_disk_deinit(emmcDisk->disk_id) != ENOERR) { PRINT_ERR("Failed to deinit emmc disk!\n"); - return NULL; + return LOS_NOK; } struct disk_divide_info *emmc = StorageBlockGetEmmc(); ret = add_mmc_partition(emmc, rootAddr / EMMC_SEC_SIZE, rootSize / EMMC_SEC_SIZE); if (ret != LOS_OK) { PRINT_ERR("Failed to add mmc root partition!\n"); - return NULL; - } else { - UINT64 storageStartCnt = userAddr / EMMC_SEC_SIZE; - UINT64 storageSizeCnt = userSize / EMMC_SEC_SIZE; - UINT64 userdataStartCnt = storageStartCnt + storageSizeCnt; - UINT64 userdataSizeCnt = g_emmcDisk->sector_count - userdataStartCnt; - ret = add_mmc_partition(emmc, storageStartCnt, storageSizeCnt); - if (ret != LOS_OK) { - PRINT_ERR("Failed to add mmc storage partition!\n"); - } - ret = add_mmc_partition(emmc, userdataStartCnt, userdataSizeCnt); - if (ret != LOS_OK) { - PRINT_ERR("Failed to add mmc userdata partition!\n"); - } - LOS_Msleep(10); /* waiting for device identification */ - INT32 diskId = los_alloc_diskid_byname(node_name); - if (diskId < 0) { - PRINT_ERR("Failed to alloc disk %s!\n", node_name); - return NULL; - } - if (los_disk_init(node_name, StorageBlockGetMmcOps(), block, diskId, emmc) != ENOERR) { - PRINT_ERR("Failed to init emmc disk!\n"); - return NULL; - } - return node_name; - } -} -#endif - -STATIC const CHAR *GetDevName(const CHAR *rootType, INT32 rootAddr, INT32 rootSize, INT32 userAddr, INT32 userSize) -{ - const CHAR *rootDev = NULL; - -#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) - INT32 ret; - if (strcmp(rootType, "flash") == 0) { - ret = add_mtd_partition(FLASH_TYPE, rootAddr, rootSize, 0); - if (ret != LOS_OK) { - PRINT_ERR("Failed to add spinor/spinand root partition!\n"); - } else { - rootDev = FLASH_DEV_NAME; - ret = add_mtd_partition(FLASH_TYPE, userAddr, userSize, SECOND_MTD_PART_NUM); - if (ret != LOS_OK) { - PRINT_ERR("Failed to add spinor/spinand storage partition!\n"); - } - } - } else -#endif - -#ifdef LOSCFG_DRIVERS_USB_MASS_STORAGE - if (strcmp(rootType, "usb") == 0) { - rootDev = "/dev/sda"; - } else -#endif - -#ifdef LOSCFG_DRIVERS_SD - if (strcmp(rootType, "sdcard") == 0) { - los_disk *sdDisk = GetMmcDisk(OTHERS); - if (sdDisk == NULL) { - PRINT_ERR("Get sdcard failed!\n"); - } else { - rootDev = sdDisk->disk_name; - } - } else -#endif - -#ifdef LOSCFG_STORAGE_EMMC - if (strcmp(rootType, "emmc") == 0) { - rootDev = AddEmmcRootfsPart(rootAddr, rootSize, userAddr, userSize); - } else -#endif - -#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7 - if (strcmp(rootType, FLASH_TYPE) == 0) { - INT32 ret; - if (rootAddr != CFIFLASH_ROOT_ADDR) { - PRINT_ERR("Error rootAddr, must be %#0x!\n", CFIFLASH_ROOT_ADDR); - return NULL; - } - ret = add_mtd_partition(FLASH_TYPE, rootAddr, rootSize, 0); - if (ret != LOS_OK) { - PRINT_ERR("Failed to add %s root partition!\n", FLASH_TYPE); - } else { - rootDev = "/dev/cfiflash0"; - ret = add_mtd_partition(FLASH_TYPE, (rootAddr + rootSize), - CFIFLASH_CAPACITY - rootAddr - rootSize, SECOND_MTD_PART_NUM); - if (ret != LOS_OK) { - PRINT_ERR("Failed to add %s storage partition!\n", FLASH_TYPE); - } - } - } else -#endif - { - PRINT_ERR("Failed to find root dev type: %s\n", rootType); - } - return rootDev; -} - -#ifndef LOSCFG_SECURITY_BOOT -STATIC INT32 GetArgs(CHAR **args) -{ -#ifdef LOSCFG_BOOTENV_RAM - *args = OsGetArgsAddr(); - return LOS_OK; - -#else - INT32 ret; - INT32 i; - INT32 len = 0; - CHAR *cmdLine = NULL; - CHAR *tmp = NULL; - const CHAR *bootargName = "bootargs="; - - cmdLine = (CHAR *)malloc(COMMAND_LINE_SIZE); - if (cmdLine == NULL) { - PRINT_ERR("Malloc cmdLine space error!\n"); return LOS_NOK; } -#ifdef LOSCFG_STORAGE_EMMC - g_emmcDisk = GetMmcDisk(EMMC); - if (g_emmcDisk == NULL) { - PRINT_ERR("Get EMMC disk failed!\n"); - goto ERROUT; - } - /* param4 is TRUE for not reading large contiguous data */ - ret = los_disk_read(g_emmcDisk->disk_id, cmdLine, COMMAND_LINE_ADDR / EMMC_SEC_SIZE, - COMMAND_LINE_SIZE / EMMC_SEC_SIZE, TRUE); - if (ret != 0) { - PRINT_ERR("Read EMMC command line failed!\n"); - goto ERROUT; - } - g_alignSize = EMMC_SEC_SIZE; -#endif - -#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) - struct MtdDev *mtd = GetMtd(FLASH_TYPE); - if (mtd == NULL) { - PRINT_ERR("Get spinor mtd failed!\n"); - goto ERROUT; - } - g_alignSize = mtd->eraseSize; - ret = mtd->read(mtd, COMMAND_LINE_ADDR, COMMAND_LINE_SIZE, cmdLine); - if (ret != COMMAND_LINE_SIZE) { - PRINT_ERR("Read spinor command line failed!\n"); - goto ERROUT; - } -#endif -#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7 - struct MtdDev *mtd = GetCfiMtdDev(); - if (mtd == NULL) { - PRINT_ERR("Get CFI mtd failed!\n"); - goto ERROUT; - } - g_alignSize = mtd->eraseSize; - ret = mtd->read(mtd, CFIFLASH_BOOTARGS_ADDR, COMMAND_LINE_SIZE, cmdLine); - if (ret != COMMAND_LINE_SIZE) { - PRINT_ERR("Read CFI command line failed!\n"); - goto ERROUT; - } -#endif - - for (i = 0; i < COMMAND_LINE_SIZE; i += len + 1) { - len = strlen(cmdLine + i); - tmp = strstr(cmdLine + i, bootargName); - if (tmp != NULL) { - *args = strdup(tmp + strlen(bootargName)); - if (*args == NULL) { - goto ERROUT; - } - free(cmdLine); - return LOS_OK; - } - } - PRINT_ERR("Cannot find bootargs!\n"); - -ERROUT: - free(cmdLine); - return LOS_NOK; -#endif -} - -STATIC INT32 MatchRootPos(CHAR *p, const CHAR *rootInfoName, INT32 *rootInfo) -{ - UINT32 offset; - CHAR *value = NULL; - - if (strncmp(p, rootInfoName, strlen(rootInfoName)) == 0) { - value = p + strlen(rootInfoName); - offset = strspn(value, DEC_NUMBER_STRING); - if (strcmp(p + strlen(p) - 1, "M") == 0) { - if ((offset < (strlen(value) - 1)) || (sscanf_s(value, "%d", rootInfo) <= 0)) { - goto ERROUT; - } - *rootInfo = *rootInfo * BYTES_PER_MBYTE; - } else if (strcmp(p + strlen(p) - 1, "K") == 0) { - if ((offset < (strlen(value) - 1)) || (sscanf_s(value, "%d", rootInfo) <= 0)) { - goto ERROUT; - } - *rootInfo = *rootInfo * BYTES_PER_KBYTE; - } else if (sscanf_s(value, "0x%x", rootInfo) > 0) { - value += strlen("0x"); - if (strspn(value, HEX_NUMBER_STRING) < strlen(value)) { - goto ERROUT; - } - } else { - goto ERROUT; - } - } - - if ((*rootInfo >= 0) && (g_alignSize != 0) && ((UINT32)(*rootInfo) & (UINT32)(g_alignSize - 1))) { - PRINT_ERR("The bootarg \"%s\" will be 0x%x aligned!\n", p, g_alignSize); - } - return LOS_OK; - -ERROUT: - PRINT_ERR("Invalid bootarg \"%s\"!\n", p); - return LOS_NOK; -} - -STATIC INT32 MatchRootInfo(CHAR *p, CHAR **rootType, CHAR **fsType, INT32 *rootAddr, INT32 *rootSize, INT32 *userAddr, INT32 *userSize) -{ - const CHAR *rootName = "root="; - const CHAR *fsName = "fstype="; - const CHAR *rootAddrName = "rootaddr="; - const CHAR *rootSizeName = "rootsize="; - const CHAR *userAddrName = "useraddr="; - const CHAR *userSizeName = "usersize="; - - if ((*rootType == NULL) && (strncmp(p, rootName, strlen(rootName)) == 0)) { - *rootType = strdup(p + strlen(rootName)); - if (*rootType == NULL) { - return LOS_NOK; - } - return LOS_OK; - } - - if ((*fsType == NULL) && (strncmp(p, fsName, strlen(fsName)) == 0)) { - *fsType = strdup(p + strlen(fsName)); - if (*fsType == NULL) { - return LOS_NOK; - } - return LOS_OK; - } - - if (*rootAddr < 0) { - if (MatchRootPos(p, rootAddrName, rootAddr) != LOS_OK) { - return LOS_NOK; - } else if (*rootAddr >= 0) { - return LOS_OK; - } - } - - if (*rootSize < 0) { - if (MatchRootPos(p, rootSizeName, rootSize) != LOS_OK) { - return LOS_NOK; - } - } - - if (*userAddr < 0) { - if (MatchRootPos(p, userAddrName, userAddr) != LOS_OK) { - return LOS_NOK; - } else if (*userAddr >= 0) { - return LOS_OK; - } - } - - if (*userSize < 0) { - if (MatchRootPos(p, userSizeName, userSize) != LOS_OK) { - return LOS_NOK; - } - } - - return LOS_OK; -} - -STATIC INT32 GetRootType(CHAR **rootType, CHAR **fsType, INT32 *rootAddr, INT32 *rootSize, INT32 *userAddr, INT32 *userSize) -{ - CHAR *args = NULL; - CHAR *p = NULL; - - if (GetArgs(&args) != LOS_OK) { - PRINT_ERR("Cannot get bootargs!\n"); + UINT64 storageStartCnt = userAddr / EMMC_SEC_SIZE; + UINT64 storageSizeCnt = userSize / EMMC_SEC_SIZE; + UINT64 userdataStartCnt = storageStartCnt + storageSizeCnt; + UINT64 userdataSizeCnt = emmcDisk->sector_count - userdataStartCnt; + ret = add_mmc_partition(emmc, storageStartCnt, storageSizeCnt); + if (ret != LOS_OK) { + PRINT_ERR("Failed to add mmc storage partition!\n"); return LOS_NOK; } -#ifndef LOSCFG_BOOTENV_RAM - CHAR *argsBak = NULL; - argsBak = args; -#endif - p = strsep(&args, " "); - while (p != NULL) { - if (MatchRootInfo(p, rootType, fsType, rootAddr, rootSize, userAddr, userSize) != LOS_OK) { - goto ERROUT; - } - p = strsep(&args, " "); - } - if ((*fsType != NULL) && (*rootType != NULL)) { -#ifndef LOSCFG_BOOTENV_RAM - free(argsBak); -#endif - return LOS_OK; + + ret = add_mmc_partition(emmc, userdataStartCnt, userdataSizeCnt); + if (ret != LOS_OK) { + PRINT_ERR("Failed to add mmc userdata partition!\n"); + return LOS_NOK; } -ERROUT: - PRINT_ERR("Invalid rootfs information!\n"); - if (*rootType != NULL) { - free(*rootType); - *rootType = NULL; + LOS_Msleep(10); /* waiting for device identification */ + + INT32 diskId = los_alloc_diskid_byname(node_name); + if (diskId < 0) { + PRINT_ERR("Failed to alloc disk %s!\n", node_name); + return LOS_NOK; } - if (*fsType != NULL) { - free(*fsType); - *fsType = NULL; + + if (los_disk_init(node_name, StorageBlockGetMmcOps(), block, diskId, emmc) != ENOERR) { + PRINT_ERR("Failed to init emmc disk!\n"); + return LOS_NOK; } -#ifndef LOSCFG_BOOTENV_RAM - free(argsBak); -#endif - return LOS_NOK; + + return LOS_OK; } #endif -#ifdef LOSCFG_STORAGE_EMMC -STATIC VOID OsMountUserdata(const CHAR *fsType) + +STATIC INT32 AddPartitions(CHAR *dev, UINT64 rootAddr, UINT64 rootSize, UINT64 userAddr, UINT64 userSize) { - INT32 ret; - INT32 err; - const CHAR *userdataDir = "/userdata"; - ret = mkdir(userdataDir, VFAT_STORAGE_MOUNT_DIR_MODE); - if ((ret != LOS_OK) && ((err = get_errno()) != EEXIST)) { - PRINT_ERR("Failed to mkdir /userdata, errno %d: %s\n", err, strerror(err)); - return; +#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7 + if ((strcmp(dev, "cfi-flash") == 0) && (rootAddr != CFIFLASH_ROOT_ADDR)) { + PRINT_ERR("Error rootAddr, must be %#0x!\n", CFIFLASH_ROOT_ADDR); + return LOS_NOK; } - CHAR emmcUserdataDev[DISK_NAME] = {0}; - if (snprintf_s(emmcUserdataDev, sizeof(emmcUserdataDev), sizeof(emmcUserdataDev) - 1, - "%s%s", g_emmcDisk->disk_name, "p2") < 0) { - PRINT_ERR("Failed to get emmc userdata dev name!\n"); - return; - } - ret = mount(emmcUserdataDev, userdataDir, fsType, 0, "umask=000"); - if (ret == LOS_OK) { - return; - } - err = get_errno(); - if (err == ENOTSUP) { -#ifdef LOSCFG_FS_FAT - ret = format(emmcUserdataDev, 0, FM_FAT32); - if (ret != LOS_OK) { - PRINT_ERR("Failed to format %s\n", emmcUserdataDev); - return; - } -#endif - ret = mount(emmcUserdataDev, userdataDir, fsType, 0, "umask=000"); - if (ret != LOS_OK) { - err = get_errno(); - PRINT_ERR("Failed to mount /userdata, errno %d: %s\n", err, strerror(err)); - } - } else { - PRINT_ERR("Failed to mount /userdata, errno %d: %s\n", err, strerror(err)); - } - return; -} #endif -STATIC INT32 OsMountRootfsAndUserfs(const CHAR *rootDev, const CHAR *fsType) -{ - INT32 ret; - INT32 err; - if (strcmp(fsType, "vfat") == 0) { - ret = mount(rootDev, "/", fsType, MS_RDONLY, NULL); - if (ret != LOS_OK) { - err = get_errno(); - PRINT_ERR("Failed to mount vfat rootfs, errno %d: %s\n", err, strerror(err)); - return ret; - } -#ifdef LOSCFG_STORAGE_EMMC - ret = mkdir("/storage", VFAT_STORAGE_MOUNT_DIR_MODE); - if ((ret != LOS_OK) && ((err = get_errno()) != EEXIST)) { - PRINT_ERR("Failed to mkdir /storage, errno %d: %s\n", err, strerror(err)); - return ret; - } else { - CHAR emmcStorageDev[DISK_NAME] = {0}; - if (snprintf_s(emmcStorageDev, sizeof(emmcStorageDev), sizeof(emmcStorageDev) - 1, - "%s%s", g_emmcDisk->disk_name, "p1") < 0) { - PRINT_ERR("Failed to get emmc storage dev name!\n"); - } else { - ret = mount(emmcStorageDev, "/storage", fsType, 0, "umask=000"); - if (ret != LOS_OK) { - err = get_errno(); - PRINT_ERR("Failed to mount /storage, errno %d: %s\n", err, strerror(err)); - } - } - } - OsMountUserdata(fsType); -#endif - } else { - ret = mount(rootDev, "/", fsType, MS_RDONLY, NULL); - if (ret != LOS_OK) { - err = get_errno(); - PRINT_ERR("Failed to mount rootfs,rootDev %s, errno %d: %s\n", rootDev, err, strerror(err)); - return ret; - } #if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) || defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7) - ret = mkdir("/storage", DEFAULT_STORAGE_MOUNT_DIR_MODE); - if ((ret != LOS_OK) && ((err = get_errno()) != EEXIST)) { - PRINT_ERR("Failed to mkdir /storage, errno %d: %s\n", err, strerror(err)); - return ret; - } else { - ret = mount(DEV_STORAGE_PATH, "/storage", fsType, 0, NULL); - if (ret != LOS_OK) { - err = get_errno(); - PRINT_ERR("Failed to mount /storage, errno %d: %s\n", err, strerror(err)); - } + INT32 ret; + INT32 blk0 = 0; + INT32 blk2 = 2; + if (strcmp(dev, "flash") == 0 || strcmp(dev, FLASH_TYPE) == 0) { + ret = add_mtd_partition(FLASH_TYPE, rootAddr, rootSize, blk0); + if (ret != LOS_OK) { + PRINT_ERR("Failed to add mtd root partition!\n"); + return LOS_NOK; } -#endif + + ret = add_mtd_partition(FLASH_TYPE, userAddr, userSize, blk2); + if (ret != LOS_OK) { + PRINT_ERR("Failed to add mtd storage partition!\n"); + return LOS_NOK; + } + + return LOS_OK; } +#endif + +#ifdef LOSCFG_STORAGE_EMMC + if (strcmp(dev, "emmc") == 0) { + return AddEmmcParts(rootAddr, rootSize, userAddr, userSize); + } +#endif + + PRINT_ERR("Unsupport dev type: %s\n", dev); + return LOS_NOK; +} + + +STATIC INT32 ParseRootArgs(CHAR **dev, CHAR **fstype, UINT64 *rootAddr, UINT64 *rootSize) { + INT32 ret; + CHAR *rootAddrStr; + CHAR *rootSizeStr; + + ret = LOS_GetArgValue("root", dev); + if (ret != LOS_OK) { + PRINT_ERR("Cannot find root!"); + return ret; + } + + ret = LOS_GetArgValue("fstype", fstype); + if (ret != LOS_OK) { + PRINT_ERR("Cannot find fstype!"); + return ret; + } + + ret = LOS_GetArgValue("rootaddr", &rootAddrStr); + if (ret != LOS_OK) { + *rootAddr = ROOTFS_ADDR; + } else { + *rootAddr = LOS_SizeStrToNum(rootAddrStr); + } + + ret = LOS_GetArgValue("rootsize", &rootSizeStr); + if (ret != LOS_OK) { + *rootSize = ROOTFS_SIZE; + } else { + *rootSize = LOS_SizeStrToNum(rootSizeStr); + } + return LOS_OK; } -INT32 OsMountRootfs(VOID) -{ - INT32 ret = LOS_OK; - INT32 err; - INT32 rootAddr = -1; - INT32 rootSize = -1; - INT32 userAddr = -1; - INT32 userSize = -1; - CHAR *rootType = NULL; - CHAR *fsType = NULL; - const CHAR *rootDev = NULL; +STATIC INT32 ParseUserArgs(UINT64 rootAddr, UINT64 rootSize, UINT64 *userAddr, UINT64 *userSize) { + INT32 ret; + CHAR *userAddrStr; + CHAR *userSizeStr; -#ifdef LOSCFG_SECURITY_BOOT - rootType = strdup(ROOTFS_ROOT_TYPE); - fsType = strdup(ROOTFS_FS_TYPE); - rootAddr = ROOTFS_FLASH_ADDR; - rootSize = ROOTFS_FLASH_SIZE; -#else - ret = GetRootType(&rootType, &fsType, &rootAddr, &rootSize, &userAddr, &userSize); + ret = LOS_GetArgValue("useraddr", &userAddrStr); + if (ret != LOS_OK) { + *userAddr = rootAddr + rootSize; + } else { + *userAddr = LOS_SizeStrToNum(userAddrStr); + } + + ret = LOS_GetArgValue("usersize", &userSizeStr); + if (ret != LOS_OK) { + *userSize = USERFS_SIZE; + } else { + *userSize = LOS_SizeStrToNum(userSizeStr); + } + + return LOS_OK; +} + +STATIC INT32 MountPartitions(CHAR *fsType) { + INT32 ret; + INT32 err; + + /* Mount rootfs */ + ret = mount(ROOT_DEV_NAME, ROOT_DIR_NAME, fsType, MS_RDONLY, NULL); + if (ret != LOS_OK) { + err = get_errno(); + PRINT_ERR("Failed to mount %s, rootDev %s, errno %d: %s\n", ROOT_DIR_NAME, ROOT_DEV_NAME, err, strerror(err)); + return ret; + } + + /* Mount userfs */ + ret = mkdir(STORAGE_DIR_NAME, DEFAULT_MOUNT_DIR_MODE); + if ((ret != LOS_OK) && ((err = get_errno()) != EEXIST)) { + PRINT_ERR("Failed to mkdir %s, errno %d: %s\n", STORAGE_DIR_NAME, err, strerror(err)); + return ret; + } + + ret = mount(USER_DEV_NAME, STORAGE_DIR_NAME, fsType, 0, DEFAULT_MOUNT_DATA); + if (ret != LOS_OK) { + err = get_errno(); + PRINT_ERR("Failed to mount %s, errno %d: %s\n", STORAGE_DIR_NAME, err, strerror(err)); + return ret; + } + +#ifdef LOSCFG_STORAGE_EMMC + /* Mount userdata */ + ret = mkdir(USERDATA_DIR_NAME, DEFAULT_MOUNT_DIR_MODE); + if ((ret != LOS_OK) && ((err = get_errno()) != EEXIST)) { + PRINT_ERR("Failed to mkdir %s, errno %d: %s\n", USERDATA_DIR_NAME, err, strerror(err)); + return ret; + } + + ret = mount(USERDATA_DEV_NAME, USERDATA_DIR_NAME, fsType, 0, DEFAULT_MOUNT_DATA); + if ((ret != LOS_OK) && ((err = get_errno()) == ENOTSUP)) { + ret = format(USERDATA_DEV_NAME, 0, FM_FAT32); + if (ret != LOS_OK) { + PRINT_ERR("Failed to format %s\n", USERDATA_DEV_NAME); + return ret; + } + + ret = mount(USERDATA_DEV_NAME, USERDATA_DIR_NAME, fsType, 0, DEFAULT_MOUNT_DATA); + if (ret != LOS_OK) { + err = get_errno(); + } + } + if (ret != LOS_OK) { + PRINT_ERR("Failed to mount %s, errno %d: %s\n", USERDATA_DIR_NAME, err, strerror(err)); + return ret; + } +#endif + return LOS_OK; +} + +STATIC INT32 CheckValidation(UINT64 rootAddr, UINT64 rootSize, UINT64 userAddr, UINT64 userSize) { + UINT64 alignSize = LOS_GetAlignsize(); + + if (alignSize == 0) { + return LOS_OK; + } + + if ((rootAddr & (alignSize - 1)) || (rootSize & (alignSize - 1)) || + (userAddr & (alignSize - 1)) || (userSize & (alignSize - 1))) { + PRINT_ERR("The address or size value should be 0x%x aligned!\n", alignSize); + return LOS_NOK; + } + + return LOS_OK; +} + +INT32 OsMountRootfs() { + INT32 ret; + CHAR *dev; + CHAR *fstype; + UINT64 rootAddr; + UINT64 rootSize; + UINT64 userAddr; + UINT64 userSize; + + ret = ParseRootArgs(&dev, &fstype, &rootAddr, &rootSize); if (ret != LOS_OK) { return ret; } - rootAddr = (rootAddr >= 0) ? rootAddr : ROOTFS_FLASH_ADDR; - rootSize = (rootSize >= 0) ? rootSize : ROOTFS_FLASH_SIZE; -#endif - userAddr = (userAddr >= 0) ? userAddr : rootAddr + rootSize; - userSize = (userSize >= 0) ? userSize : STORAGE_SIZE; - rootDev = GetDevName(rootType, rootAddr, rootSize, userAddr, userSize); - if (rootDev != NULL) { - ret = OsMountRootfsAndUserfs(rootDev, fsType); - if (ret != LOS_OK) { - err = get_errno(); - PRINT_ERR("Failed to mount rootfs, errno %d: %s\n", err, strerror(err)); - } + ret = ParseUserArgs(rootAddr, rootSize, &userAddr, &userSize); + if (ret != LOS_OK) { + return ret; } - free(rootType); - free(fsType); - return ret; -} + ret = CheckValidation(rootAddr, rootSize, userAddr, userSize); + if (ret != LOS_OK) { + return ret; + } + + ret = AddPartitions(dev, rootAddr, rootSize, userAddr, userSize); + if (ret != LOS_OK) { + return ret; + } + + ret = MountPartitions(fstype); + if (ret != LOS_OK) { + return ret; + } + + return LOS_OK; +} \ No newline at end of file diff --git a/kernel/common/los_rootfs.h b/kernel/common/los_rootfs.h index f2de0986..dc325541 100644 --- a/kernel/common/los_rootfs.h +++ b/kernel/common/los_rootfs.h @@ -32,45 +32,52 @@ #ifndef _LOS_ROOTFS_H #define _LOS_ROOTFS_H -#define BYTES_PER_MBYTE 0x100000 -#define BYTES_PER_KBYTE 0x400 - -#define COMMAND_LINE_ADDR LOSCFG_BOOTENV_ADDR * BYTES_PER_KBYTE -#define COMMAND_LINE_SIZE 1024 - -#ifdef LOSCFG_STORAGE_SPINOR -#define ROOTFS_ROOT_TYPE "flash" -#define ROOTFS_FS_TYPE "jffs2" -#elif defined(LOSCFG_STORAGE_SPINAND) -#define ROOTFS_ROOT_TYPE "nand" -#define ROOTFS_FS_TYPE "yaffs2" -#endif +#include "los_typedef.h" +#define ROOT_DIR_NAME "/" +#define STORAGE_DIR_NAME "/storage" #ifdef LOSCFG_STORAGE_EMMC -#define ROOTFS_ROOT_TYPE "emmc" -#define ROOTFS_FS_TYPE "vfat" -#endif - -#ifdef LOSCFG_TEE_ENABLE -#define ROOTFS_FLASH_ADDR 0x600000 -#define ROOTFS_FLASH_SIZE 0x800000 -#else -#define ROOTFS_FLASH_ADDR 0x400000 -#define ROOTFS_FLASH_SIZE 0xa00000 +#define USERDATA_DIR_NAME "/userdata" #endif +#define DEFAULT_MOUNT_DIR_MODE 0755 +#define DEFAULT_MOUNT_DATA NULL #ifdef LOSCFG_STORAGE_SPINOR #define FLASH_TYPE "spinor" -#define FLASH_DEV_NAME "/dev/spinorblk0" -#elif defined(LOSCFG_STORAGE_SPINAND) +#define ROOT_DEV_NAME "/dev/spinorblk0" +#define USER_DEV_NAME "/dev/spinorblk2" +#define ROOTFS_ADDR 0x600000 +#define ROOTFS_SIZE 0x800000 +#define USERFS_SIZE 0x80000 +#elif defined (LOSCFG_STORAGE_SPINAND) #define FLASH_TYPE "nand" -#define FLASH_DEV_NAME "/dev/nandblk0" +#define ROOT_DEV_NAME "/dev/nandblk0" +#define USER_DEV_NAME "/dev/nandblk2" +#define ROOTFS_ADDR 0x600000 +#define ROOTFS_SIZE 0x800000 +#define USERFS_SIZE 0x80000 +#elif defined (LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7) +#define ROOT_DEV_NAME "/dev/cfiflash0" +#define USER_DEV_NAME "/dev/cfiflash2" +#define ROOTFS_ADDR CFIFLASH_ROOT_ADDR +#define ROOTFS_SIZE 0x1B00000 +#define USERFS_SIZE (CFIFLASH_CAPACITY - ROOTFS_ADDR - ROOTFS_SIZE) +#elif defined (LOSCFG_STORAGE_EMMC) +#define ROOT_DEV_NAME "/dev/mmcblk0p0" +#define USER_DEV_NAME "/dev/mmcblk0p1" +#define USERDATA_DEV_NAME "/dev/mmcblk0p2" +#define ROOTFS_ADDR 0xA00000 +#define ROOTFS_SIZE 0x1400000 +#define USERFS_SIZE 0x3200000 +#ifdef DEFAULT_MOUNT_DIR_MODE +#undef DEFAULT_MOUNT_DIR_MODE +#endif +#ifdef DEFAULT_MOUNT_DATA +#undef DEFAULT_MOUNT_DATA +#endif +#define DEFAULT_MOUNT_DIR_MODE 0777 +#define DEFAULT_MOUNT_DATA "umask=000" #endif - -#define EMMC_SEC_SIZE 512 - -#define DEC_NUMBER_STRING "0123456789" -#define HEX_NUMBER_STRING "0123456789abcdefABCDEF" INT32 OsMountRootfs(VOID); VOID OsSetCmdLineAddr(UINT64 addr); diff --git a/platform/Makefile b/platform/Makefile index 940337fd..27934023 100644 --- a/platform/Makefile +++ b/platform/Makefile @@ -37,7 +37,7 @@ LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/compat/posix/src \ -I $(LITEOSTOPDIR)/bsd/dev/random LOCAL_SRCS += $(wildcard ../kernel/common/*.c) -LOCAL_SRCS := $(filter-out ../kernel/common/los_rootfs.c, $(LOCAL_SRCS)) +LOCAL_SRCS := $(filter-out ../kernel/common/los_rootfs.c ../kernel/common/los_bootargs.c, $(LOCAL_SRCS)) ifneq ($(LOSCFG_FS_VFS), y) LOCAL_SRCS := $(filter-out ../kernel/common/console.c ../kernel/common/virtual_serial.c, $(LOCAL_SRCS)) endif From 51a50c95b4cd47b6931523926b728d1c0ff8988b Mon Sep 17 00:00:00 2001 From: Guangyao Ma Date: Tue, 20 Jul 2021 14:37:27 +0800 Subject: [PATCH 33/43] feat: support .mkshrc close #I3Y5KE Signed-off-by: Guangyao Ma Change-Id: Iea3cfe4da572b1a4e250f90cea24efa2c27ceddb --- Makefile | 2 +- apps/mksh/Makefile | 3 ++ tools/scripts/make_rootfs/rootfs.sh | 39 -------------------------- tools/scripts/make_rootfs/rootfsdir.sh | 18 ++++++++---- 4 files changed, 17 insertions(+), 45 deletions(-) delete mode 100755 tools/scripts/make_rootfs/rootfs.sh diff --git a/Makefile b/Makefile index ff3bf7c9..3ef0218e 100644 --- a/Makefile +++ b/Makefile @@ -181,7 +181,7 @@ endif $(ROOTFSDIR): prepare $(APPS) $(HIDE)$(MAKE) clean -C apps - $(HIDE)$(LITEOSTOPDIR)/tools/scripts/make_rootfs/rootfsdir.sh $(OUT)/bin $(OUT)/musl $(ROOTFS_DIR) $(LITEOS_TARGET_DIR) + $(HIDE)$(LITEOSTOPDIR)/tools/scripts/make_rootfs/rootfsdir.sh $(OUT) $(ROOTFS_DIR) $(LITEOS_TARGET_DIR) ifneq ($(VERSION),) $(HIDE)$(LITEOSTOPDIR)/tools/scripts/make_rootfs/releaseinfo.sh "$(VERSION)" $(ROOTFS_DIR) $(LITEOS_TARGET_DIR) endif diff --git a/apps/mksh/Makefile b/apps/mksh/Makefile index 182c7c01..43f215f1 100755 --- a/apps/mksh/Makefile +++ b/apps/mksh/Makefile @@ -34,6 +34,7 @@ LITEOSTOPDIR = $(MKSH_DIR)/../../ include $(MKSH_DIR)/../config.mk APPS_OUT := $(OUT)/bin +ETC_OUT := $(OUT)/etc BUILD_DIR := $(MKSH_DIR)/build BUILD_LOG := $(MKSH_DIR)/build.log TARGET_OS := OpenHarmony @@ -61,6 +62,8 @@ endif $(HIDE)$(STRIP) $(MKSH) $(HIDE)mkdir -p $(APPS_OUT) $(HIDE)$(CP) $(MKSH) $(APPS_OUT) + $(HIDE)mkdir -p $(ETC_OUT) + $(HIDE)$(CP) -rf $(BUILD_DIR)/.mkshrc $(ETC_OUT)/ clean: $(HIDE)$(RM) $(MKSH) $(BUILD_DIR) $(BUILD_LOG) diff --git a/tools/scripts/make_rootfs/rootfs.sh b/tools/scripts/make_rootfs/rootfs.sh deleted file mode 100755 index e1c46223..00000000 --- a/tools/scripts/make_rootfs/rootfs.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. -# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, this list of -# conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, this list -# of conditions and the following disclaimer in the documentation and/or other materials -# provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its contributors may be used -# to endorse or promote products derived from this software without specific prior written -# permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -set -e - -BIN_DIR=$1 -LIB_DIR=$2 -ROOTFS_DIR=$3 -FSTYPE=$4 -CUR_DIR=$(dirname $(readlink -f "$0")) -. ${CUR_DIR}/rootfsdir.sh ${BIN_DIR} ${LIB_DIR} ${ROOTFS_DIR} -. ${CUR_DIR}/rootfsimg.sh ${ROOTFS_DIR} ${FSTYPE} \ No newline at end of file diff --git a/tools/scripts/make_rootfs/rootfsdir.sh b/tools/scripts/make_rootfs/rootfsdir.sh index 35c553e4..a7c571e4 100755 --- a/tools/scripts/make_rootfs/rootfsdir.sh +++ b/tools/scripts/make_rootfs/rootfsdir.sh @@ -30,14 +30,17 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. set -e -BIN_DIR=$1 -LIB_DIR=$2 -ROOTFS_DIR=$3 -OUT_DIR=$4 +OUT=$1 +ROOTFS_DIR=$2 +OUT_DIR=$3 +BIN_DIR=${OUT}/bin +LIB_DIR=${OUT}/musl +ETC_DIR=${OUT}/etc NEED_COPYTO_OUTDIR=(shell toybox mksh tftp) + mkdir -p ${ROOTFS_DIR}/bin ${ROOTFS_DIR}/lib ${ROOTFS_DIR}/usr/bin ${ROOTFS_DIR}/usr/lib ${ROOTFS_DIR}/etc \ ${ROOTFS_DIR}/app ${ROOTFS_DIR}/data ${ROOTFS_DIR}/proc ${ROOTFS_DIR}/dev ${ROOTFS_DIR}/data/system ${ROOTFS_DIR}/data/system/param \ -${ROOTFS_DIR}/system ${ROOTFS_DIR}/system/internal ${ROOTFS_DIR}/system/external ${OUT_DIR}/bin ${OUT_DIR}/libs +${ROOTFS_DIR}/system ${ROOTFS_DIR}/system/internal ${ROOTFS_DIR}/system/external ${OUT_DIR}/bin ${OUT_DIR}/libs ${OUT_DIR}/etc if [ -d "${BIN_DIR}" ] && [ "$(ls -A "${BIN_DIR}")" != "" ]; then cp -f ${BIN_DIR}/* ${ROOTFS_DIR}/bin for el in ${NEED_COPYTO_OUTDIR[@]} @@ -49,3 +52,8 @@ if [ -d "${BIN_DIR}" ] && [ "$(ls -A "${BIN_DIR}")" != "" ]; then fi cp -f ${LIB_DIR}/* ${ROOTFS_DIR}/lib cp -f ${LIB_DIR}/* ${OUT_DIR}/libs + +if [ -e ${ETC_DIR} ]; then +cp -f ${ETC_DIR}/.mkshrc ${ROOTFS_DIR}/etc +cp -f ${ETC_DIR}/.mkshrc ${OUT_DIR}/etc +fi From 8729f6ee57ea57bc664d076ff112c8726fedded9 Mon Sep 17 00:00:00 2001 From: Far Date: Tue, 20 Jul 2021 15:12:58 +0800 Subject: [PATCH 34/43] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0mount=E7=9A=84M?= =?UTF-8?q?S=5FRDONLY=E6=A0=87=E5=BF=97=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加mount的MS_RDONLY标志的支持，并修改vfs主要接口相关支持。 1. fatfs lseek接口在分区以MS_RDONLY方式和文件以只读打开时不再能够扩大文件的大小。 2. 直接在镜像中创建storage目录，而不是在挂载根文件系统时创建storage目录。 3. 增加了MS_RDONLY的测试用例。 Close #I3Z1W6 Signed-off-by: Far --- fs/fat/os_adapt/fatfs.c | 17 +++- fs/jffs2/src/vfs_jffs2.c | 2 +- fs/vfs/operation/fs_chattr.c | 7 ++ fs/vfs/operation/fs_utime.c | 8 ++ kernel/common/los_rootfs.c | 19 +++- testsuites/unittest/fs/BUILD.gn | 3 + testsuites/unittest/fs/jffs/It_vfs_jffs.h | 3 + .../full/It_vfs_test_mount_rdonly_001.cpp | 93 ++++++++++++++++++ .../full/It_vfs_test_mount_rdonly_002.cpp | 79 +++++++++++++++ .../full/It_vfs_test_mount_rdonly_003.cpp | 95 +++++++++++++++++++ testsuites/unittest/fs/jffs/vfs_jffs_test.cpp | 15 +++ 11 files changed, 333 insertions(+), 8 deletions(-) create mode 100644 testsuites/unittest/fs/jffs/full/It_vfs_test_mount_rdonly_001.cpp create mode 100644 testsuites/unittest/fs/jffs/full/It_vfs_test_mount_rdonly_002.cpp create mode 100644 testsuites/unittest/fs/jffs/full/It_vfs_test_mount_rdonly_003.cpp diff --git a/fs/fat/os_adapt/fatfs.c b/fs/fat/os_adapt/fatfs.c index 1876af94..b6c02f02 100644 --- a/fs/fat/os_adapt/fatfs.c +++ b/fs/fat/os_adapt/fatfs.c @@ -46,6 +46,7 @@ #include "los_tables.h" #include "user_copy.h" #include "los_vm_filemap.h" +#include "los_hash.h" #include #include #include @@ -53,7 +54,7 @@ #include #include #include -#include "los_hash.h" +#include struct VnodeOps fatfs_vops; /* forward define */ @@ -190,7 +191,7 @@ static int fatfs_sync(unsigned long mountflags, FATFS *fs) { #ifdef LOSCFG_FS_FAT_CACHE los_part *part = NULL; - if (mountflags != MS_NOSYNC) { + if (!(mountflags & (MS_NOSYNC | MS_RDONLY))) { part = get_part((INT)fs->pdrv); if (part == NULL) { return -ENODEV; @@ -736,6 +737,7 @@ off64_t fatfs_lseek64(struct file *filep, off64_t offset, int whence) struct Vnode *vp = filep->f_vnode; DIR_FILE *dfp = (DIR_FILE *)vp->data; FILINFO *finfo = &(dfp->fno); + struct Mount *mount = vp->originMount; FSIZE_t fpos; FRESULT result; int ret; @@ -773,6 +775,17 @@ off64_t fatfs_lseek64(struct file *filep, off64_t offset, int whence) if (ret == FALSE) { return -EBUSY; } + + if (fpos > finfo->fsize) { + if ((filep->f_oflags & O_ACCMODE) == O_RDONLY) { + result = FR_DENIED; + goto ERROR_EXIT; + } + if (mount->mountFlags & MS_RDONLY) { + result = FR_WRITE_PROTECTED; + goto ERROR_EXIT; + } + } fp->obj.sclust = finfo->sclst; fp->obj.objsize = finfo->fsize; diff --git a/fs/jffs2/src/vfs_jffs2.c b/fs/jffs2/src/vfs_jffs2.c index 234c435a..63cbf3c6 100644 --- a/fs/jffs2/src/vfs_jffs2.c +++ b/fs/jffs2/src/vfs_jffs2.c @@ -123,7 +123,7 @@ int VfsJffs2Bind(struct Mount *mnt, struct Vnode *blkDriver, const void *data) partNo = p->patitionnum; - ret = jffs2_mount(partNo, &rootNode); + ret = jffs2_mount(partNo, &rootNode, mnt->mountFlags); if (ret != 0) { LOS_MuxUnlock(&g_jffs2FsLock); return ret; diff --git a/fs/vfs/operation/fs_chattr.c b/fs/vfs/operation/fs_chattr.c index d01aee31..04caf82b 100644 --- a/fs/vfs/operation/fs_chattr.c +++ b/fs/vfs/operation/fs_chattr.c @@ -41,6 +41,8 @@ #include "stdlib.h" #include "sys/stat.h" #include "vnode.h" +#include "fs/mount.h" +#include /**************************************************************************** * Static Functions @@ -69,6 +71,11 @@ int chattr(const char *pathname, struct IATTR *attr) goto errout_with_lock; } + if ((vnode->originMount) && (vnode->originMount->mountFlags & MS_RDONLY)) { + ret = -EROFS; + goto errout_with_lock; + } + /* The way we handle the stat depends on the type of vnode that we * are dealing with. */ diff --git a/fs/vfs/operation/fs_utime.c b/fs/vfs/operation/fs_utime.c index 8bab3155..31cf98e2 100644 --- a/fs/vfs/operation/fs_utime.c +++ b/fs/vfs/operation/fs_utime.c @@ -37,9 +37,11 @@ #include "vfs_config.h" #include "sys/stat.h" #include "vnode.h" +#include "fs/mount.h" #include "string.h" #include "stdlib.h" #include "utime.h" +#include /**************************************************************************** * Global Functions @@ -79,6 +81,12 @@ int utime(const char *path, const struct utimbuf *ptimes) goto errout_with_path; } + if ((vnode->originMount) && (vnode->originMount->mountFlags & MS_RDONLY)) { + VnodeDrop(); + ret = -EROFS; + goto errout_with_path; + } + if (vnode->vop && vnode->vop->Chattr) { if (ptimes == NULL) { /* get current seconds */ diff --git a/kernel/common/los_rootfs.c b/kernel/common/los_rootfs.c index 8369f709..e9b19849 100644 --- a/kernel/common/los_rootfs.c +++ b/kernel/common/los_rootfs.c @@ -156,10 +156,11 @@ STATIC INT32 AddPartitions(CHAR *dev, UINT64 rootAddr, UINT64 rootSize, UINT64 u } -STATIC INT32 ParseRootArgs(CHAR **dev, CHAR **fstype, UINT64 *rootAddr, UINT64 *rootSize) { +STATIC INT32 ParseRootArgs(CHAR **dev, CHAR **fstype, UINT64 *rootAddr, UINT64 *rootSize, UINT32 *mountFlags) { INT32 ret; CHAR *rootAddrStr; CHAR *rootSizeStr; + CHAR *rwTag; ret = LOS_GetArgValue("root", dev); if (ret != LOS_OK) { @@ -186,6 +187,13 @@ STATIC INT32 ParseRootArgs(CHAR **dev, CHAR **fstype, UINT64 *rootAddr, UINT64 * } else { *rootSize = LOS_SizeStrToNum(rootSizeStr); } + + ret = LOS_GetArgValue("ro", &rwTag); + if (ret == LOS_OK) { + *mountFlags = MS_RDONLY; + } else { + *mountFlags = 0; + } return LOS_OK; } @@ -212,12 +220,12 @@ STATIC INT32 ParseUserArgs(UINT64 rootAddr, UINT64 rootSize, UINT64 *userAddr, U return LOS_OK; } -STATIC INT32 MountPartitions(CHAR *fsType) { +STATIC INT32 MountPartitions(CHAR *fsType, UINT32 mountFlags) { INT32 ret; INT32 err; /* Mount rootfs */ - ret = mount(ROOT_DEV_NAME, ROOT_DIR_NAME, fsType, MS_RDONLY, NULL); + ret = mount(ROOT_DEV_NAME, ROOT_DIR_NAME, fsType, mountFlags, NULL); if (ret != LOS_OK) { err = get_errno(); PRINT_ERR("Failed to mount %s, rootDev %s, errno %d: %s\n", ROOT_DIR_NAME, ROOT_DEV_NAME, err, strerror(err)); @@ -291,8 +299,9 @@ INT32 OsMountRootfs() { UINT64 rootSize; UINT64 userAddr; UINT64 userSize; + UINT32 mountFlags; - ret = ParseRootArgs(&dev, &fstype, &rootAddr, &rootSize); + ret = ParseRootArgs(&dev, &fstype, &rootAddr, &rootSize, &mountFlags); if (ret != LOS_OK) { return ret; } @@ -312,7 +321,7 @@ INT32 OsMountRootfs() { return ret; } - ret = MountPartitions(fstype); + ret = MountPartitions(fstype, mountFlags); if (ret != LOS_OK) { return ret; } diff --git a/testsuites/unittest/fs/BUILD.gn b/testsuites/unittest/fs/BUILD.gn index bc1b6d76..468b795e 100644 --- a/testsuites/unittest/fs/BUILD.gn +++ b/testsuites/unittest/fs/BUILD.gn @@ -790,6 +790,9 @@ sources_full = [ "jffs/full/It_vfs_test_symlink_002.cpp", "jffs/full/It_vfs_test_symlink_003.cpp", "jffs/full/It_vfs_test_symlinkat_001.cpp", + "jffs/full/It_vfs_test_mount_rdonly_001.cpp", + "jffs/full/It_vfs_test_mount_rdonly_002.cpp", + "jffs/full/It_vfs_test_mount_rdonly_003.cpp", ] if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { diff --git a/testsuites/unittest/fs/jffs/It_vfs_jffs.h b/testsuites/unittest/fs/jffs/It_vfs_jffs.h index a64eddb8..41d89e57 100644 --- a/testsuites/unittest/fs/jffs/It_vfs_jffs.h +++ b/testsuites/unittest/fs/jffs/It_vfs_jffs.h @@ -962,6 +962,9 @@ VOID ItFsTestSymlink001(VOID); VOID ItFsTestSymlink002(VOID); VOID ItFsTestSymlink003(VOID); VOID ItFsTestSymlinkat001(VOID); +VOID ItFsTestMountRdonly001(VOID); +VOID ItFsTestMountRdonly002(VOID); +VOID ItFsTestMountRdonly003(VOID); #endif #if defined(LOSCFG_USER_TESTSUIT_SHELL) diff --git a/testsuites/unittest/fs/jffs/full/It_vfs_test_mount_rdonly_001.cpp b/testsuites/unittest/fs/jffs/full/It_vfs_test_mount_rdonly_001.cpp new file mode 100644 index 00000000..338927ad --- /dev/null +++ b/testsuites/unittest/fs/jffs/full/It_vfs_test_mount_rdonly_001.cpp @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "It_vfs_jffs.h" + +static UINT32 testcase(VOID) +{ + INT32 fd = -1; + INT32 ret; + CHAR pathname1[JFFS_STANDARD_NAME_LENGTH] = { JFFS_PATH_NAME0 }; + CHAR pathname2[JFFS_STANDARD_NAME_LENGTH] = { JFFS_PATH_NAME01 }; + + fd = creat(pathname1, 0777); + ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT); + + ret = close(fd); + ICUNIT_GOTO_EQUAL(ret, JFFS_NO_ERROR, ret, EXIT4); + + ret = umount(JFFS_MAIN_DIR0); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT3); + + ret = mount(JFFS_DEV_PATH0, JFFS_MAIN_DIR0, JFFS_FILESYS_TYPE, MS_RDONLY, NULL); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT2); + + fd = open(pathname1, O_RDWR); + ICUNIT_GOTO_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT4); + + ret = symlink(pathname1, pathname2); + ICUNIT_GOTO_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT5); + + ret = rename(pathname1, pathname2); + ICUNIT_GOTO_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT5); + + ret = unlink(pathname1); + ICUNIT_GOTO_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT3); + + ret = umount(JFFS_MAIN_DIR0); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT3); + + ret = mount(JFFS_DEV_PATH0, JFFS_MAIN_DIR0, JFFS_FILESYS_TYPE, 0, NULL); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT2); + + ret = unlink(pathname1); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT1); + + return JFFS_NO_ERROR; + +EXIT5: + unlink(pathname2); + goto EXIT3; +EXIT4: + close(fd); +EXIT3: + umount(JFFS_MAIN_DIR0); +EXIT2: + mount(JFFS_DEV_PATH0, JFFS_MAIN_DIR0, JFFS_FILESYS_TYPE, 0, NULL); +EXIT1: + unlink(pathname1); +EXIT: + return JFFS_NO_ERROR; +} + +VOID ItFsTestMountRdonly001(VOID) +{ + TEST_ADD_CASE("IT_FS_TEST_MOUNT_RDONLY_001", testcase, TEST_VFS, TEST_JFFS, TEST_LEVEL0, TEST_FUNCTION); +} \ No newline at end of file diff --git a/testsuites/unittest/fs/jffs/full/It_vfs_test_mount_rdonly_002.cpp b/testsuites/unittest/fs/jffs/full/It_vfs_test_mount_rdonly_002.cpp new file mode 100644 index 00000000..7fc30971 --- /dev/null +++ b/testsuites/unittest/fs/jffs/full/It_vfs_test_mount_rdonly_002.cpp @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "It_vfs_jffs.h" + +static UINT32 testcase(VOID) +{ + INT32 fd = -1; + INT32 ret; + CHAR pathname1[JFFS_STANDARD_NAME_LENGTH] = { JFFS_PATH_NAME0 }; + + ret = umount(JFFS_MAIN_DIR0); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT); + + ret = mount(JFFS_DEV_PATH0, JFFS_MAIN_DIR0, JFFS_FILESYS_TYPE, MS_RDONLY, NULL); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT1); + + fd = creat(pathname1, 0755); + ICUNIT_GOTO_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT3); + + fd = open(pathname1, O_CREAT | O_RDONLY, 0755); + ICUNIT_GOTO_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT3); + + fd = open(pathname1, O_CREAT | O_RDWR, 0755); + ICUNIT_GOTO_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT3); + + ret = mkdir(pathname1, 0755); + ICUNIT_GOTO_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT2); + + ret = umount(JFFS_MAIN_DIR0); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT1); + + ret = mount(JFFS_DEV_PATH0, JFFS_MAIN_DIR0, JFFS_FILESYS_TYPE, 0, NULL); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT1); + + return JFFS_NO_ERROR; + +EXIT3: + close(fd); +EXIT2: + remove(pathname1); +EXIT1: + umount(JFFS_MAIN_DIR0); + mount(JFFS_DEV_PATH0, JFFS_MAIN_DIR0, JFFS_FILESYS_TYPE, 0, NULL); +EXIT: + return JFFS_NO_ERROR; +} + +VOID ItFsTestMountRdonly002(VOID) +{ + TEST_ADD_CASE("IT_FS_TEST_MOUNT_RDONLY_002", testcase, TEST_VFS, TEST_JFFS, TEST_LEVEL0, TEST_FUNCTION); +} \ No newline at end of file diff --git a/testsuites/unittest/fs/jffs/full/It_vfs_test_mount_rdonly_003.cpp b/testsuites/unittest/fs/jffs/full/It_vfs_test_mount_rdonly_003.cpp new file mode 100644 index 00000000..68cd07aa --- /dev/null +++ b/testsuites/unittest/fs/jffs/full/It_vfs_test_mount_rdonly_003.cpp @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "It_vfs_jffs.h" + +static UINT32 testcase(VOID) +{ + INT32 fd = -1; + INT32 ret; + CHAR readbuf[JFFS_STANDARD_NAME_LENGTH] = {0}; + const CHAR writebuf[JFFS_STANDARD_NAME_LENGTH] = "0123456789"; + CHAR pathname1[JFFS_STANDARD_NAME_LENGTH] = { JFFS_PATH_NAME0 }; + + fd = creat(pathname1, 0777); + ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT); + + ret = write(fd, writebuf, strlen(writebuf)); + ICUNIT_GOTO_EQUAL(ret, strlen(writebuf), ret, EXIT4); + + ret = close(fd); + ICUNIT_GOTO_EQUAL(ret, JFFS_NO_ERROR, ret, EXIT4); + + ret = umount(JFFS_MAIN_DIR0); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT3); + + ret = mount(JFFS_DEV_PATH0, JFFS_MAIN_DIR0, JFFS_FILESYS_TYPE, MS_RDONLY, NULL); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT2); + + fd = open(pathname1, O_RDWR); + ICUNIT_GOTO_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT4); + + fd = open(pathname1, O_RDONLY); + ICUNIT_GOTO_NOT_EQUAL(fd, JFFS_IS_ERROR, fd, EXIT4); + + ret = read(fd, readbuf, strlen(writebuf)); + ICUNIT_GOTO_EQUAL(ret, strlen(writebuf), ret, EXIT4); + ICUNIT_GOTO_STRING_EQUAL(readbuf, writebuf, readbuf, EXIT4); + + ret = close(fd); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT4); + + ret = umount(JFFS_MAIN_DIR0); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT3); + + ret = mount(JFFS_DEV_PATH0, JFFS_MAIN_DIR0, JFFS_FILESYS_TYPE, 0, NULL); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT2); + + ret = unlink(pathname1); + ICUNIT_GOTO_NOT_EQUAL(ret, JFFS_IS_ERROR, ret, EXIT1); + + return JFFS_NO_ERROR; + +EXIT4: + close(fd); +EXIT3: + umount(JFFS_MAIN_DIR0); +EXIT2: + mount(JFFS_DEV_PATH0, JFFS_MAIN_DIR0, JFFS_FILESYS_TYPE, 0, NULL); +EXIT1: + unlink(pathname1); +EXIT: + return JFFS_NO_ERROR; +} + +VOID ItFsTestMountRdonly003(VOID) +{ + TEST_ADD_CASE("IT_FS_TEST_MOUNT_RDONLY_003", testcase, TEST_VFS, TEST_JFFS, TEST_LEVEL0, TEST_FUNCTION); +} \ No newline at end of file diff --git a/testsuites/unittest/fs/jffs/vfs_jffs_test.cpp b/testsuites/unittest/fs/jffs/vfs_jffs_test.cpp index ccd3ab4d..5c66f8ab 100644 --- a/testsuites/unittest/fs/jffs/vfs_jffs_test.cpp +++ b/testsuites/unittest/fs/jffs/vfs_jffs_test.cpp @@ -6885,6 +6885,21 @@ HWTEST_F(VfsJffsTest, ItFsTestSymlinkat001, TestSize.Level0) ItFsTestSymlinkat001(); } +HWTEST_F(VfsJffsTest, ItFsTestMountRdonly001, TestSize.Level0) +{ + ItFsTestMountRdonly001(); +} + +HWTEST_F(VfsJffsTest, ItFsTestMountRdonly002, TestSize.Level0) +{ + ItFsTestMountRdonly002(); +} + +HWTEST_F(VfsJffsTest, ItFsTestMountRdonly003, TestSize.Level0) +{ + ItFsTestMountRdonly003(); +} + #endif #if defined(LOSCFG_USER_TEST_SMOKE) /* * From 14bd753aa8beb49af887c8d0aedaefa446409760 Mon Sep 17 00:00:00 2001 From: chenjing Date: Tue, 20 Jul 2021 19:28:06 +0800 Subject: [PATCH 35/43] =?UTF-8?q?fix:=20OsGetArgsAddr=E5=A3=B0=E6=98=8E?= =?UTF-8?q?=E6=89=80=E5=9C=A8=E5=A4=B4=E6=96=87=E4=BB=B6=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit close #I41MWM Signed-off-by: chenjing Change-Id: Iad136b3b8b63fed63fa69c594ec39bd90d5513b7 --- kernel/common/los_bootargs.c | 1 - kernel/common/los_bootargs.h | 3 +++ kernel/common/los_rootfs.h | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/kernel/common/los_bootargs.c b/kernel/common/los_bootargs.c index 03868dc7..815a27c4 100644 --- a/kernel/common/los_bootargs.c +++ b/kernel/common/los_bootargs.c @@ -200,7 +200,6 @@ INT32 LOS_GetArgValue(CHAR *argName, CHAR **argValue) { return LOS_NOK; } - UINT64 LOS_GetAlignsize() { return g_alignSize; } diff --git a/kernel/common/los_bootargs.h b/kernel/common/los_bootargs.h index caae9d70..3cb73d0c 100644 --- a/kernel/common/los_bootargs.h +++ b/kernel/common/los_bootargs.h @@ -55,4 +55,7 @@ INT32 LOS_GetArgValue(CHAR *argName, CHAR **argValue); UINT64 LOS_GetAlignsize(VOID); UINT64 LOS_SizeStrToNum(CHAR *value); +#ifdef LOSCFG_BOOTENV_RAM +CHAR *OsGetArgsAddr(VOID); +#endif #endif /* _LOS_BOOTARGS_H */ \ No newline at end of file diff --git a/kernel/common/los_rootfs.h b/kernel/common/los_rootfs.h index dc325541..9f3aebef 100644 --- a/kernel/common/los_rootfs.h +++ b/kernel/common/los_rootfs.h @@ -80,10 +80,5 @@ #endif INT32 OsMountRootfs(VOID); -VOID OsSetCmdLineAddr(UINT64 addr); -UINT64 OsGetCmdLineAddr(VOID); -#ifdef LOSCFG_BOOTENV_RAM -CHAR *OsGetArgsAddr(VOID); -#endif #endif /* _LOS_ROOTFS_H */ From 2ff44c4938d2e66ce60e9497c505eb6e97efc8c2 Mon Sep 17 00:00:00 2001 From: wangchen <253227059@qq.com> Date: Fri, 16 Jul 2021 19:26:47 +0800 Subject: [PATCH 36/43] =?UTF-8?q?fix:=20L1=20toybox=20=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【背景】 解决toybox已支持命令的遗留问题，新增命令功能。 【修改方案】 1. 在内核态对toybox的系统调用进行支持。 【影响】 对现有的产品编译不会有影响。 re #I41N2A Signed-off-by: wangchen <253227059@qq.com> --- compat/posix/src/misc.c | 16 ++- syscall/fs_syscall.c | 260 ++++++++++++++++++++++++++++++++++++--- syscall/los_syscall.c | 1 - syscall/los_syscall.h | 5 + syscall/syscall_lookup.h | 6 + syscall/syscall_pub.c | 65 ++++++++++ syscall/syscall_pub.h | 5 + 7 files changed, 337 insertions(+), 21 deletions(-) diff --git a/compat/posix/src/misc.c b/compat/posix/src/misc.c index e740930f..39337571 100644 --- a/compat/posix/src/misc.c +++ b/compat/posix/src/misc.c @@ -36,7 +36,7 @@ #include "sys/utsname.h" #include "mqueue.h" #include "semaphore.h" - +#include "los_hw.h" /* * Supply some suitable values for constants that may not be present @@ -52,17 +52,27 @@ int uname(struct utsname *name) { INT32 ret; + const char *cpuInfo = NULL; + if (name == NULL) { return -EFAULT; } (VOID)strncpy_s(name->sysname, sizeof(name->sysname), KERNEL_NAME, strlen(KERNEL_NAME) + 1); (VOID)strncpy_s(name->nodename, sizeof(name->nodename), "hisilicon", strlen("hisilicon") + 1); - ret = snprintf_s(name->version, sizeof(name->version), sizeof(name->version) - 1, "%s %u.%u.%u.%u %s %s\n", + ret = snprintf_s(name->version, sizeof(name->version), sizeof(name->version) - 1, "%s %u.%u.%u.%u %s %s", KERNEL_NAME, KERNEL_MAJOR, KERNEL_MINOR, KERNEL_PATCH, KERNEL_ITRE, __DATE__, __TIME__); if (ret < 0) { return -EIO; } - name->machine[0] = '\0'; + + cpuInfo = LOS_CpuInfo(); + (VOID)strncpy_s(name->machine, sizeof(name->machine), cpuInfo, sizeof(name->machine)); + ret = snprintf_s(name->release, sizeof(name->release), sizeof(name->release) - 1, "%u.%u.%u.%u", + KERNEL_MAJOR, KERNEL_MINOR, KERNEL_PATCH, KERNEL_ITRE); + if (ret < 0) { + return -EIO; + } + name->domainname[0] = '\0'; return 0; } diff --git a/syscall/fs_syscall.c b/syscall/fs_syscall.c index b424b05b..0aff7b7b 100644 --- a/syscall/fs_syscall.c +++ b/syscall/fs_syscall.c @@ -29,11 +29,13 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "syscall_pub.h" #ifdef LOSCFG_FS_VFS #include "errno.h" #include "unistd.h" #include "fs/fd_table.h" #include "fs/file.h" +#include "fs/fs.h" #include "fs/fs_operation.h" #include "sys/mount.h" #include "los_task_pri.h" @@ -56,29 +58,77 @@ #include "sys/statfs.h" #define HIGH_SHIFT_BIT 32 +#define TIMESPEC_TIMES_NUM 2 -static int UserPathCopy(const char *userPath, char **pathBuf) +static int CheckNewAttrTime(struct IATTR *attr, struct timespec times[TIMESPEC_TIMES_NUM]) +{ + int ret = ENOERR; + struct timespec stp = {0}; + + if (times) { + if (times[0].tv_nsec == UTIME_OMIT) { + attr->attr_chg_valid &= ~CHG_ATIME; + } else if (times[0].tv_nsec == UTIME_NOW) { + ret = clock_gettime(CLOCK_REALTIME, &stp); + if (ret < 0) { + return -get_errno(); + } + attr->attr_chg_atime = (unsigned int)stp.tv_sec; + attr->attr_chg_valid |= CHG_ATIME; + } else { + attr->attr_chg_atime = (unsigned int)times[0].tv_sec; + attr->attr_chg_valid |= CHG_ATIME; + } + + if (times[1].tv_nsec == UTIME_OMIT) { + attr->attr_chg_valid &= ~CHG_MTIME; + } else if (times[1].tv_nsec == UTIME_NOW) { + ret = clock_gettime(CLOCK_REALTIME, &stp); + if (ret < 0) { + return -get_errno(); + } + attr->attr_chg_mtime = (unsigned int)stp.tv_sec; + attr->attr_chg_valid |= CHG_MTIME; + } else { + attr->attr_chg_mtime = (unsigned int)times[1].tv_sec; + attr->attr_chg_valid |= CHG_MTIME; + } + } else { + ret = clock_gettime(CLOCK_REALTIME, &stp); + if (ret < 0) { + return -get_errno(); + } + attr->attr_chg_atime = (unsigned int)stp.tv_sec; + attr->attr_chg_mtime = (unsigned int)stp.tv_sec; + attr->attr_chg_valid |= CHG_ATIME; + attr->attr_chg_valid |= CHG_MTIME; + } + + return ret; +} + +static int GetFullpathNull(int fd, const char *path, char **filePath) { int ret; + char *fullPath = NULL; + struct file *file = NULL; - *pathBuf = (char *)LOS_MemAlloc(OS_SYS_MEM_ADDR, PATH_MAX + 1); - if (*pathBuf == NULL) { - return -ENOMEM; + if ((fd != AT_FDCWD) && (path == NULL)) { + fd = GetAssociatedSystemFd(fd); + ret = fs_getfilep(fd, &file); + if (ret < 0) { + return -get_errno(); + } + fullPath = file->f_path; + } else { + ret = GetFullpath(fd, path, &fullPath); + if (ret < 0) { + return ret; + } } - ret = LOS_StrncpyFromUser(*pathBuf, userPath, PATH_MAX + 1); - if (ret < 0) { - (void)LOS_MemFree(OS_SYS_MEM_ADDR, *pathBuf); - *pathBuf = NULL; - return ret; - } else if (ret > PATH_MAX) { - (void)LOS_MemFree(OS_SYS_MEM_ADDR, *pathBuf); - *pathBuf = NULL; - return -ENAMETOOLONG; - } - (*pathBuf)[ret] = '\0'; - - return 0; + *filePath = fullPath; + return ret; } static int UserIovItemCheck(const struct iovec *iov, const int iovcnt) @@ -2124,6 +2174,37 @@ OUT: return result; } +int SysUtimensat(int fd, const char *path, struct timespec times[TIMESPEC_TIMES_NUM], int flag) +{ + int ret; + int timeLen; + struct IATTR attr = {0}; + char *filePath = NULL; + + timeLen = TIMESPEC_TIMES_NUM * sizeof(struct timespec); + CHECK_ASPACE(times, timeLen); + DUP_FROM_USER(times, timeLen); + ret = CheckNewAttrTime(&attr, times); + FREE_DUP(times); + if (ret < 0) { + goto OUT; + } + + ret = GetFullpathNull(fd, path, &filePath); + if (ret < 0) { + goto OUT; + } + + ret = chattr(filePath, &attr); + if (ret < 0) { + ret = -get_errno(); + } + +OUT: + PointerFree(filePath); + return ret; +} + int SysChmod(const char *pathname, mode_t mode) { int ret; @@ -2148,6 +2229,112 @@ OUT: return ret; } +int SysFchmodat(int fd, const char *path, mode_t mode, int flag) +{ + int ret; + char *pathRet = NULL; + char *fullpath = NULL; + struct IATTR attr = { + .attr_chg_mode = mode, + .attr_chg_valid = CHG_MODE, + }; + + if (path != NULL) { + ret = UserPathCopy(path, &pathRet); + if (ret != 0) { + goto OUT; + } + } + + if (fd != AT_FDCWD) { + /* Process fd convert to system global fd */ + fd = GetAssociatedSystemFd(fd); + } + + ret = vfs_normalize_pathat(fd, pathRet, &fullpath); + if (ret < 0) { + goto OUT; + } + + ret = chattr(fullpath, &attr); + if (ret < 0) { + ret = -get_errno(); + } + +OUT: + PointerFree(pathRet); + PointerFree(fullpath); + + return ret; +} + +int SysFchownat(int fd, const char *path, uid_t owner, gid_t group, int flag) +{ + int ret; + char *fullpath = NULL; + struct IATTR attr = { + .attr_chg_valid = 0, + }; + + ret = GetFullpath(fd, path, &fullpath); + if (ret < 0) { + goto OUT; + } + + if (owner != (uid_t)-1) { + attr.attr_chg_uid = owner; + attr.attr_chg_valid |= CHG_UID; + } + if (group != (gid_t)-1) { + attr.attr_chg_gid = group; + attr.attr_chg_valid |= CHG_GID; + } + + ret = chattr(fullpath, &attr); + if (ret < 0) { + ret = -get_errno(); + } + +OUT: + PointerFree(fullpath); + + return ret; +} + +int SysFchown(int fd, uid_t owner, gid_t group) +{ + int ret; + int sysFd; + struct IATTR attr = {0}; + attr.attr_chg_valid = 0; + struct file *file = NULL; + + sysFd = GetAssociatedSystemFd(fd); + if (sysFd < 0) { + return -EBADF; + } + + ret = fs_getfilep(sysFd, &file); + if (ret < 0) { + return -get_errno(); + } + + if (owner != (uid_t)-1) { + attr.attr_chg_uid = owner; + attr.attr_chg_valid |= CHG_UID; + } + if (group != (gid_t)-1) { + attr.attr_chg_gid = group; + attr.attr_chg_valid |= CHG_GID; + } + ret = chattr(file->f_path, &attr); + if (ret < 0) { + ret = -get_errno(); + } + + return ret; +} + int SysChown(const char *pathname, uid_t owner, gid_t group) { int ret; @@ -2218,4 +2405,43 @@ OUT: } return ret; } + +int SysFaccessat(int fd, const char *filename, int amode, int flag) +{ + int ret; + struct stat buf; + struct statfs fsBuf; + char *fullDirectory = NULL; + + ret = GetFullpath(fd, filename, &fullDirectory); + if (ret < 0) { + goto OUT; + } + + ret = statfs(fullDirectory, &fsBuf); + if (ret != 0) { + ret = -get_errno(); + goto OUT; + } + + if ((fsBuf.f_flags & MS_RDONLY) && ((unsigned int)amode & W_OK)) { + ret = -EROFS; + goto OUT; + } + + ret = stat(fullDirectory, &buf); + if (ret != 0) { + ret = -get_errno(); + goto OUT; + } + + if (VfsPermissionCheck(buf.st_uid, buf.st_gid, buf.st_mode, amode)) { + ret = -EACCES; + } + +OUT: + PointerFree(fullDirectory); + + return ret; +} #endif diff --git a/syscall/los_syscall.c b/syscall/los_syscall.c index b590c97a..6761fff7 100644 --- a/syscall/los_syscall.c +++ b/syscall/los_syscall.c @@ -32,7 +32,6 @@ #define _GNU_SOURCE #ifdef LOSCFG_FS_VFS #include "fs/file.h" -#include "fs/file.h" #endif #include "los_init.h" #include "los_signal.h" diff --git a/syscall/los_syscall.h b/syscall/los_syscall.h index 37429b88..c756916f 100644 --- a/syscall/los_syscall.h +++ b/syscall/los_syscall.h @@ -230,7 +230,11 @@ extern ssize_t SysReadlinkat(int dirfd, const char *pathname, char *buf, size_t extern int SysUnlink( const char *pathname); extern int SysExecve(const char *fileName, char *const *argv, char *const *envp); extern int SysChdir(const char *path); +extern int SysUtimensat(int fd, const char *path, struct timespec times[2], int flag); +extern int SysFchmodat(int fd, const char *path, mode_t mode, int flag); extern int SysChmod(const char *path, mode_t mode); +extern int SysFchownat(int fd, const char *path, uid_t owner, gid_t group, int flag); +extern int SysFchown(int fd, uid_t owner, gid_t group); extern int SysChown(const char *pathname, uid_t owner, gid_t group); extern off_t SysLseek(int fd, off_t offset, int whence); extern off64_t SysLseek64(int fd, int offsetHigh, int offsetLow, off64_t *result, int whence); @@ -238,6 +242,7 @@ extern int SysMount(const char *source, const char *target, const char *filesyst const void *data); extern int SysUmount(const char *target); extern int SysAccess(const char *path, int amode); +extern int SysFaccessat(int fd, const char *filename, int amode, int flag); extern int SysRename(const char *oldpath, const char *newpath); extern int SysMkdir(const char *pathname, mode_t mode); extern int SysRmdir(const char *pathname); diff --git a/syscall/syscall_lookup.h b/syscall/syscall_lookup.h index 236f7a25..44190732 100644 --- a/syscall/syscall_lookup.h +++ b/syscall/syscall_lookup.h @@ -48,11 +48,15 @@ SYSCALL_HAND_DEF(__NR_execve, SysExecve, int, ARG_NUM_3) SYSCALL_HAND_DEF(__NR_sysinfo, SysInfo, int, ARG_NUM_1) SYSCALL_HAND_DEF(__NR_chdir, SysChdir, int, ARG_NUM_1) +SYSCALL_HAND_DEF(__NR_utimensat, SysUtimensat, int, ARG_NUM_4) +SYSCALL_HAND_DEF(__NR_fchmodat, SysFchmodat, int, ARG_NUM_4) +SYSCALL_HAND_DEF(__NR_utimensat, SysUtimensat, int, ARG_NUM_4) SYSCALL_HAND_DEF(__NR_chmod, SysChmod, int, ARG_NUM_2) SYSCALL_HAND_DEF(__NR_lseek, SysLseek, off_t, ARG_NUM_7) /* current only support 32bit max 4G file */ SYSCALL_HAND_DEF(__NR_mount, SysMount, int, ARG_NUM_5) SYSCALL_HAND_DEF(__NR_umount, SysUmount, int, ARG_NUM_1) SYSCALL_HAND_DEF(__NR_access, SysAccess, int, ARG_NUM_2) +SYSCALL_HAND_DEF(__NR_faccessat, SysFaccessat, int, ARG_NUM_4) SYSCALL_HAND_DEF(__NR_sync, SysSync, void, ARG_NUM_0) SYSCALL_HAND_DEF(__NR_rename, SysRename, int, ARG_NUM_2) SYSCALL_HAND_DEF(__NR_mkdir, SysMkdir, int, ARG_NUM_2) @@ -166,6 +170,8 @@ SYSCALL_HAND_DEF(__NR_rt_sigpending, SysSigPending, int, ARG_NUM_1) SYSCALL_HAND_DEF(__NR_rt_sigtimedwait, SysSigTimedWait, int, ARG_NUM_4) SYSCALL_HAND_DEF(__NR_rt_sigsuspend, SysSigSuspend, int, ARG_NUM_1) +SYSCALL_HAND_DEF(__NR_fchownat, SysFchownat, int, ARG_NUM_5) +SYSCALL_HAND_DEF(__NR_fchown32, SysFchown, int, ARG_NUM_3) SYSCALL_HAND_DEF(__NR_chown, SysChown, int, ARG_NUM_3) SYSCALL_HAND_DEF(__NR_chown32, SysChown, int, ARG_NUM_3) #ifdef LOSCFG_SECURITY_CAPABILITY diff --git a/syscall/syscall_pub.c b/syscall/syscall_pub.c index dbfd0f5a..759b74a3 100644 --- a/syscall/syscall_pub.c +++ b/syscall/syscall_pub.c @@ -60,3 +60,68 @@ void *DupUserMem(const void *ptr, size_t len, int needCopy) return p; } + +int GetFullpath(int fd, const char *path, char **fullpath) +{ + int ret = 0; + char *pathRet = NULL; + struct file *file = NULL; + struct stat bufRet = {0}; + + if (path != NULL) { + ret = UserPathCopy(path, &pathRet); + if (ret != 0) { + goto OUT; + } + } + + if ((pathRet != NULL) && (*pathRet == '/')) { + *fullpath = pathRet; + pathRet = NULL; + } else { + if (fd != AT_FDCWD) { + /* Process fd convert to system global fd */ + fd = GetAssociatedSystemFd(fd); + } + ret = fs_getfilep(fd, &file); + if (file) { + ret = stat(file->f_path, &bufRet); + if (!ret) { + if (!S_ISDIR(bufRet.st_mode)) { + set_errno(ENOTDIR); + ret = -ENOTDIR; + goto OUT; + } + } + } + ret = vfs_normalize_pathat(fd, pathRet, fullpath); + } + +OUT: + PointerFree(pathRet); + return ret; +} + +int UserPathCopy(const char *userPath, char **pathBuf) +{ + int ret; + + *pathBuf = (char *)LOS_MemAlloc(OS_SYS_MEM_ADDR, PATH_MAX + 1); + if (*pathBuf == NULL) { + return -ENOMEM; + } + + ret = LOS_StrncpyFromUser(*pathBuf, userPath, PATH_MAX + 1); + if (ret < 0) { + (void)LOS_MemFree(OS_SYS_MEM_ADDR, *pathBuf); + *pathBuf = NULL; + return ret; + } else if (ret > PATH_MAX) { + (void)LOS_MemFree(OS_SYS_MEM_ADDR, *pathBuf); + *pathBuf = NULL; + return -ENAMETOOLONG; + } + (*pathBuf)[ret] = '\0'; + + return 0; +} diff --git a/syscall/syscall_pub.h b/syscall/syscall_pub.h index 52993987..e784a510 100644 --- a/syscall/syscall_pub.h +++ b/syscall/syscall_pub.h @@ -36,9 +36,14 @@ #include "los_vm_lock.h" #include "los_vm_map.h" #include "user_copy.h" +#include "fs/fs.h" +#include "fcntl.h" +#include "los_strncpy_from_user.h" extern int CheckRegion(const LosVmSpace *space, VADDR_T ptr, size_t len); extern void *DupUserMem(const void *ptr, size_t len, int needCopy); +extern int GetFullpath(int fd, const char *path, char **fullpath); +extern int UserPathCopy(const char *userPath, char **pathBuf); #define CHECK_ASPACE(ptr, len, ...) \ do { \ From 35a2f3af33a5dba1e0ba36587efced8fead97223 Mon Sep 17 00:00:00 2001 From: YOUR_NAME Date: Tue, 20 Jul 2021 18:21:36 +0800 Subject: [PATCH 37/43] =?UTF-8?q?fix:=20init=E8=BF=9B=E7=A8=8B=E6=94=B6?= =?UTF-8?q?=E5=88=B0=E5=AD=90=E8=BF=9B=E7=A8=8B=E9=80=80=E5=87=BA=E4=BF=A1?= =?UTF-8?q?=E5=8F=B7=E5=90=8E=EF=BC=8C=E8=B0=83=E7=94=A8fork=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E6=8B=89=E8=B5=B7=E8=BF=9B=E7=A8=8B=EF=BC=8C=E4=BC=9A?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=B3=BB=E7=BB=9F=E5=8D=A1=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 问题原因：init进程执行信号时，线程栈底预留了部分空间给信号上下文使用， 从而导致处理信号时线程栈底比线程控制块里面记录的大，这样在fork的过程中内核 从init线程栈底copy线程上下文给新进程时，copy的不是实际运行的栈底，以致于 新进程的线程上下文不对，在实际运行时跑飞，引发系统卡死。 解决方案：在fork过程copy线程上下文时，判断是否预留了信号上下文空间，如果预留 了，则copy的栈底要基于预留后的栈底去copy线程上下文。 close: #I41HOY Signed-off-by: zff Change-Id: I61cb05183c78919730e3a68c1c85b72fa1decd16 --- arch/arm/arm/src/los_hw.c | 10 +++++++++- kernel/base/ipc/los_signal.c | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm/arm/src/los_hw.c b/arch/arm/arm/src/los_hw.c index 2db15a42..2c9584b9 100644 --- a/arch/arm/arm/src/los_hw.c +++ b/arch/arm/arm/src/los_hw.c @@ -105,7 +105,15 @@ LITE_OS_SEC_TEXT_INIT VOID *OsTaskStackInit(UINT32 taskID, UINT32 stackSize, VOI LITE_OS_SEC_TEXT VOID OsUserCloneParentStack(VOID *childStack, UINTPTR parentTopOfStack, UINT32 parentStackSize) { - VOID *cloneStack = (VOID *)(((UINTPTR)parentTopOfStack + parentStackSize) - sizeof(TaskContext)); + LosTaskCB *task = OsCurrTaskGet(); + sig_cb *sigcb = &task->sig; + VOID *cloneStack = NULL; + + if (sigcb->sigContext != NULL) { + cloneStack = (VOID *)((UINTPTR)sigcb->sigContext - sizeof(TaskContext)); + } else { + cloneStack = (VOID *)(((UINTPTR)parentTopOfStack + parentStackSize) - sizeof(TaskContext)); + } (VOID)memcpy_s(childStack, sizeof(TaskContext), cloneStack, sizeof(TaskContext)); ((TaskContext *)childStack)->R0 = 0; diff --git a/kernel/base/ipc/los_signal.c b/kernel/base/ipc/los_signal.c index 43285ad4..ec7c5d59 100644 --- a/kernel/base/ipc/los_signal.c +++ b/kernel/base/ipc/los_signal.c @@ -678,6 +678,7 @@ VOID *OsRestorSignalContext(VOID *sp) LosProcessCB *process = OsCurrProcessGet(); VOID *saveContext = sigcb->sigContext; + sigcb->sigContext = NULL; sigcb->count--; process->sigShare = 0; OsProcessExitCodeSignalClear(process); From 58d4366e1d5c3c6a1338665685837c9bca62c661 Mon Sep 17 00:00:00 2001 From: kenneth Date: Wed, 21 Jul 2021 08:47:41 +0800 Subject: [PATCH 38/43] chore: fix function and variable name spell issues fix some spell issues in files under folder kernel/base/core: change Recyle to Recycle, ilde to idle and Porcess to Process close #I3R28X Signed-off-by: kenneth --- kernel/base/core/los_process.c | 26 +++++++++++++------------- kernel/base/core/los_sortlink.c | 6 +++--- kernel/base/core/los_task.c | 14 +++++++------- kernel/base/include/los_process_pri.h | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/kernel/base/core/los_process.c b/kernel/base/core/los_process.c index 8d00696b..a4bf395c 100644 --- a/kernel/base/core/los_process.c +++ b/kernel/base/core/los_process.c @@ -57,7 +57,7 @@ LITE_OS_SEC_BSS LosProcessCB *g_processCBArray = NULL; LITE_OS_SEC_DATA_INIT STATIC LOS_DL_LIST g_freeProcess; -LITE_OS_SEC_DATA_INIT STATIC LOS_DL_LIST g_processRecyleList; +LITE_OS_SEC_DATA_INIT STATIC LOS_DL_LIST g_processRecycleList; LITE_OS_SEC_BSS UINT32 g_userInitProcess = OS_INVALID_VALUE; LITE_OS_SEC_BSS UINT32 g_kernelInitProcess = OS_INVALID_VALUE; LITE_OS_SEC_BSS UINT32 g_kernelIdleProcess = OS_INVALID_VALUE; @@ -331,9 +331,9 @@ LITE_OS_SEC_TEXT STATIC VOID OsRecycleZombiesProcess(LosProcessCB *childCB, Proc LOS_ListDelete(&childCB->pendList); if (childCB->processStatus & OS_PROCESS_FLAG_EXIT) { - LOS_ListHeadInsert(&g_processRecyleList, &childCB->pendList); + LOS_ListHeadInsert(&g_processRecycleList, &childCB->pendList); } else if (childCB->processStatus & OS_PROCESS_FLAG_GROUP_LEADER) { - LOS_ListTailInsert(&g_processRecyleList, &childCB->pendList); + LOS_ListTailInsert(&g_processRecycleList, &childCB->pendList); } else { OsInsertPCBToFreeList(childCB); } @@ -413,7 +413,7 @@ STATIC VOID OsProcessNaturalExit(LosTaskCB *runTask, UINT32 status) #ifdef LOSCFG_KERNEL_VM (VOID)OsKill(processCB->parentProcessID, SIGCHLD, OS_KERNEL_KILL_PERMISSION); #endif - LOS_ListHeadInsert(&g_processRecyleList, &processCB->pendList); + LOS_ListHeadInsert(&g_processRecycleList, &processCB->pendList); OsRunTaskToDelete(runTask); return; } @@ -437,7 +437,7 @@ STATIC UINT32 OsProcessInit(VOID) (VOID)memset_s(g_processCBArray, size, 0, size); LOS_ListInit(&g_freeProcess); - LOS_ListInit(&g_processRecyleList); + LOS_ListInit(&g_processRecycleList); for (index = 0; index < g_processMaxNum; index++) { g_processCBArray[index].processID = index; @@ -457,14 +457,14 @@ STATIC UINT32 OsProcessInit(VOID) return LOS_OK; } -LITE_OS_SEC_TEXT VOID OsProcessCBRecyleToFree(VOID) +LITE_OS_SEC_TEXT VOID OsProcessCBRecycleToFree(VOID) { UINT32 intSave; LosProcessCB *processCB = NULL; SCHEDULER_LOCK(intSave); - while (!LOS_ListEmpty(&g_processRecyleList)) { - processCB = OS_PCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_processRecyleList)); + while (!LOS_ListEmpty(&g_processRecycleList)) { + processCB = OS_PCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_processRecycleList)); if (!(processCB->processStatus & OS_PROCESS_FLAG_EXIT)) { break; } @@ -487,7 +487,7 @@ LITE_OS_SEC_TEXT VOID OsProcessCBRecyleToFree(VOID) LOS_ListDelete(&processCB->pendList); if ((processCB->processStatus & OS_PROCESS_FLAG_GROUP_LEADER) || (processCB->processStatus & OS_PROCESS_STATUS_ZOMBIES)) { - LOS_ListTailInsert(&g_processRecyleList, &processCB->pendList); + LOS_ListTailInsert(&g_processRecycleList, &processCB->pendList); } else { /* Clear the bottom 4 bits of process status */ OsInsertPCBToFreeList(processCB); @@ -525,7 +525,7 @@ STATIC VOID OsDeInitPCB(LosProcessCB *processCB) processCB->processStatus &= ~OS_PROCESS_STATUS_INIT; processCB->processStatus |= OS_PROCESS_FLAG_EXIT; - LOS_ListHeadInsert(&g_processRecyleList, &processCB->pendList); + LOS_ListHeadInsert(&g_processRecycleList, &processCB->pendList); SCHEDULER_UNLOCK(intSave); (VOID)LOS_MemFree(m_aucSysMem1, group); @@ -1005,7 +1005,7 @@ WAIT_BACK: return LOS_OK; } -STATIC UINT32 OsWaitRecycleChildPorcess(const LosProcessCB *childCB, UINT32 intSave, INT32 *status) +STATIC UINT32 OsWaitRecycleChildProcess(const LosProcessCB *childCB, UINT32 intSave, INT32 *status) { ProcessGroup *group = NULL; UINT32 pid = childCB->processID; @@ -1081,7 +1081,7 @@ LITE_OS_SEC_TEXT INT32 LOS_Wait(INT32 pid, USER INT32 *status, UINT32 options, V } if (childCB != NULL) { - return (INT32)OsWaitRecycleChildPorcess(childCB, intSave, status); + return (INT32)OsWaitRecycleChildProcess(childCB, intSave, status); } if ((options & LOS_WAIT_WNOHANG) != 0) { @@ -1104,7 +1104,7 @@ LITE_OS_SEC_TEXT INT32 LOS_Wait(INT32 pid, USER INT32 *status, UINT32 options, V goto ERROR; } - return (INT32)OsWaitRecycleChildPorcess(childCB, intSave, status); + return (INT32)OsWaitRecycleChildProcess(childCB, intSave, status); ERROR: SCHEDULER_UNLOCK(intSave); diff --git a/kernel/base/core/los_sortlink.c b/kernel/base/core/los_sortlink.c index 6cb8b82b..2f818dfd 100644 --- a/kernel/base/core/los_sortlink.c +++ b/kernel/base/core/los_sortlink.c @@ -122,10 +122,10 @@ STATIC INLINE UINT64 OsGetSortLinkNextExpireTime(SortLinkAttribute *sortHeader, return expirTime; } -STATIC Percpu *OsFindIdleCpu(UINT16 *ildeCpuID) +STATIC Percpu *OsFindIdleCpu(UINT16 *idleCpuID) { Percpu *idleCpu = OsPercpuGetByID(0); - *ildeCpuID = 0; + *idleCpuID = 0; #ifdef LOSCFG_KERNEL_SMP UINT16 cpuID = 1; @@ -136,7 +136,7 @@ STATIC Percpu *OsFindIdleCpu(UINT16 *ildeCpuID) UINT32 temp = cpu->taskSortLink.nodeNum + cpu->swtmrSortLink.nodeNum; if (nodeNum > temp) { idleCpu = cpu; - *ildeCpuID = cpuID; + *idleCpuID = cpuID; } cpuID++; diff --git a/kernel/base/core/los_task.c b/kernel/base/core/los_task.c index f7b3b1a9..48e2e74d 100644 --- a/kernel/base/core/los_task.c +++ b/kernel/base/core/los_task.c @@ -67,7 +67,7 @@ LITE_OS_SEC_BSS LosTaskCB *g_taskCBArray; LITE_OS_SEC_BSS LOS_DL_LIST g_losFreeTask; -LITE_OS_SEC_BSS LOS_DL_LIST g_taskRecyleList; +LITE_OS_SEC_BSS LOS_DL_LIST g_taskRecycleList; LITE_OS_SEC_BSS UINT32 g_taskMaxNum; LITE_OS_SEC_BSS UINT32 g_taskScheduled; /* one bit for each cores */ LITE_OS_SEC_BSS EVENT_CB_S g_resourceEvent; @@ -201,7 +201,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsTaskInit(VOID) (VOID)memset_s(g_taskCBArray, size, 0, size); LOS_ListInit(&g_losFreeTask); - LOS_ListInit(&g_taskRecyleList); + LOS_ListInit(&g_taskRecycleList); for (index = 0; index < g_taskMaxNum; index++) { g_taskCBArray[index].taskStatus = OS_TASK_STATUS_UNUSED; g_taskCBArray[index].taskID = index; @@ -450,8 +450,8 @@ LITE_OS_SEC_TEXT VOID OsTaskCBRecycleToFree() UINT32 intSave; SCHEDULER_LOCK(intSave); - while (!LOS_ListEmpty(&g_taskRecyleList)) { - taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_taskRecyleList)); + while (!LOS_ListEmpty(&g_taskRecycleList)) { + taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_taskRecycleList)); LOS_ListDelete(&taskCB->pendList); SCHEDULER_UNLOCK(intSave); @@ -888,7 +888,7 @@ LITE_OS_SEC_TEXT VOID OsRunTaskToDelete(LosTaskCB *runTask) LOS_ListDelete(&runTask->threadList); processCB->threadNumber--; - LOS_ListTailInsert(&g_taskRecyleList, &runTask->pendList); + LOS_ListTailInsert(&g_taskRecycleList, &runTask->pendList); OsEventWriteUnsafe(&g_resourceEvent, OS_RESOURCE_EVENT_FREE, FALSE, NULL); OsSchedResched(); @@ -962,7 +962,7 @@ STATIC VOID OsTaskDeleteInactive(LosProcessCB *processCB, LosTaskCB *taskCB) LOS_ListDelete(&taskCB->threadList); processCB->threadNumber--; - LOS_ListTailInsert(&g_taskRecyleList, &taskCB->pendList); + LOS_ListTailInsert(&g_taskRecycleList, &taskCB->pendList); return; } @@ -1650,7 +1650,7 @@ STATIC VOID OsResourceRecoveryTask(VOID) if (ret & (OS_RESOURCE_EVENT_FREE | OS_RESOURCE_EVENT_OOM)) { OsTaskCBRecycleToFree(); - OsProcessCBRecyleToFree(); + OsProcessCBRecycleToFree(); } #ifdef LOSCFG_ENABLE_OOM_LOOP_TASK diff --git a/kernel/base/include/los_process_pri.h b/kernel/base/include/los_process_pri.h index 8cf6b7c0..27e80cf4 100644 --- a/kernel/base/include/los_process_pri.h +++ b/kernel/base/include/los_process_pri.h @@ -441,7 +441,7 @@ extern UINTPTR __user_init_bss; extern UINTPTR __user_init_end; extern UINTPTR __user_init_load_addr; extern UINT32 OsSystemProcessCreate(VOID); -extern VOID OsProcessCBRecyleToFree(VOID); +extern VOID OsProcessCBRecycleToFree(VOID); extern VOID OsProcessResourcesToFree(LosProcessCB *processCB); extern VOID OsProcessExit(LosTaskCB *runTask, INT32 status); extern UINT32 OsUserInitProcess(VOID); From a8805a65aab9109b915364fccf36c8328f636e48 Mon Sep 17 00:00:00 2001 From: Caoruihong Date: Tue, 13 Jul 2021 23:57:39 +0800 Subject: [PATCH 39/43] feat: add support for gn build system add BUILD.gn for all kernel modules Signed-off-by: Caoruihong Change-Id: I018446427bf64615f2596d47862b219659b58b34 --- BUILD.gn | 321 ++++++++++++++++-- Kconfig | 13 +- Makefile | 18 +- apps/BUILD.gn | 50 +++ apps/init/BUILD.gn | 53 +++ apps/mksh/BUILD.gn | 40 +++ apps/shell/BUILD.gn | 58 ++++ apps/tftp/BUILD.gn | 55 +++ apps/toybox/BUILD.gn | 40 +++ arch/BUILD.gn | 44 +++ arch/arm/BUILD.gn | 47 +++ arch/arm/arm/BUILD.gn | 82 +++++ arch/arm/gic/BUILD.gn | 41 +++ bsd/BUILD.gn | 86 +++++ bsd/Kconfig | 8 + bsd/compat/linuxkpi/BUILD.gn | 57 ++++ bsd/dev/usb/BUILD.gn | 154 +++++++++ compat/BUILD.gn | 38 +++ compat/posix/BUILD.gn | 55 +++ drivers/BUILD.gn | 70 ++++ drivers/block/disk/BUILD.gn | 45 +++ drivers/char/bch/BUILD.gn | 52 +++ drivers/char/mem/BUILD.gn | 42 +++ drivers/char/quickstart/BUILD.gn | 42 +++ drivers/char/random/BUILD.gn | 46 +++ drivers/char/video/BUILD.gn | 42 +++ drivers/mtd/multi_partition/BUILD.gn | 54 +++ fs/BUILD.gn | 56 +++ fs/fat/BUILD.gn | 55 +++ fs/fat/virpart/BUILD.gn | 47 +++ fs/jffs2/BUILD.gn | 75 ++++ fs/nfs/BUILD.gn | 40 +++ fs/proc/BUILD.gn | 34 +- fs/ramfs/BUILD.gn | 36 ++ fs/romfs/BUILD.gn | 39 +++ fs/vfs/BUILD.gn | 116 +++++++ fs/vfs/bcache/BUILD.gn | 42 +++ fs/zpfs/BUILD.gn | 13 +- kernel/BUILD.gn | 38 +-- kernel/base/BUILD.gn | 54 +-- kernel/base/misc/panic_shellcmd.c | 2 +- kernel/common/BUILD.gn | 48 +++ kernel/common/blackbox/BUILD.gn | 47 +++ kernel/common/hidumper/BUILD.gn | 41 +++ kernel/common/patchfs/BUILD.gn | 44 +++ kernel/common/rootfs/BUILD.gn | 44 +++ kernel/common/{ => rootfs}/Kconfig | 0 kernel/common/{ => rootfs}/Makefile | 0 kernel/common/{ => rootfs}/los_bootargs.c | 0 kernel/common/{ => rootfs}/los_bootargs.h | 0 kernel/common/{ => rootfs}/los_rootfs.c | 0 kernel/common/{ => rootfs}/los_rootfs.h | 0 kernel/extended/BUILD.gn | 56 +++ kernel/extended/cppsupport/BUILD.gn | 36 ++ kernel/extended/cpup/BUILD.gn | 45 +++ .../extended/{include => cpup}/los_cpup_pri.h | 0 kernel/extended/dynload/BUILD.gn | 45 +++ kernel/extended/hilog/BUILD.gn | 45 +++ kernel/extended/liteipc/BUILD.gn | 41 +++ kernel/extended/power/BUILD.gn | 36 ++ kernel/extended/trace/BUILD.gn | 45 +++ .../{include => trace}/los_trace_pri.h | 0 kernel/extended/vdso/BUILD.gn | 53 +++ kernel/extended/vdso/src/Makefile | 2 +- kernel/extended/vdso/src/los_vdso_text.S | 2 +- kernel/extended/vdso/usr/BUILD.gn | 54 +++ kernel/extended/vdso/usr/Makefile | 2 +- kernel/user/BUILD.gn | 57 ++++ lib/BUILD.gn | 50 +++ lib/libc/BUILD.gn | 92 +++++ lib/libmbedtls/BUILD.gn | 122 +++++++ lib/libscrew/BUILD.gn | 46 +++ lib/libsec/BUILD.gn | 83 +++++ lib/zlib/BUILD.gn | 62 ++++ liteos.gni | 63 ++++ net/BUILD.gn | 44 +++ net/lwip-2.1/BUILD.gn | 63 ++++ net/lwip-2.1/lwip_porting.gni | 40 +++ net/telnet/BUILD.gn | 45 +++ platform/BUILD.gn | 101 ++++++ platform/Makefile | 7 +- platform/bsp.mk | 3 +- {kernel/common => platform}/console.c | 0 {kernel/common => platform}/console.h | 0 {kernel/common => platform}/hwi_shell.c | 0 {kernel/common => platform}/los_builddef.h | 0 {kernel/common => platform}/los_cir_buf.c | 0 {kernel/common => platform}/los_cir_buf_pri.h | 0 {kernel/common => platform}/los_config.c | 0 {kernel/common => platform}/los_config.h | 2 +- {kernel/common => platform}/los_excinfo.c | 0 {kernel/common => platform}/los_excinfo_pri.h | 0 {kernel/common => platform}/los_hilog.c | 0 {kernel/common => platform}/los_hilog.h | 0 {kernel/common => platform}/los_init.c | 0 {kernel/common => platform}/los_init.h | 0 {kernel/common => platform}/los_init_info.h | 0 {kernel/common => platform}/los_init_pri.h | 0 {kernel/common => platform}/los_magickey.c | 0 {kernel/common => platform}/los_magickey.h | 0 {kernel/common => platform}/los_printf.c | 0 {kernel/common => platform}/los_seq_buf.c | 0 {kernel/common => platform}/los_seq_buf.h | 0 {kernel/common => platform}/los_timer_pri.h | 0 {kernel/common => platform}/sys_config.h | 0 {kernel/common => platform}/virtual_serial.c | 0 {kernel/common => platform}/virtual_serial.h | 0 security/BUILD.gn | 44 +++ security/cap/BUILD.gn | 41 +++ security/vid/BUILD.gn | 41 +++ shell/BUILD.gn | 31 +- syscall/BUILD.gn | 46 +++ testsuites/BUILD.gn | 37 ++ tools/build/mk/los_config.mk | 12 +- 114 files changed, 3993 insertions(+), 125 deletions(-) create mode 100644 apps/BUILD.gn create mode 100644 apps/init/BUILD.gn create mode 100644 apps/mksh/BUILD.gn create mode 100644 apps/shell/BUILD.gn create mode 100644 apps/tftp/BUILD.gn create mode 100644 apps/toybox/BUILD.gn create mode 100644 arch/BUILD.gn create mode 100644 arch/arm/BUILD.gn create mode 100644 arch/arm/arm/BUILD.gn create mode 100644 arch/arm/gic/BUILD.gn create mode 100644 bsd/BUILD.gn create mode 100644 bsd/compat/linuxkpi/BUILD.gn create mode 100644 bsd/dev/usb/BUILD.gn create mode 100644 compat/BUILD.gn create mode 100644 compat/posix/BUILD.gn create mode 100644 drivers/BUILD.gn create mode 100644 drivers/block/disk/BUILD.gn create mode 100644 drivers/char/bch/BUILD.gn create mode 100644 drivers/char/mem/BUILD.gn create mode 100644 drivers/char/quickstart/BUILD.gn create mode 100644 drivers/char/random/BUILD.gn create mode 100644 drivers/char/video/BUILD.gn create mode 100644 drivers/mtd/multi_partition/BUILD.gn create mode 100644 fs/BUILD.gn create mode 100644 fs/fat/BUILD.gn create mode 100644 fs/fat/virpart/BUILD.gn create mode 100644 fs/jffs2/BUILD.gn create mode 100644 fs/nfs/BUILD.gn create mode 100644 fs/ramfs/BUILD.gn create mode 100644 fs/romfs/BUILD.gn create mode 100644 fs/vfs/BUILD.gn create mode 100644 fs/vfs/bcache/BUILD.gn create mode 100644 kernel/common/BUILD.gn create mode 100644 kernel/common/blackbox/BUILD.gn create mode 100644 kernel/common/hidumper/BUILD.gn create mode 100644 kernel/common/patchfs/BUILD.gn create mode 100644 kernel/common/rootfs/BUILD.gn rename kernel/common/{ => rootfs}/Kconfig (100%) rename kernel/common/{ => rootfs}/Makefile (100%) rename kernel/common/{ => rootfs}/los_bootargs.c (100%) rename kernel/common/{ => rootfs}/los_bootargs.h (100%) rename kernel/common/{ => rootfs}/los_rootfs.c (100%) rename kernel/common/{ => rootfs}/los_rootfs.h (100%) create mode 100644 kernel/extended/BUILD.gn create mode 100644 kernel/extended/cppsupport/BUILD.gn create mode 100644 kernel/extended/cpup/BUILD.gn rename kernel/extended/{include => cpup}/los_cpup_pri.h (100%) create mode 100644 kernel/extended/dynload/BUILD.gn create mode 100644 kernel/extended/hilog/BUILD.gn create mode 100644 kernel/extended/liteipc/BUILD.gn create mode 100644 kernel/extended/power/BUILD.gn create mode 100644 kernel/extended/trace/BUILD.gn rename kernel/extended/{include => trace}/los_trace_pri.h (100%) create mode 100644 kernel/extended/vdso/BUILD.gn create mode 100644 kernel/extended/vdso/usr/BUILD.gn create mode 100644 kernel/user/BUILD.gn create mode 100644 lib/BUILD.gn create mode 100644 lib/libc/BUILD.gn create mode 100644 lib/libmbedtls/BUILD.gn create mode 100644 lib/libscrew/BUILD.gn create mode 100644 lib/libsec/BUILD.gn create mode 100644 lib/zlib/BUILD.gn create mode 100644 liteos.gni create mode 100644 net/BUILD.gn create mode 100644 net/lwip-2.1/BUILD.gn create mode 100644 net/lwip-2.1/lwip_porting.gni create mode 100644 net/telnet/BUILD.gn create mode 100644 platform/BUILD.gn rename {kernel/common => platform}/console.c (100%) rename {kernel/common => platform}/console.h (100%) rename {kernel/common => platform}/hwi_shell.c (100%) rename {kernel/common => platform}/los_builddef.h (100%) rename {kernel/common => platform}/los_cir_buf.c (100%) rename {kernel/common => platform}/los_cir_buf_pri.h (100%) rename {kernel/common => platform}/los_config.c (100%) rename {kernel/common => platform}/los_config.h (99%) rename {kernel/common => platform}/los_excinfo.c (100%) rename {kernel/common => platform}/los_excinfo_pri.h (100%) rename {kernel/common => platform}/los_hilog.c (100%) rename {kernel/common => platform}/los_hilog.h (100%) rename {kernel/common => platform}/los_init.c (100%) rename {kernel/common => platform}/los_init.h (100%) rename {kernel/common => platform}/los_init_info.h (100%) rename {kernel/common => platform}/los_init_pri.h (100%) rename {kernel/common => platform}/los_magickey.c (100%) rename {kernel/common => platform}/los_magickey.h (100%) rename {kernel/common => platform}/los_printf.c (100%) rename {kernel/common => platform}/los_seq_buf.c (100%) rename {kernel/common => platform}/los_seq_buf.h (100%) rename {kernel/common => platform}/los_timer_pri.h (100%) rename {kernel/common => platform}/sys_config.h (100%) rename {kernel/common => platform}/virtual_serial.c (100%) rename {kernel/common => platform}/virtual_serial.h (100%) create mode 100644 security/BUILD.gn create mode 100644 security/cap/BUILD.gn create mode 100644 security/vid/BUILD.gn create mode 100644 syscall/BUILD.gn create mode 100644 testsuites/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn index df7704a6..93965953 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -28,49 +28,310 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import("//build/lite/config/component/lite_component.gni") -import("//build/lite/config/subsystem/lite_subsystem.gni") + +declare_args() { + tee_enable = false +} + +LITEOS_MENUCONFIG_H = rebase_path("$root_out_dir/config.h") + +tee = "" +if (tee_enable) { + tee = "_tee" +} + +productName = get_path_info(product_path, "file") +config_file = "${productName}_release.config" +if (ohos_build_compiler == "clang") { + if (ohos_build_type == "debug") { + config_file = "debug/${productName}_${ohos_build_compiler}${tee}.config" + } else { + config_file = "${productName}_${ohos_build_compiler}_release${tee}.config" + } +} else if (ohos_build_compiler == "gcc") { + if (ohos_build_type == "debug") { + config_file = "${productName}_debug_shell${tee}.config" + } else { + config_file = "${productName}_release${tee}.config" + } +} + +liteos_config_file = rebase_path("tools/build/config/$config_file") + +# we prefer use product specified config file +f = "$product_path/config/${ohos_build_type}${tee}.config" +if (exec_script("//build/lite/run_shell_cmd.py", [ "if [ -f $f ]; then echo true; else echo false; fi" ], "value")) { + liteos_config_file = f +} + +print("liteos_config_file:", liteos_config_file) + +exec_script("//build/lite/run_shell_cmd.py", [ "which genconfig || pip install --user kconfiglib" ]) + +exec_script("//build/lite/run_shell_cmd.py", + [ + "env" + + " CONFIG_=LOSCFG_" + + " KCONFIG_CONFIG_HEADER='y=true'" + + " KCONFIG_CONFIG=$liteos_config_file" + + " DEVICE_PATH=$device_path" + + " srctree=" + rebase_path(".") + + " genconfig" + + " --header-path $LITEOS_MENUCONFIG_H" + + " --file-list kconfig_files.txt" + + " --env-list kconfig_env.txt" + + " --config-out config.gni", + ]) + +import("liteos.gni") generate_notice_file("kernel_notice_file") { module_name = "kernel" module_source_dir_list = [ - "//third_party/FreeBSD", - "//third_party/musl", - "//third_party/zlib", - "//third_party/FatFs", - "//third_party/Linux_Kernel", - "//third_party/lwip", - "//third_party/NuttX", - "//third_party/mtd-utils", + "$LITEOSTHIRDPARTY/FreeBSD", + "$LITEOSTHIRDPARTY/musl", + "$LITEOSTHIRDPARTY/zlib", + "$LITEOSTHIRDPARTY/FatFs", + "$LITEOSTHIRDPARTY/Linux_Kernel", + "$LITEOSTHIRDPARTY/lwip", + "$LITEOSTHIRDPARTY/NuttX", + "$LITEOSTHIRDPARTY/mtd-utils", ] } -declare_args() { - enable_ohos_kernel_liteos_a_ext_build = true - LOSCFG_TEST_APPS = false - tee_enable = "" +liteos_arch_cflags = [] +if (defined(LOSCFG_ARCH_ARM)) { + mcpu = LOSCFG_ARCH_CPU + if (defined(LOSCFG_ARCH_ARM_AARCH64) && defined(LOSCFG_ARCH_FPU_DISABLE)) { + mcpu += "+nofp" + } + liteos_arch_cflags += [ "-mcpu=$mcpu" ] + if (defined(LOSCFG_ARCH_ARM_AARCH32)) { + liteos_arch_cflags += [ + "-mfloat-abi=softfp", + "-mfpu=$LOSCFG_ARCH_FPU", + ] + } } -lite_subsystem("kernel") { - subsystem_components = [] +cc = "$ohos_current_cc_command " + string_join(" ", liteos_arch_cflags) +if (ohos_build_compiler == "clang") { + cc += " --target=$target_triple" +} - if (enable_ohos_kernel_liteos_a_ext_build == false) { - subsystem_components += [ - "//kernel/liteos_a/kernel", - "//kernel/liteos_a/net", - "//kernel/liteos_a/lib", - "//kernel/liteos_a/compat", - "//kernel/liteos_a/fs", - "//kernel/liteos_a/arch:platform_cpu", - ] - if (LOSCFG_SHELL) { - subsystem_components += [ "//kernel/liteos_a/shell" ] - } - } else { - deps = [ ":make" ] - deps += [ "//kernel/liteos_a/testsuites/unittest:unittest" ] +config("arch_config") { + cflags = liteos_arch_cflags + asmflags = cflags + ldflags = cflags +} + +config("as_objs_libc_flags") { + defines = [ "__ASSEMBLY__" ] + + # linux style macros + if (defined(LOSCFG_ARCH_ARM_V7A) || defined(LOSCFG_ARCH_ARM_V7R) || + defined(LOSCFG_ARCH_ARM_V7M)) { + defines += [ "__LINUX_ARM_ARCH__=7" ] + } else if (defined(LOSCFG_ARCH_ARM_V8A) || defined(LOSCFG_ARCH_ARM_V8R) || + defined(LOSCFG_ARCH_ARM_V8M)) { + defines += [ "__LINUX_ARM_ARCH__=8" ] } } +config("std_include") { + std_include = exec_script("//build/lite/run_shell_cmd.py", [ "$cc -print-file-name=include" ], "trim string") + include_dirs = [ std_include ] +} + +config("public") { + configs = [ + "arch:public", + "platform:public", + "kernel:public", + "compat:public", + "bsd:public", + "fs:public", + "drivers:public", + "security:public", + "net:public", + "shell:public", + "lib:public", + ":std_include", + ] +} + +config("los_config") { + cflags = [ + "-imacros", + "$LITEOS_MENUCONFIG_H", + ] + + defines = [ "__LITEOS__" ] + + configs = [ ":arch_config" ] + + ldflags = [ "-nostdlib" ] + + cflags_c = [ "-std=c99" ] + + cflags += [ + "-fno-pic", + "-fno-builtin", + "-nostdinc", + "-Wall", + "-Werror", + "-fms-extensions", + "-Wno-address-of-packed-member", + "-fno-strict-aliasing", + "-fno-common", + "-fsigned-char", + "-Wpointer-arith", + "-Wstrict-prototypes", + "-Winvalid-pch", + "-ffunction-sections", + "-fdata-sections", + "-fno-exceptions", + "-fno-omit-frame-pointer", + "-fno-short-enums", + ] + + if (defined(LOSCFG_QUICK_START)) { + cflags -= [ "-Werror" ] + } + + if (defined(LOSCFG_COMPILE_DEBUG)) { + cflags += [ + "-O0", + "-g", + "-gdwarf-2", + ] + } else { + if (defined(LOSCFG_COMPILER_CLANG_LLVM)) { + cflags += [ + "-Oz", + "-flto", + ] + } else { + cflags += [ "-O2" ] + } + } + + if (defined(LOSCFG_CC_STACKPROTECTOR_ALL)) { + cflags += [ "-fstack-protector-all" ] + } else if (defined(LOSCFG_CC_STACKPROTECTOR_STRONG)) { + cflags += [ "-fstack-protector-strong" ] + } else if (defined(LOSCFG_CC_STACKPROTECTOR)) { + cflags += [ + "-fstack-protector", + "--param", + "ssp-buffer-size=4", + ] + } else { + cflags += [ "-fno-stack-protector" ] + } + + if (!defined(LOSCFG_COMPILER_CLANG_LLVM)) { + cflags += [ "-fno-aggressive-loop-optimizations" ] + if (!defined(LOSCFG_ARCH_ARM_AARCH64)) { + cflags += [ + "-mno-unaligned-access", + "-mthumb-interwork", + ] + } + } + + if (defined(LOSCFG_THUMB)) { + cflags += [ + "-mthumb", + "-Wa,-mimplicit-it=thumb", + ] + } + + asmflags = cflags +} + +liteos_name = "liteos2" +liteos_out = rebase_path("$target_out_dir/$liteos_name") +executable(liteos_name) { + configs = [] # clear default configs + configs += [ ":los_config" ] + + ldflags = [ + "-static", + "-Wl,--gc-sections", + "-Wl,-Map=" + rebase_path("$liteos_out.map"), + "-Wl,--no-eh-frame-hdr", + "-Wl,--whole-archive", + ] + + libgcc = exec_script("//build/lite/run_shell_cmd.py", [ "$cc -print-libgcc-file-name" ], "trim string") + libs = [ libgcc ] + if (defined(LOSCFG_COMPILER_CLANG_LLVM)) { + libs += [ "tools/build/liteos_llvm.ld" ] + } else { + libs += [ "tools/build/liteos.ld" ] + ldflags += [ "-nostartfiles" ] + } + + deps = [ + ":modules", + ] +} + +build_ext_component("build_liteos_bin") { + deps = [ ":$liteos_name" ] + exec_path = rebase_path(target_out_dir) + + objcopy = "${compile_prefix}objcopy$toolchain_cmd_suffix" + objdump = "${compile_prefix}objdump$toolchain_cmd_suffix" + + liteos = rebase_path("$root_out_dir/unstripped/bin/$liteos_name") + + command = "$objcopy -O binary $liteos $liteos_out.bin" + command += " && sh -c '$objdump -t $liteos | sort >$liteos_out.sym.sorted'" + command += " && sh -c '$objdump -d $liteos >$liteos_out.asm'" +} + +group("modules") { + deps = [ + "arch", + "bsd", + "compat", + "drivers", + "fs", + "kernel", + "lib", + "net", + "platform", + "security", + "shell", + "syscall", + ] +} + +group("apps") { + deps = [ "apps" ] +} + +group("tests") { + deps = [ "testsuites" ] +} + +group("kernel") { + deps = [ + ":make", + ":tests", + ] +} + +group("liteos_a") { + deps = [ + ":apps", + ":kernel", + ":tests", + ] +} + build_ext_component("make") { exec_path = rebase_path(".", root_build_dir) outdir = rebase_path(get_path_info(".", "out_dir")) diff --git a/Kconfig b/Kconfig index 1b3a174e..8b8704e8 100644 --- a/Kconfig +++ b/Kconfig @@ -58,7 +58,7 @@ source "platform/Kconfig" source "arch/Kconfig" ######################### config options of rootfs ##################### -source "kernel/common/Kconfig" +source "kernel/common/rootfs/Kconfig" ######################### config options of patchfs ##################### source "kernel/common/patchfs/Kconfig" ######################### config options of blackbox ##################### @@ -93,6 +93,7 @@ source "fs/romfs/Kconfig" source "fs/nfs/Kconfig" source "fs/proc/Kconfig" source "fs/jffs2/Kconfig" +source "fs/zpfs/Kconfig" config ENABLE_READ_BUFFER bool "Enable read buffer Option" default n @@ -163,9 +164,16 @@ config ENABLE_MAGICKEY config THUMB bool "Enable Thumb" default n + select INTERWORK_THUMB help Answer Y to build thumb version. This will make LiteOS smaller. +config INTERWORK_THUMB + bool "Enable interwork Thumb" if THUMB + default n + help + Answer Y to enable interwork thumb. + config PLATFORM_DVFS bool "Enable Dvfs" default n @@ -295,8 +303,7 @@ source "bsd/dev/usb/Kconfig" source "../../drivers/adapter/khdf/liteos/Kconfig" # Device driver Kconfig import -osource "$(DEVICE_PATH)/Kconfig" -osource "$(DEVICE_PATH)/config/Kconfig" +osource "$(DEVICE_PATH)/drivers/Kconfig" source "drivers/char/mem/Kconfig" source "drivers/char/quickstart/Kconfig" diff --git a/Makefile b/Makefile index ff3bf7c9..72d7994b 100644 --- a/Makefile +++ b/Makefile @@ -51,13 +51,25 @@ LITEOS_PLATFORM_BASE = $(LITEOSTOPDIR)/platform export CONFIG_=LOSCFG_ ifeq ($(PRODUCT_PATH),) -export PRODUCT_PATH=$(LITEOSTOPDIR)/../../device/hisilicon/drivers +export PRODUCT_PATH=$(shell hb env|grep "product path:"|sed 's/.*: //g') +endif +ifeq ($(DEVICE_PATH),) +export DEVICE_PATH=$(shell hb env|grep "device path:"|sed 's/.*: //g') +endif + +ifeq ($(TEE:1=y),y) +tee = _tee +endif +ifeq ($(RELEASE:1=y),y) +CONFIG ?= $(PRODUCT_PATH)/config/release$(tee).config +else +CONFIG ?= $(PRODUCT_PATH)/config/debug$(tee).config endif ifeq ($(shell which menuconfig),) $(shell pip install --user kconfiglib >/dev/null) endif -$(shell env CONFIG_=$(CONFIG_) PRODUCT_PATH=$(PRODUCT_PATH) olddefconfig >/dev/null) +$(shell env CONFIG_=$(CONFIG_) DEVICE_PATH=$(DEVICE_PATH) olddefconfig >/dev/null) -include $(LITEOSTOPDIR)/tools/build/config.mk @@ -217,7 +229,7 @@ update_all_config: done update_config: - $(HIDE)test -f "$(CONFIG)" && cp "$(CONFIG)" .config && menuconfig && savedefconfig --out "$(CONFIG)" + $(HIDE)test -f "$(CONFIG)" && cp -v "$(CONFIG)" .config && menuconfig && savedefconfig --out "$(CONFIG)" .PHONY: all lib clean cleanall $(LITEOS_TARGET) debug release help update_all_config update_config .PHONY: prepare sysroot cleanrootfs $(ROOTFS) $(ROOTFSDIR) $(APPS) menuconfig $(LITEOS_LIBS_TARGET) $(__LIBS) $(OUT) diff --git a/apps/BUILD.gn b/apps/BUILD.gn new file mode 100644 index 00000000..3e197007 --- /dev/null +++ b/apps/BUILD.gn @@ -0,0 +1,50 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +group("apps") { + deps = [] + + if (defined(LOSCFG_SHELL)) { + deps += [ + "shell", + #"mksh", + #"toybox", + ] + } + + if (defined(LOSCFG_USER_INIT_DEBUG)) { + #deps += [ "init" ] + } + + if (defined(LOSCFG_NET_LWIP_SACK_TFTP)) { + deps += [ "tftp" ] + } +} diff --git a/apps/init/BUILD.gn b/apps/init/BUILD.gn new file mode 100644 index 00000000..3b8b4f5a --- /dev/null +++ b/apps/init/BUILD.gn @@ -0,0 +1,53 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +executable("init") { + sources = [ "src/init.c" ] + + cflags = [ "-fPIE" ] + + if (defined(LOSCFG_COMPILER_CLANG_LLVM)) { + cflags += [ + "-Wno-shift-op-parentheses", + "-Wno-bitwise-op-parentheses", + "-Wnonnull", + ] + } + + ldflags = [ + "-pie", + "-s", + ] + + if (defined(LOSCFG_QUICK_START)) { + ldflags += [ "--static" ] + } +} diff --git a/apps/mksh/BUILD.gn b/apps/mksh/BUILD.gn new file mode 100644 index 00000000..a09888e5 --- /dev/null +++ b/apps/mksh/BUILD.gn @@ -0,0 +1,40 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//build/lite/config/component/lite_component.gni") +import("//kernel/liteos_a/liteos.gni") + +group("mksh") { + deps = [ ":build_mksh" ] +} + +build_ext_component("build_mksh") { + exec_path = rebase_path(target_out_dir) + command = "make -C $LITEOSTHIRDPARTY/mksh" +} diff --git a/apps/shell/BUILD.gn b/apps/shell/BUILD.gn new file mode 100644 index 00000000..7afbbf6f --- /dev/null +++ b/apps/shell/BUILD.gn @@ -0,0 +1,58 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +executable("shell") { + sources = [ + "builtin/cd.c", + "src/main.c", + "src/shcmd.c", + "src/shcmdparse.c", + "src/shmsg.c", + ] + + deps = [ "$LITEOSTHIRDPARTY/bounds_checking_function:libsec_static" ] + + include_dirs = [ "include" ] + + cflags = [ "-fPIE" ] + + if (defined(LOSCFG_COMPILER_CLANG_LLVM)) { + cflags += [ + "-Wno-shift-op-parentheses", + "-Wno-bitwise-op-parentheses", + ] + } + + ldflags = [ + "-pie", + "-s", + ] +} diff --git a/apps/tftp/BUILD.gn b/apps/tftp/BUILD.gn new file mode 100644 index 00000000..eef0d82a --- /dev/null +++ b/apps/tftp/BUILD.gn @@ -0,0 +1,55 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +executable("tftp") { + sources = [ + "src/main.c", + "src/tftpc.c", + ] + + deps = [ "$LITEOSTHIRDPARTY/bounds_checking_function:libsec_static" ] + + include_dirs = [ "include" ] + + cflags = [ "-fPIE" ] + + if (defined(LOSCFG_COMPILER_CLANG_LLVM)) { + cflags += [ + "-Wno-shift-op-parentheses", + "-Wno-bitwise-op-parentheses", + ] + } + + ldflags = [ + "-pie", + "-s", + ] +} diff --git a/apps/toybox/BUILD.gn b/apps/toybox/BUILD.gn new file mode 100644 index 00000000..8438e89e --- /dev/null +++ b/apps/toybox/BUILD.gn @@ -0,0 +1,40 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//build/lite/config/component/lite_component.gni") +import("//kernel/liteos_a/liteos.gni") + +group("toybox") { + deps = [ ":build_toybox" ] +} + +build_ext_component("build_toybox") { + exec_path = rebase_path(target_out_dir) + command = "make -C $LITEOSTHIRDPARTY/toybox" +} diff --git a/arch/BUILD.gn b/arch/BUILD.gn new file mode 100644 index 00000000..75517815 --- /dev/null +++ b/arch/BUILD.gn @@ -0,0 +1,44 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +group("arch") { + deps = [] + if (defined(LOSCFG_ARCH_ARM)) { + deps += [ "arm" ] + } +} + +config("public") { + configs = [] + if (defined(LOSCFG_ARCH_ARM)) { + configs += [ "arm:public" ] + } +} diff --git a/arch/arm/BUILD.gn b/arch/arm/BUILD.gn new file mode 100644 index 00000000..6a797c10 --- /dev/null +++ b/arch/arm/BUILD.gn @@ -0,0 +1,47 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +group("arm") { + deps = [ "gic" ] + if (defined(LOSCFG_ARCH_ARM_AARCH32)) { + deps += [ "arm" ] + } +} + +config("public") { + include_dirs = [ "include" ] + configs = [] + if (defined(LOSCFG_ARCH_ARM_AARCH32)) { + configs += [ "arm:public" ] + } else if (defined(LOSCFG_ARCH_ARM_AARCH64)) { + configs += [ "aarch64:public" ] + } +} diff --git a/arch/arm/arm/BUILD.gn b/arch/arm/arm/BUILD.gn new file mode 100644 index 00000000..f2ef7610 --- /dev/null +++ b/arch/arm/arm/BUILD.gn @@ -0,0 +1,82 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_name = LOSCFG_ARCH_CPU +kernel_module(module_name) { + sources = [ + "src/arm_generic_timer.c", + "src/clear_user.S", + "src/hw_user_get.S", + "src/hw_user_put.S", + "src/jmp.S", + "src/los_arch_mmu.c", + "src/los_asid.c", + "src/los_dispatch.S", + "src/los_exc.c", + "src/los_hw.c", + "src/los_hw_exc.S", + "src/los_hw_runstop.S", + "src/los_hw_tick.c", + "src/los_hwi.c", + "src/strncpy_from_user.c", + "src/strnlen_user.c", + "src/user_copy.c", + ] + + if (LOSCFG_ARCH_ARM_VER == "armv7-a") { + sources += [ "src/armv7a/cache.S" ] + } + + if (defined(LOSCFG_KERNEL_SMP)) { + sources += [ "src/startup/reset_vector_mp.S" ] + } else { + sources += [ "src/startup/reset_vector_up.S" ] + } + + include_dirs = [ "src/include" ] + + if (defined(LOSCFG_GDB)) { + configs += [ "$LITEOSTOPDIR:as_objs_libc_flags" ] + } + + public_configs = [ ":public" ] +} + +group("arm") { + public_deps = [ ":$module_name" ] +} + +config("public") { + include_dirs = [ + "include", + "src/include", + ] +} diff --git a/arch/arm/gic/BUILD.gn b/arch/arm/gic/BUILD.gn new file mode 100644 index 00000000..127100f5 --- /dev/null +++ b/arch/arm/gic/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [] + + if (defined(LOSCFG_ARCH_GIC_V2)) { + sources += [ "gic_v2.c" ] + } else if (defined(LOSCFG_ARCH_GIC_V3)) { + sources += [ "gic_v3.c" ] + } +} diff --git a/bsd/BUILD.gn b/bsd/BUILD.gn new file mode 100644 index 00000000..fac70d00 --- /dev/null +++ b/bsd/BUILD.gn @@ -0,0 +1,86 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_COMPAT_BSD) +module_name = "libbsd" +kernel_module(module_name) { + sources = [ + "kern/bus_if.c", + "kern/device_if.c", + "kern/kern_condvar.c", + "kern/kern_timeout.c", + "kern/subr_bus.c", + "kern/subr_kobj.c", + ] + + if (defined(LOSCFG_ARCH_ARM_AARCH32)) { + sources += [ + "arm/autoconf.c", + "arm/hw_user_copy.S", + "arm/in_cksum.c", + "arm/in_cksum_arm.S", + "arm/nexus.c", + ] + } + + if (defined(LOSCFG_DRIVERS_RANDOM)) { + sources += [ + "crypto/rijndael/rijndael-alg-fst.c", + "crypto/rijndael/rijndael-api-fst.c", + "crypto/sha2/sha256c.c", + "dev/random/hash.c", + "dev/random/yarrow.c", + "libkern/explicit_bzero.c", + ] + } + + public_configs = [ ":public" ] +} + +group("bsd") { + public_deps = [ ":$module_name" ] + + deps = [ + "compat/linuxkpi", + "dev/usb", + ] +} + +config("public") { + include_dirs = [ + ".", + "kern", + ] + configs = [ + "compat/linuxkpi:public", + "dev/usb:public", + ] +} diff --git a/bsd/Kconfig b/bsd/Kconfig index 53c2816a..c19d8cd8 100644 --- a/bsd/Kconfig +++ b/bsd/Kconfig @@ -1,6 +1,14 @@ config COMPAT_BSD bool "Enable FreeBSD" default y + select COMPAT_LINUXKPI help Answer Y to enable LiteOS support FreeBSD. + +config COMPAT_LINUXKPI + bool "Enable linuxkpi" if COMPAT_BSD + default y + + help + Answer Y to enable LiteOS support compatible layer for linuxkpi. diff --git a/bsd/compat/linuxkpi/BUILD.gn b/bsd/compat/linuxkpi/BUILD.gn new file mode 100644 index 00000000..01c73efb --- /dev/null +++ b/bsd/compat/linuxkpi/BUILD.gn @@ -0,0 +1,57 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_COMPAT_BSD) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "src/adp.c", + "src/linux_completion.c", + "src/linux_interrupt.c", + "src/linux_sched.c", + "src/linux_semaphore.c", + "src/linux_timer.c", + "src/linux_wakelock.c", + "src/linux_workqueue.c", + "src/prctl.c", + "src/tzdst.c", + ] + + if (defined(LOSCFG_HRTIMER_ENABLE)) { + sources += [ "src/linux_hrtimer.c" ] + } + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/bsd/dev/usb/BUILD.gn b/bsd/dev/usb/BUILD.gn new file mode 100644 index 00000000..c2cb6c1d --- /dev/null +++ b/bsd/dev/usb/BUILD.gn @@ -0,0 +1,154 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_DRIVERS_USB) +module_name = "usb_base" +kernel_module(module_name) { + sources = [ + "implementation/bsd_busspace.c", + "implementation/bsd_kernel.c", + "implementation/usb_btree.c", + "implementation/usb_busdma_loader.c", + "implementation/usb_init.c", + "implementation/usb_version.c", + "usb_debug.c", + ] + + if (defined(LOSCFG_DRIVERS_USB)) { + sources += [ + "controller/usb_controller.c", + "quirk/usb_quirk.c", + "usb_dev.c", + "usb_device.c", + "usb_dynamic.c", + "usb_error.c", + "usb_generic.c", + "usb_handle_request.c", + "usb_hub.c", + "usb_if.c", + "usb_lookup.c", + "usb_mbuf.c", + "usb_parse.c", + "usb_process.c", + "usb_request.c", + "usb_transfer.c", + "usb_util.c", + ] + } + + if (defined(LOSCFG_DRIVERS_USB_4G_MODEM)) { + sources += [ "net/if_cdce.c" ] + } + + if (defined(LOSCFG_DRIVERS_USB_ETHERNET)) { + sources += [ + "net/if_axe.c", + "net/if_axge.c", + ] + } + + if (defined(LOSCFG_DRIVERS_USB_RNDIS_HOST)) { + sources += [ "net/if_urndis.c" ] + } + + if (defined(LOSCFG_DRIVERS_USB_4G_MODEM) || + defined(LOSCFG_DRIVERS_USB_ETHERNET) || + defined(LOSCFG_DRIVERS_USB_RNDIS_HOST)) { + sources += [ + "net/usb_eth_drv.c", + "net/usb_ethernet.c", + ] + } + + if (defined(LOSCFG_DRIVERS_USB_4G_MODEM) || + defined(LOSCFG_DRIVERS_USB_SERIAL)) { + sources += [ + "serial/u3g.c", + "serial/usb_serial.c", + ] + } + + if (defined(LOSCFG_DRIVERS_USB_HOST_EHCI)) { + sources += [ + "controller/ehci.c", + "controller/ehci_pci.c", + ] + } + + if (defined(LOSCFG_DRIVERS_USB_HOST_XHCI) || + defined(LOSCFG_DRIVERS_USB_HOST_XHCI_FOR_PORT2)) { + sources += [ + "controller/xhci.c", + "controller/xhci_pci.c", + ] + } + + if (defined(LOSCFG_DRIVERS_USB_WIRELESS)) { + sources += [ "linux_usb.c" ] + } + + if (defined(LOSCFG_DRIVERS_USB_MASS_STORAGE)) { + sources += [ "storage/umass.c" ] + } + + if (defined(LOSCFG_DRIVERS_USB_HID_CLASS) && + defined(LOSCFG_DRIVERS_HDF_INPUT)) { + sources += [ + "input/uhid.c", + "usb_hid.c", + ] + + include_dirs = [ + "//drivers/framework/model/input/driver", + "//drivers/framework/include/core", + "//drivers/framework/core/common/include/host", + "//drivers/framework/utils", + "//drivers/framework/osal", + "//drivers/framework/ability/sbuf/include", + "//drivers/framework/include/osal", + ] + } + + configs += [ + "$HDFTOPDIR:hdf_config" + ] + + public_configs = [ ":public" ] +} + +group("usb") { + public_deps = [ ":$module_name" ] +} + +config("public") { + include_dirs = [ "." ] + include_dirs += [ "$LITEOSTHIRDPARTY/FreeBSD/sys/dev/evdev" ] +} diff --git a/compat/BUILD.gn b/compat/BUILD.gn new file mode 100644 index 00000000..300dcf3e --- /dev/null +++ b/compat/BUILD.gn @@ -0,0 +1,38 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +group("compat") { + deps = [ "posix" ] +} + +config("public") { + configs = [ "posix:public" ] +} diff --git a/compat/posix/BUILD.gn b/compat/posix/BUILD.gn new file mode 100644 index 00000000..d145e64f --- /dev/null +++ b/compat/posix/BUILD.gn @@ -0,0 +1,55 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_COMPAT_POSIX) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "src/map_error.c", + "src/misc.c", + "src/mqueue.c", + "src/posix_memalign.c", + "src/pthread.c", + "src/pthread_attr.c", + "src/pthread_cond.c", + "src/pthread_mutex.c", + "src/sched.c", + "src/semaphore.c", + "src/socket.c", + "src/time.c", + ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/drivers/BUILD.gn b/drivers/BUILD.gn new file mode 100644 index 00000000..4926f959 --- /dev/null +++ b/drivers/BUILD.gn @@ -0,0 +1,70 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +cmd = "if [ -f $device_path/drivers/BUILD.gn ]; then echo true; else echo false; fi" +HAVE_DEVICE_DRIVERS = exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value") + +module_switch = defined(LOSCFG_DRIVERS) +group("drivers") { + if (module_switch) { + deps = [ + "block/disk", + "char/bch", + "char/mem", + "char/quickstart", + "char/random", + "char/video", + "mtd/multi_partition", + "//drivers/adapter/khdf/liteos", + "//drivers/liteos", + ] + if (HAVE_DEVICE_DRIVERS) { + deps += [ "$device_path/drivers" ] + } + } +} + +config("public") { + configs = [ + "block/disk:public", + "char/bch:public", + "char/mem:public", + "char/quickstart:public", + "char/random:public", + "char/video:public", + "mtd/multi_partition:public", + "//drivers/adapter/khdf/liteos:public", + "//drivers/liteos:public", + ] + if (HAVE_DEVICE_DRIVERS) { + configs += [ "$device_path/drivers:public" ] + } +} diff --git a/drivers/block/disk/BUILD.gn b/drivers/block/disk/BUILD.gn new file mode 100644 index 00000000..48e42b06 --- /dev/null +++ b/drivers/block/disk/BUILD.gn @@ -0,0 +1,45 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_FS_FAT_DISK) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "src/disk.c", + "src/disk_shellcmd.c", + ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/drivers/char/bch/BUILD.gn b/drivers/char/bch/BUILD.gn new file mode 100644 index 00000000..cc684575 --- /dev/null +++ b/drivers/char/bch/BUILD.gn @@ -0,0 +1,52 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_FS_VFS_BLOCK_DEVICE) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchdev_driver.c", + "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchdev_register.c", + "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchdev_unregister.c", + "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_cache.c", + "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_read.c", + "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_sem.c", + "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_setup.c", + "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_teardown.c", + "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_write.c", + ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/drivers/char/mem/BUILD.gn b/drivers/char/mem/BUILD.gn new file mode 100644 index 00000000..aad2d717 --- /dev/null +++ b/drivers/char/mem/BUILD.gn @@ -0,0 +1,42 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_DRIVERS_MEM) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ "src/mem.c" ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/drivers/char/quickstart/BUILD.gn b/drivers/char/quickstart/BUILD.gn new file mode 100644 index 00000000..9f2cb98d --- /dev/null +++ b/drivers/char/quickstart/BUILD.gn @@ -0,0 +1,42 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_DRIVERS_QUICKSTART) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ "src/quickstart.c" ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/drivers/char/random/BUILD.gn b/drivers/char/random/BUILD.gn new file mode 100644 index 00000000..0410df5b --- /dev/null +++ b/drivers/char/random/BUILD.gn @@ -0,0 +1,46 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_DRIVERS_RANDOM) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ "src/random.c" ] + + if (defined(LOSCFG_HW_RANDOM_ENABLE)) { + sources += [ "src/random_hw.c" ] + } + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/drivers/char/video/BUILD.gn b/drivers/char/video/BUILD.gn new file mode 100644 index 00000000..1470983e --- /dev/null +++ b/drivers/char/video/BUILD.gn @@ -0,0 +1,42 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_DRIVERS_VIDEO) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ "$LITEOSTHIRDPARTY/NuttX/drivers/video/fb.c" ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "$LITEOSTHIRDPARTY/NuttX/include/nuttx/video" ] +} diff --git a/drivers/mtd/multi_partition/BUILD.gn b/drivers/mtd/multi_partition/BUILD.gn new file mode 100644 index 00000000..625a89d5 --- /dev/null +++ b/drivers/mtd/multi_partition/BUILD.gn @@ -0,0 +1,54 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_FS_VFS) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "src/mtd_partition.c", + "src/mtd_shellcmd.c", + ] + + include_dirs = [ + "$LITEOSTOPDIR/fs/jffs2/include", + "//device/hisilicon/drivers/include/mtd/common/include", + ] + + if (defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7)) { + include_dirs += [ "//device/qemu/drivers/cfiflash" ] + } + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/fs/BUILD.gn b/fs/BUILD.gn new file mode 100644 index 00000000..f148c269 --- /dev/null +++ b/fs/BUILD.gn @@ -0,0 +1,56 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +group("fs") { + deps = [ + "fat", + "fat/virpart", + "jffs2", + "nfs", + "proc", + "ramfs", + "romfs", + "vfs", + "vfs/bcache", + "zpfs", + ] +} + +config("public") { + include_dirs = [ "include" ] + configs = [ + "vfs:public", + "vfs/bcache:public", + "fat:public", + "fat/virpart:public", + "proc:public", + ] +} diff --git a/fs/fat/BUILD.gn b/fs/fat/BUILD.gn new file mode 100644 index 00000000..34abc034 --- /dev/null +++ b/fs/fat/BUILD.gn @@ -0,0 +1,55 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_FS_FAT) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "os_adapt/fat_shellcmd.c", + "os_adapt/fatfs.c", + "os_adapt/format.c", + ] + + sources += [ + "$LITEOSTHIRDPARTY/FatFs/source/diskio.c", + "$LITEOSTHIRDPARTY/FatFs/source/ff.c", + "$LITEOSTHIRDPARTY/FatFs/source/ffsystem.c", + "$LITEOSTHIRDPARTY/FatFs/source/ffunicode.c", + ] + + include_dirs = [ "os_adapt" ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "$LITEOSTHIRDPARTY/FatFs/source" ] +} diff --git a/fs/fat/virpart/BUILD.gn b/fs/fat/virpart/BUILD.gn new file mode 100644 index 00000000..08178e2d --- /dev/null +++ b/fs/fat/virpart/BUILD.gn @@ -0,0 +1,47 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_FS_FAT_VIRTUAL_PARTITION) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "src/virpart.c", + "src/virpartff.c", + ] + + include_dirs = [ "../os_adapt" ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/fs/jffs2/BUILD.gn b/fs/jffs2/BUILD.gn new file mode 100644 index 00000000..bf5eecc1 --- /dev/null +++ b/fs/jffs2/BUILD.gn @@ -0,0 +1,75 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_FS_JFFS) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "src/jffs2_hash.c", + "src/vfs_jffs2.c", + ] + + sources += [ + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/background.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/build.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/compr.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/compr_rtime.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/compr_rubin.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/compr_zlib.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/debug.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/dir.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/erase.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/file.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/fs.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/gc.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/malloc.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/nodelist.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/nodemgmt.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/read.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/readinode.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/scan.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/summary.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/super.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/write.c", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2/writev.c", + ] + + include_dirs = [ + "$LITEOSTHIRDPARTY/Linux_Kernel/fs/jffs2", + "$LITEOSTHIRDPARTY/Linux_Kernel/fs", + ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/fs/nfs/BUILD.gn b/fs/nfs/BUILD.gn new file mode 100644 index 00000000..8f987f9d --- /dev/null +++ b/fs/nfs/BUILD.gn @@ -0,0 +1,40 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_FS_NFS) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "$LITEOSTHIRDPARTY/NuttX/fs/nfs/nfs_adapter.c", + "$LITEOSTHIRDPARTY/NuttX/fs/nfs/nfs_util.c", + "$LITEOSTHIRDPARTY/NuttX/fs/nfs/rpc_clnt.c", + ] +} diff --git a/fs/proc/BUILD.gn b/fs/proc/BUILD.gn index 122e956e..2c133512 100644 --- a/fs/proc/BUILD.gn +++ b/fs/proc/BUILD.gn @@ -25,23 +25,31 @@ # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -static_library("fs_proc") { +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_FS_PROC) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { sources = [ + "os_adapt/fd_proc.c", + "os_adapt/fs_cache_proc.c", + "os_adapt/kernel_trace_proc.c", + "os_adapt/mounts_proc.c", + "os_adapt/power_proc.c", "os_adapt/proc_init.c", - "os_adapt/vfs_proc.c", + "os_adapt/proc_vfs.c", + "os_adapt/process_proc.c", + "os_adapt/uptime_proc.c", + "os_adapt/vmm_proc.c", + "src/proc_file.c", "src/proc_shellcmd.c", - "src/pseudofs.c", - "src/seq_file.c", ] - include_dirs = [ "include" ] - - if (LOSCFG_LLTREPORT) { - cflags += [ - "-fprofile-arcs", - "-ftest-coverage", - ] - } + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] } diff --git a/fs/ramfs/BUILD.gn b/fs/ramfs/BUILD.gn new file mode 100644 index 00000000..5b593f83 --- /dev/null +++ b/fs/ramfs/BUILD.gn @@ -0,0 +1,36 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_FS_RAMFS) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ "$LITEOSTHIRDPARTY/NuttX/fs/tmpfs/fs_tmpfs.c" ] +} diff --git a/fs/romfs/BUILD.gn b/fs/romfs/BUILD.gn new file mode 100644 index 00000000..eef06c08 --- /dev/null +++ b/fs/romfs/BUILD.gn @@ -0,0 +1,39 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_FS_ROMFS) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "$LITEOSTHIRDPARTY/NuttX/fs/romfs/fs_romfs.c", + "$LITEOSTHIRDPARTY/NuttX/fs/romfs/fs_romfsutil.c", + ] +} diff --git a/fs/vfs/BUILD.gn b/fs/vfs/BUILD.gn new file mode 100644 index 00000000..1cd4859e --- /dev/null +++ b/fs/vfs/BUILD.gn @@ -0,0 +1,116 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_FS_VFS) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "operation/fs_chattr.c", + "operation/fs_check.c", + "operation/fs_fallocate.c", + "operation/fs_fallocate64.c", + "operation/fs_file.c", + "operation/fs_file_mapping.c", + "operation/fs_init.c", + "operation/fs_other.c", + "operation/fs_preadv.c", + "operation/fs_pwritev.c", + "operation/fs_readv.c", + "operation/fs_utime.c", + "operation/fs_writev.c", + "operation/fullpath.c", + "vfs_cmd/vfs_shellcmd.c", + ] + + sources += [ + "$LITEOSTHIRDPARTY/NuttX/fs/dirent/fs_closedir.c", + "$LITEOSTHIRDPARTY/NuttX/fs/dirent/fs_opendir.c", + "$LITEOSTHIRDPARTY/NuttX/fs/dirent/fs_readdir.c", + "$LITEOSTHIRDPARTY/NuttX/fs/dirent/fs_rewinddir.c", + "$LITEOSTHIRDPARTY/NuttX/fs/dirent/fs_seekdir.c", + "$LITEOSTHIRDPARTY/NuttX/fs/dirent/fs_telldir.c", + "$LITEOSTHIRDPARTY/NuttX/fs/driver/fs_blockproxy.c", + "$LITEOSTHIRDPARTY/NuttX/fs/driver/fs_closeblockdriver.c", + "$LITEOSTHIRDPARTY/NuttX/fs/driver/fs_findblockdriver.c", + "$LITEOSTHIRDPARTY/NuttX/fs/driver/fs_openblockdriver.c", + "$LITEOSTHIRDPARTY/NuttX/fs/driver/fs_registerblockdriver.c", + "$LITEOSTHIRDPARTY/NuttX/fs/driver/fs_registerdriver.c", + "$LITEOSTHIRDPARTY/NuttX/fs/driver/fs_unregisterblockdriver.c", + "$LITEOSTHIRDPARTY/NuttX/fs/driver/fs_unregisterdriver.c", + "$LITEOSTHIRDPARTY/NuttX/fs/inode/fs_files.c", + "$LITEOSTHIRDPARTY/NuttX/fs/mount/fs_foreachmountpoint.c", + "$LITEOSTHIRDPARTY/NuttX/fs/mount/fs_mount.c", + "$LITEOSTHIRDPARTY/NuttX/fs/mount/fs_umount.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_close.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_dup.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_dup2.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_dupfd.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_dupfd2.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_fcntl.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_fsync.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_getfilep.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_ioctl.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_link.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_lseek.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_lseek64.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_mkdir.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_open.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_poll.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_pread.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_pread64.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_pwrite.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_pwrite64.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_read.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_readlink.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_rename.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_rmdir.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_select.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_sendfile.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_stat.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_statfs.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_symlink.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_truncate.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_truncate64.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_unlink.c", + "$LITEOSTHIRDPARTY/NuttX/fs/vfs/fs_write.c", + "$LITEOSTOPDIR/fs/vfs/mount.c", + "$LITEOSTOPDIR/fs/vfs/path_cache.c", + "$LITEOSTOPDIR/fs/vfs/vnode.c", + "$LITEOSTOPDIR/fs/vfs/vnode_hash.c", + ] + + include_dirs = [ "$LITEOSTOPDIR/syscall" ] + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/fs/vfs/bcache/BUILD.gn b/fs/vfs/bcache/BUILD.gn new file mode 100644 index 00000000..6f52a9bc --- /dev/null +++ b/fs/vfs/bcache/BUILD.gn @@ -0,0 +1,42 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_FS_FAT_CACHE) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ "src/bcache.c" ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "../include/bcache" ] +} diff --git a/fs/zpfs/BUILD.gn b/fs/zpfs/BUILD.gn index e8094f4f..e0cc31e2 100644 --- a/fs/zpfs/BUILD.gn +++ b/fs/zpfs/BUILD.gn @@ -27,16 +27,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -static_library("fs_zpfs") { +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_FS_ZPFS) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { sources = [ "vfs_zpfs.c", "zpfs.c", ] - - if (LOSCFG_LLTREPORT) { - cflags += [ - "-fprofile-arcs", - "-ftest-coverage", - ] - } } diff --git a/kernel/BUILD.gn b/kernel/BUILD.gn index 34a26649..504db26b 100644 --- a/kernel/BUILD.gn +++ b/kernel/BUILD.gn @@ -25,32 +25,24 @@ # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/component/lite_component.gni") +import("//kernel/liteos_a/liteos.gni") -lite_component("kernel") { - features = [ +group("kernel") { + deps = [ "base", - "syscall", + "common", + "extended", "user", ] - if (LOSCFG_KERNEL_CPUP) { - features += [ "extended/cpup" ] - } - if (LOSCFG_KERNEL_MPU) { - features += [ "extended/mpu" ] - } - if (LOSCFG_KERNEL_CPPSUPPORT) { - features += [ "extended/cppsupport" ] - } - if (LOSCFG_KERNEL_DYNLOAD) { - features += [ "extended/dynload" ] - } - if (LOSCFG_KERNEL_TRACE) { - features += [ "extended/trace" ] - } - if (LOSCFG_KERNEL_VDSO) { - features += [ "extended/vdso" ] - } +} + +config("public") { + include_dirs = [ "include" ] + configs = [ + "base:public", + "common:public", + "extended:public", + ] } diff --git a/kernel/base/BUILD.gn b/kernel/base/BUILD.gn index 67cb2543..b231ed27 100644 --- a/kernel/base/BUILD.gn +++ b/kernel/base/BUILD.gn @@ -25,9 +25,12 @@ # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -static_library("base") { +import("//kernel/liteos_a/liteos.gni") + +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { sources = [ "core/los_bitmap.c", "core/los_process.c", @@ -36,22 +39,24 @@ static_library("base") { "core/los_sys.c", "core/los_task.c", "core/los_tick.c", - "core/los_timeslice.c", "ipc/los_event.c", + "ipc/los_futex.c", "ipc/los_ipcdebug.c", "ipc/los_mux.c", - "ipc/los_mux_debug.c", "ipc/los_queue.c", "ipc/los_queue_debug.c", + "ipc/los_rwlock.c", "ipc/los_sem.c", "ipc/los_sem_debug.c", - "mem/bestfit/los_memory.c", - "mem/bestfit/los_multipledlinkhead.c", + "ipc/los_signal.c", "mem/common/los_memstat.c", "mem/membox/los_membox.c", + "mem/tlsf/los_memory.c", + "misc/kill_shellcmd.c", "misc/los_misc.c", "misc/los_stackinfo.c", "misc/mempt_shellcmd.c", + "misc/panic_shellcmd.c", "misc/swtmr_shellcmd.c", "misc/sysinfo_shellcmd.c", "misc/task_shellcmd.c", @@ -59,22 +64,33 @@ static_library("base") { "mp/los_lockdep.c", "mp/los_mp.c", "mp/los_percpu.c", + "mp/los_spinlock.c", "mp/los_stat.c", "om/los_err.c", - "sched/sched_sq/los_priqueue.c", "sched/sched_sq/los_sched.c", - "vm/filemap.c", - "vm/pmm.c", - "vm/vm.c", - "vm/vmm.c", + "vm/los_vm_boot.c", + "vm/los_vm_dump.c", + "vm/los_vm_fault.c", + "vm/los_vm_filemap.c", + "vm/los_vm_iomap.c", + "vm/los_vm_map.c", + "vm/los_vm_page.c", + "vm/los_vm_phys.c", + "vm/los_vm_scan.c", + "vm/los_vm_syscall.c", + "vm/oom.c", + "vm/shm.c", ] - include_dirs = [ - "include", - "../extended/include", - "../extended/vdso/include", - "../extended/dynload/include", - "../include", - "mem", - ] + if (defined(LOSCFG_SHELL_CMD_DEBUG)) { + configs += [ + "$HDFTOPDIR:hdf_config" + ] + } + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] } diff --git a/kernel/base/misc/panic_shellcmd.c b/kernel/base/misc/panic_shellcmd.c index 0829a7e7..1923c625 100644 --- a/kernel/base/misc/panic_shellcmd.c +++ b/kernel/base/misc/panic_shellcmd.c @@ -35,7 +35,6 @@ #include "shell.h" #endif #include "los_swtmr_pri.h" -#include "watchdog_if.h" #ifdef LOSCFG_SHELL_CMD_DEBUG @@ -46,6 +45,7 @@ LITE_OS_SEC_TEXT_MINOR BOOL OsSystemExcIsReset(VOID) return systemExcReset; } #ifdef LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG +#include "watchdog_if.h" #define WATCHDOG_TIMER_INTERVAL 5 // 5 seconds #define WATCHDOG_TIMER_INTERVAL_HALF (WATCHDOG_TIMER_INTERVAL / 2) diff --git a/kernel/common/BUILD.gn b/kernel/common/BUILD.gn new file mode 100644 index 00000000..02da36bc --- /dev/null +++ b/kernel/common/BUILD.gn @@ -0,0 +1,48 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +group("common") { + deps = [ + "blackbox", + "hidumper", + "patchfs", + "rootfs", + ] +} + +config("public") { + configs = [ + "blackbox:public", + "hidumper:public", + "patchfs:public", + "rootfs:public", + ] +} diff --git a/kernel/common/blackbox/BUILD.gn b/kernel/common/blackbox/BUILD.gn new file mode 100644 index 00000000..b1327cf3 --- /dev/null +++ b/kernel/common/blackbox/BUILD.gn @@ -0,0 +1,47 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_BLACKBOX) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "los_blackbox_common.c", + "los_blackbox_core.c", + "los_blackbox_detector.c", + "los_blackbox_system_adapter.c", + ] + include_dirs = [ "$LITEOSTOPDIR/syscall" ] + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "." ] +} diff --git a/kernel/common/hidumper/BUILD.gn b/kernel/common/hidumper/BUILD.gn new file mode 100644 index 00000000..93f74119 --- /dev/null +++ b/kernel/common/hidumper/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_HIDUMPER) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ "los_hidumper.c" ] + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "." ] +} diff --git a/kernel/common/patchfs/BUILD.gn b/kernel/common/patchfs/BUILD.gn new file mode 100644 index 00000000..28d5e761 --- /dev/null +++ b/kernel/common/patchfs/BUILD.gn @@ -0,0 +1,44 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_PLATFORM_PATCHFS) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "los_partition_utils.c", + "los_patchfs.c", + ] + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "." ] +} diff --git a/kernel/common/rootfs/BUILD.gn b/kernel/common/rootfs/BUILD.gn new file mode 100644 index 00000000..e69ae93e --- /dev/null +++ b/kernel/common/rootfs/BUILD.gn @@ -0,0 +1,44 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_PLATFORM_ROOTFS) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "los_bootargs.c", + "los_rootfs.c", + ] + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "." ] +} diff --git a/kernel/common/Kconfig b/kernel/common/rootfs/Kconfig similarity index 100% rename from kernel/common/Kconfig rename to kernel/common/rootfs/Kconfig diff --git a/kernel/common/Makefile b/kernel/common/rootfs/Makefile similarity index 100% rename from kernel/common/Makefile rename to kernel/common/rootfs/Makefile diff --git a/kernel/common/los_bootargs.c b/kernel/common/rootfs/los_bootargs.c similarity index 100% rename from kernel/common/los_bootargs.c rename to kernel/common/rootfs/los_bootargs.c diff --git a/kernel/common/los_bootargs.h b/kernel/common/rootfs/los_bootargs.h similarity index 100% rename from kernel/common/los_bootargs.h rename to kernel/common/rootfs/los_bootargs.h diff --git a/kernel/common/los_rootfs.c b/kernel/common/rootfs/los_rootfs.c similarity index 100% rename from kernel/common/los_rootfs.c rename to kernel/common/rootfs/los_rootfs.c diff --git a/kernel/common/los_rootfs.h b/kernel/common/rootfs/los_rootfs.h similarity index 100% rename from kernel/common/los_rootfs.h rename to kernel/common/rootfs/los_rootfs.h diff --git a/kernel/extended/BUILD.gn b/kernel/extended/BUILD.gn new file mode 100644 index 00000000..d171bc1f --- /dev/null +++ b/kernel/extended/BUILD.gn @@ -0,0 +1,56 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +group("extended") { + deps = [ + "cppsupport", + "cpup", + "dynload", + "hilog", + "liteipc", + "pipes", + "power", + "trace", + "vdso", + ] +} + +config("public") { + configs = [ + "cpup:public", + "dynload:public", + "vdso:public", + "trace:public", + "liteipc:public", + "pipes:public", + "hilog:public", + ] +} diff --git a/kernel/extended/cppsupport/BUILD.gn b/kernel/extended/cppsupport/BUILD.gn new file mode 100644 index 00000000..d264cd20 --- /dev/null +++ b/kernel/extended/cppsupport/BUILD.gn @@ -0,0 +1,36 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_KERNEL_CPPSUPPORT) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ "los_cppsupport.c" ] +} diff --git a/kernel/extended/cpup/BUILD.gn b/kernel/extended/cpup/BUILD.gn new file mode 100644 index 00000000..2482774f --- /dev/null +++ b/kernel/extended/cpup/BUILD.gn @@ -0,0 +1,45 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_KERNEL_CPUP) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "cpup_shellcmd.c", + "los_cpup.c", + ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "." ] +} diff --git a/kernel/extended/include/los_cpup_pri.h b/kernel/extended/cpup/los_cpup_pri.h similarity index 100% rename from kernel/extended/include/los_cpup_pri.h rename to kernel/extended/cpup/los_cpup_pri.h diff --git a/kernel/extended/dynload/BUILD.gn b/kernel/extended/dynload/BUILD.gn new file mode 100644 index 00000000..110abc4c --- /dev/null +++ b/kernel/extended/dynload/BUILD.gn @@ -0,0 +1,45 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_KERNEL_DYNLOAD) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "src/los_exec_elf.c", + "src/los_load_elf.c", + ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/kernel/extended/hilog/BUILD.gn b/kernel/extended/hilog/BUILD.gn new file mode 100644 index 00000000..16e05fe9 --- /dev/null +++ b/kernel/extended/hilog/BUILD.gn @@ -0,0 +1,45 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_BASE_CORE_HILOG) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ "//base/hiviewdfx/hilog_lite/frameworks/featured/hiview_log.c" ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ + "//base/hiviewdfx/hilog_lite/interfaces/native/kits", + "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog", + ] +} diff --git a/kernel/extended/liteipc/BUILD.gn b/kernel/extended/liteipc/BUILD.gn new file mode 100644 index 00000000..5074fe3a --- /dev/null +++ b/kernel/extended/liteipc/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_KERNEL_LITEIPC) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ "hm_liteipc.c" ] + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "." ] +} diff --git a/kernel/extended/power/BUILD.gn b/kernel/extended/power/BUILD.gn new file mode 100644 index 00000000..d21ffda6 --- /dev/null +++ b/kernel/extended/power/BUILD.gn @@ -0,0 +1,36 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_KERNEL_PM) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ "los_pm.c" ] +} diff --git a/kernel/extended/trace/BUILD.gn b/kernel/extended/trace/BUILD.gn new file mode 100644 index 00000000..ac772b6e --- /dev/null +++ b/kernel/extended/trace/BUILD.gn @@ -0,0 +1,45 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_KERNEL_TRACE) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "los_trace.c", + "los_trace_frame.c", + ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "." ] +} diff --git a/kernel/extended/include/los_trace_pri.h b/kernel/extended/trace/los_trace_pri.h similarity index 100% rename from kernel/extended/include/los_trace_pri.h rename to kernel/extended/trace/los_trace_pri.h diff --git a/kernel/extended/vdso/BUILD.gn b/kernel/extended/vdso/BUILD.gn new file mode 100644 index 00000000..82062c17 --- /dev/null +++ b/kernel/extended/vdso/BUILD.gn @@ -0,0 +1,53 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_KERNEL_VDSO) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "src/los_vdso.c", + "src/los_vdso_text.S", + ] + + asmflags = [ "-DOHOS_VDSO_SO=\"OHOS-vdso.so\"" ] + deps = [ ":copy_ohos_vdso" ] + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} + +copy("copy_ohos_vdso") { + deps = [ "usr:OHOS-vdso" ] + sources = [ "$root_out_dir/libOHOS-vdso.so" ] + outputs = [ "$root_out_dir/OHOS-vdso.so" ] +} diff --git a/kernel/extended/vdso/src/Makefile b/kernel/extended/vdso/src/Makefile index 90e2c714..f5de37ee 100644 --- a/kernel/extended/vdso/src/Makefile +++ b/kernel/extended/vdso/src/Makefile @@ -35,6 +35,6 @@ LOCAL_SRCS := $(wildcard *.c) $(wildcard *.S) LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/kernel/base/include -I $(LITEOSTOPDIR)/kernel/extended/include -I $(LITEOSTOPDIR)/kernel/extended/vdso/include -LOCAL_FLAGS := $(LOCAL_INCLUDE) +LOCAL_FLAGS := $(LOCAL_INCLUDE) -DOHOS_VDSO_SO=\"../usr/OHOS-vdso.so\" include $(MODULE) \ No newline at end of file diff --git a/kernel/extended/vdso/src/los_vdso_text.S b/kernel/extended/vdso/src/los_vdso_text.S index fcf8224e..c8e1f268 100644 --- a/kernel/extended/vdso/src/los_vdso_text.S +++ b/kernel/extended/vdso/src/los_vdso_text.S @@ -31,4 +31,4 @@ .globl __vdso_text_start .section .data.vdso.text __vdso_text_start: - .incbin "../usr/OHOS-vdso.so" \ No newline at end of file + .incbin OHOS_VDSO_SO \ No newline at end of file diff --git a/kernel/extended/vdso/usr/BUILD.gn b/kernel/extended/vdso/usr/BUILD.gn new file mode 100644 index 00000000..db79bb3a --- /dev/null +++ b/kernel/extended/vdso/usr/BUILD.gn @@ -0,0 +1,54 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +shared_library("OHOS-vdso") { + sources = [ "los_vdso_sys.c" ] + + include_dirs = [ + "$LITEOSTOPDIR/kernel/extended/vdso/include", + "$LITEOSTOPDIR/kernel/include", + "$LITEOSTOPDIR/platform", + "$LITEOSTOPDIR/bsd/compat/linuxkpi/include", + ] + + cflags = [ + "-nostdlib", + "-fPIC", + "-fno-common", + "-fno-strict-aliasing", + ] + + ldflags = [ + "-s", + "-Bsymbolic", + "-Tlos_vdso.ld", + ] +} diff --git a/kernel/extended/vdso/usr/Makefile b/kernel/extended/vdso/usr/Makefile index dde4d96d..68819e19 100644 --- a/kernel/extended/vdso/usr/Makefile +++ b/kernel/extended/vdso/usr/Makefile @@ -34,7 +34,7 @@ VDSO_SO = OHOS-vdso VDSO_SRCS := los_vdso_sys.c VDSO_INCLUDE := -I $(LITEOSTOPDIR)/kernel/extended/vdso/include \ -I $(LITEOSTOPDIR)/kernel/include \ - -I $(LITEOSTOPDIR)/kernel/common \ + -I $(LITEOSTOPDIR)/platform \ -I $(LITEOSTOPDIR)/bsd/compat/linuxkpi/include VDSO_CCFLAGS := -nostdlib -fPIC -fno-common -fno-strict-aliasing \ diff --git a/kernel/user/BUILD.gn b/kernel/user/BUILD.gn new file mode 100644 index 00000000..42efa259 --- /dev/null +++ b/kernel/user/BUILD.gn @@ -0,0 +1,57 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_name = "userinit" +shared_library(module_name) { + sources = [ "src/los_user_init.c" ] + + include_dirs = [ + "include", + "$LITEOSTOPDIR/syscall", + ] + + configs = [] + configs += [ + "$LITEOSTOPDIR:public", + "$LITEOSTOPDIR:los_config", + ] + + ldflags = [ + "-static", + "-r", + ] + + output_extension = "O" +} + +group("user") { + public_deps = [ ":$module_name" ] +} diff --git a/lib/BUILD.gn b/lib/BUILD.gn new file mode 100644 index 00000000..03142ff2 --- /dev/null +++ b/lib/BUILD.gn @@ -0,0 +1,50 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +group("lib") { + deps = [ + "libc", + "libmbedtls", + "libscrew", + "libsec", + "zlib", + ] +} + +config("public") { + configs = [ + "libc:public", + "libmbedtls:public", + "libscrew:public", + "libsec:public", + "zlib:public", + ] +} diff --git a/lib/libc/BUILD.gn b/lib/libc/BUILD.gn new file mode 100644 index 00000000..d7087821 --- /dev/null +++ b/lib/libc/BUILD.gn @@ -0,0 +1,92 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +MUSLDIR = "$LITEOSTHIRDPARTY/musl" +OPTRTDIR = "$LITEOSTHIRDPARTY/optimized-routines" + +import("$MUSLDIR/porting/liteos_a/kernel/musl.gni") + +module_switch = defined(LOSCFG_LIB_LIBC) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = MUSL_SRC_COMMON + + if (defined(LOSCFG_ARCH_ARM_AARCH32)) { + sources += MUSL_SRC_ARM + foreach(f, MUSL_SRC_ARM) { + sources -= [ string_replace(f, "/arm/", "/") ] + } + } + + if (LOSCFG_ARCH_ARM_VER == "armv7-a") { + sources -= [ + "$MUSLPORTINGDIR/src/string/memchr.c", + "$MUSLPORTINGDIR/src/string/memcpy.c", + "$MUSLPORTINGDIR/src/string/strcmp.c", + "$MUSLPORTINGDIR/src/string/strcpy.c", + "$MUSLPORTINGDIR/src/string/strlen.c", + ] + sources += [ + "$OPTRTDIR/string/arm/memchr.S", + "$OPTRTDIR/string/arm/memcpy.S", + "$OPTRTDIR/string/arm/strcmp.S", + "$OPTRTDIR/string/arm/strcpy.c", + "$OPTRTDIR/string/arm/strlen-armv6t2.S", + ] + } + + public_configs = [ ":public" ] + configs += [ ":private" ] +} + +config("public") { + include_dirs = [ "$MUSLPORTINGDIR/include" ] +} + +config("private") { + if (defined(LOSCFG_COMPILER_CLANG_LLVM)) { + cflags = [ + "-Wno-char-subscripts", + "-Wno-unknown-pragmas", + ] + } else { + cflags = [ + "-frounding-math", + "-Wno-unused-but-set-variable", + "-Wno-unknown-pragmas", + ] + } + + include_dirs = [ + "$MUSLPORTINGDIR/src/include", + "$MUSLPORTINGDIR/src/internal", + ] +} diff --git a/lib/libmbedtls/BUILD.gn b/lib/libmbedtls/BUILD.gn new file mode 100644 index 00000000..d9aa20af --- /dev/null +++ b/lib/libmbedtls/BUILD.gn @@ -0,0 +1,122 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_DRIVERS_TZDRIVER) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "$LITEOSTHIRDPARTY/mbedtls/library/aes.c", + "$LITEOSTHIRDPARTY/mbedtls/library/aesni.c", + "$LITEOSTHIRDPARTY/mbedtls/library/arc4.c", + "$LITEOSTHIRDPARTY/mbedtls/library/aria.c", + "$LITEOSTHIRDPARTY/mbedtls/library/asn1parse.c", + "$LITEOSTHIRDPARTY/mbedtls/library/asn1write.c", + "$LITEOSTHIRDPARTY/mbedtls/library/base64.c", + "$LITEOSTHIRDPARTY/mbedtls/library/bignum.c", + "$LITEOSTHIRDPARTY/mbedtls/library/blowfish.c", + "$LITEOSTHIRDPARTY/mbedtls/library/camellia.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ccm.c", + "$LITEOSTHIRDPARTY/mbedtls/library/certs.c", + "$LITEOSTHIRDPARTY/mbedtls/library/chacha20.c", + "$LITEOSTHIRDPARTY/mbedtls/library/chachapoly.c", + "$LITEOSTHIRDPARTY/mbedtls/library/cipher.c", + "$LITEOSTHIRDPARTY/mbedtls/library/cipher_wrap.c", + "$LITEOSTHIRDPARTY/mbedtls/library/cmac.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ctr_drbg.c", + "$LITEOSTHIRDPARTY/mbedtls/library/debug.c", + "$LITEOSTHIRDPARTY/mbedtls/library/des.c", + "$LITEOSTHIRDPARTY/mbedtls/library/dhm.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ecdh.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ecdsa.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ecjpake.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ecp.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ecp_curves.c", + "$LITEOSTHIRDPARTY/mbedtls/library/entropy.c", + "$LITEOSTHIRDPARTY/mbedtls/library/entropy_poll.c", + "$LITEOSTHIRDPARTY/mbedtls/library/error.c", + "$LITEOSTHIRDPARTY/mbedtls/library/gcm.c", + "$LITEOSTHIRDPARTY/mbedtls/library/havege.c", + "$LITEOSTHIRDPARTY/mbedtls/library/hkdf.c", + "$LITEOSTHIRDPARTY/mbedtls/library/hmac_drbg.c", + "$LITEOSTHIRDPARTY/mbedtls/library/md.c", + "$LITEOSTHIRDPARTY/mbedtls/library/md2.c", + "$LITEOSTHIRDPARTY/mbedtls/library/md4.c", + "$LITEOSTHIRDPARTY/mbedtls/library/md5.c", + "$LITEOSTHIRDPARTY/mbedtls/library/md_wrap.c", + "$LITEOSTHIRDPARTY/mbedtls/library/memory_buffer_alloc.c", + "$LITEOSTHIRDPARTY/mbedtls/library/net_sockets.c", + "$LITEOSTHIRDPARTY/mbedtls/library/nist_kw.c", + "$LITEOSTHIRDPARTY/mbedtls/library/oid.c", + "$LITEOSTHIRDPARTY/mbedtls/library/padlock.c", + "$LITEOSTHIRDPARTY/mbedtls/library/pem.c", + "$LITEOSTHIRDPARTY/mbedtls/library/pk.c", + "$LITEOSTHIRDPARTY/mbedtls/library/pk_wrap.c", + "$LITEOSTHIRDPARTY/mbedtls/library/pkcs11.c", + "$LITEOSTHIRDPARTY/mbedtls/library/pkcs12.c", + "$LITEOSTHIRDPARTY/mbedtls/library/pkcs5.c", + "$LITEOSTHIRDPARTY/mbedtls/library/pkparse.c", + "$LITEOSTHIRDPARTY/mbedtls/library/pkwrite.c", + "$LITEOSTHIRDPARTY/mbedtls/library/platform.c", + "$LITEOSTHIRDPARTY/mbedtls/library/platform_util.c", + "$LITEOSTHIRDPARTY/mbedtls/library/poly1305.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ripemd160.c", + "$LITEOSTHIRDPARTY/mbedtls/library/rsa.c", + "$LITEOSTHIRDPARTY/mbedtls/library/rsa_internal.c", + "$LITEOSTHIRDPARTY/mbedtls/library/sha1.c", + "$LITEOSTHIRDPARTY/mbedtls/library/sha256.c", + "$LITEOSTHIRDPARTY/mbedtls/library/sha512.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ssl_cache.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ssl_ciphersuites.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ssl_cli.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ssl_cookie.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ssl_srv.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ssl_ticket.c", + "$LITEOSTHIRDPARTY/mbedtls/library/ssl_tls.c", + "$LITEOSTHIRDPARTY/mbedtls/library/threading.c", + "$LITEOSTHIRDPARTY/mbedtls/library/timing.c", + "$LITEOSTHIRDPARTY/mbedtls/library/version.c", + "$LITEOSTHIRDPARTY/mbedtls/library/version_features.c", + "$LITEOSTHIRDPARTY/mbedtls/library/x509.c", + "$LITEOSTHIRDPARTY/mbedtls/library/x509_create.c", + "$LITEOSTHIRDPARTY/mbedtls/library/x509_crl.c", + "$LITEOSTHIRDPARTY/mbedtls/library/x509_crt.c", + "$LITEOSTHIRDPARTY/mbedtls/library/x509_csr.c", + "$LITEOSTHIRDPARTY/mbedtls/library/x509write_crt.c", + "$LITEOSTHIRDPARTY/mbedtls/library/x509write_csr.c", + "$LITEOSTHIRDPARTY/mbedtls/library/xtea.c", + ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "$LITEOSTHIRDPARTY/mbedtls/include" ] +} diff --git a/lib/libscrew/BUILD.gn b/lib/libscrew/BUILD.gn new file mode 100644 index 00000000..87b4cae6 --- /dev/null +++ b/lib/libscrew/BUILD.gn @@ -0,0 +1,46 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "src/los_crc32.c", + "src/los_rbtree.c", + ] + + sources += [ "$LITEOSTHIRDPARTY/FreeBSD/sys/libkern/crc32.c" ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/lib/libsec/BUILD.gn b/lib/libsec/BUILD.gn new file mode 100644 index 00000000..f93a7652 --- /dev/null +++ b/lib/libsec/BUILD.gn @@ -0,0 +1,83 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_LIB_LIBC) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "$LITEOSTHIRDPARTY/bounds_checking_function/src/fscanf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/fwscanf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/gets_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/memcpy_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/memmove_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/memset_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/scanf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/securecutil.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/secureinput_a.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/secureinput_w.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/secureprintoutput_a.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/secureprintoutput_w.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/snprintf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/sprintf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/sscanf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/strcat_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/strcpy_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/strncat_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/strncpy_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/strtok_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/swprintf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/swscanf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/vfscanf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/vfwscanf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/vscanf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/vsnprintf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/vsprintf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/vsscanf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/vswprintf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/vswscanf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/vwscanf_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/wcscat_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/wcscpy_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/wcsncat_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/wcsncpy_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/wcstok_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/wmemcpy_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/wmemmove_s.c", + "$LITEOSTHIRDPARTY/bounds_checking_function/src/wscanf_s.c", + ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "$LITEOSTHIRDPARTY/bounds_checking_function/include" ] + defines = [ "SECUREC_IN_KERNEL=0" ] +} diff --git a/lib/zlib/BUILD.gn b/lib/zlib/BUILD.gn new file mode 100644 index 00000000..5b75164e --- /dev/null +++ b/lib/zlib/BUILD.gn @@ -0,0 +1,62 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_LIB_ZLIB) +module_name = "z" +kernel_module(module_name) { + sources = [ + "$LITEOSTHIRDPARTY/zlib/adler32.c", + "$LITEOSTHIRDPARTY/zlib/compress.c", + "$LITEOSTHIRDPARTY/zlib/crc32.c", + "$LITEOSTHIRDPARTY/zlib/deflate.c", + "$LITEOSTHIRDPARTY/zlib/gzclose.c", + "$LITEOSTHIRDPARTY/zlib/gzlib.c", + "$LITEOSTHIRDPARTY/zlib/gzread.c", + "$LITEOSTHIRDPARTY/zlib/gzwrite.c", + "$LITEOSTHIRDPARTY/zlib/infback.c", + "$LITEOSTHIRDPARTY/zlib/inffast.c", + "$LITEOSTHIRDPARTY/zlib/inflate.c", + "$LITEOSTHIRDPARTY/zlib/inftrees.c", + "$LITEOSTHIRDPARTY/zlib/trees.c", + "$LITEOSTHIRDPARTY/zlib/uncompr.c", + "$LITEOSTHIRDPARTY/zlib/zutil.c", + ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "$LITEOSTHIRDPARTY/zlib" ] +} + +group("zlib") { + public_deps = [ ":$module_name" ] +} diff --git a/liteos.gni b/liteos.gni new file mode 100644 index 00000000..5e2e723c --- /dev/null +++ b/liteos.gni @@ -0,0 +1,63 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("$root_out_dir/config.gni") + +LITEOSTOPDIR = "//kernel/liteos_a" +LITEOSTHIRDPARTY = "//third_party" +HDFTOPDIR = "//drivers/adapter/khdf/liteos" + +template("kernel_module") { + if (defined(invoker.module_switch) && !invoker.module_switch) { + group(target_name) { + not_needed(invoker, "*") + } + } else { + static_library(target_name) { + forward_variables_from(invoker, "*") + } + } +} + +template("config") { + config(target_name) { + if (defined(invoker.module_switch) && !invoker.module_switch && target_name == "public") { + not_needed(invoker, "*") + } else { + forward_variables_from(invoker, "*") + } + } +} + +set_defaults("kernel_module") { + configs = [ + "$LITEOSTOPDIR:public", + "$LITEOSTOPDIR:los_config", + ] +} diff --git a/net/BUILD.gn b/net/BUILD.gn new file mode 100644 index 00000000..9dcb78a2 --- /dev/null +++ b/net/BUILD.gn @@ -0,0 +1,44 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +group("net") { + deps = [ + "lwip-2.1", + "telnet", + ] +} + +config("public") { + configs = [ + "lwip-2.1:public", + "telnet:public", + ] +} diff --git a/net/lwip-2.1/BUILD.gn b/net/lwip-2.1/BUILD.gn new file mode 100644 index 00000000..f4009b22 --- /dev/null +++ b/net/lwip-2.1/BUILD.gn @@ -0,0 +1,63 @@ +# Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") +import("$LITEOSTHIRDPARTY/lwip/lwip.gni") +import("lwip_porting.gni") + +module_switch = defined(LOSCFG_NET_LWIP_SACK_2_1) +module_name = "lwip" +kernel_module(module_name) { + include_dirs = [ "$LWIP_PORTING_DIR/enhancement/include" ] + + sources = LWIP_PORTING_FILES + LWIPNOAPPSFILES + + sources -= [ + "$LWIPDIR/api/sockets.c", + "$LWIPDIR/core/ipv4/dhcp.c", + "$LWIPDIR/core/ipv4/etharp.c", + ] + + public_configs = [ ":public" ] + + defines = [ + "__LWIP__", + "LWIP_NOASSERT", + "_BSD_SOURCE=1", + ] +} + +config("public") { + include_dirs = [ "../mac" ] + include_dirs += LWIP_PORTING_INCLUDE_DIRS + include_dirs += LWIP_INCLUDE_DIRS +} + +group("lwip-2.1") { + public_deps = [ ":$module_name" ] +} diff --git a/net/lwip-2.1/lwip_porting.gni b/net/lwip-2.1/lwip_porting.gni new file mode 100644 index 00000000..1f373670 --- /dev/null +++ b/net/lwip-2.1/lwip_porting.gni @@ -0,0 +1,40 @@ +# Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +LWIP_PORTING_DIR = get_path_info(".", "abspath") + +LWIP_PORTING_INCLUDE_DIRS = [ "$LWIP_PORTING_DIR/porting/include" ] + +LWIP_PORTING_FILES = [ + "$LWIP_PORTING_DIR/porting/src/driverif.c", + "$LWIP_PORTING_DIR/porting/src/sockets.c", + "$LWIP_PORTING_DIR/porting/src/sys_arch.c", + "$LWIP_PORTING_DIR/enhancement/src/api_shell.c", + "$LWIP_PORTING_DIR/enhancement/src/fixme.c", + "$LWIP_PORTING_DIR/enhancement/src/dhcps.c", +] diff --git a/net/telnet/BUILD.gn b/net/telnet/BUILD.gn new file mode 100644 index 00000000..0601c60a --- /dev/null +++ b/net/telnet/BUILD.gn @@ -0,0 +1,45 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_NET_TELNET) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "src/telnet_dev.c", + "src/telnet_loop.c", + ] + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "include" ] +} diff --git a/platform/BUILD.gn b/platform/BUILD.gn new file mode 100644 index 00000000..13c15ef1 --- /dev/null +++ b/platform/BUILD.gn @@ -0,0 +1,101 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +cmd = "if [ -f " + rebase_path("//$LOSCFG_BOARD_CONFIG_PATH/BUILD.gn") + " ]; then echo true; else echo false; fi" +HAVE_BOARD_CONFIG = exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value") + +module_name = "bsp" +kernel_module(module_name) { + sources = [ "main.c" ] + + sources += [ + "hwi_shell.c", + "los_cir_buf.c", + "los_config.c", + "los_excinfo.c", + "los_init.c", + "los_magickey.c", + "los_printf.c", + "los_seq_buf.c", + ] + + if (defined(LOSCFG_FS_VFS)) { + sources += [ + "console.c", + "virtual_serial.c", + ] + } + + if (defined(LOSCFG_BASE_CORE_HILOG)) { + sources += [ "los_hilog.c" ] + } + + public_configs = [ ":public" ] +} + +group("platform") { + public_deps = [ ":$module_name" ] + deps = [ ":board.ld" ] + if (HAVE_BOARD_CONFIG) { + deps += [ "//$LOSCFG_BOARD_CONFIG_PATH" ] + } +} + +config("public") { + include_dirs = [ + ".", + ] + if (HAVE_BOARD_CONFIG) { + configs = [ "//$LOSCFG_BOARD_CONFIG_PATH:public" ] + } +} + +source_set("board") { + sources = [ "board.ld.S" ] + + configs = [] + configs += [ + "$LITEOSTOPDIR:los_config", + "$LITEOSTOPDIR/kernel/base:public", + ":public", + ] + + asmflags = [ + "-P", + "-E", + ] +} + +copy("board.ld") { + deps = [ ":board" ] + sources = [ "$target_out_dir/board.board.ld.o" ] + outputs = [ "$root_out_dir/board.ld" ] +} diff --git a/platform/Makefile b/platform/Makefile index 27934023..94f9dd24 100644 --- a/platform/Makefile +++ b/platform/Makefile @@ -36,13 +36,12 @@ LOCAL_SRCS = $(wildcard ./main.c) LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/compat/posix/src \ -I $(LITEOSTOPDIR)/bsd/dev/random -LOCAL_SRCS += $(wildcard ../kernel/common/*.c) -LOCAL_SRCS := $(filter-out ../kernel/common/los_rootfs.c ../kernel/common/los_bootargs.c, $(LOCAL_SRCS)) +LOCAL_SRCS += $(wildcard *.c) ifneq ($(LOSCFG_FS_VFS), y) -LOCAL_SRCS := $(filter-out ../kernel/common/console.c ../kernel/common/virtual_serial.c, $(LOCAL_SRCS)) +LOCAL_SRCS := $(filter-out console.c virtual_serial.c, $(LOCAL_SRCS)) endif ifneq ($(LOSCFG_BASE_CORE_HILOG), y) -LOCAL_SRCS := $(filter-out ../kernel/common/los_hilog.c, $(LOCAL_SRCS)) +LOCAL_SRCS := $(filter-out los_hilog.c, $(LOCAL_SRCS)) endif ifeq ($(LOSCFG_KERNEL_TICKLESS), y) diff --git a/platform/bsp.mk b/platform/bsp.mk index c937f81a..0d1fe022 100644 --- a/platform/bsp.mk +++ b/platform/bsp.mk @@ -49,7 +49,8 @@ PLATFORM_BSP_BASE := $(LITEOSTOPDIR)/platform PLATFORM_INCLUDE := -I $(LITEOSTOPDIR)/../../$(LOSCFG_BOARD_CONFIG_PATH) \ -I $(LITEOSTOPDIR)/../../$(LOSCFG_BOARD_CONFIG_PATH)/include \ - -I $(PLATFORM_BSP_BASE)/../kernel/common \ + -I $(PLATFORM_BSP_BASE)/../kernel/common/rootfs \ + -I $(PLATFORM_BSP_BASE) \ -I $(PLATFORM_BSP_BASE)/../../../drivers/liteos/platform/pm \ -I $(PLATFORM_BSP_BASE)/hw/include \ -I $(PLATFORM_BSP_BASE)/include diff --git a/kernel/common/console.c b/platform/console.c similarity index 100% rename from kernel/common/console.c rename to platform/console.c diff --git a/kernel/common/console.h b/platform/console.h similarity index 100% rename from kernel/common/console.h rename to platform/console.h diff --git a/kernel/common/hwi_shell.c b/platform/hwi_shell.c similarity index 100% rename from kernel/common/hwi_shell.c rename to platform/hwi_shell.c diff --git a/kernel/common/los_builddef.h b/platform/los_builddef.h similarity index 100% rename from kernel/common/los_builddef.h rename to platform/los_builddef.h diff --git a/kernel/common/los_cir_buf.c b/platform/los_cir_buf.c similarity index 100% rename from kernel/common/los_cir_buf.c rename to platform/los_cir_buf.c diff --git a/kernel/common/los_cir_buf_pri.h b/platform/los_cir_buf_pri.h similarity index 100% rename from kernel/common/los_cir_buf_pri.h rename to platform/los_cir_buf_pri.h diff --git a/kernel/common/los_config.c b/platform/los_config.c similarity index 100% rename from kernel/common/los_config.c rename to platform/los_config.c diff --git a/kernel/common/los_config.h b/platform/los_config.h similarity index 99% rename from kernel/common/los_config.h rename to platform/los_config.h index 3ce31935..36c3c4d5 100644 --- a/kernel/common/los_config.h +++ b/platform/los_config.h @@ -115,7 +115,7 @@ extern UINT32 __heap_end; * @ingroup los_config * External configuration item for timer tailoring */ -#ifndef LOSCFG_BASE_CORE_TICK_HW_TIME +#if defined(LOSCFG_BASE_CORE_TICK_HW_TIME) && (LOSCFG_BASE_CORE_TICK_HW_TIME == 0) #undef LOSCFG_BASE_CORE_TICK_HW_TIME #endif /****************************** Hardware interrupt module configuration ******************************/ diff --git a/kernel/common/los_excinfo.c b/platform/los_excinfo.c similarity index 100% rename from kernel/common/los_excinfo.c rename to platform/los_excinfo.c diff --git a/kernel/common/los_excinfo_pri.h b/platform/los_excinfo_pri.h similarity index 100% rename from kernel/common/los_excinfo_pri.h rename to platform/los_excinfo_pri.h diff --git a/kernel/common/los_hilog.c b/platform/los_hilog.c similarity index 100% rename from kernel/common/los_hilog.c rename to platform/los_hilog.c diff --git a/kernel/common/los_hilog.h b/platform/los_hilog.h similarity index 100% rename from kernel/common/los_hilog.h rename to platform/los_hilog.h diff --git a/kernel/common/los_init.c b/platform/los_init.c similarity index 100% rename from kernel/common/los_init.c rename to platform/los_init.c diff --git a/kernel/common/los_init.h b/platform/los_init.h similarity index 100% rename from kernel/common/los_init.h rename to platform/los_init.h diff --git a/kernel/common/los_init_info.h b/platform/los_init_info.h similarity index 100% rename from kernel/common/los_init_info.h rename to platform/los_init_info.h diff --git a/kernel/common/los_init_pri.h b/platform/los_init_pri.h similarity index 100% rename from kernel/common/los_init_pri.h rename to platform/los_init_pri.h diff --git a/kernel/common/los_magickey.c b/platform/los_magickey.c similarity index 100% rename from kernel/common/los_magickey.c rename to platform/los_magickey.c diff --git a/kernel/common/los_magickey.h b/platform/los_magickey.h similarity index 100% rename from kernel/common/los_magickey.h rename to platform/los_magickey.h diff --git a/kernel/common/los_printf.c b/platform/los_printf.c similarity index 100% rename from kernel/common/los_printf.c rename to platform/los_printf.c diff --git a/kernel/common/los_seq_buf.c b/platform/los_seq_buf.c similarity index 100% rename from kernel/common/los_seq_buf.c rename to platform/los_seq_buf.c diff --git a/kernel/common/los_seq_buf.h b/platform/los_seq_buf.h similarity index 100% rename from kernel/common/los_seq_buf.h rename to platform/los_seq_buf.h diff --git a/kernel/common/los_timer_pri.h b/platform/los_timer_pri.h similarity index 100% rename from kernel/common/los_timer_pri.h rename to platform/los_timer_pri.h diff --git a/kernel/common/sys_config.h b/platform/sys_config.h similarity index 100% rename from kernel/common/sys_config.h rename to platform/sys_config.h diff --git a/kernel/common/virtual_serial.c b/platform/virtual_serial.c similarity index 100% rename from kernel/common/virtual_serial.c rename to platform/virtual_serial.c diff --git a/kernel/common/virtual_serial.h b/platform/virtual_serial.h similarity index 100% rename from kernel/common/virtual_serial.h rename to platform/virtual_serial.h diff --git a/security/BUILD.gn b/security/BUILD.gn new file mode 100644 index 00000000..1a7f6f3f --- /dev/null +++ b/security/BUILD.gn @@ -0,0 +1,44 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +group("security") { + deps = [ + "cap", + "vid", + ] +} + +config("public") { + configs = [ + "cap:public", + "vid:public", + ] +} diff --git a/security/cap/BUILD.gn b/security/cap/BUILD.gn new file mode 100644 index 00000000..a4e95342 --- /dev/null +++ b/security/cap/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_SECURITY_CAPABILITY) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ "capability.c" ] + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "." ] +} diff --git a/security/vid/BUILD.gn b/security/vid/BUILD.gn new file mode 100644 index 00000000..7b53edc7 --- /dev/null +++ b/security/vid/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_SECURITY_VID) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ "vid.c" ] + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "." ] +} diff --git a/shell/BUILD.gn b/shell/BUILD.gn index 6e8dc0bb..c3b8e522 100644 --- a/shell/BUILD.gn +++ b/shell/BUILD.gn @@ -25,19 +25,28 @@ # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/lite/config/component/lite_component.gni") +import("//kernel/liteos_a/liteos.gni") -lite_component("shell") { - version = "1.0.0" - dependences = [ - "fs:^1.0.0", - "kernel:^1.0.0", +module_switch = defined(LOSCFG_SHELL) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "full/src/base/shcmd.c", + "full/src/base/shcmdparse.c", + "full/src/base/shell_lk.c", + "full/src/base/shmsg.c", + "full/src/base/show.c", + "full/src/cmds/date_shell.c", + "full/src/cmds/dmesg.c", + "full/src/cmds/shell_shellcmd.c", + "full/src/cmds/watch_shell.c", ] - features = [] - if (LOSCFG_SHELL) { - features += [ "full:shell_full" ] - } + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = [ "full/include" ] } diff --git a/syscall/BUILD.gn b/syscall/BUILD.gn new file mode 100644 index 00000000..b3f2b3e9 --- /dev/null +++ b/syscall/BUILD.gn @@ -0,0 +1,46 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +module_switch = defined(LOSCFG_KERNEL_SYSCALL) +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = [ + "fs_syscall.c", + "ipc_syscall.c", + "los_syscall.c", + "misc_syscall.c", + "net_syscall.c", + "process_syscall.c", + "syscall_pub.c", + "time_syscall.c", + "vm_syscall.c", + ] +} diff --git a/testsuites/BUILD.gn b/testsuites/BUILD.gn new file mode 100644 index 00000000..17bddbfe --- /dev/null +++ b/testsuites/BUILD.gn @@ -0,0 +1,37 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_a/liteos.gni") + +group("testsuites") { + deps = [ + #"kernel", + "unittest", + ] +} diff --git a/tools/build/mk/los_config.mk b/tools/build/mk/los_config.mk index b332f723..840f64b2 100644 --- a/tools/build/mk/los_config.mk +++ b/tools/build/mk/los_config.mk @@ -27,7 +27,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --include $(LITEOSTOPDIR)/.config +CONFIG_FILE ?= $(LITEOSTOPDIR)/.config +-include $(CONFIG_FILE) ifeq ($(LOSCFG_COMPILER_HIMIX_32), y) CROSS_COMPILE := arm-linux-ohoseabi- else ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y) @@ -121,8 +122,8 @@ CXX_PATH = $(LITEOSTOPDIR)/lib/cxxstl JFFS_PATH = $(LITEOSTOPDIR)/fs/jffs2 LITEOS_SCRIPTPATH ?= $(LITEOSTOPDIR)/tools/scripts LITEOS_LIB_BIGODIR = $(OUT)/lib/obj -LITEOS_MENUCONFIG_H = $(LITEOSTOPDIR)/config.h -LOSCFG_ENTRY_SRC = $(LITEOSTOPDIR)/kernel/common/los_config.c +LITEOS_MENUCONFIG_H ?= $(LITEOSTOPDIR)/config.h +LOSCFG_ENTRY_SRC = $(LITEOSTOPDIR)/platform/los_config.c ### include variable MODULE = $(MK_PATH)/module.mk @@ -158,7 +159,7 @@ include $(LITEOSTOPDIR)/platform/bsp.mk ifeq ($(LOSCFG_PLATFORM_ROOTFS), y) LITEOS_BASELIB += -lrootfs - LIB_SUBDIRS += $(LITEOSTOPDIR)/kernel/common + LIB_SUBDIRS += $(LITEOSTOPDIR)/kernel/common/rootfs endif ifeq ($(LOSCFG_PLATFORM_PATCHFS), y) @@ -703,7 +704,8 @@ endif # temporary LITEOS_PLATFORM_INCLUDE += \ -I $(LITEOSTOPDIR)/kernel/base/include \ - -I $(LITEOSTOPDIR)/kernel/extended/include + -I $(LITEOSTOPDIR)/kernel/extended/cpup \ + -I $(LITEOSTOPDIR)/kernel/extended/trace LITEOS_CXXINCLUDE += \ $(LITEOS_NET_INCLUDE) \ From 8f6a1dd33c59164070e8d2fb5abbd3e76ef8ac8e Mon Sep 17 00:00:00 2001 From: pcwlno1 Date: Thu, 22 Jul 2021 09:29:03 +0800 Subject: [PATCH 40/43] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9F=90?= =?UTF-8?q?=E4=BA=9B=E5=B9=B3=E5=8F=B0=E4=BF=9D=E5=AD=98bbox=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、在日志写如完成之后执行fsync确保落盘。 Close #I41UTP Signed-off-by: qidechun --- kernel/common/blackbox/los_blackbox_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/common/blackbox/los_blackbox_common.c b/kernel/common/blackbox/los_blackbox_common.c index c7ae0795..813ab8d9 100644 --- a/kernel/common/blackbox/los_blackbox_common.c +++ b/kernel/common/blackbox/los_blackbox_common.c @@ -78,6 +78,7 @@ int FullWriteFile(const char *filePath, const char *buf, size_t bufSize, int isA totalToWrite -= writeThisTime; totalWrite += writeThisTime; } + (void)fsync(fd); (void)close(fd); return (totalWrite == (int)bufSize) ? 0 : -1; @@ -124,4 +125,4 @@ bool IsLogPartReady(void) { return TRUE; } -#endif \ No newline at end of file +#endif From 3b5268f02a6fbc5f356c36cb69808a83aace111d Mon Sep 17 00:00:00 2001 From: Caoruihong Date: Thu, 22 Jul 2021 18:52:24 +0800 Subject: [PATCH 41/43] chore: output liteos binaries to target_out_dir liteos binaries no need pack to rootfs. Signed-off-by: Caoruihong Change-Id: Iba650c9d09302902c108760163eca55b4ec40221 --- BUILD.gn | 32 ++++++++++++++++++++++--------- kernel/BUILD.gn | 1 + kernel/extended/vdso/BUILD.gn | 2 +- kernel/extended/vdso/usr/BUILD.gn | 16 ++++++++++++---- kernel/user/BUILD.gn | 10 ++++++++-- 5 files changed, 45 insertions(+), 16 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 93965953..f0ab922f 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -160,7 +160,15 @@ config("public") { ] } -config("los_config") { +config("los_nostdinc") { + cflags = [ "-nostdinc" ] +} + +config("los_nostdlib") { + ldflags = [ "-nostdlib" ] +} + +config("los_common") { cflags = [ "-imacros", "$LITEOS_MENUCONFIG_H", @@ -168,16 +176,11 @@ config("los_config") { defines = [ "__LITEOS__" ] - configs = [ ":arch_config" ] - - ldflags = [ "-nostdlib" ] - cflags_c = [ "-std=c99" ] cflags += [ "-fno-pic", "-fno-builtin", - "-nostdinc", "-Wall", "-Werror", "-fms-extensions", @@ -250,6 +253,15 @@ config("los_config") { asmflags = cflags } +config("los_config") { + configs = [ + ":los_common", + ":arch_config", + ":los_nostdinc", + ":los_nostdlib", + ] +} + liteos_name = "liteos2" liteos_out = rebase_path("$target_out_dir/$liteos_name") executable(liteos_name) { @@ -267,12 +279,14 @@ executable(liteos_name) { libgcc = exec_script("//build/lite/run_shell_cmd.py", [ "$cc -print-libgcc-file-name" ], "trim string") libs = [ libgcc ] if (defined(LOSCFG_COMPILER_CLANG_LLVM)) { - libs += [ "tools/build/liteos_llvm.ld" ] + ldflags += [ "-Wl,-T" + rebase_path("tools/build/liteos_llvm.ld", root_build_dir) ] } else { - libs += [ "tools/build/liteos.ld" ] + ldflags += [ "-Wl,-T" + rebase_path("tools/build/liteos.ld", root_build_dir) ] ldflags += [ "-nostartfiles" ] } + output_dir = target_out_dir + deps = [ ":modules", ] @@ -285,7 +299,7 @@ build_ext_component("build_liteos_bin") { objcopy = "${compile_prefix}objcopy$toolchain_cmd_suffix" objdump = "${compile_prefix}objdump$toolchain_cmd_suffix" - liteos = rebase_path("$root_out_dir/unstripped/bin/$liteos_name") + liteos = rebase_path("$target_out_dir/unstripped/bin/$liteos_name") command = "$objcopy -O binary $liteos $liteos_out.bin" command += " && sh -c '$objdump -t $liteos | sort >$liteos_out.sym.sorted'" diff --git a/kernel/BUILD.gn b/kernel/BUILD.gn index 504db26b..e0a1da6d 100644 --- a/kernel/BUILD.gn +++ b/kernel/BUILD.gn @@ -44,5 +44,6 @@ config("public") { "base:public", "common:public", "extended:public", + "user:public", ] } diff --git a/kernel/extended/vdso/BUILD.gn b/kernel/extended/vdso/BUILD.gn index 82062c17..fd7608f5 100644 --- a/kernel/extended/vdso/BUILD.gn +++ b/kernel/extended/vdso/BUILD.gn @@ -48,6 +48,6 @@ config("public") { copy("copy_ohos_vdso") { deps = [ "usr:OHOS-vdso" ] - sources = [ "$root_out_dir/libOHOS-vdso.so" ] + sources = [ get_path_info("usr/", "out_dir") + "/libOHOS-vdso.so" ] outputs = [ "$root_out_dir/OHOS-vdso.so" ] } diff --git a/kernel/extended/vdso/usr/BUILD.gn b/kernel/extended/vdso/usr/BUILD.gn index db79bb3a..2c6edf94 100644 --- a/kernel/extended/vdso/usr/BUILD.gn +++ b/kernel/extended/vdso/usr/BUILD.gn @@ -40,15 +40,23 @@ shared_library("OHOS-vdso") { ] cflags = [ - "-nostdlib", "-fPIC", "-fno-common", "-fno-strict-aliasing", ] + configs = [] + configs += [ "$LITEOSTOPDIR:los_common" ] + configs += [ "$LITEOSTOPDIR:los_nostdlib" ] + configs += [ "$LITEOSTOPDIR:arch_config" ] + + defines = [ "_XOPEN_SOURCE=700" ] + ldflags = [ - "-s", - "-Bsymbolic", - "-Tlos_vdso.ld", + "-Wl,-s", + "-Wl,-Bsymbolic", + "-Wl,-T" + rebase_path("los_vdso.ld", root_build_dir), ] + + output_dir = target_out_dir } diff --git a/kernel/user/BUILD.gn b/kernel/user/BUILD.gn index 42efa259..975b37e4 100644 --- a/kernel/user/BUILD.gn +++ b/kernel/user/BUILD.gn @@ -30,7 +30,7 @@ import("//kernel/liteos_a/liteos.gni") module_name = "userinit" -shared_library(module_name) { +executable(module_name) { sources = [ "src/los_user_init.c" ] include_dirs = [ @@ -46,12 +46,18 @@ shared_library(module_name) { ldflags = [ "-static", - "-r", + "-Wl,-r", ] + output_dir = target_out_dir + output_name = "lib$module_name" output_extension = "O" } group("user") { public_deps = [ ":$module_name" ] } + +config("public") { + lib_dirs = [ "$target_out_dir/unstripped/bin" ] +} From 76f45b3fb2783d1cab45a6ba08787c29dfa2c948 Mon Sep 17 00:00:00 2001 From: Kiita Date: Mon, 19 Jul 2021 19:20:52 +0800 Subject: [PATCH 42/43] =?UTF-8?q?fix:=20toybox=E5=91=BD=E4=BB=A4=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【背景】liteos_a toybox 命令升级升级 【修改方案】 1、help命令列表不支持命令删除。 2、cp命令和mv命令拷贝文件失败和文件损坏等问题修复。 3、修复du命令统计nfs文件大小为0问题修复。 4、修复ls命令nfs文件时间打印信息有误问题。 5、更新命令不支持入参列表。 re #I41N2A Signed-off-by: yansira Change-Id: I5f5b82e33ba9193ae06e9547182d5b7bac0a3b44 --- apps/toybox/liteos_a_custom.config | 12 +++++++++--- fs/fat/os_adapt/fatfs.c | 3 +++ fs/jffs2/src/vfs_jffs2.c | 5 +++++ syscall/fs_syscall.c | 8 ++++---- syscall/los_syscall.h | 5 +++-- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/apps/toybox/liteos_a_custom.config b/apps/toybox/liteos_a_custom.config index 03dbae41..7628c2fa 100644 --- a/apps/toybox/liteos_a_custom.config +++ b/apps/toybox/liteos_a_custom.config @@ -1,7 +1,6 @@ -CONFIG_GETTY=y -CONFIG_MDEV=y -CONFIG_MDEV_CONF=y +# CONFIG_BASENAME is not set # CONFIG_CAL is not set +# CONFIG_CAT is not set # CONFIG_CATV is not set # CONFIG_CKSUM is not set # CONFIG_CRC32 is not set @@ -13,6 +12,7 @@ CONFIG_MDEV_CONF=y # CONFIG_CUT is not set # CONFIG_DF is not set # CONFIG_DIRNAME is not set +# CONFIG_ECHO is not set # CONFIG_ENV is not set # CONFIG_EXPAND is not set # CONFIG_FALSE is not set @@ -178,3 +178,9 @@ CONFIG_MDEV_CONF=y # CONFIG_SEQ is not set # CONFIG_SU is not set # CONFIG_SYNC is not set +# +# pending (see toys/pending/README) +# +# CONFIG_GETTY is not set +# CONFIG_MDEV is not set +# CONFIG_MDEV_CONF is not set diff --git a/fs/fat/os_adapt/fatfs.c b/fs/fat/os_adapt/fatfs.c index b6c02f02..8df522ab 100644 --- a/fs/fat/os_adapt/fatfs.c +++ b/fs/fat/os_adapt/fatfs.c @@ -1416,6 +1416,9 @@ int fatfs_stat(struct Vnode *vp, struct stat* sp) time = fattime_transfer(finfo->fdate, finfo->ftime); sp->st_mtime = time; + /* Adapt to kstat member "long tv_sec" */ + sp->__st_mtim32.tv_sec = (long)time; + unlock_fs(fs, FR_OK); return 0; } diff --git a/fs/jffs2/src/vfs_jffs2.c b/fs/jffs2/src/vfs_jffs2.c index 63cbf3c6..43922953 100644 --- a/fs/jffs2/src/vfs_jffs2.c +++ b/fs/jffs2/src/vfs_jffs2.c @@ -807,6 +807,11 @@ int VfsJffs2Stat(struct Vnode *pVnode, struct stat *buf) buf->st_mtime = node->i_mtime; buf->st_ctime = node->i_ctime; + /* Adapt to kstat member long tv_sec */ + buf->__st_atim32.tv_sec = (long)node->i_atime; + buf->__st_mtim32.tv_sec = (long)node->i_mtime; + buf->__st_ctim32.tv_sec = (long)node->i_ctime; + LOS_MuxUnlock(&g_jffs2FsLock); return 0; diff --git a/syscall/fs_syscall.c b/syscall/fs_syscall.c index b424b05b..c4f0af49 100644 --- a/syscall/fs_syscall.c +++ b/syscall/fs_syscall.c @@ -1206,7 +1206,7 @@ OUT: return ret; } -int SysStat(const char *path, struct stat *buf) +int SysStat(const char *path, struct kstat *buf) { int ret; char *pathRet = NULL; @@ -1225,7 +1225,7 @@ int SysStat(const char *path, struct stat *buf) goto OUT; } - ret = LOS_ArchCopyToUser(buf, &bufRet, sizeof(struct stat)); + ret = LOS_ArchCopyToUser(buf, &bufRet, sizeof(struct kstat)); if (ret != 0) { ret = -EFAULT; } @@ -1237,7 +1237,7 @@ OUT: return ret; } -int SysLstat(const char *path, struct stat *buffer) +int SysLstat(const char *path, struct kstat *buffer) { int ret; char *pathRet = NULL; @@ -1256,7 +1256,7 @@ int SysLstat(const char *path, struct stat *buffer) goto OUT; } - ret = LOS_ArchCopyToUser(buffer, &bufRet, sizeof(struct stat)); + ret = LOS_ArchCopyToUser(buffer, &bufRet, sizeof(struct kstat)); if (ret != 0) { ret = -EFAULT; } diff --git a/syscall/los_syscall.h b/syscall/los_syscall.h index 37429b88..1934673d 100644 --- a/syscall/los_syscall.h +++ b/syscall/los_syscall.h @@ -55,6 +55,7 @@ #include "time.h" #include "sys/time.h" #include "sys/stat.h" +#include "sys/kstat.h" #ifdef LOSCFG_FS_VFS #include "sys/socket.h" #include "dirent.h" @@ -252,8 +253,8 @@ extern int SysFtruncate(int fd, off_t length); extern int SysStatfs(const char *path, struct statfs *buf); extern int SysStatfs64(const char *path, size_t sz, struct statfs *buf); -extern int SysStat(const char *path, struct stat *buf); -extern int SysLstat(const char *path, struct stat *buffer); +extern int SysStat(const char *path, struct kstat *buf); +extern int SysLstat(const char *path, struct kstat *buffer); extern int SysFstat(int fildes, struct stat *buf); extern int SysStatx(int fd, const char *restrict path, int flag, unsigned mask, struct statx *restrict stx); extern int SysFsync(int fd); From 9458de9ac664cd75540c8b638b9a6caf82812fc8 Mon Sep 17 00:00:00 2001 From: zhushengle Date: Thu, 22 Jul 2021 19:56:01 +0800 Subject: [PATCH 43/43] =?UTF-8?q?fix:=20nanosleep=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9A=84rmtp=E5=8F=82=E6=95=B0=E8=A2=AB=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=B8=85=E9=9B=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit posix/linux 标准： nanosleep 使线程进入到了可被信号中断的状态，当线程睡眠被信号 中断，线程回复运行态时，若rmtp不为NULL，则会将sleep剩余的时间 记录在rmtp参数中返回，但是如果线程sleep过程中未被信号唤醒， 则忽略该参数。 由于鸿蒙中nanosleep是不可被打断的，即rmtp应该被忽略，而不是清零。 Close #I41U0R Signed-off-by: zhushengle Change-Id: I6622eb43d6782c2b53b99d9df5cfff5f5e1ed79c --- syscall/time_syscall.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/syscall/time_syscall.c b/syscall/time_syscall.c index e433e2de..ea87f298 100644 --- a/syscall/time_syscall.c +++ b/syscall/time_syscall.c @@ -356,13 +356,18 @@ int SysNanoSleep(const struct timespec *rqtp, struct timespec *rmtp) { int ret; struct timespec srqtp; - struct timespec srmtp = { 0 }; + struct timespec srmtp; if (!rqtp || LOS_ArchCopyFromUser(&srqtp, rqtp, sizeof(struct timespec))) { errno = EFAULT; return -EFAULT; } + if (rmtp && LOS_ArchCopyFromUser(&srmtp, rmtp, sizeof(struct timespec))) { + errno = EFAULT; + return -EFAULT; + } + ret = nanosleep(&srqtp, rmtp ? &srmtp : NULL); if (ret < 0) { return -get_errno();