From 06dd2cfbc15c0c3020934a449334d1c9254032dc Mon Sep 17 00:00:00 2001 From: Mark McCaskey Date: Thu, 26 Sep 2019 16:18:23 -0700 Subject: [PATCH] Clean up example, add changelog entry --- CHANGELOG.md | 1 + examples/parallel-guest.wasm | Bin 41500 -> 41653 bytes examples/parallel/src/main.rs | 4 ++-- examples/parallel/wat | 9 --------- 4 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 examples/parallel/wat diff --git a/CHANGELOG.md b/CHANGELOG.md index 730d90d9bdc..d06203a93f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Blocks of changes will separated by version increments. ## **[Unreleased]** +- [#835](https://github.com/wasmerio/wasmer/pull/835) Add parallel execution example (independent instances created from the same `ImportObject` and `Module` run with rayon) - [#834](https://github.com/wasmerio/wasmer/pull/834) Fix panic when parsing numerical arguments for no-ABI targets run with the wasmer binary - [#833](https://github.com/wasmerio/wasmer/pull/833) Add doc example of using ImportObject's new `maybe_with_namespace` method - [#832](https://github.com/wasmerio/wasmer/pull/832) Delete unused runtime ABI diff --git a/examples/parallel-guest.wasm b/examples/parallel-guest.wasm index fafa0f291914146eafebd02a20be239575e4c93c..0f8d24dc7fd37afa5cae355edb17f6eb5d7a43c3 100755 GIT binary patch delta 4576 zcmbVP3viUx6~5>G`)`u{_wk2k5|VKLCFB7K39F##nf?}X|vh; zIQQIh&-u>d-aYmrf9ejO%HK{ z4Lo1xHx0wII2tc`Re*Yz`#kH~)~sj#j7DOTteFt$^_Yh!eS~FaPph3ev3SCmu~|JE z#?233otIlMyWSZo=FA;ED(Cu}Zn$yDgS2+@x;yC}+S-0=M<4B@yJ`D=IzR`>cjhuQ zR5C4WE^wG2b#>Z=pgWRww15d_aTUmzMj5IhSb4_Wf#-a%$}vDDxzF6Udg zAdXpoQ6E!j#Y2=MJn}qqrD0SYl_R1ut%fs9B2k&17}+k_z(lq2QB&p1%q1{)wa%Er zM}Yn8&Os1tjIgT|-KkxgaD(vF(GGl%h7LH743kQjU) z0|6B5wIR#xk5O`PA6fnIVQd_e_S!HNfL{tpb|B2_v4`r!6z&luIP{XjF(h+5yf*PM z&!#a7^k0T$qlb z$)2cWQ<;Vea!kjAO=50kfjvTVr+)p;{=l~az=f?NC>xsehAb@E@PIx zf>~;rkuy=t(f)^@wUt=vPv@Z+-vRs2(AqFBV0FyN#CMn)G-kwjtx*e;eUcn2Wj3r~ zivl<>K}PQv*n>Wx5y5iik7U6Hc^W>6mNFI&%Gi9E&$Wshpj}YT>XE&)aVqO^XM@xu zy<6mtu>xeN1~kAgQN5 z;1Pb|n;U>np;t7FNkc-%O&T41f(b+#1LV5xN!JK?^y?)Dm+= zgI^~CmswGbpFLcc3gG8b^N0f1?J`4MHXT~29Pjkl zQC(!JA*z^XIYERB1_D^4dzHcgnI1(JYbOLn0HbhV4&oYP5wedHVjParyt!dlIRF4C zQJz>GZFd;fd|GE0Dwiy1F_26}wx7p_I6NW8-4N8+>J9$K>%<;-zO(sg#3#1EHeKp*V4zbk>vxKfQ4XC+1RcS-ucd0WR02Q(hj2?XqS#!>QlPN zaa00BZ5X`>#K361wAyW7aN99iL)g-jY`@CVY$e%4maOE`J41H``A0LUwY)>n4b0Bdv51D=TE%<0fS+67oPa}?jsL8yf;%% z-rWD;$0rWIwrA1*Rk+nlW5&}F^~sq0*j)%hrV~pSVq`7KEi#|md!gG`j))|1b##P$ z)9tV`bt^oO8uXG?^xxigJ(F@cq~vMw>gn8Vl&`AtZb5q@Zw3X`AM->ZBFQ8D(xXGl zfMULeFpD~dV9*W~_`+`Yrd6G}6AP|!Z%_nRE{=nG@V_SvcvF#}<5C^WpReZS=RtZ` zeqm|QvW9C*AT1>d8Sss?cJ=4+3r7BxdpwwW6*RmkWvr z>DtEK`oVEN;ppV8YY4@>TsrMi%I6{ES6e8 zP(9%kLGRz9eMo)jUO4LEOdIofVZSBD40Gs$$$n zKsT@85ZWgSDk)99TTt#F`fyO8@i}QSVWuh@KaYykmhmft`G^Herx^^luTrxM=Tn>N zFPu$P>dnH15&hOVyBCK}kuRgO!7g#TO=V|asCAWh-vYYC>GCMcWx5?utwoy)kL^jS ze7YaIg*=7M-K{MKG%o8h^=VN_sS7F2HyV=2>h}PU1hO7|6_8GM1ITh9JG*#ySlN3>9rL(9@tt(v%e12b=uT>5*dF}u>v*FsKDy^(6)+ne6fpy@yL4<%{ z_H_tYcf#x@RIt>z)#^bE@>+LpHwunTU!Ny5UbYey`3dQ+NSmP_>pXumXUWxp}%w{kZ%mE}Kr_qZMl?pm=4u z2XIeNHI-u%0v;_Bc0vueaoaL z>Q*6y2rix{@4+^A#oiNtDw4)&k$Sdf7B$DesJVbi{JpCi$wR{15RXjzM6ZTtZpZ5J znI96meYN8})S@1r{co&1S|7u>WKK0TsTFfdd>Va$Ah282;W_<~6`q?(;ET-LLe1*2 zd0&9^Xv2$|w0^-RkltVLIkui#_$0&}xc0XE7F`R{QTR{=_5F$eD|O9Ys+`8x=w|iC z*haKMj75D|-qfBbD4@LElncr~o2LHH)k!3iBm-dr?WZ%#WcnfOWAe}d;ObHjF4{w@ zR6+AnIC4jGC(gXkT$r&Ow^^FbF*SVgN$OV5EWXu)pBCL}V$1kU{aeN@q9osjkQ%O9 zTPC|q)70}V5zRPXecm#|N~|KuZ5f~5dc6rAwR9hK$MbIdh_b;Zk1DN%&OO1Zb)AHg z{c-2!Dh{QtTYi>S#V4)EqnNHwAKZsD^ay6Jf^vq$!x}N=vA#=&eu)V8;m&JaJJ-84 z+bzAgYEW3R@TlOZ#RWuT0d4)kUhYeJrg}>)U?~++@cyJX0TnfJ6x4&=Hc#8AZMApAe;0j_({Z(V-QTl2aR@501j2SS zF$Ol=j>dPbpTucb{HGg=iTczZdfE^&(>G>?`e?|TZ6B%brbg?Oc3A>Wb$VkK^~c}Z z*g(K=>?R#)yEi>Yht;;t`Ko<$mOFYHZPk{)(&2dcHV=WN=ypXvjQ{NRGvsRNw|A(+ zThCD}e(SbR2!<}ZV|B_mk?vjll*e@`fCiK=`|ByuiAO{HCd(1W)m@6f_^0Wt=O)6Rl2h^^B9O_ zn7o4CkNzz+uyb0*Ma&|Y^{KaZR+%fwW-LCi>j;&M08#&G4MyQRbUqsMEPTPtJgT{` zpJvD3?Q8KARaQr;D>|#D)U>x(c2-wjRn^rInG&h!XlpBPtLnU}t+JynvZ^|wZrazw jFY@^7`|60M$20d^M&=TjQVe-#{I+{uN4)HwPlx{pHD9fu delta 4348 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 diff --git a/examples/parallel/src/main.rs b/examples/parallel/src/main.rs index 91c6529493f..b68b0eaeba3 100644 --- a/examples/parallel/src/main.rs +++ b/examples/parallel/src/main.rs @@ -9,9 +9,9 @@ static PLUGIN_LOCATION: &'static str = "../parallel-guest.wasm"; fn get_hashed_password(ctx: &mut Ctx, ptr: WasmPtr, len: u32) -> u32 { // "hard" password - 7 characters - let password = b"2ab96390c7dbe3439de74d0c9b0b1767"; + //let password = b"2ab96390c7dbe3439de74d0c9b0b1767"; // "easy" password - 5 characters - //let password = b"ab56b4d92b40713acc5af89985d4b786"; + let password = b"ab56b4d92b40713acc5af89985d4b786"; let memory = ctx.memory(0); if let Some(writer) = ptr.deref(memory, 0, len) { for (i, byte) in password.iter().enumerate() { diff --git a/examples/parallel/wat b/examples/parallel/wat deleted file mode 100644 index 3df012731a6..00000000000 --- a/examples/parallel/wat +++ /dev/null @@ -1,9 +0,0 @@ -Serial: -a; b; c; d; e; f; g; h; i; j; k; l; m; n; o; p; q; r; s; t; u; v; w; x; y; z; A; B; C; D; E; F; G; H; I; J; K; L; M; N; O; P; Q; R; S; T; U; V; W; X; Y; Z; 0; 1; 2; 3; 4; 5; 6; 7; 8; 9; ab; bb; cb; db; eb; fb; gb; hb; ib; jb; kb; lb; mb; nb; ob; pb; qb; rb; sb; tb; ub; vb; wb; xb; yb; zb; Ab; Bb; Cb; Db; Eb; Fb; Gb; Hb; Ib; Jb; Kb; Lb; Mb; Nb; Ob; Pb; Qb; Rb; Sb; Tb; Ub; Vb; Wb; Xb; Yb; Zb; 0b; 1b; 2b; 3b; 4b; 5b; 6b; 7b; 8b; 9b; ac; bc; cc; dc; ec; fc; gc; hc; ic; jc; kc; lc; mc; nc; oc; pc; qc; rc; sc; tc; uc; vc; wc; xc; yc; zc; Ac; Bc; Cc; Dc; Ec; Fc; Gc; Hc; Ic; Jc; Kc; Lc; Mc; Nc; Oc; Pc; Qc; Rc; Sc; Tc; Uc; Vc; Wc; Xc; Yc; Zc; 0c; 1c; 2c; 3c; 4c; 5c; 6c; 7c; 8c; 9c; ad; bd; cd; dd; ed; fd; gd; hd; id; jd; kd; ld; md; nd; od; pd; qd; rd; sd; td; ud; vd; wd; xd; yd; zd; Ad; Bd; Cd; Dd; Ed; Fd; Gd; Hd; Id; Jd; Kd; Ld; Md; Nd; Od; Pd; Qd; Rd; Sd; Td; Ud; Vd; Wd; Xd; Yd; Zd; 0d; 1d; 2d; 3d; 4d; 5d; 6d; 7d; 8d; 9d; ae; be; ce; de; ee; fe; ge; he; ie; je; ke; le; me; ne; oe; pe; qe; re; se; te; ue; ve; we; xe; ye; ze; Ae; Be; Ce; De; Ee; Fe; Ge; He; Ie; Je; Ke; Le; Me; Ne; Oe; Pe; Qe; Re; Se; Te; Ue; Ve; We; Xe; Ye; Ze; 0e; 1e; 2e; 3e; 4e; 5e; 6e; 7e; 8e; 9e; af; bf; cf; df; ef; ff; gf; hf; if; jf; kf; lf; mf; nf; of; pf; qf; rf; sf; tf; uf; vf; wf; xf; yf; zf; Af; Bf; Cf; Df; Ef; Ff; Gf; Hf; If; Jf; Kf; Lf; Mf; Nf; Of; Pf; Qf; Rf; Sf; Tf; Uf; Vf; Wf; Xf; Yf; Zf; 0f; 1f; 2f; 3f; 4f; 5f; 6f; 7f; 8f; 9f; ag; bg; cg; dg; eg; fg; gg; hg; ig; jg; kg; lg; mg; ng; og; pg; qg; rg; sg; tg; ug; vg; wg; xg; yg; zg; Ag; Bg; Cg; Dg; Eg; Fg; Gg; Hg; Ig; Jg; Kg; Lg; Mg; Ng; Og; Pg; Qg; Rg; Sg; Tg; Ug; Vg; Wg; Xg; Yg; Zg; 0g; 1g; 2g; 3g; 4g; 5g; 6g; 7g; 8g; 9g; ah; bh; ch; dh; eh; fh; gh; hh; ih; jh; kh; lh; mh; nh; oh; ph; qh; rh; sh; th; uh; vh; wh; xh; yh; zh; Ah; Bh; Ch; Dh; Eh; Fh; Gh; Hh; Ih; Jh; Kh; Lh; Mh; Nh; Oh; Ph; Qh; Rh; Sh; Th; Uh; Vh; Wh; Xh; Yh; Zh; 0h; 1h; 2h; 3h; 4h; 5h; 6h; 7h; 8h; 9h; ai; bi; ci; di; ei; fi; gi; hi; ii; ji; ki; li; mi; ni; oi; pi; qi; ri; si; ti; ui; vi; wi; xi; yi; zi; Ai; Bi; Ci; Di; Ei; Fi; Gi; Hi; Ii; Ji; Ki; Li; Mi; Ni; Oi; Pi; Qi; Ri; Si; Ti; Ui; Vi; Wi; Xi; Yi; Zi; 0i; 1i; 2i; 3i; 4i; 5i; 6i; 7i; 8i; 9i; aj; bj; cj; dj; ej; fj; gj; hj; ij; jj; kj; lj; mj; nj; oj; pj; qj; rj; sj; tj; uj; vj; wj; xj; yj; zj; Aj; Bj; Cj; Dj; Ej; Fj; Gj; Hj; Ij; Jj; Kj; Lj; Mj; Nj; Oj; Pj; Qj; Rj; Sj; Tj; Uj; Vj; Wj; Xj; Yj; Zj; 0j; 1j; 2j; 3j; 4j; 5j; 6j; 7j; 8j; 9j; ak; bk; ck; dk; ek; fk; gk; hk; ik; jk; kk; lk; mk; nk; ok; pk; qk; rk; sk; tk; uk; vk; wk; xk; yk; zk; Ak; Bk; Ck; Dk; Ek; Fk; Gk; Hk; Ik; Jk; Kk; Lk; Mk; Nk; Ok; Pk; Qk; Rk; Sk; Tk; Uk; Vk; Wk; Xk; Yk; Zk; 0k; 1k; 2k; 3k; 4k; 5k; 6k; 7k; 8k; 9k; al; bl; cl; dl; el; fl; gl; hl; il; jl; kl; ll; ml; nl; ol; pl; ql; rl; sl; tl; ul; vl; wl; xl; yl; zl; Al; Bl; Cl; Dl; El; Fl; Gl; Hl; Il; Jl; Kl; Ll; Ml; Nl; Ol; Pl; Ql; Rl; Sl; Tl; Ul; Vl; Wl; Xl; Yl; Zl; 0l; 1l; 2l; 3l; 4l; 5l; 6l; 7l; 8l; 9l; am; bm; cm; dm; em; fm; gm; hm; im; jm; km; lm; mm; nm; om; pm; qm; rm; sm; tm; um; vm; wm; xm; ym; zm; Am; Bm; Cm; Dm; Em; Fm; Gm; Hm; Im; Jm; Km; Lm; Mm; Nm; Om; Pm; Qm; Rm; Sm; Tm; Um; Vm; Wm; Xm; Ym; Zm; 0m; 1m; 2m; 3m; 4m; 5m; 6m; 7m; 8m; 9m; an; bn; cn; dn; en; fn; gn; hn; in; jn; kn; ln; mn; nn; on; pn; qn; rn; sn; tn; un; vn; wn; xn; yn; zn; An; Bn; Cn; Dn; En; Fn; Gn; Hn; In; Jn; Kn; Ln; Mn; Nn; On; Pn; Qn; Rn; Sn; Tn; Un; Vn; Wn; Xn; Yn; Zn; 0n; 1n; 2n; 3n; 4n; 5n; 6n; 7n; 8n; 9n; ao; bo; co; do; eo; fo; go; ho; io; jo; ko; lo; mo; no; oo; po; qo; ro; so; to; uo; vo; wo; xo; yo; zo; Ao; Bo; Co; Do; Eo; Fo; Go; Ho; Io; Jo; Ko; Lo; Mo; No; Oo; Po; Qo; Ro; So; To; Uo; Vo; Wo; Xo; Yo; Zo; 0o; 1o; 2o; 3o; 4o; 5o; 6o; 7o; 8o; 9o; ap; bp; cp; dp; ep; fp; gp; hp; ip; jp; kp; lp; mp; np; op; pp; qp; rp; sp; tp; up; vp; wp; xp; yp; zp; Ap; Bp; Cp; Dp; Ep; Fp; Gp; Hp; Ip; Jp; Kp; Lp; Mp; Np; Op; Pp; Qp; Rp; Sp; Tp; Up; Vp; Wp; Xp; Yp; Zp; 0p; 1p; 2p; 3p; 4p; 5p; 6p; 7p; 8p; 9p; aq; bq; cq; dq; eq; fq; gq; hq; iq; jq; kq; lq; mq; nq; oq; pq; qq; rq; sq; tq; uq; vq; wq; xq; yq; zq; Aq; Bq; Cq; Dq; Eq; Fq; -0cc175b9c0f1b6a831c399e269772661 -0cc175b9c0f1b6a831c399e269772661 -a -0cc175b9c0f1b6a831c399e269772661 -RESULT: 4296081456 -. -Password cracked: "a"