From f98e888fddbef5d77ad5cb6a81cb53f6556e55d3 Mon Sep 17 00:00:00 2001 From: cjihrig Date: Fri, 22 May 2020 20:00:59 -0400 Subject: [PATCH] wasi: refactor and enable poll_oneoff() test This commit refactors and enables the poll_oneoff() WASI test. The refactor includes testing additional cases, as well as some platform specific checks. PR-URL: https://github.com/nodejs/node/pull/33521 Reviewed-By: Anna Henningsen Reviewed-By: Jiawen Geng --- test/wasi/c/poll.c | 58 +++++++++++++++++++++++++++++++++------ test/wasi/test-wasi.js | 10 +++++-- test/wasi/wasm/poll.wasm | Bin 33777 -> 36414 bytes 3 files changed, 58 insertions(+), 10 deletions(-) diff --git a/test/wasi/c/poll.c b/test/wasi/c/poll.c index 6b6ef71fd68c3b..9afb6325a98a03 100644 --- a/test/wasi/c/poll.c +++ b/test/wasi/c/poll.c @@ -2,30 +2,72 @@ #include #include #include +#include +#include int main(void) { - struct pollfd fds[2]; + struct pollfd fds[4]; time_t before, now; int ret; + char* platform; + int is_aix; + int is_win; + platform = getenv("NODE_PLATFORM"); + is_aix = platform != NULL && 0 == strcmp(platform, "aix"); + is_win = platform != NULL && 0 == strcmp(platform, "win32"); + + // Test sleep() behavior. + time(&before); + sleep(1); + time(&now); + assert(now - before >= 1); + + // Test poll() timeout behavior. + fds[0] = (struct pollfd){.fd = -1, .events = 0, .revents = 0}; + time(&before); + ret = poll(fds, 1, 2000); + time(&now); + assert(ret == 0); + assert(now - before >= 2); + + // The rest of the test is unsupported on Windows. + if (is_win) + return 0; + + fds[0] = (struct pollfd){.fd = 1, .events = POLLOUT, .revents = 0}; + fds[1] = (struct pollfd){.fd = 2, .events = POLLOUT, .revents = 0}; + + ret = poll(fds, 2, -1); + assert(ret == 2); + assert(fds[0].revents == POLLOUT); + assert(fds[1].revents == POLLOUT); + + // Make a poll() call with duplicate file descriptors. fds[0] = (struct pollfd){.fd = 1, .events = POLLOUT, .revents = 0}; fds[1] = (struct pollfd){.fd = 2, .events = POLLOUT, .revents = 0}; + fds[2] = (struct pollfd){.fd = 1, .events = POLLOUT, .revents = 0}; + fds[3] = (struct pollfd){.fd = 1, .events = POLLIN, .revents = 0}; ret = poll(fds, 2, -1); assert(ret == 2); assert(fds[0].revents == POLLOUT); assert(fds[1].revents == POLLOUT); + assert(fds[2].revents == 0); + assert(fds[3].revents == 0); + // The original version of this test expected a timeout and return value of + // zero. In the Node test suite, STDIN is not a TTY, and poll() returns one, + // with revents = POLLHUP | POLLIN, except on AIX whose poll() does not + // support POLLHUP. fds[0] = (struct pollfd){.fd = 0, .events = POLLIN, .revents = 0}; - time(&before); ret = poll(fds, 1, 2000); - time(&now); - assert(ret == 0); - assert(now - before >= 2); + assert(ret == 1); - sleep(1); - time(&now); - assert(now - before >= 3); + if (is_aix) + assert(fds[0].revents == POLLIN); + else + assert(fds[0].revents == (POLLHUP | POLLIN)); return 0; } diff --git a/test/wasi/test-wasi.js b/test/wasi/test-wasi.js index 89d8f73d684833..e4bd44e83d186c 100644 --- a/test/wasi/test-wasi.js +++ b/test/wasi/test-wasi.js @@ -38,7 +38,13 @@ if (process.argv[2] === 'wasi-child') { function runWASI(options) { console.log('executing', options.test); - const opts = { env: { ...process.env, NODE_DEBUG_NATIVE: 'wasi' } }; + const opts = { + env: { + ...process.env, + NODE_DEBUG_NATIVE: 'wasi', + NODE_PLATFORM: process.platform + } + }; if (options.stdin !== undefined) opts.input = options.stdin; @@ -75,7 +81,7 @@ if (process.argv[2] === 'wasi-child') { runWASI({ test: 'link' }); runWASI({ test: 'main_args' }); runWASI({ test: 'notdir' }); - // runWASI({ test: 'poll' }); + runWASI({ test: 'poll' }); runWASI({ test: 'preopen_populates' }); runWASI({ test: 'read_file', stdout: `hello from input.txt${EOL}` }); runWASI({ diff --git a/test/wasi/wasm/poll.wasm b/test/wasi/wasm/poll.wasm index 90b39c502ef4dbe3eaa0ca2f1122e3be99e882ea..37e17b8d880ad220cbb89732bd9e67ff31a21ec7 100755 GIT binary patch delta 7576 zcmZ`;31C!3(tg!52?LXmK|&Ie0M)}4Ac1gA2oN_9lK>h{QEm`0C=(0>ka)oaK}CoP zJQ0Kd;Znp43@W<7g1U;wk0|J}{^;V0=X&6->#gip{bnMfl9}m#b$(S{)!j3Ed7C;= zt9E@uY5n{8e2wE&6R+iqi}QNp;~F=P^ZER7PE(cAJw86pijR-C;+rM~@aK)A*#w%0 zEEV6v6Cr!W7Oy{I#fF-oGg9^Qwd;`8E?U^H!so2oU9Z5oTytsEd}pX7)|3AoK~q@!h6e*DsqjbbGpumaH`Ja z49*;=TS2fjx8l~7x(%mjhW9qEcgzKD&|YP{x8)$Wje2j#TDRwRx&yc84kfxHchu}> z)>#8cce0OKx-)!s4(l%5MQ6i7j(x(?T|w&_*4?<9j^u*aowK-mrS1W8j}YAE2JVv3 z(m5w^hdarRQB)_-aNUzJjM2TgC-+*Qdvk9c;!Zk`L!38O_kqED?!)<&x-V??MgGogn%rA^^Kkm;3d|_atc(VM0`A-1yr?4*MLT$s^0Q+c?zQ{ghX=ILz z!n&A?b%_Kr5YGd{dJqrNgY7>0Vmw|P)|c=lx)hloVn_5)kcNg-9}GkKQGa*1kV`u$ zOAq4`jtt9F77vbvSHc7MqQFYCu)`rdJfuq5j&ZRHrFsN{8X@bl*F-Qf8r7wC8$Bu- z)nz=AFXd5uSuCglN?$HH8?HyYsT;$idCUSmmLp^JIKEtu=W#rKte${qC-MZISg9w$ z%_Mj^WV}p{dbz@8JtgX8Do^GscnVLAd66n9)YDWURHwO>b0uQ9QaT`k{I=3%$jEd_ zG^yu&zHAUDTMZWcy!6R|t%YKkUj5%EHf za5eEFisc7E-At^y(R96-?0{ZEyf{Lo_X>xkDA*Aj0y7sf`iBN4rcq$277iR&n=Hxq9ry@jxlTZOh2v~9%ONN*>U#(e_e ze)-rTIeb7w9)QSB;+>=)BqaGELWe&rjEBK^g!mECj}j_(m(X^Bwwri2>BsOG;T;rG z4EjUVkJ@3p4`T;@jHFEJiMJ5flUrAN%+ns|KQ4wgLNP6>m>E@U&5s(zCx{{Qgi#FW zCynBhP~0nu;xQ0aj3h@jQ}{un`4lmPo-&$g`e~#2G&KJl)AT{%eqc<9DmLZqMsXi8 zWcG=ofZj;FiK2DAUv&4wYqYWt5Fa4@7ZHl+gT$B}#OfZBtUg10i1-<-?z6JG&&uk$ zb^cszb^l6sZ~c61bzdNUj`**{&lA6J?&=iSarS0gktb-y;40#BY*5NsP%!z<66=yhHpp@jHO=4}tNI zUuykS492@;=jngOV7y0siuhgPe-gjf07DWnU!N8P?-QRUejf-vApU?Nm|m+t6yqO~ z?3pWWudcTAM=|Rk6V8=SV%Gmf{1NfT#GerV>sQtn>QBY`XT+Zpe+KKH6XW$6jDI1< zzc9wP8RKVS#=k`WAJC zqyA1B^LxqH4>J2vM1DlMSr~snsd_Pfk1?LVGo|_yG4y_tQjN&$E8_pgYV~JP{`r?$ zJxhF+bhUzzUZfb4MXE&Ktl(_1;+qvOR+V~*LWoNg(zn+{c#Deehqo&Gkfm=^(Or3| z;#(Bos`xg=OO@=)k!qazvfmf!+hGJ|ZdbAl*llsElk#1zkk=Z;%N5tCdHN2;c-5$D z^_`0ERQfK(%amTB7?Tx1wo;I-QoK^}Dj;(NnIp&!8Dw|IkgZnsbC$j*5`(rz@!g77 zE51kZ8Usy`$+5ZUprzMF!Q3lg)+xSM@j8H6uNbd&08^{DR_P6j*DAeHF(w-UW|M%a zQ@jaVE5K|PFq;L;TL#P)WlwhRL|c{pyrs9rz-(8%1v{_eZHl)yfbq-r3m|--k|W)u ztp=O1lB@6zVeC+0{Q&l3SV1mF0oH$%?8wcI7?YUuk8zKi@jOO7xZwvy<~&)NMgP^RqK45Sfgq-IaN*9sMEDh zAZc-nbF@UaKfbrQ43k{(K_!M)oxYb7>H@F9dOv9vmHm00>YP$Ysy%`R@b#Q4{^ zzGta3wN7m_W8#HoT@ugK!h~&cTnJw4&o*mIqS~(c5;3&1`Lvj-H>#SEY*b5<&r@|4 zCYK5B_mf8kPm4{!^$f#ez~e{eIi5X36460f>Z@93Y>QT%4H>TSCE_cQU})GLT!Fld ziw?4skYOSM;JOwa@{Lu9;~Rzn%@7Lgpx9pdPgH)ZRL0Qc6miF=m4mQioj`nXavKYEpUy?iNZA zzD%Gsb!a?9Ob5)2;A_pskF+?yjSmwzu z+kyQ32B33K%iPGPX2~Qjj%RCFB0AM%-q53n7>!bALNzQC8gNEJ>POL*lw~QCy^yMw z0u)L}?GP1@Aam;*6Sq8rCRZ>CApcdxI1i^jIxynr*&m?D*`a$`fh=<_(Nlrt-1qjXDB=3s@VahdBQ z=lMAYk}u|`u^kB8RwuPh(93nDu{@dNd{%9+<{ zWUL{P%PeW{*}OaQLaZ=fcLPz^!$LE2Diro_Cy0d6ud#~6tp!V z&2KwZ%)Qn2R^=jOBhEwR*SviS+_NW;f;pzK~^Z>mZ7J_-2-7QyVLaYKU^lP027+Q z>CKUqdC{)c5HN-MLYIa@HHQguz94&nEX0r5X03bWjL39%jz~C& zNX(pZwIe@*+g9gn&S?#zb10{R9(Qu_I}7&1kzH3N9+y@ND)Do)&N-SP|H%w0ay93v9g;-vQ2PFtP*J-Vhp zDkzX#54OGNy-4|emVK(uiR(GqJ;U(3h}WFVcBVPQX7`*=+no=4mgDo%Ue8J<(|Tto z-7lv6i#;Yu#!0TTxOaj2w9aWA8mCUW!_qBy8s!`b&8MACao%&Z$7#}MFy^EBoWMLM ze?ab1lRvo$o{{J@D#M+Hlwl!E_s>&^r0iPeY|773)ythD`8hqRmy3oM*8{mXCkOT! zP(i|P2@zC+71%3;AT|gaiDwEtPPg;Q1oE^H3fwpb#RUIXyI(yy_Ie1`Gnc`cFQNH*;Ewx&0QIaYA+e%)RVbnkYw0vO3;0Hx2ol#eo4j}a$u(=Xz^Rfx~ zRTFYLNOs)(U?9VO){tK?}%< z+4}q-5|oDre+8NS7st}k>XN}3E&_3FNtcLs{1TjEY%aQ_7vvX}x;BepFR!!}J})cn zaxVRMZDeq&v5`4MY@Cnl^&z*G?UvZx%f9SmsDnV*G;aeVLAqPoC+$2&Ko}k{_&i3k zFyzLY6=gX4ho+@B7|awl?%H;r82gK%Ei)R}?S$@v>kRmTCjfOu+#Af zWAWvZiUXGy|8B^w@N2p(MeETLa)T^1j*ngqN_b2j=3B?og#P&yDW8KA z+c^1C#rc8D#Z5QN)=w3U$EWrH|D&lFVV*th!VBC;63kX@7sxJIf77(#D)libAj_YL zTk(3#Y;(>89;tt?tjHHRO{8$1U=KTs9YYQg+19W#c`7l-<|gGX=LqV{6)M3L8yBvE zkdcEy#N~+b*pay?inBlcP!+DUs~6q8sTGWQSk3*FT%aj!cApg#QG93&7vDfv2#1x0H8fjo*nbtGG^e9h0ynB-@h~8g$f0C{ zf@3-2Gy$v}hd7mD!T>0on1IA0nkB|v^r778P_Zjg9Xq4p%KTPhNm$|&-{0Ki;YNeT z!GDawk5|kXZ^5{M;6p`moO~#8hy%hPG8VLauQe#ViB^IqdMYDrII?4Ax>)7@bR0I2 z1lT~m*n zC7eN*4d%9CsqqzsFl|FY2Zo ej>I>zS7`rDV**aq;;w3Dz`1{MiFa+lvi=9U$`rf+ delta 4792 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 Be)9kT