From 52bded653488ac579a948071f8bddf76896df18f Mon Sep 17 00:00:00 2001
From: "quentin.perret" <quentinprrt33@gmail.com>
Date: Mon, 13 Jun 2022 17:11:16 +0200
Subject: [PATCH] almost debug second thread

---
 Code-C/getArray.c          |  13 +++----------
 Code-C/initialParameters.h |   2 +-
 Code-C/main                | Bin 24632 -> 24600 bytes
 Code-C/main.c              |  23 ++++++++++++-----------
 Code-C/power.c             |   1 +
 Code-C/simulateFlux.c      |   4 ++--
 6 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/Code-C/getArray.c b/Code-C/getArray.c
index 8b2087c..7389042 100644
--- a/Code-C/getArray.c
+++ b/Code-C/getArray.c
@@ -15,27 +15,23 @@ long **get(int N, int M) /* Allocate the array */
 
 void fillArrayWithRawData(char *rawDataFileName,long** p, int N, int M) {
     int i, j;
-
     char *buffer;
     size_t bufsize = 200;
     buffer = (char *)malloc(bufsize * sizeof(char));
     char* token;
 
     FILE *f = fopen(rawDataFileName,"r");
+
     for(i = 0 ; i < N ; i++){
         if (!getline(&buffer, &bufsize, f)) break; // condition d'arret de la boucle si fichier fini
-        //printf("buffer : %s token : ",buffer);
         j = 0;
         while((token = strsep(&buffer,",")) != NULL){     // séparation valeur par virgule initiale : csv
-            //printf(token);
             p[i][j] = atoi(token);
-            //printf("%d,", p[i][j]);
-            //printf("%d, " , p[i][j]);
             j++;
         }
-        //printf("\n\n");
     }
     fclose(f);
+
 }
 /**
  * @brief print all the element of a bidimensionnal array p of shape : N x M
@@ -76,14 +72,11 @@ long **getRawDataArray(char* rawDataFileName , int N , int M){
     long **p;
     p = get(N, M);
     fillArrayWithRawData(rawDataFileName,p ,N, M);
-    //printf("before  test\n");
-    if(checkArrayFullyFill(p,N,M)==0){
-        //printf("after test 0\n");
+    if(checkArrayFullyFill(p,N,M)){
         clearRawData(N);
         return p;
     }
     else{
-        //printf("after test 1\n");
         return NULL;
     }
 }
\ No newline at end of file
diff --git a/Code-C/initialParameters.h b/Code-C/initialParameters.h
index 9a2e2f4..ba11617 100644
--- a/Code-C/initialParameters.h
+++ b/Code-C/initialParameters.h
@@ -1,7 +1,7 @@
 #include <stdbool.h>
 #include "queue.h"
 
-extern bool rawDataWriteFlag , stopFlag;
+extern bool rawDataWriteFlag;
 extern int nRow;
 extern int nCol;
 extern double freqEch;
diff --git a/Code-C/main b/Code-C/main
index fdb4b168bbc5f9156fe034b1d95e48e07e446b48..31dc9ce46809548b4d233859cd21ed2c5066e57b 100755
GIT binary patch
delta 3731
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

delta 3957
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
BvNr$#

diff --git a/Code-C/main.c b/Code-C/main.c
index a6c84b8..bccc3f9 100644
--- a/Code-C/main.c
+++ b/Code-C/main.c
@@ -5,7 +5,7 @@
 #include "initialParameters.h"
 #include "queue.h"
 
-bool rawDataWriteFlag = 0, stopFlag = 0;
+bool rawDataWriteFlag;
 int nRow = 100000;
 int nCol = 9;
 double freqEch = 250;
@@ -22,20 +22,21 @@ double period = 0;
 double invTimeBandWidth = 0;
 
 void *threadCalcul(void *vargp){
-    printf("start thread calcul\n");
     Pqueue rawDataQueue = firstRawDataQueue;
-    while(queueGetNextE(rawDataQueue) != NULL){
-            printf("wile calcul\n");
-            //pthread_mutex_lock(&mutex); 
-            power(queueGetTabChar(rawDataQueue),nRow,nCol,period,invTimeBandWidth);
-                /*remove(queueGetTabChar(rawDataQueue));
-                rawDataQueue = queueRmFrstE(rawDataQueue);*/
-            
-            //pthread_mutex_unlock(&mutex);
+    while(rawDataWriteFlag){
+        while(queueGetNextE(rawDataQueue) != NULL){
+            char* fileName = queueGetTabChar(rawDataQueue);
+            //queuePrintE(rawDataQueue);
+            printf("%s\n",fileName);
+            power(fileName,nRow,nCol,period,invTimeBandWidth);
+            /*remove(queueGetTabChar(rawDataQueue));
+            rawDataQueue = queueRmFrstE(rawDataQueue);*/
+        }
     }
 }
 
 int main(int argc , char** argv){
+    rawDataWriteFlag = true;
 
     period = 1 / freqEch;
     invTimeBandWidth = 1 /(nRow * period);
@@ -45,7 +46,7 @@ int main(int argc , char** argv){
     pthread_create(&rawData , NULL, simulateFlux, (void *)&rawData);
 
     pthread_t calcul;
-    //pthread_create(&calcul , NULL, threadCalcul, (void *)&calcul);
+    pthread_create(&calcul , NULL, threadCalcul, (void *)&calcul);
 
     pthread_exit(NULL);
 }
\ No newline at end of file
diff --git a/Code-C/power.c b/Code-C/power.c
index 52153ec..4b58106 100644
--- a/Code-C/power.c
+++ b/Code-C/power.c
@@ -3,6 +3,7 @@
 #include "fileGestion.h"
 #include "initialParameters.h"
 #include "queue.h"
+#include <assert.h>
 
 void powerCalculation(long **p, double powerArray[] , int N, int M , double period , double invTimeBandwidth){
     for(int i = 0; i < M-1; i++){
diff --git a/Code-C/simulateFlux.c b/Code-C/simulateFlux.c
index 57f3596..28e1980 100644
--- a/Code-C/simulateFlux.c
+++ b/Code-C/simulateFlux.c
@@ -114,7 +114,6 @@ bool writeOneRawData(FILE *rawDataFile){
 }
 
 void *simulateFlux(void *vargp){
-    printf("start thread simul\n");
 
     char *fileName = createNewRawDataFileName();
     FILE *rawDataFile = fopen(fileName,"w+");
@@ -131,5 +130,6 @@ void *simulateFlux(void *vargp){
             FILE *rawDataFile = fopen(fileName,"w+");
         }
     }
-    queuePrintWholeQ(firstRawDataQueue);
+    //queuePrintWholeQ(firstRawDataQueue);
+    rawDataWriteFlag = false;
 }