From fd586bd63dda8c0750be3d84567251492fb45a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cchenyue=E2=80=9D?= <10195501438@stu.ecnu.edu.cn> Date: Sun, 14 Mar 2021 00:42:10 +0800 Subject: [PATCH] 3.13 commit --- fun_2.c | 45 ++++++++------------------------------------- main | Bin 24016 -> 24056 bytes 2 files changed, 8 insertions(+), 37 deletions(-) diff --git a/fun_2.c b/fun_2.c index 08787f7..1cbc401 100644 --- a/fun_2.c +++ b/fun_2.c @@ -13,8 +13,14 @@ void history(char *cmdline) void print_history(char *argv) { - - int i = num - atoi(argv); + int i = 0; + if(argv == NULL) + { + for(; ip_endpoint == p2->p_endpoint) { - t = t + p2->p_cpucycles[i] - p1->p_cpucycles[i]; - } else { - t = t + p2->p_cpucycles[i]; - } - } -// for(i = 0; i < CPUTIMENAMES; i++) { -// if(!CPUTIME(timemode, i)) -// continue; -// if(proc->p_endpoint == prev_proc->p_endpoint) { -// t = t + prev_proc->p_cpucycles[i] - proc->p_cpucycles[i]; -// } else { -// t = t + prev_proc->p_cpucycles[i]; -// } -// } - return t; -} */ \ No newline at end of file diff --git a/main b/main index fd11ba0ebe39c8fe043669d60c3343e3d41bff8e..1f5e5d463494128cb1f4064fe3c3a4603145e536 100755 GIT binary patch delta 3082 zcmZuz4Qx}_6~6bG7yl$Cc7E)agb)W3f}x3H65@nrkdioggpQH5NKgfJsc0Y_8bPh0 zW@Ii)gPK_>31?M1MkZRVP{xK*d8=GnV%kXyXkw$?#GtfNrWMU4DU3BR!?Jqkyr0ZQ zyOQs@-#Op8=iGCDo-e(}6YufirM!N`eZt&Z$duMQay4d;I#m#LHYtNBoaEQ?HX7cY z%4{fGJHKXc=e3@-H}8M>w`k-w;cKIfAy1z8VAw%o!t00}w@7^cgnyd6<^H}aEU*$j z&vcc2=Re70zkiyC#f*FxYw%C+|Krq_aPhr77n8&OEArq(yb>;E`f|lN;wiK#M3Az| zLK{e*NCxs^OEG5r5W*P8Ao1VeD1HgMfpdXwMHQvsaVx6A{@K9^72cdBn9$)Z1*3IgIISipztSDWg>sq?W?DLNrw3wc;q=g`EuxpPq#AEh zi}!of#@183w`rt=`-|#Wrzc*o;JL)zMEqY8XVT%RNUwE(hvK#WrgXCh4kHtnNnyv= znsKbp8o8fL4*F;N`({}%FZL9rFor5+=J;hAQ8Ma6eF#$uE2YB%gb!5Gi=}*4RVxcd zxb2=k`93tHEa3YH;|F0ZdqK#ILp>*pnn_(c`Bj`HC6njVVGyCVSlm;+#($cN{DnSJ zmvsZ-@P*%Qk_WHL2c}&jgsi^E4{c?fx55c~JzoNo_KwiJ1SOT|?@O@kfgfW{sASJ= z7#DCD+m3ZpC+qtc(PqN_nQ=5Qz08;IQo=LiR7_p>A?g%G%#PZ44SLGqfnGdd^3W@a zP!D4}8V1_W1sChq!QaJp&jlRCS=1UeBae~_*i*{78kJKyDPb<&h5I>G^FO@59lPfwBGQo?()2GY`hd2nlZbT2VU4jLWTLisC} zzxb6B#1b1tb$kgrMyb40Rr;K7YV>Pg!Ke9Ei%%g`H>m?X<#7IwEG{Mw`Hzin)Ych< zN{7?-cbsV|+Fg}h@*?UPgY}ML$Kys9+awQFl6>q@_jS2{+7w?C`GF&Y_w2ZxOkP6b z`F|#pZ=p<}d>`d$43j{452b{uoy3V7DMj3}PL#WFZ}y}70FTyDl+}31-$zOJ>{FC4 z;N_h~*@#DC0iLrUeCd4HE#d4QoP@O)Z8j9u_^U;oNIGm~_-n!6Fmy;2{4@lmlJcu) zA0y)<^KA!(W^0DO-yj^%GMZ4e0DokA8qP{3{3v`Tm6T55R(~5K&+!f4W2O|#}Z;jVk3P?QNDaR)rKtQ3clZ!Ozv5WEgJ zUs=u@;AUkbpMm97<^0dkQRU_J&|fvgZ-L#jhp&g1Jd5~tIOQqlA^6DS^4aZJhIW&y^ZmmdL9eZb|M@1c{3+)#qZW&*2rNp=Kp!)Y_y_ zchT{}#*cm%Pob2BkT>V0md>xIY=4W^)2czObZvU6w9?5sR!X;3BV*~tXy($4E;zQL zC{*fHi=x%2v|Ou^-A=5<<}hX?jO<8V$9YVzkfoOG6GcU|IhbV zslG5-vz(7XR;`QMB9*mG0{=#Z$F5eAmcB<;qg z>upT`lbNo!Gdc3tH75*(`qQABFW~kw!AeiX8_kys9yEWBH;2r3V5G%act?9zbY~Y{ z3e`FCVao=NkCwf4FOR}tt4Cl?IMaHZ?r>WhzE$vxwpO&?v!cFw`nhpTn&9{Jy^KNqmHOdr5)v^rCH-W}Cal(9m8%uhvuTd-$!$ z)%HUoZ;144G@AGT?B48|dp9Y!&2<*No{|%8Y_2owWsHJ*i_a`eO%xxC*t4b0z(?Wj cPM=_T7;bc~<~zW>bqzlTJ=lK&C%0Do7ekuT)Bpeg delta 2896 zcmaJ@3s6+o89wK(%RXRbcUkrU!Y(w3tAX9sRKWOHm6aRw5YlD>j*OFp&=4vz32T7S z*``#+b;k+opGRwTs*`EdWHg$aq_jpB+p$n*+CnDHXq$9srG+S*Vh7Tx~m+#of&{P?>0K=$^8_etsd!X1Nk*cm3`$hmqhMsDRxZ<*aRH&L`Q-$%qm%smq-4w@kE5ER2rl2mk!-({ zPVXL$wsO-T<0NlFdm=IuA5qjGSEn^KG}l{-DiV>!1oC-87UQ2XN;}b-nqqKI$JmhL z?ZJ`!CUzW;K`8(eGYoGQ;2c+H;eS5YE1`;b6AIphif3UU*;rHgOY|#n9<*WFDvfyW z+`R29@Ggm&x$56$pvxMOrY&ozMeN%plict9h}EVYYI1$CE4R|=cx0w;*9_@#q)Hj? zU(v+V$(Dbs43yP%pd+K2o93$ZsQ!2P-d3!9kyyC;jgAzF&6e&x)aA3-VM%+` zJVSzs5ZnX>K8#L{s#zhpjVGDS@f*yZLGazV>M2z3t#{FgY}RtfK5eAnmE4lLtZkG& z2!FIy(`Inl8*toaUyxmnWm00^hXK1YX1U35r-sxNoHvK1vebj3;prPKPK~8)Q}J7v(P4JcO0Tez?A>> z^&*mBw$G;+zb-dVmmours`m5T9#uEO#S$_=jCfp)coSaEcX}U1DuayR<-H6=joGZm zbijxCOP8Gal4F=t&1jaJF*BbrS*e9TtA^XBAkSI3wjEWa0()?#n8-h8_7QPkX3@4|*VE}S z%w@zp$52+I{0QYWl+!3{kfR${brj`Fly@-i7L?m?M|PsTFr7{xL|KDJ>LZlw?0$wa zj$CF?M(`Xg5D57$RJb4XH~ur74q#SNYp_~T1o7)ao1WRQ-G^T-eq)eym(y$TQ@6Lw zgG@S@bM1Uo5xh|@0@VMUo8B^4CB-Z_b)ENp|ol7 zOFH3JK8#kBQ30-1tfXgQNo5&51PzrTN};cE9~}f+U?sZ&W#PwvowY7!NR*lC3g*+!*jFSsU5rIcS zWqwO;n58EBd9R!eLd*EPZ}GsAmS`uT3*kVhke-AOLnZ#7sB?P$$DChh&e^}TB({oU z?y!V;@OE~@u+f9j|r>TDrAbsnpV~({x_CC)Hpq-6@v2 zFv|;vmlnnfT}n~Z8WonQHL}@QRFNrxjD+NK?5t~RA4PfvB(rS4=a!;CPMC#}#k|L> zjb_issL*1gdUlGM)R^r`46In@3O=pcTGe@(V0HLARzTE3^EEV?;7G_JjOM@_%Y6Rv z|1(r)Ve$$+%u2jc_o5{d;sIMEL6Hu`xvG7L(PVlXg8eR5D zbSN&eUG>f0Gk9uaIeS+2Zrni!CHn9ydb(Un)*Fm80zYUB%sy<4TjO%GR+)=Vus1C? w-TlYg&{SnIy2BjCC?%WfbhHaDZK)Fev;yqSt7#Y-n%Cf>li0rp