From fb7985cb67046b4736a58f2f517c236baaafa1b9 Mon Sep 17 00:00:00 2001
From: Denis <denis.nadey@gmail.com>
Date: Tue, 11 May 2021 17:26:54 +0300
Subject: [PATCH] create logic block

---
 philo_one/Makefile                |   8 ++---
 philo_one/includes/philo_header.h |   1 +
 philo_one/obj/logic.o             | Bin 0 -> 1820 bytes
 philo_one/obj/parser.o            | Bin 2144 -> 2224 bytes
 philo_one/philo_one               | Bin 50470 -> 50710 bytes
 philo_one/srcs/logic.c            |  47 ++++++++++++++++++++++++++++++
 philo_one/srcs/main.c             |   1 -
 philo_one/srcs/parser.c           |   2 ++
 8 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 philo_one/obj/logic.o
 create mode 100644 philo_one/srcs/logic.c

diff --git a/philo_one/Makefile b/philo_one/Makefile
index 942b953..899f5ee 100644
--- a/philo_one/Makefile
+++ b/philo_one/Makefile
@@ -1,6 +1,6 @@
 .PHONY:			all clean fclean re
 
-SRCS			=	main.c utilc.c parser.c
+SRCS			=	main.c utilc.c parser.c logic.c
 
 
 SRC_DIR = ./srcs/
@@ -18,7 +18,7 @@ vpath %.c $(SRC_DIR)
 
 CC				= gcc
 RM				= rm -f
-CFLAGS			= -Wall -Wextra -Werror -I ./includes/
+CFLAGS			= -Wall -Wextra -Werror -I  ./includes/
 
 NAME			= philo_one
 
@@ -31,13 +31,13 @@ $(OBJ_DIR):
 	mkdir -p obj
 
 $(NAME):		$(OBJS_FILES)
-				$(CC) $(CFLAGS) -o $(NAME) $(OBJS_FILES)
+				$(CC) $(CFLAGS) -o $(NAME) $(OBJS_FILES) -lpthread
 
 clean:
 				$(RM) $(OBJS_FILES)
 
 $(OBJ_DIR)%.o: %.c $(HEADER)
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) -c $<  -o $@
 
 fclean:			clean
 				$(RM) $(NAME)
diff --git a/philo_one/includes/philo_header.h b/philo_one/includes/philo_header.h
index 90b7684..cf4aa2a 100644
--- a/philo_one/includes/philo_header.h
+++ b/philo_one/includes/philo_header.h
@@ -23,5 +23,6 @@ t_all				*structalloc_and_bzero(void);
 int					parse_and_check_values(char **argv, int quantity);
 int					ft_atoi(const char *str);
 int					check_f(char ch);
+int					runner(t_all *all, int optional);
 
 #endif
diff --git a/philo_one/obj/logic.o b/philo_one/obj/logic.o
new file mode 100644
index 0000000000000000000000000000000000000000..22eaa60092036d73d7c3259e529196ab85825e33
GIT binary patch
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<WxLIAYLI^7`Ye@nSqUTO;PmU|APxj${+<FlU
zUE*LF1sRkG;h(mqM$CuOQP@xQIh65swTR?$ZPgC@_$S6E2mF?pF&~eZgF+a$kApD!
zWkJ7mc3>}VIeX^#jCn2F5UYne$EijV6v9dDkD%^6V>!`0kfZmYELBpu|2b&E>hPQ{
zM`224=1O9jTNF)IP<pSzmqt|t8r^qMw5f!cFSsfAHRW=@%FK1eP!rvBiSI{STw5B;
zfG>p`4^rsCdArEN{*i9<z)lfAkb6{8u(pyaM?*yXjb>-CKXv&(>#BX}U6<1vb8Fq?
zF7A!<oR)*y`_9?AV>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`o7yyx<g71i^bgIUddfp7<!f1wZF6XU=^eGlk?pZjxs8;Gl9d~;C$EaM3oUjgFE
z8F2^oC14HeUIH=PSaeWd0OCC~_(u%XgFx>86o}u1G3%f{4CMMjAnt_G@1WiX<oaF*
z^(#QGuLt5NMxBGY&%ts{B7o!NVPFjmCFn&p7@*#>Cz3ytIir$?B<J~@|61|~lE)>#
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)

literal 0
HcmV?d00001

diff --git a/philo_one/obj/parser.o b/philo_one/obj/parser.o
index 01a56e751f12b1da195cc27a11fd987edf110e96..368455bec8bcfcd23cbf4d601303e0e8bbcb5279 100644
GIT binary patch
delta 722
zcmZ`%KS&!<9R9srE_X4B$<a8(p{Ed9g$gOs;$X<3i^C07?BLQAX=&>q+LFNrnm81k
z#N!FBQ4kU*#U+^(u0u!N94|{T(9t0QL;YUvh0sDD_xRrT=l$OCe$Pvs8he(J2~uy|
zFds9{Vs7M}G7tk;>LH>r=Xl!a8=riiW}Q}U^h&1RO0lXE2}#%Z9D5lX(}?1r37x3I
zzcZ7m{ER*2mn?dI!(InID(t#jRBBz9oQh($58cOg#P_`jb*k>0x;a9d%>XTX5vy~g
z<l8!xmzs)xA~I!0FMxZPj^MY*c<{o#Ot_bs#Jc91^(TBg_-JvQDA}u;`n&2lQldiT
zKNUrlrV>7B#i=23t+>??Rb!$m_kzZ#JX)9+Fe+}o-Yw48{wRz`)GfZFTEPS^nIE!b
z$;SN*5lvaZC~y{tM%XhxW}iuY0*D6KX&<vmU<~<th+<zG2+6+lG5Z@BhW=CfKY;k`
zOCPhRK<sBz{8cE;hIt|MrF4Kl9+ut5l2U>r*YEYN<OLigMhR2+-z49Vd|&b%$@}}a
x1c%puCOPo<;5`08GoIU0Tafx1_#i^G@(*9-HO*ubyrE^(&xQ5%_xzXk^#M}kht>c9

delta 629
zcmZ8fze~eF82zs4kEpGt*di*J1_Zk}h-h^vt)+uPmKGg!QJm^n97G)2MRC(`4vsED
zl?oLd>ZH)c(XnF`hx!Ky78HHgTxjvg<$dpc-@Qw|yIR=RPSau4OP$eV4yslz6<tue
zq6eYvBbu--XTxq{$H|jseWb=JvU*F3WmF64#m_TrKGgCP4T3%gh|c*T)0vmwvMK(=
zf_F`}=HZ4iTtfcLR;b+?N<ZjPDlU0w)mGB&w}Et9rE>mNQLj5SM03DXOiS=Ma+QW&
zj}b+B^+#yq&^msjR5W`046G4r?XFjU*NlI9<73#_mOBcki^gXC=OA<S+aR9s?enTH
zTY85DhHRfh#5;yx?<bm$0E0jch$1uSU{bV3=-+589`nn=WD6+tcOXhk+reZL*a!Vy
z=4(J9nN=r9@?-xb3-KHOE<52yU}W7rq$7OIAc|ICC&nJ8;Caalk{2W|OYW{O3XYt6
lz6ovx^qDNwAzYSad11D}Wr&C<_m6Mz*MQD7)!>Wj-XB3HYbyW%

diff --git a/philo_one/philo_one b/philo_one/philo_one
index d5a26e70f09b3ea406c359c4e7044576299ba1c1..bf58e53d7b4d36ddccc2ab2472e9527c29379e66 100755
GIT binary patch
delta 2178
zcmb7F4Qx|Y6h800b?eyJx~`1jGWw8FOBB~lH@bG+io`fVL?8qgWR}u(7B;rAc5^zk
z<wqq8YM*yP3<|3u$S{U2b)m@5emdh~0AE3YL?E5PxM4(MkT4UO=e|BzotWrN&b{ZH
z`<?UMd+vSr9c<@z@8bNT+EWC;0Dw}79X3yq@I#q;izVi*h&f@4g%mPn>LJ;^PIeDj
z$ToE6mBr9)G!eGEGIEajgGnT3*fz#MmT);t5^-{mW*B@jnFIqckO21_o0Uj@<4g~`
z(7Cf8U=&9dC7ap<02&-2jKYv*30cXhs7*&nB7!1EF+7Ntup*OmCg@d9*etuf=A!Ha
z<K;CyFPYvZmlBMur--N(%XE#HiDsOSqC%mWY0E{SHVgq|u|Yv`BcJGv1qptma5q?G
zT+A{XNx<|1`z#Z@Yx;^M&8Bp3AUr#?d}3lxGzG>Fg<lM5XTatW7FI=5tm7YZwmVAj
ztsLQ$hmRn}#{gCs{17z??*Vj-A|{G+$r2{{up52zQSS<CL%P^z{g788yoLTg^vyw^
z#4+nWN4-Qc2ZQz?LFYY!iW1?~I0Bk<giAg=mJY|(pnojgdW@1_?Px_Ml6sj0&pzhs
zED<)u<yc4OiQS|jv&<>_XcCN%CRxX&=p80ui~~W>!1(is!Y!Yp+xoL@Q5Weh)p$F%
zYwtuCgFq)}E$~GBPx%Z2hod9aEG)qwtbsZil54jDtdf#un*}TSqjUcyZrCiC9~Aek
zStz7&Slba?6c+qxx+1j_l#|JKlnQwG9Z}o?1wDrPKQKOvz{mV6>265K!sm`+;SK>j
zNwW`N!Re{sE;M>9@FCJ;$y}r5x$jgOwh~zF1*+f7oYciQy*p0#$LWo-zB!XsN%7D0
zb<wdggIq5wp0ONn?k^J)GfS~XRKJe;N|Iad^NM}qsmM0*l=uZd&&^Xk;uE{Y9?9D+
z9-jst1BfTZUS2$bs9<C}AK8k^QSo!J8^OEyxC|Zx!VCU8ykMGl3Rvtz`jEuXiwq%T
z4pElK*2ud&u5pqK7eeX&zO?@rUN8;F{_;6#^Z_$sWvIMn37#!4v@W<Tzf+^~cuO8Z
zeyCFAF`JI~&F?7;b}CAzCuGcp)g+<6veM0GSZ$3SSCi9TZF6AnapD)_*2j4_Hf*Rz
zA2!AY3Q*cMxopl>r=!{9w7D?M*#uRa?1-^DTuw)=4QgtjmAuoR<vqwW+MC=?8+0=s
zr`rP;nWpCYdc=<~^xfm&)<%2*Yru^#`zH95;ox*FdOS90XPWCBHYw^d1FYTCumL_~
z9QL}p1_uNX7^=hg{s!!>HDY&SGseZzoMG(sxEGhR0vFR_uWNR?;T%Tn@F33Lf?a1T
zc9&@v!iNM`QCYW>JHS*9v%6S7TZ)8IyMcWgz8D5lFrf9Gmj54G^rj=?1fBy0;^!sV
z#^RVwA3-|bzc6N7WqU2&YKmVf+xPxQD`Z=RA3UAMXGw}rFvaYanC%6le73L4fNFUG
z@5?qX6YNDB6VY5!>%u<XJ~G8VI>qjrVt*sqOD7XvnF63csWg;y6ctJaiW(&o<$-gg
zWUwN+=H3Al@8ANZd@*eF-YBGVCj*1?a;IL+`!>Cl<j280q6!x$4gt?XD*h&Qq$#Z7
zvs%}G6k64DvY+hEslK_-cIE2&s>tzW=Tl~u<o|T_`j_Nj*vcnWUh<y4lcA|nhhJv%
z^+9{FZVegB`Q-P&mfC>!=lvvc$j7&}-5!qWIub{IwYRR;RX<YG{=tDa2QKu^{_O19
tfWquT&^kUTWnsm&mi*T9uUu>y{l4R&_BS5a_BwCxO`EIR*W33s`~|V;l~e!#

delta 1325
zcmZ8geP|nH7=P|ASJG@tvov;*uH?FE%{D)3B`(%{oDMcO$3C=!h>+VYz0s}dnzU(|
zjpafWaZ*Q)w^aY=LS&;R`bRhN$0B94+eJ2zN)cA7BG##6vMNPItlOy1<!&SNxaWP|
z-|u;z-}~~u&pS54Onktk=j?7T00jW4Dje{0dzG63doG}}EjkIg0BNNH_637}#h@1g
zWEg2KsAmruG#4b_Q2$XTGD{~Zj_hITDV9jg_KjRhPc%PBB%d$`=w_Du$+T_ZkvuX3
zP()9oInmr#0BX?lR{^dA*>9?=u107<V~N7nvrY_DD~D=H*5tOmC%^i5?VRscrewMC
z@1?;$vS9MkZZEO3`<tDpWW%zpXqwlQwXXq9!!{M5jxH$d&(9RH>@-aho@Y%dpE6#^
zdv?;4nf$)vP5KTL_Ij_;<OP4Nd~kL3qeTW*ZrAW%xE_J{OEk1EGW^QTb^MAMQm_5Q
zm_M7;asWK2pN2V~(gHB*##l~u6*&M$nRob=ZOBg}SC3p-?@@?1R_HZi&3L7j*Dou$
z^M_&^D#SJ!VtB~<0%^ZuNA5OmZV@+y2UuP#s|v;Y$(Qr1Dkw9IFz@1+8y75e2xwP%
zp01e3D&_~vbBAmGkcGBsMa#RV^O~PClX?I1<gvgI1tb&PV%2&J|FY!+g|CCHe8aNQ
zLiY@BHhRaQ`SS6f%d$4p#wKVdrkPMHmSaEw7OI5qPC+^)Mfwwx&?$)>QZF3n7LT8V
z*CU-$q)UL%v4j98h^*Gh?@}?bw@(t_45jrF1GyM>)iIEe7Q5jz#Xu^KjF{*-4ucUf
z8tsXI%)n9{bN^1@@bLf+%LACBmwZl%Cp!dvr2#S8FZIC%R4KlNX{DsL%UmoJeV;i`
zg|5@q5pC5=XjZ%ijwn}Late<^ducAT8l1#l)bW!BUNYiZw`lQ1n;z#4{NSbTGH}VS
z$HN9L`gGi7V5gx!j2Pu)ZSC@x#u33oJhldB*5HXXSbKfz(AJ}2<AD`zEr%3vAXHo#
zv8vCJed>0+o=s$2Z6ZIYO$=s{dum&iYU5~Fk1x8J94$GxKUzNg&D%9|v8$n98k-8f
z{j~UFhcftm|Bg>b_R;U0K10SzJg4@=-tb-K5C5`Z=eg44iEpz{#V2~fonFd)*LiK|
zVut)vN^zTK8@C0XIQmsMw;bJS3Xe`EGM=-4wI{1Kr*6&XFW<+cBix<(@jUr;s=3=T
a8oL_~&rW&vuF9oF=c&8HUk>g{`u+#$W>R?o

diff --git a/philo_one/srcs/logic.c b/philo_one/srcs/logic.c
new file mode 100644
index 0000000..0991a91
--- /dev/null
+++ b/philo_one/srcs/logic.c
@@ -0,0 +1,47 @@
+#include "../includes/philo_header.h"
+
+void *test(char *str)
+{
+	printf("поток %s отработал\n", str);
+	return(NULL);
+}
+
+int func_test(t_all *all)
+{
+	pthread_t t0;
+	pthread_t t1;
+	void *result;
+	(void)all;
+
+	if (pthread_create(&t0, NULL, (void*)test, "t0") == -1) // предпоследнее это функция и аргумент
+	{
+		printf("не могу создать поток t0\n");
+	}
+	if (pthread_create(&t1, NULL, (void*)test, "t1") == -1) // предпоследнее это функция и аргумент
+	{
+		printf("не могу создать поток t1\n");
+	}
+
+	if (pthread_join(t0, &result) == -1)
+	{
+		printf("не могу присоединиться к потоку t0\n");
+	}
+	if (pthread_join(t1, &result) == -1)
+	{
+		printf("не могу присоединиться к потоку t1\n");
+	}
+	return (0);
+}
+
+int		runner(t_all *all, int optional)
+{
+	if (optional)
+	{
+		func_test(all);
+		return(0);
+	}
+	else
+	{
+		return(1);
+	}
+}
diff --git a/philo_one/srcs/main.c b/philo_one/srcs/main.c
index 3a36598..4a25c98 100644
--- a/philo_one/srcs/main.c
+++ b/philo_one/srcs/main.c
@@ -9,6 +9,5 @@ int		main(int argc, char **argv)
 		printf("exit because error\n");
 		return (1);
 	}
-
 	return(0);
 }
diff --git a/philo_one/srcs/parser.c b/philo_one/srcs/parser.c
index 2c9ddc9..3169ef7 100644
--- a/philo_one/srcs/parser.c
+++ b/philo_one/srcs/parser.c
@@ -60,6 +60,7 @@ int		parse_and_check_values(char **argv, int quantity)
 		if (!parse_param(all, 0, argv))
 		{
 			printf("ok standart run\n");
+			runner(all, 0);
 			return(1);
 		}
 		else
@@ -73,6 +74,7 @@ int		parse_and_check_values(char **argv, int quantity)
 		if (!parse_param(all, 1, argv))
 		{
 			printf("ok run with optional\n");
+			runner(all, 1);
 			return(1);
 		}
 		else