From b7ce76b06c7c45e7a8b427dcf655608219a46685 Mon Sep 17 00:00:00 2001 From: Yiyang Wu Date: Sat, 12 Oct 2024 14:36:31 +0800 Subject: [PATCH 1/4] feat(lab4): update procmgr test_sched Signed-off-by: Yiyang Wu --- .../system-servers/procmgr/procmgr.c | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/Lab4/user/system-services/system-servers/procmgr/procmgr.c b/Lab4/user/system-services/system-servers/procmgr/procmgr.c index 33628190..2bcb889d 100644 --- a/Lab4/user/system-services/system-servers/procmgr/procmgr.c +++ b/Lab4/user/system-services/system-servers/procmgr/procmgr.c @@ -678,6 +678,60 @@ void boot_default_apps(void) #endif } +static void bind_to_cpu(int cpu) +{ + cpu_set_t mask; + + CPU_ZERO(&mask); + CPU_SET(cpu, &mask); + sched_setaffinity(0, sizeof(mask), &mask); + + /* + * Invoke usys_yield to ensure current thread to run on the target CPU. + * If current thread is running on another CPU, it will be migrated to + * the specific CPU after setting affinity. + */ + usys_yield(); +} + +void *thread_routine1(void *arg) +{ + bind_to_cpu(0); + for (int i = 0; i < 3; ++i) { + printf("Hello from thread 2\n"); + usys_yield(); + } + printf("Cooperative Schedluing Test Done!\n"); + return NULL; +} + +void *thread_routine2(void *arg) +{ + printf("Hello, I am thread 3. I'm spinning.\n"); + + while (1) { + } + return 0; +} + +void test_sched(void) +{ + pthread_t tid; + pthread_create(&tid, NULL, thread_routine1, NULL); + usys_yield(); + for (int i = 0; i < 3; ++i) { + printf("Hello from thread 1\n"); + usys_yield(); + } + pthread_join(tid, NULL); + + printf("Thread 1 creates a spinning thread!\n"); + pthread_create(&tid, NULL, thread_routine2, NULL); + usys_yield(); + printf("Thread 1 successfully regains the control!\n"); + printf("Preemptive Schedluing Test Done!\n"); +} + int main(int argc, char *argv[], char *envp[]) { cap_t cap; @@ -694,6 +748,7 @@ int main(int argc, char *argv[], char *envp[]) init_root_proc_node(); + test_sched(); boot_default_servers(); /* Configure system servers, and boot some of them. */ From 3f459d6c03d3dc75ec140a8bb13c07af34a66c70 Mon Sep 17 00:00:00 2001 From: Yiyang Wu Date: Sat, 12 Oct 2024 15:46:36 +0800 Subject: [PATCH 2/4] feat(lab4): reimplement testing Signed-off-by: Yiyang Wu --- Lab4/kernel/arch/aarch64/main.c.dbg.obj | Bin 10240 -> 18392 bytes Lab4/kernel/arch/aarch64/main.c.obj | Bin 10920 -> 18560 bytes .../arch/aarch64/plat/raspi3/irq/timer.c | 3 +- Lab4/kernel/object/thread.c.dbg.obj | Bin 17912 -> 17992 bytes Lab4/kernel/object/thread.c.obj | Bin 16144 -> 16224 bytes Lab4/kernel/sched/policy_rr.c | 2 +- Lab4/kernel/tests/runtime/CMakeLists.txt | 2 +- Lab4/kernel/tests/runtime/lab4.c.obj | Bin 5120 -> 0 bytes Lab4/kernel/tests/runtime/tests.c.dbg.obj | Bin 0 -> 5456 bytes Lab4/kernel/tests/runtime/tests.c.obj | Bin 0 -> 5072 bytes Lab4/kernel/tests/runtime/tests.h | 27 ++++-------------- 11 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 Lab4/kernel/tests/runtime/lab4.c.obj create mode 100644 Lab4/kernel/tests/runtime/tests.c.dbg.obj create mode 100644 Lab4/kernel/tests/runtime/tests.c.obj diff --git a/Lab4/kernel/arch/aarch64/main.c.dbg.obj b/Lab4/kernel/arch/aarch64/main.c.dbg.obj index e4a1aa59864a4b7f0508450bbcddea19af25ea90..120a2a8457e2bb6b21f0b7f297c22d84fded00b8 100644 GIT binary patch literal 18392 zcmeI3Uu+yl9mnUqPH~f9LQ@GuRSOT6)cm3ae9=7q@LgM8sbOFSmmCm$5wLM}5QW}j18 z%X$cP6gx4$EzzCtg1jVVZ&~7}w}icNYgmY%{q6dtw_48mw-%vHZLz(oq1M~Jf~{O$ zXjyyGd`Q!zb};5{9QTv&bH5q#m*c^HeRX#{=6TKahtL-b+7@~~-tJ-B`V-iGqSO7W zzfac5j(CmWdWh!$=hA(8&)LEY(YwIn7~(vt^V))WJqSEyZsRrwVf|#z92+EEWqvy5 zWZ}+^{Jr~E-&tC*ocBKs@%uziu5r#pz(l}Az(l}Az(l}Az(l}Az(n9v5rGR&J#*^W zi}r<)@`xXJ7wxKFoVF|VN@P#L->~eJw#VZLyvRQIgq`C-4NsmvVLuX{c%)?eb-T}- zX#|f#JuwC&Rk!H|QJSu5*YJWPBNLNgI_3W__O)7?RcHT|dgKK`vytjViocCoGgVmi zH!MPkQY=-wg6~ImtyzsKMToN!+?4){f#*hEEL?G`c2tIX$u9YIF9|W}kJTamQ}*|~ zpzc-ek+N5uZul_P5GMyMrFpt=YUte1_(l6{*>6@$cHR4t7uW^QE_;D@a68Rh&8^g- znMo!BCITh`CITh`CITh`CITh`CITh`CIX+a2;^o)$A(6S$Hq>5#s+4FVwn>BE}I+3 z9(^?7ahqM#GV|l-MEA^r%)Xrui~Yd%5`PiDJTTOod-Z|WwvD{py# z@Xt`M{c87X*6_<+#lQaL-Cjf=m#oxpBnV-NZ5_>$?=E!m?$|Q9DmO|p8s5_I4Gq7o;deD$bZrSI&1^>WX!tG-->c!a z!g=2N6rQ-35vv-$rs3-v-cmS@(h?7B9W2z6emnW+;%l3nS8!sVj6xPmIJVlF624vF zmq*lOfk$b{5}o>JXNgYzg!iP$fc=9S-aZ!8zWyaB?WSlTjGr5je;I!H8H1eDAtY`$b%!0CN%bEHQbGLr1eRHK5$%De80!<8_>V5(fNgj|0>p( z?hAJKP)Qt`5sov}tQQ?8d-T|`<03vZg(v46JUJ&C0i3{^7I@?>0Z1J<+2#}*O(0Xg zsMV4yHMijeZvCml961ySr_?r_&g`nT5<^+Zz zjKDY)K_H6FfO_#8p$NSI4!k+_X06}_P=l^YZg2(dgD5R399UM3nlR{EBf8==aB!4( zf3gSW6@J?9d)&KVI-qbnrb6rkj?WlQeNN%yYz1hiwq?ehB#yvcc>m zm05q8^z+2oPv)bt zUL~&THxwP--$aTI^BKi{jrzT&*fZzn0`|*ugrQWgai@tA0(K z$IEAcO^b3 z@qbg9`)%)EsekU5c{g#j-yY(u!~5NxiVpMrlFs9jKenR7`{P534)Z?6p7+g%6?^76 z;;R1x5<{y@V$Xh76?^6l#eRwEkz&t$hPdkgHHpjq&k@J3>OUckYhL2=zaZ=v+8>bYd3?yx zzK^c4U(ER)SXT7Ull@JF&k|ozI6v=JCH`Hq#cWODPfC1U;^^l(U27@4hw2*=&r3SD zC5}2ds^3-kd8+e$%yF0_&i5tqAxWR_Gvvb(=lh9uI9|Mdne%uC(K$%C9_07+N#cAT ztx`QtIj>vh@FH+9_FrSxnJ|@M7`$zjBiSMWK zHsJ8nPJE9u?;~B24X@N9w*Yw*Bzc)jfme02@%}qoawAt{3t=d-fsYk5@6Qf$Rb=s> zf^4#>7TKa-t9kWEWb1z9Wlujdc_iM3gEdNeWoIgIYwbOA+sXfOGWmwhs#3@SA5q`360hX6Yk^oxrglZoil8zD8XA#G_9IWG~MNBHWvyW{3GM zyb6i)q}EZ#y(4PMYd$umb~`lVXFu}PUNIB9cE>6mpM3K8ldD3Uq4pjA+hp-y{GX)u zIWli&1Ta2wV!t{60bJy=Y$S8b1agdixvXKYsosC$;^5 E06Czsg8%>k literal 10240 zcmeI2O^h7H6@cGtuVKN)v9Ti=Y~i-DBx}M>X4eK5W5U==Y!g}FU|ZVASnZyfUeCz$ z)9UGgG3IBL(@Jnygpqs*Xb(9oCcD$nIhprRWdgS&8fFTiVmfAz!%OWwo>vncae8gJS#+nrcZSC`K&IUCYq zNVCb~aL)ZS?#gW-$*_k?7MLLck69+ozGDBmMS;Se5}@gb+Y!f z&Pi@*jr?D3I9zxo{sdW)8(JT8y_Rsjwjobhvt-OR+!vVxJI2_qk@xOgUtOKQe&fuA zxdq4j{8r4@Ewy;PV0szoWuTXVUIuy@=w+anfnElB8R%u;|0)B=o_c!UGsoRy{QsZLV_$>6d@5^jnvlX@=+r+#|KNjs-n|u4VcUFzR*?-n~s}Ed6^ukW%xAd`R zt^0QWJI>xW`-*@2>nCdoeOGZ(e}MvUU{%*J^;=ap?@u&UuRchT41`9P@V13dS@^Vt zCvOhicC%A#DZkzP_M~rx%Z^m~Y8JXN#qR+6@y{#{dQK}2blV|42grMO zabTbuB5~l3F8)I#ck}G1Gx=U)eJ}pWGl001K@`&XPc58&@J-X-Z{g2ac*VkBw(w~S zf5XD*d6gFD`xbt|!aud}FD?8V3txpBB`uyGAYTvv{*SD%)LSk3!>r%2l}CqI#w_}e zS@=`PlYPS9m*n}5c7AQqZ&~;h^7ZAA(?DIt)_Zve&|Jh{bYbmFFY9+s@|y}ss~l@qhc8$-wKp= zT&bZE<)cQH&{=Z8D=~31i7py1)KQNDYC=%=3)R4D)i*5ndb@q7ko}1Db9# zM&%|%5fodIr=o3yO=t#ayyQoxNh6BW<|`=^J8=uAQw!tMUPxglMb7yRxL)|Lb8gZd zfXaOacM}S*8Tn6GrfP^~vC}4FSRPbW$BytEbFw323CX>J_;%KzYB$Sb{~X)TGnY7p zKgry*e^BEOuuRn zv0+De+t8oqdA(%l3zzRZ`IWUJ)mhdjKFl&zztebD<8v&_d>7d7@0rVdg`d~#==njP80gf20ccouoSbWTu_c!V!1 zoP3Y;`Tj-YBP>((g~mrUzRa@tU1GogWG;S%U(xL7e!tTA4wk99rtzH`|CVL(yUc!p zYw;_*pShX;0p?=o3b)r7c7$)y?9iP~Yh1r-OI)PCMbnr05hs1wixQV`@o~ist*?IG zZDcO{P~NjPF_(QPe9+LB_pc#CU-%*B}d-yeGDqOCE$zYj*VK&+8i3pFfg6+RyralROdE_nXX*_!C-w#6NL; z-Q_z)?-BT~Q$(l3IX=iXPuF6y0?b?tl8|aB@>c1+o&9y~)V0@g=hp)&DNIIE3c4^5(5<A_l*x~b-$b2QevE&_yWZHl0BPU62Gpj#Pd2;M*HJGP zsa311O?LqDub=seDv$dIb!tW87o5jFl8rRM@_IE$e#cO)mHA8i017ldCxGjJ@p%2a zOR)M$hbGlMck8VcS;h&OM1hzYzsuw091wk(zqEZ6($;_JM@mEHMe9#nLB`Aa xr}?IlZT7#3H|82-v{%gWWV37SkU^5x{|hYof+7F_ diff --git a/Lab4/kernel/arch/aarch64/main.c.obj b/Lab4/kernel/arch/aarch64/main.c.obj index 58b7e46a9f714a035dd96c736a39e28ff05b6934..3c731cf65c290d8f5fc85da939dac9bf4b7b7060 100644 GIT binary patch literal 18560 zcmeI3U2I%O6@X{GPH>wjxQUUXCNwuF0T+^Gowy_oEnTneBtX_pENGmxKQ90+{ zb2i7bcM!Z4X-3|iGvAy!=ghf3dv`p0W%AVVzEnzaNvU6{M=hpG^PHBxd+Nwz5N5I^D6a5Ua2?!dga0| zJdjIj{&re@?{-J2-_zJ={9ZMG8oWM8ojiP0@Td=Y^yUxDn zBXnx*YFH^kp0(sA_%8;&7y6OmidS{QGPFxhsZsai6qEhQI^=)G`KBM#{i-uw_KUO4 z2F$gE2M0C9aXNQ=?B%gj=bbai)OkNINEnFYMwV*uM#Py*4Q1d!bXXDzC=4YdijWNi0)Y4jdM~{DsN4H7yfb}J@#uUW~ zvF?rLjcZSlZydYCeV^Mte>$Om2>a7GPk0puVx3~IogwJ|M3D9Gl2bP98U^*bbWkn*o~vn*o~vn*o~vn*o~vn*o~v zn*o~vn}PrL44fDrKjsXdEwt-l+j%xKn#mp*Va91H?W<==iwinYHVBf?al9O8h@*QDLwI{J_itP;>UvjEQNmO?f!St`M3JK zzx?_AZHWF;NhkgyL8-Lb)H4j-s|1cTtu|w|p}_AHp!D+C&Sn+OM~q;;5DVQN=J?NS zS(sln@Q#5m8~BQW-!Sl11HWnDw+#G_fv*|(T?4;o;OhpiV1s}xvD#)eVBmuWzEk7z zao3!JqnM=BRq0glj)CJ3Ph?>`D-x2NRs%gW*6-z?0?m}r=QBRmk7pr`#r!deB01(; zRni87G+Y@;C9Qhxqh4C|+K)MHBGHVc)fSD!&9vIu!#@LLySN_b-I2kkTP zFBv#)R7tXP!oXiL@QQ(d$G{g1{7nP@iGjas;O`mu2L}Fk1OM2-x505p%G+lR{0qRJ zQ2+dx&uFfX5bxT`fkP;HgPkb@haZ(C#^Xiy#ra8&8o;;H)s6n5&mpL<80`Gmz<(Cm z7uN+(WM4_`n^Uek)2Z??H0|*t+J%8_-nMD~!6K-wNH> ze#w8e?YDi^daV*dT*U?iHWw<`Q3gXAJgVRoXT!iN`l?X5NE3;|P&n~c2;D7(JLKFj zECeHNHLHR^725%MX*64^`)#!JGWUQtHpA`IM zlG*PvwO^r{{W32RNBf6K#;Pp%sNhw>`B@E7lQ{cbp>{|$`(^%p;^_CQBxAKm@{_=y z6P!P1@h7M+2;LzXc}{SiA9DFGEB22(FZB6J#rRR?&l5h57{BBWjm7x+*dZDw&UX0u zk9F7%^Q^FQkYublw`e~jIOl}zFGD|;T=X8FR~RSr3F2r++Lz~*JfEjXpY8K=B%fCt zKl5pW{R@Kg91)d>vweOZ<@1g0GneO^jK8VbS*1Mi`NsBd5}zl1w$J(t8fSez-!O0T zy2H;~EXWVVV)Wi28M(ZUeoCCO}L_j^z9qaq zQ`k8s;@Pd);qO0=#`*itKFvPs4{MzD4-nVm&k8Q@=c9u2y$i!VN}T7rNbTn|&fmu- zh;trT|D?uQ{}gdO&MCp47kQf|uE+C=#;;QQg2p@4E>o??S=Bh(X=f^YW^R=<8*`Fr;6^+jmzoBuyudNC$Ki_W( zo+BGr-4Yz*yhD9=G(JG>HNnS77puF1qn#|Z?`eFR+Upu$pf+EZn4i3`&({<3al!d| z;(T&m`21zgaqp(Fo4`)Lu*26Ba`<~xGObIs&?~4+D-7bg%u?W2y-f7{ohf;tr!s|B zOJ#xvHc)*ea}=7a1O%R(+fCL`8T_7*iJ!Aorr4;}{CcP|^+xDtPP};bVDy|$2K=%+ z6L_`mWAvl={zu6HeVm`Z0+$1Z(sAT8;%8Z9)K6x)W>(foDOOhv^GA2piTMA5se_dEqL;Z!trw)_#FXdJ%5AS z<3WyLJe$mckd(hQ`ta$HL(CugVE>%IGr-Wl=0;_Q07BUmSKW6W&)^&gIKC%;4ryrl z>gJWY%TVL^EVa880X#mkpe`1!UlnrHL2n0o48|Qij&*+s0}%tt8`*~8W^sL>Em&wq$l^lPSQizyV``cCam!!k6)qq L7olGkef+-x{Z+IR delta 1952 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 diff --git a/Lab4/kernel/object/thread.c.obj b/Lab4/kernel/object/thread.c.obj index 61f142c62ba765c285da6888e10c6791679e371e..0d9add72a7085e78fbcf98f3f8e497d4faeaf533 100644 GIT binary patch delta 4719 zcmZ`+VN6@s6@J$cYBIB$7`Qw^30}$K1PXp&2Ns+F-85k-?V!t4RIx$`RJ4jJScw#A zEO9cVp()zPPE_$D&5V>uR=2iT&JTX1nlt5xD`lFgDve3iEcR6l&&55skoB;;8{^`HCneHTB%pU>c3@K*Y_%{ z_e-!T4vIl|BAV*+&slL%m-=+jN`0#NFBPAHui#9VJhJRKb z6;m+3uiba0Nl$!J&F1h>AKJxHQx<`n``Sf^8QT@!lDk(`^oc*f{QiS*yZVmLcMNXs zZ-K$88gVRlbN_d%#5Q~pd_laH3)TL{mn(*b1(ZU5+j>T&@%&Yqb7A=*TrXjyei?S^ zs~h)wD%2?z6<|~q1sj4wK)69dYlFXb>udj8D_~SHBZ^rLaOSdNQi_Sxa3+h)%KtGB zT*fYP#z+V&m=p5fLTu-R{c9oKg{&>bM|!kB7M69uQd`3Wb3Ue?Kxcm(2JJJzjbbE2$^9+(PR^#Hl0K5&u2n z)Q?HT?;}p#=tKN3h*K{Ti2p<3wN?fEtoiwtc&{}v@y7YL&rVEqcE|d9JhOOrJXdIb zSu~tGGZmXyn0aSm;+?azGt(0@Z_l5fIiIU*+4b2gRjz0rwOiC~^@dj<9R8(Pg=|=g z)!ZlHzxl)-WZPtT4;PHPcZt=cs=tqm^ttoXBBHGBGueLTqil{Ns@+Zhoqfh%9P}HaQU0kUS}+6ZfM`+9p<=&sqQhHRuvHE zN$%?;$$woZqTY7hSRED#Cf(ooz1cKxsBu3tCHd5;s+6t zA_!}TWwH)yc#>v@Q<7H1d6G8RJS^=F=15(N!d>MUGrkGqJIM4muy4Z*C*Mv=IQiZx zN2J7lsMS-R&R;k=FEv?_u)??8u6l8hnC zlk_p1-sTC0lgoEZwqax`8?72)IITL3IL|g_vQ09t49=$+zJv2whLg*j$+mzjWusM# z45w8o#Cf(QolU(L!d(&?I|C5t4AiEvR;c%Ye)kW;P-h4diXk;(T4BCZ!d$1nmY!W= zCSgr6X~h(o+A?e^rl^<_V=^GRo3DE6 z&w22dJop^qbi=IRZE|EN17E+^$3w@8#G4)q7jCovL@ko z%XF~s!B3(R7NY@s+=CwX=&0^RrG3N0_Iub2JdSobcRcKC9=71YM?H8+Yl>Yn)?&Zr@2Y{(eH*AbtDuu__aCysQ^k&@b@`e#wi9OC@mTY%AS zX)k%$aZlc>aJgI7lss%de5?>}&5o{7ds6#&agVvLVnRP2wfhe}`T-CAy20VCo|d5~ z!qk8boW~eWn@b>0cS;7bJ?fE&`Nc4-^+<6FHhZK!f>k=ifG5Nl%=gHlai*Qe`6R>1 za~ARcdd|mWHLY4Oz8AD_%_3GBU-)B8J~!cUrxxj_$UI#j;vsk%3)E(Con|`q3UJ~Q zqH(`X{h%k$uPXFk9!BHprG zE1eNsO=?A)pT;Ap5k3v`$D}=rtnP(-!QJE+jPf$9DVM9}{FWZi-1gLaAHTc@KkG`E zk+SQ~c)Ls~{?lb#qdo)T(s_z%w3ifq{rT}odm+3IuJua04OzXHq$fik-0hXg1hQOn zu#6^Y^W>{q&AGwUTJeiA&D01lm{s@7tlBEGYFqEi*+rJ`i?n&dVGze1(_X zpSOMLs80*9c3j%@<-E#R^|DoL1ikhcy8@zLiXzzke^#%lC;h$E>j&L*MQ{?mVhr9) z42T&JG6bcnO2{W7Viq1NECNSP42aj^%@YH@p9f*HssZvRBI2@VQAmMN#@I%qM5{PKGNJXx+LE>S8&?*moh!KcL1d$*ReF!3fKICDwyZ6qV zQ(YYtOF1+5`_BE&chAh&bF+21aJdi@g~elk70`ZQs*s=ESan(C;M=Od_?!ql?@#%i!&Wzx{4w80Hk_`0%=h(C_-}OwM5{Z551y#*@IC%( zg?ET1&5FmNqRu~3F)ohjL=kiGqwq>ihd5e(ujU7zN_s2!g}AC>3yfBW+_Q(vYlqru z#3pO~M#Il5C{lY!D9~7cK!pg%~y@b*FJZ#kmgri3) ziU#?5LsndobF zp~h31#HAfkM}1l-i=*H9>|LZ!d3S|H^e%|@I*7N2#6`%o%V#bjUx(9+IB$XB%ZOiN zdL_j33@^fByM#h}z+OV8NmUre)$2nMw%esBxh~#j)z(pUnc?K(7OO@sZZmuxGLLvJ z9AvnQk6jmcvyHNPMr8Opn;{yL^KGmS>BSg+3;Q2uIQdE=&VBX4p7K$QgX3^ZM2^X^Ym6lq zud-@1tH5vvB9D14t|P-;lw23ftPbhjgo<);i?QTlg;k?jA2NImD(GSj8Sdha>*7;Z zhxF7Ptz2v}mRx+ps?n^w40m9$!|TO8WVnlc?c$1s_Z~e9q~~Y&7LEf9CtqR2`91m| z!%3&v!(lESgsFJIZpA$AvJJL7GtXpGTg<2c2S#0R;XWqC*gRfgxSte zq-db}XMPmsJL}+8#gGr3ubEa@RCAopKxBo@$-=5)b``V6m^|z$rnM^&*RBTvjyScYfNe=5PHiE493m+xCLwu3!hW*R zo?&?z zN>1z`$KCES7v$DLH+t2x#;W}=e?r=A$dVd)kHM;1UExIIL>e=w3zX5v@LM<@W%x3V zPeC*-C&qE4-HaG+rV!^orWwA1;~7{~?z1@J-p<0FV$U;{oLtaOhAtw@ov54N{piR3 zIm03KQ{&U{P`8B1?ofofq0vsA4VmsbSm+Mf)DQal2&fGGS%Dkfa^j9r-F!sX5vM*l zxFOg?oK{M>A4HE7jXK(K%+)K(y0yHJaC1&UvPaI3V-D%B;dl~{q)+&)p=sVdSpz>~ z)Vko-%E6v;bN@*#^xY8AnjJHwa?f* zWCo;IgFg&>F2XQ2*c-gm;<;OaR|b2<6nro^;yZH~Dm4ud9*T)9oE#bvt?;snPr(O6 xBfhI)j~tGvo%6}z5s`qGhev|W1D?(XtPb}Ei_PBXD-a{S!B%`w)H5~I@_#66DhvPs diff --git a/Lab4/kernel/sched/policy_rr.c b/Lab4/kernel/sched/policy_rr.c index 3b8f9151..ab070876 100644 --- a/Lab4/kernel/sched/policy_rr.c +++ b/Lab4/kernel/sched/policy_rr.c @@ -292,7 +292,7 @@ int rr_sched_init(void) /* LAB 4 TODO END (exercise 1) */ - test_scheduler_meta(); + lab4_test_scheduler_meta(); return 0; } diff --git a/Lab4/kernel/tests/runtime/CMakeLists.txt b/Lab4/kernel/tests/runtime/CMakeLists.txt index 8b168868..eaa8634e 100644 --- a/Lab4/kernel/tests/runtime/CMakeLists.txt +++ b/Lab4/kernel/tests/runtime/CMakeLists.txt @@ -8,5 +8,5 @@ # PURPOSE. # See the Mulan PSL v2 for more details. -target_sources(${kernel_target} PRIVATE lab4.c.obj) +chcore_target_precompile(${kernel_target} PRIVATE tests.c) target_include_directories(${kernel_target} PRIVATE ../) diff --git a/Lab4/kernel/tests/runtime/lab4.c.obj b/Lab4/kernel/tests/runtime/lab4.c.obj deleted file mode 100644 index fc5fd27af504fefc8a542ffdd0646531c7e78b55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5120 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 Date: Sat, 12 Oct 2024 16:25:32 +0800 Subject: [PATCH 3/4] feat(lab4): add scoring Signed-off-by: Yiyang Wu --- Lab4/scores.json | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Lab4/scores.json diff --git a/Lab4/scores.json b/Lab4/scores.json new file mode 100644 index 00000000..63aca615 --- /dev/null +++ b/Lab4/scores.json @@ -0,0 +1,35 @@ +[ + { + "capture": "test_scheduler_meta: OK", + "msg": "Scheduler Initialization", + "proposed": 10 + }, + { + "capture": "test_sched_enqueue: OK", + "msg": "Scheduler Enqueue", + "proposed": 10 + }, + { + "capture": "test_sched_dequeue: OK", + "msg": "Scheduler Dequeue", + "proposed": 10 + }, + { + "capture": "Cooperative Scheduling Test Done!", + "msg": "Cooperative Scheduling", + "proposed": 20, + "userland": true + }, + { + "capture": "Preemptive Scheduling Test Done!", + "msg": "Preemptive Scheduling", + "proposed": 20, + "userland": true + }, + { + "capture": "Test IPC finished!", + "msg": "Test IPC", + "proposed": 30, + "userland": true + } +] From 6bb20b946c0dc48b80e943b745b8fdb900b11c0c Mon Sep 17 00:00:00 2001 From: Yiyang Wu Date: Sat, 12 Oct 2024 17:00:29 +0800 Subject: [PATCH 4/4] feat: add alternative images and download links Signed-off-by: Yiyang Wu --- .devcontainer/Dockerfile | 67 +--------------------------------------- Pages/Getting-started.md | 11 ++++++- Scripts/chbuild | 2 +- 3 files changed, 12 insertions(+), 68 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 435bb977..639a8044 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,72 +1,7 @@ -FROM ipads/chcore_builder:v1.9.0 +FROM ipads/oslab:24.09 ARG USERNAME=stu ARG USER_UID=1000 ARG USER_GID=$USER_UID -RUN sed -i "s/archive.ubuntu.com/mirrors.tuna.tsinghua.edu.cn/g" /etc/apt/sources.list -RUN apt-get update && apt-get upgrade -y -RUN apt-get install -y sudo \ - binutils-dev \ - libgmp-dev \ - libmpfr-dev \ - curl \ - meson \ - python3 \ - python3-pip \ - python3-psutil \ - bear \ - cmake \ - git \ - pkgconf \ - clangd - -# We need to install a latest gdb to support cppdbg. -RUN curl -SLO https://ftp.gnu.org/gnu/gdb/gdb-13.2.tar.xz && \ - tar -xf gdb-13.2.tar.xz && \ - cd gdb-13.2 && \ - ./configure --prefix=/usr/local \ - --enable-targets=aarch64-linux-gnu,x86_64-linux-gnu \ - --enable-tui \ - --disable-sim \ - && \ - make -j$(nproc) && \ - make install && \ - cd .. && \ - rm -rf gdb-13.2 gdb-13.2.tar.xz - -# install tomli for .toml file required by qemu 9.1.x -RUN pip install tomli - -# we need to install >=glib-2.66.8 to support qemu 9.1.x -RUN curl -SLO https://download.gnome.org/sources/glib/2.66/glib-2.66.8.tar.xz && \ - tar -xvf glib-2.66.8.tar.xz && \ - cd glib-2.66.8 && \ - meson build --prefix /usr/local && \ - ninja -C build && \ - ninja -C build install && \ - cd .. && \ - rm -rf glib-2.66.8 glib-2.66.8.tar.xz - -# install latest supported qemu supported by ubuntu-20.04. -RUN curl -SLO https://download.qemu.org/qemu-9.1.0.tar.xz && \ - tar -xf qemu-9.1.0.tar.xz && \ - cd qemu-9.1.0 && \ - ./configure --prefix=/usr/local \ - --target-list=aarch64-softmmu,aarch64-linux-user && \ - make -j$(nproc) && \ - make install && \ - cd .. && \ - rm -rf qemu-9.1.0 qemu-9.1.0.tar.xz - -RUN apt-get install -y libglib2.0-dev -RUN apt-get clean - -# install repo -RUN curl -SL https://storage.googleapis.com/git-repo-downloads/repo -o /usr/local/bin/repo && \ - chmod +x /usr/local/bin/repo -RUN useradd -m -u $USER_UID -U -s /bin/bash stu -RUN usermod -aG sudo stu -RUN passwd -d stu -USER $USERNAME CMD ["/bin/bash"] diff --git a/Pages/Getting-started.md b/Pages/Getting-started.md index d935bfd2..c7011be6 100644 --- a/Pages/Getting-started.md +++ b/Pages/Getting-started.md @@ -8,7 +8,16 @@ 请按照Docker官方指示为你运行的操作系统安装对应的Docker发行版。 > [!IMPORTANT] 关于Docker -> 由于中国大陆地区的网络限制，请确保你的docker能够连接到docker-hub，测试方法可以使用 `docker pull nginx:latest`，如果无法访问，您可以依照[该文档](https://docs.docker.com/engine/daemon/)为你的docker daemon添加代理规则。 +> 由于中国大陆地区的网络限制，请确保你的docker能够连接到docker-hub，测试方法可以使用 `docker pull nginx:latest`，如果无法访问，您可以依照[该文档](https://docs.docker.com/engine/daemon/)为你的docker daemon添加代理规则。 +> 如果你缺少代理，你可以使用这个[链接(提取uwuv)](https://pan.baidu.com/s/1ipbMZ-C1Qk0S9PGDDMMy6w)下载压缩好的Docker镜像，镜像使用`zstd`进行压缩。你可以使用以下的命令解压后，再使用`docker`进行导入。 +> +> ``` +> zstd -d docker.ipads.oslab.yy.mm.tar.zstd +> docker load -i docker.ipads.oslab.yy.mm.tar +> ``` + +> [!IMPORTANT] 关于虚拟机 +> 如果你使用的是Windows/MacOS系统，如果不想手动安装docker以及下载镜像，我们也准备了基于VMWare 17的虚拟机镜像，你可以在这个[链接(提取uwuv)](https://pan.baidu.com/s/1ipbMZ-C1Qk0S9PGDDMMy6w)找到，你可以在解压之后导入vmware即可使用。用户stu 密码为123456 ### 使用Dev-Container (推荐) diff --git a/Scripts/chbuild b/Scripts/chbuild index 6949a8bd..4f9d859a 100755 --- a/Scripts/chbuild +++ b/Scripts/chbuild @@ -279,7 +279,7 @@ _docker_run() { -u $(id -u ${USER}):$(id -g ${USER}) \ -v ${LABROOT}:${LABROOT} -w $(pwd) \ --security-opt=seccomp:unconfined \ - ipads/chcore_builder:v1.9.0 \ + ipads/oslab:24.09 \ $self $@ fi }