From 709288b773dc81d70be5addbc697d845e00d9a94 Mon Sep 17 00:00:00 2001 From: Matthos Denys Date: Wed, 12 May 2021 15:48:43 +0300 Subject: [PATCH] fix structure delete int in s_all on time_t --- philo_one/includes/philo_header.h | 21 ++++++++++++++------- philo_one/obj/logic.o | Bin 1820 -> 1936 bytes philo_one/obj/main.o | Bin 832 -> 888 bytes philo_one/obj/parser.o | Bin 2224 -> 2204 bytes philo_one/obj/utilc.o | Bin 1552 -> 1788 bytes philo_one/philo_one | Bin 50710 -> 9256 bytes philo_one/srcs/logic.c | 11 ++++++++++- 7 files changed, 24 insertions(+), 8 deletions(-) diff --git a/philo_one/includes/philo_header.h b/philo_one/includes/philo_header.h index cf4aa2a..a2d71a7 100644 --- a/philo_one/includes/philo_header.h +++ b/philo_one/includes/philo_header.h @@ -9,14 +9,21 @@ # include -typedef struct s_all +typedef struct s_philo_data { - int number_of_philosophers; - int time_to_die; - int time_to_eat; - int time_to_sleep; - int number_of_times_each_philosopher_must_eat; -} t_all; + pthread_mutex_t *mutex; +} t_philo_data; + + +typedef struct s_all +{ + int number_of_philosophers; + time_t time_to_die; + time_t time_to_eat; + time_t time_to_sleep; + int number_of_times_each_philosopher_must_eat; + t_philo_data *data_philo; +} t_all; void *ft_calloc(size_t num, size_t size); t_all *structalloc_and_bzero(void); diff --git a/philo_one/obj/logic.o b/philo_one/obj/logic.o index 22eaa60092036d73d7c3259e529196ab85825e33..cbd161aaf45cb0785ee5545a7abcff5ec45d91a1 100644 GIT binary patch literal 1936 zcmb7FTSydP6#g|+vCD3hWKlQ|MZGAyLEwvF98QBBD*(ND$`DYdv|#*FhEkg}N1O z(Jtk&=EWp7LtN0$!3>5Y%Hi_GGZs-wsdvf_GkQVK7c8AG$n#{FuL0-ukGM{VPENUI zAJ!VEdp#Sgga|+()Rf{G%uxy3fJ<+MMZIW&`i1V(Q-Azl_GeW4yPBK|s&?P3no7*7 z>BdW#WkgI;b@;vg(T@C5?HM)sCfGLCF~s;#__aOm)};Gp)U^8~)%1q5D0K^yvkQUi zo4^3RV+B4t^3^R&_e~axT30GM>@S*7Q`9B#Z5j7bKkPGL;9UWx`C(4@HBJ+18w=Dn z3IF-CbkU=L=Fi|>hkdw4O+{u^EtG94N~A8cSf9tZgj+XQ6;R9 za9%l26z3&Sk8(*RH-ODE=dm*a@GZs1V1)n=|2sTfwFK*A(LLifc!CBQG|o_y+(7P* zf)NY7Fb8!jp6vh1(cLfgd53PNNJ8v=$lGQ4{EH++WR-jiR~%R+zlHfruACGlmxCq2 z^%a#vsM&@14yZG?;0n(t#KDch8>NRf;5BuHaLv#O#_^mh;<|zB|C8tAc~`{U1@1oM zcf+4r6! zdb)TRSB_&P4o~)DRHVWmiwkAYja}Itoz@IZFqZCADaGcaJ9i0v}+n%K!iX literal 1820 zcmbVNPe_wt7=Lu8Q_F>UFbw>l0y`+qEIjzZw7SH1i1Oe;c$GQR)KAe*l8o5eRcHeb z9y)k*L9j?^_D2P~_bnnkc$hamba&CT-?Q(1o!bbj2cG?&-}C=vd*6Ne`Qz{`Q3*l# zqYRp0LxVytLOZh2EG_!jEOlJlGDq}VIeX^#jCn2F5UYne$EijV6v9dDkD%^6V>!`0kfZmYELBpu|2b&E>hPQ{ zM`224=1O9jTNF)IPp`4^rsCdArEN{*i9-CKXv&(>#BX}U6<1vb8Fq? zF7A!naM*;3V%-u2Mhp2xSgOw^vjT;6+Qt1*G|)it4h8TQhaNMz=6 zJ?ss8J^9>Tx8G}5r!}^dK|5~0$$I1VhbppK$^K-oYW7EDy-kL-WC+GPd&Q0;d0sow z!D>ai_wUoaRRy{B2Bs&n16DC0fx!tLk_;tZXjm~f3w!Xi{LTKY9Mkiq)1kNx`6B(a z^M`o7yyx86o}u1G3%f{4CMMjAnt_G@1WiXCz3ytIir$?B# zEBTJ(U6MDThQ)%OoEKn@gRA$C%RKn#1hQO!GFRUxzJo017|S&%*C_GAILR9dIEkSd z(~m!kX^X~03*LAVQ!}O+08U!NQ-Og&@n~Yi1jFlZ4duLk#H@fUYPqS58_H-`#&sIA S#wXhpg#qeS6b5K3@B14*+Jcb) diff --git a/philo_one/obj/main.o b/philo_one/obj/main.o index 330829f1b7398a679148dc992822c70e4a6ed9e5..1460cf1efd9e9e7a84113a123f8dffc1e014c0e5 100644 GIT binary patch literal 888 zcmaJeYQf}m*N3JVbh8(GeCH9?ceJv0abAu5I-SX%lM z{0V}BrLBKJFc85qh^XJ(?P3zpfp5Q=ots6}Jk8-f#+3P=ds^_)y@S8WQ> ztfzGbRQ^o$r!`ta^k?U@2bS##KX;VLZ40ryq|Y)JRA4B+fdKcF#G;<3Nm2-z7CVlW zm0>|^f7eQ9Uh$pMQz7*brM1sI4J3i!uKsSKH~`~IdEZd)v;v+)jCxuD8jWiiO^r4l z_{U#2%P(fBW;~`o`Bb@BH_QIJSt-6({Q4_zmFg5f?SxYu!D3#{O@MAG$f1faE~jc$ z9ttH=Nqw572V?VI7BZf(C2h-hr6C zY8<&?!2AwP&jT&=C(hdz`=VS7n+5P5Q!^nCj)GA>1!9i!{Kp$^Ww#-uv6h&`f#tYT bSQsHYE$uyVXzlybC6To literal 832 zcma)4y-vbV6h2sg5;3?i=wv73AOs16F)^u869)!k7}#!VtwMy-v_(l+NL(Bt@c|s= z4PerQ2QV(i5gxz?zy$R>+^esC_)f6^Uw|lDipE~-Sw+J z{9~Fj^C5czyo5ZfBI`nUX3diTPKexbJ~zQZl$QbX%^@zp@Juibc7X_CxSmtAu4H1C zFW`yGdWy+HG6OM>Q7PNH;fbnsTeL2O$R35-$(BHs{saWP+daHoeTp)T+8T6Ri=r6{ z;U>;E5%B#mi3Z2jQz#4X%gSdLpi{)a|B;_NdK=Xv?a?8%o_iaeew4Zcg@%1a8xEpc z7aR{7Q3f;c74fsRIJZTOvnTZ9n{ht(*b|*m{h$rL){7$E&05h@&rL(Gx~6J6PQ_Wq zv5Clg=kcc`1GGq#NWo*T?Dp92tMJ${0mu2pJ^0x8(m3V+e=!UbyeIR7ags6aF#JBN zq4OMuAZ^ZI61MKRrqJ=^M!__$#f@I7nl6<@5@**)4tvDZHj&Y D7uI5g diff --git a/philo_one/obj/parser.o b/philo_one/obj/parser.o index 368455bec8bcfcd23cbf4d601303e0e8bbcb5279..db8d9fea254f34fd65ae49255b427b6e394f6ef7 100644 GIT binary patch literal 2204 zcmb_d-HQ`f6hEtRH*8ZUpn}qcy+SFG5?MvT2bD;jnuiwDy3h~8bxbC1FdxfgqEQf) zxU$1iw1t9yf`}BK`_KkZ=AKF7xclZ|@BPjBo!>q8 z+>^UAzdio%*$C0ldcuT}z(}scq%dIHFlIThhTY@^unez(MLu#84+)djzT5U$VNB~2 z_Qxk8uaEn=5E$pT_=THKt85!;*b)0DW%r#lrDQt%{2?+^(Cb-HzeN#&MA39 z<_)4L35Bp5^Hz-Tr`R}3WMRN~Q|9lYjwEmbQx%BybQELII6seAD+VQNK2PR@zw^Px z<)F3Hxwu5u)oYOE=j`RqKC-T-;QVB-aBc^9_DW&Cywe)L${tzc6!xdHq@+jrU~s%Qb#} z-~r&Ssoban`(c-7mmmr(tWR%(AezlLP$-H`{44%=R;| zFl<_2FTA|puib-2eXOtU?e}wcy9s{O4|1x&z87UdfG-L9lPkP~f(T+eHGYP#w=O;@!rpl#LMy07-COeEW(pxL7` zQRW@WybyS2*e1RU^12A0WKxEw@EWfcm$%s18tXSpo}mlJX{enZN~cDWH=unR{20dl zC(lEZ{fQ23OkZ2~-kZa+j&+AI7FLW->R46B|J=8p8lBYhiY|i}8ve3lnDAc9ZUN#5 zTb^TL{}GV=zc8VO?C-+=BK$W7v)6^672X4~z9f7>_zw+cCxCe6W>Y{|_Az>p0RAKR zhv0XDw}GttO8hH=HNj5=-xth5jK^Um2nhXsKnsD$_>p~O>L5GvMN@=7AgALo|Ff9S z-}^!R_Lxt4+VPsM#&y=kDYtk=pLMD&w@Dfox$b(T@mX#aeWzM&6hqai3$E875o57a Zi*krl_O;_TDq!(F_sfLOrt4x`dI4Sdxh?7fK6n@TPuoLo!f>b!vgFuy|VgvyM60xvKD{=6ls&b$grW|82ezSebuLLeI4Zm82?C&;k)2tvslE?+HqOeHqndaM5clM-C45q-`YwgGPX`P`y)?rF+&>&R{J?m~ z7ZqQB$QKviaLCs$zP%yeF!qDI2XIbYW3id2`+a!Nb-6|yHCC+neN$(#sp}iJKB=Jx zK`*QbdSTTzz!$B=+HcJd>m18{x!1f{Pwb_+l^&YlT)$g-E#~Ko`T6D}bP};Y!S3)H z?$xptyC1GOiuf9y?<1T;IQ9X2{M+zr?Au;rt1n&hb54GyRs0XQ?kdiWYxH-hfxqIm zx@M2Oj`tAs<6LdiiunB~T~QU!E>795r`&3>mnQ8gWxJPp2?`wQTHc#crLvbV741SV zIj&oBRk`5U6-QNJh^@{#MNgenNfS1z5OYE$P3BR>SHRXd&ligFuaPYuPkcXcH|xPQ z?oZ6ugxpR;UGyw28x%@qfOsFI#(}unv!?@09~OTSh*a4_0j5WQ=w<39oV;!g2v_#M z0MjpkarhsJ{t$>yb}7L0pFm#!3y{~}1!9ZYg#gn(0D1ikZ~!WG-yMo^emIX6t6s9|sAi(E80|y|O!SBNX)HLsxAB9)(&^&I#SpQmh zS@?qR?}VH6H<&{+@0YXSgQ0pnWp2(dE8Lv-W$;iqec8q*+qi1u$u>^9Y`Yal<7cgN zGfwV`zG@e$PK65k2wu3P@w+ZMK#*$AvkQe%&JUiv>9{45HOOJlnp8rjJ#BlXJiK^q fd()(+UB{8MM~+j$n=OwSiV5g3Looq8imlRXFSo@$ diff --git a/philo_one/obj/utilc.o b/philo_one/obj/utilc.o index ec09fb915cb245bbbcfb6b13aa8f869ae5603c51..19865c1d3246de7ece440a5f77185952706d6ee6 100644 GIT binary patch literal 1788 zcmaJ?O=uHA6rO0+TGLL1`io%2zk?L3cxcf>LV6RvJfFB32kxxUS>8)iS>~;?`OXEyUFJJ>aRaL7z=G> zIKW-t1yTmUpabAxvNxe&3IHt|Okg7?Bc{AWN~IGI(puN{b#dc*%MP@)En1^|lsd9q zOBnM3hNM#Q>C{Xto>tbq`*-i%QR>R&_WPjlym2lg8TB$0Y%C1$lzl0pC>W%2t zl(E8+fU+nFEg(FMNx-`c}H=a`7Mi!G?jESWmlA(PeH98K|Ew# zw>rTOUuMko8~HGR_yT=Tf{;2vi%h437VT=O-7PiTQX_$i0+I10bQSpev~&ix$igCLJzO8(1S=Q65i4M3|WrBe+YbQotpOjpbvJjFY0T+tvwV2XjV^9qgB&gb()Fd}qQ>Gz@M_hZp}`de(}kV^dSp waTUXh|MtVg>@@xlR4S30OQcnNGRf3LTE)`ScNwfiJgFv_N;M)HH*u}9zYUA47XSbN literal 1552 zcmb7EUr19?82_%f>E_C%1X)otsK|$5Mv=ZPEGX)s#0Q@`tu=AXIj>$xvf#>IjGl}h zjG!j;uxY(S!uF)Hhk7dXq30Pyn-Wy?umx-VzI)HbEhXrKbAI2y^PS)M?mg$judly% z6Db7YX&1&ID{UB%0~mQz+j$yME&sGxfylNS;O0>$mkFVVCUj{4gy_52-?wGk+Bdm? z>#d_)d8Ewh&h@*fB=Cjv<{BD8f`*9kSjQH8bNh$1tp8 zxRHzjVGiu?!a64~4eSSU^cn^W=kQ>j^->4?msEOaHP=Di`Htmo?{U&lu+P-nNlPeF zpCZj~>ps$QB>kPF8Mc0wv?=H($>_~{C<9*mD!`n_pTQn8%c}TTQI*y5q?#&cX(pk1 zi%Z!fX*<8-rczQB#Z>lLn!<%H9O7|;=u9$uBkgoha}v45N@c&D(}*0gNZK;?tns}f zZ4O*(e8`()p5Wplqs4jOb%;4u*RIZY;|yYjv`sfPD73)TB6u1Em(Qr4S3{Eu9(!|I_E9Fxdxk-3)@V-1|2rqG{x z^rt;M--SIMI#=j>9(`Ltk0R*N0($fwJuLx2Vclc(zTokf zcn$Z4dzDk2^ZXrh*n?v@(;Mzn5{P)|9nm7&(?H%c8TS^OB$yhVFG*Btu;4krabSdD;x9g}Jb<_EhDKv}S4A`w9Si9qI2a)@po@SW c3lpqRFd_y>M9mduBxtEadUT|dcs@n+2VLTMfB*mh diff --git a/philo_one/philo_one b/philo_one/philo_one index bf58e53d7b4d36ddccc2ab2472e9527c29379e66..23cc77d5c1f0c3a7ac7d2e8d9145b54f55ffba3e 100755 GIT binary patch literal 9256 zcmeHNe{3699e+-{&ZH^lbnOUbQ?G-Rl&!5(R;gtxa#4@oSi5yyGfjnZb)0i!;@FXW z?ouEko8u~n7iK0QBm}7ZF;qcWgSLtaM$&du)1hf|rU{A~BnvTgh9E3aA+POfKHq!q z&dy~;NJxl3{G@m9eSd%7_kF+btb2az+TU*8&X{irW1}sMF$q0z8)G>pW5(D=(N%O! z+qZMKa!}d-C}9^i-$L*MA<}ahjGA^pdGf$Q7F#~B5XS@zSD4d@L(>d>*r@Y*^%cNO z`ZoDF55Y_8>;#N9f|`~#GQDXR<<&Q}g6sQ);Ba6^z%TSI69}$P>(}E$dI~tNzCQ_l zdjvnh6nD2R@-LD$QnADl!Qj;w{4n?LYhn`!Zfpy5gP>`d#8a_EpB76*lQz6?KTaV5 zNEPilHG;i5IE6oHU$;R(({}AVu(N@J{j*(i_SG{Y-XR;7)XC%9hco8V2aoOqV=feyJ~h` zo>6X)Idi0{nwg54AF1RsRqM-GL$=DKFj|pnNM%Nu2PatP$VqiZDG{jVm5LhKJ1_<1$o z1N#}+U%Dk*4UX@GS3Vv*!li@gR1*G5*LTOU)yjq|+J8tk}_*GiR&|SPUsuvm+LA zYaJQSj#MzE#c*tn3W;NLwE5VL5@f372ROdOB#xg^s=%-^&K1`EPj%)ztqS>D$}4l` z1?vmkR?(5iSVeNe)u^;~7h}TTz_bkcDasSeULi~o>kQ-SFbgfMPyO|2TYVaErZ5n& zv!CZbmmmI?IQV->#OYwUsr(8;#hw{8j33w>Opp@ed z+3UqYhp@L&vNze!q4nT(2F>%?CcF;dN*5|7g{(4n-X z=7;^(`WyD1R?ORJXVv^S0@fW4YWGrs>#%Cq1>0`Fz{%EMU0j>Mby>f2aRJ~eeB1Zm ztf63Uln*r;{+YvBH~c*Z)nNFzi>n(>0f&TyesedOu2_}#Z42)4D6I`S>kosIn+7NGFb2+r60_C-a?j<<XyU zP6Q5z_B-WoV}zw;QZ7ntc5Hh@JbE2tn}{^A;{?~R90M`hK{J)2^%E40YwwNnXE}F_ zbN_)8frGtEWxLcTb_{UhIS@&esk~;LtTXcXgm?it^@;ePATw1s66Mm*K%)C~^G#E^ zs+tvEa#8pE={{#(v}GnnD(b}QGbl}UVg)VVdK7}$Dh|wc?&kc7*v_mzQiLkg8=fuaUH(qP}&4vv9 z7FH}u)p@gG-FPvI7kaI84?L}PK4L%j*-!Gl)_K5wK7l7=dnWE)jmgf(Yn?O}`UzS7 zGj#XUPr&jV&19OrO*6``@+F!*NV6%L?WftxnCZhYL+;fh;Y?bW^;9aEYGug*IcJ=S1qk`6n9(mMhm2S<5stSqTTC8`>tX01J>bm@>Ip;MDt9?- z8{}k4zF+QgG;fewS#i2JHTz6)s`yK}GcD76cCNE7T!T#>USEmGIZ~Exl z$P!k-^=3SHZoBN=1g^+ouCz7NJy8{|t8 zDQU-}f{&Cf;Z$1J*d<>|heBOT>FH!9717h|J*eO|-u01Z-07p?cm~A3KwDuIDY_Gn z$qqb9^q5?O$0%Khq7{}O9vWRT={tO)Wwhl)OR(tUx3aVj$;WR#>3a;_%t)A2@ZE>t zwGNDLk_6u;;KR!}yj8#@+=UT6?K=8u?rte4uKPKP+;zV%FfyH;IqXG_!??k46 zM+Hn@vdO=K@aLq%FYLVt7-Ujyw^#6NgfDpD-*{m9V%y07M-N=_z;MgHr^eqI?E78% z*1QrOEp!JSx1!7V=fL8e6dN05V#4=aiyE4pKr|64q($BQLYW|uHSi*P7G;OP3r$0d mQcDvljS~H!?B^-Guu^%AI@RgarMDto*sjGzr+^(I#{LD)@~Z~` literal 50710 zcmeI5du-d)701udZm6BKO;QS!b|XJl=#q^!U3t~& z8&|KpmaP+uIeDUKlE!}Cz(A$eudZG{vD=&J4?xh8eelnv`E{%1B0H8|?A9{?7TfmETr-6Igeb3BJ*xRCDasNGzlxvAVdaPu!2T z%PoJm*iKl_^|#!Eb+^CqnU*wuKfkl)nyXh|xyGVT)R(hP=v+>> zAu)IR$e8x8A#-yLeMB7FhjzZ%WBusR>mlw$%Uqcc_wU?CG!HHHqrzbUnzgK>I5GHc z%tm!{;C^@6|2u1p+s5)7R2`LllsBi6<eeG7~4UE$G2*o$5&CNx4)!&sDOHgy_6mD2C~BifgYvN?f}t6_+ElP zt!Smzip&YvN-4dr1LN_zz&xJU)~~vcZ(Z35f0;h7Iykn928YUN`AB)+@{)5Yfe#ke zn{pW?+B93UQY#^hs+ z>Y_v+VotCCl7HJ&e84LJ-z^IQ2Qux1dNa5`u~6uhyVD< zg2U(=0rx7ROU}VsA!kQF^gMmngTw#uY5pUl?s%HNAqbuM;~S1?$Cl(-41LIv_iU~` zc8!)kfSe!d1fMmGIJ?R_wXF{W9|8>&M~hx z3hEm-_E?Y9qQQet*#th=RNI7A2^%R2M*v&49%qM z$jm^N_tCE*PnPrS)^E47?Y0=_5B(F)JN)u`ux4|ORe5v~=it`@J(p{g7(MjJg1fM% z=D94Po>lgG{CQLNS33RvsrxT<`e#qw|4paAcQoc?KYbk31~njCqL zOa{~BXx?S87%IVCcHWJCevdqz$Duns-@|*v`#j<43;8^bX} zU#6Ej!^-q{Qol$qbv&2p`83cw@Y3K92VNTZt$uDwXL&F^uy^1o)4F%y`Ft{#(!h%Y zUHZTa81>BH4t;Ptgy#mH9oUP(_vkJU#!?JF|34poKH^VsJR~!g! zj)qjqXs%H;kyt34r0bH@N-6Xxr5eMHsj#7H>l@hSgRL$Z4zpYYxiJ`x#%o!d53MN~ zi5YdQ>8u&`$#5{FYVm8BGfG|7jqykfBT+O(dE`@#^(x#Fu5C8Lsvgsj#?6gEj0x7( zhie-Y)zwi;%1AcX8fHutjD=LqmT)pozt)<9$y8X;Ud;%n3_7GGn`1FJ7}h-S@1>&~ zi9B_b!mwZ?J+67_l?GT0MZ2`-SgkT=y{(ZaXv8D*3$4~#RXYZDM=`%Ij-U6N@bf|f z^DH-i);I$zxlO@nb2vo@FyRgZ!&*1tr>zA)Z}U(07Nl`>V|8?=_ff5SzvmuLt7iq` zndNWzo#P`~nzsHu22Qz9D>D0d$mym|^vW`;zr@yGsIc_&Y`x-QOUE$GC+fSz(gU`B z(+W$!+SU!*-*vWLRB81`Y<E9`$C;s>@Kvg7~E)^*$eL(mc4UL8?qj{anh z{#=gUo1?#$qra1*&xSq+wGfr56{F5YJr#AjK6H^zINX!YoV}rSWDC|_t2#rOXM+X% zbf~(MM+esc2US_8aMG!;?Y1ZTXyU$2b(F26IPuz97tXnA&LzveUMF?)VokczN|`3y z&`o?9Q9gTjRv!*CA1`OG=D~*J=kbtd1{(ZFRD)WL$^|%ICf!4`EcNq#1I_@gsXh{o zt9UF-r?=GnvU~kgFZSJc|H9BG536_Ht+{#d`D%m8VwC`ZoSx>xrQ+r-z s{TCg7X2B&@?{6w^d42PtO(SpZUa;%VB_&&A1J=2Ei2wiq diff --git a/philo_one/srcs/logic.c b/philo_one/srcs/logic.c index 0991a91..f257345 100644 --- a/philo_one/srcs/logic.c +++ b/philo_one/srcs/logic.c @@ -6,6 +6,7 @@ void *test(char *str) return(NULL); } + int func_test(t_all *all) { pthread_t t0; @@ -33,11 +34,19 @@ int func_test(t_all *all) return (0); } + +int prepare_resources(t_all *all) +{ + all->data_philo = ft_calloc(sizeof(t_philo_data), 1); + all->data_philo->mutex = (pthread_mutex_t *)ft_calloc(sizeof(pthread_mutex_t), all->number_of_philosophers); +} + int runner(t_all *all, int optional) { if (optional) { - func_test(all); + // func_test(all); + prepare_resources(all); return(0); } else