From 2e7253c43c8e65a98686582d853147831016103f Mon Sep 17 00:00:00 2001 From: "quentin.perret" Date: Fri, 10 Jun 2022 15:50:27 +0200 Subject: [PATCH] queue ok for flux --- Code-C/main | Bin 19192 -> 19368 bytes Code-C/main.c | 5 ++--- Code-C/queue.c | 21 ++++++++++++++------- Code-C/queue.h | 6 ++++-- Code-C/simulateFlux.c | 2 +- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Code-C/main b/Code-C/main index 3b69e1ef77c4cf11daca18bbc316c192437c3fdd..17258e960d2ae2c921cd0e392f1b2013b424a03b 100755 GIT binary patch delta 5460 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 V^vwLpgOg_S1;bTCqf@h!{s%=PV7~wW delta 5016 zcmZ8l3v`sl6`p^?A9f>oY##i(iR48hfxsrqBRtb&fxs>#fQ0}BG@*)u9z`BO1Y<}8 z$g(GzaI4^<9v}5VX|>d}2Z%3%ih%)YYo}dlU%}a4W>^H;*5X;V^gZcfYxF z=g!POv)Q#>i#(&XxRPs~Oq6md*xE_0LtcyPbV#++(R$hw*P9@<-ULe4Jnk*JR4vJp zq^?n`mgSfbBefmWs2MqtVN#2f{#=GNsfTI5HZ!L-M{2jqqY`FEX|Qc(j;VZ^%9kZw zHc4~QbGGrRpOR^P6V{EQy_H&Z!(E7woXpM2eQ2QArC>{`Lw8YO>|4qAcvdaYgVmZymEC-4XX*vsj8u{o`yNv)IX~g!*wd_n?}?6 zCe5?4Js3kRB73&=S!5`NwJWSHeHk``jeVrzu(EE&Rh}#j-D*`VoYBd?g_=&ieGRwT zKZ0nMNj_hOBpPNn+-VXJb>t?iL3hFGy2)Cra>6&Do0{#9YO$m{-ghV7#Mw|TmA(*8 zI_s#>`nPrDPl|mj>6co=%O1w=Yq8kgbAjN=yZym0{Y_tW&ze)&tgnk_%-3?&{ehC;FBbe!3%D5k z6J2ojpR6msJsQ4GxV7jT1e?_rRr{Mtzu}wRAN+cCKYyrnH@cX^qS2_i6xAVpEKN@? zb@xkPtbG8dHIHhM5w}8^i|D1~O81}9Y#%DEh0uf$eH4D|BBN}B<*jK*3M~-^mxi0?jhVdURu{k>w0dTNN=YMbzeraygM><`w1T^9~kpYb=Mk)_s@&9$5G8dF@`vLk4kQt#o z;|=Wy{oM$ceu<-v@Vc=7&&%eCkp4;mV;E?@T&+%c?cxL1NBC4efZEB`ha+^}HNPSC zI(mYmI#;zWe@8fmt0lr(u?O?(LdSjn;HMmZ`UkK=)!elO4du*G^*%s*6lgui*3U5*eup>7ZGabGbeXJh^%u7fgf|iIf2MxIt6ZvipR)o{M1(+2wwKh@dd9{`$5h|hPVUUvfVMORQk8Tuj~ z9%*?Q`H!Qu4uOk3=u1f2Y?~AxYisY<7hjXxG1=e2?j~PehW-v(57OeitXTd~+O z=jF!Q5$3@jdNVIQwgAoVd+2yxy6#8QL+8+GDO!stK0ia>f>s<2%g@UH6I%KIi$-U| zJ-a^S3^C+nKu2M(r4{*;9I2ShS}--d77RPqYEHm<+A#IRK`5f|=MpctZe&q!CtQc3 z^khouR=P=EPnOnAcY2DnUDSwne|pJNrtP6GJXuZ`X3qa;$ItS6HW4);L4Fx+q#=ib~=wqsZdGbv|;fi&cd zNQ+5h5xR54>+Tly^TX@*2~i3JfJw`v;rKHf+LF>)@Dnq z$|Y-qs^Lw$LE*T|L^+I_<1N`z$Av7)=cqaUVz$&R{IbIL+=AbR_2B#i5`TbM9deZ6 zgz8`gG+N>0y)T@= z7J~!EagRC-m5QH07fK8*OVlGoJ(bt`Lh!T6XG_s`QsZbtdz7Q@t;)+KbrQ!ZFVBdc zuL%x5XX1y`3ZFDu5p(poNvKN!Us1`ag-Z&QTWkm#TdgIj}HNlxFB6xkE0JS zy>OUp<9l7|Ry}|gk2SPnI*Cz^@V0xB@-Qq#awaJ13~u!esLbA_ zaO?=o`45<65`1n@KCKa7P*K)8B~qvi3zWCrD!J?0dn<6^F2aa!Nbj`o(Xww&%<4)2N^C&9+m%XKc7z`m`;boULh( zP_UxNY27fE>`#Y*TK9`3N0MVo(E#gqv1GA~L;PJvqv|OG9R=ztETG0Iqp#nO);+n0 z4o_*Y7pt)8!W4t*UP;19;KpM*si- diff --git a/Code-C/main.c b/Code-C/main.c index cc23244..d02a0a3 100644 --- a/Code-C/main.c +++ b/Code-C/main.c @@ -19,10 +19,9 @@ int main(int argc , char** argv){ double period = 1 / freqEch; double invTimeBandWidth = 1 /(nRow * period); - Pqueue new = createE -/* + pthread_t rawData; pthread_create(&rawData , NULL, simulateFlux, (void *)&rawData); pthread_exit(NULL); -*/ + } \ No newline at end of file diff --git a/Code-C/queue.c b/Code-C/queue.c index bf570d1..d14a0bc 100644 --- a/Code-C/queue.c +++ b/Code-C/queue.c @@ -24,7 +24,7 @@ typedef struct queue *Pqueue; * @param lenChar size of char array that will be created * @return Pqueue new element created */ -Pqueue createE(int lenChar , char* _tabChar){ +Pqueue createE(int lenChar){ Pqueue new = (Pqueue) malloc(sizeof(struct queue)); assert(new); /* ???? tab char create or give pointer ???*/ @@ -55,18 +55,24 @@ char * gettabChar(Pqueue elem){ return elem->tabChar; } -Pqueue setCharLen(Pqueue elem , int _charLen){ +void setCharLen(Pqueue elem , int _charLen){ assert(elem); elem->charLen = _charLen; } -Pqueue setTabChar(Pqueue elem , int _charLen , char *_tabChar){ +void setTabChar(Pqueue elem , int _charLen , char *_tabChar){ assert(elem); elem->charLen = _charLen; elem->tabChar = (char *) malloc(_charLen * sizeof(char)); elem->tabChar = _tabChar; } +void setNextE(Pqueue elem , Pqueue next){ + assert(elem); + assert(next); + elem -> pNextE = next; +} + /** * @brief remove and free the last element of queue * @@ -129,10 +135,11 @@ Pqueue addLastQ(Pqueue elem, const char* str, int len){ previous = tmp; tmp = getNextE(tmp); } - tmp = createE(len); - tmp->tabChar = str; - tmp->charLen = len; - return tmp; + tmp -> pNextE = createE(len); + Pqueue next = getNextE(tmp); + next->tabChar = str; + next->charLen = len; + return next; } void printE(Pqueue elem){ diff --git a/Code-C/queue.h b/Code-C/queue.h index dbaed95..d23fab8 100644 --- a/Code-C/queue.h +++ b/Code-C/queue.h @@ -11,8 +11,10 @@ Pqueue getNextE(Pqueue elem); char * gettabChar(Pqueue elem); //Setters -Pqueue setCharLen(Pqueue elem , int _charLen); -Pqueue setTabChar(Pqueue elem , int _charLen , char *_tabChar); +void setCharLen(Pqueue elem , int _charLen); +void setTabChar(Pqueue elem , int _charLen , char *_tabChar); +void setNextE(Pqueue elem , Pqueue next); + Pqueue addLastQ(Pqueue elem, const char* str, int len); //Removers diff --git a/Code-C/simulateFlux.c b/Code-C/simulateFlux.c index e5538eb..7286853 100644 --- a/Code-C/simulateFlux.c +++ b/Code-C/simulateFlux.c @@ -107,7 +107,7 @@ bool writeOneRawData(FILE *rawDataFile){ } } cptData++; - sleep(0.004); //simul la freq ech + //sleep(0.004); //simul la freq ech return true; } else {