diff --git a/bash/perf.sh b/bash/perf.sh index 7568b1c..4ed7e69 100755 --- a/bash/perf.sh +++ b/bash/perf.sh @@ -17,18 +17,20 @@ # Stockage des résultats de mesure # (et des téléchargements) RESULT_DIR="$CUR_DIR/perfs/$SESSION" +if [ -d "$RESULT_DIR" ]; then + rm -Rf "$RESULT_DIR" +fi CORPUS_DIR="$CUR_DIR/perfs/$SESSION/CORPUS" mkdir -p "$RESULT_DIR" mkdir -p "$CORPUS_DIR" # Fichier où on stocke le temps d'execution -TIMEFILE="$RESULT_DIR/time.txt" +TIMEFILE="/tmp/exectime" # Commandes TIME="/usr/bin/time --output "$TIMEFILE" --format %e" HARVEST="$CUR_DIR/harvest-perf.sh" NET="" -HARVEST="ls -alph" cd "$CORPUS_DIR" $TIME $HARVEST @@ -37,5 +39,12 @@ NB_PDF=$(find "$CORPUS_DIR" -type f -name "*.pdf"| wc -l) NB_XML=$(find "$CORPUS_DIR" -type f -name "*.xml"| wc -l) NB_JSON=$(find "$CORPUS_DIR" -type f -name "*.json"| wc -l) +NB_ZIP=$(find "$CORPUS_DIR" -type f -name "*.zip"| wc -l) +NB_TEI=$(find "$CORPUS_DIR" -type f -name "*.tei"| wc -l) +NB_MODS=$(find "$CORPUS_DIR" -type f -name "*.mods"| wc -l) +NB_TXT=$(find "$CORPUS_DIR" -type f -name "*.txt"| wc -l) NB_TOTAL=$(find "$CORPUS_DIR" -type f | wc -l) SIZE_TOTAL=$(du -s "$CORPUS_DIR" | cut -f 1) +EXEC_TIME=$(cat "$TIMEFILE") + +echo "$SESSION;$NB_PDF;$NB_XML;$NB_JSON;$NB_ZIP;$NB_TEI;$NB_MODS;$NB_TXT;$NB_TOTAL;$SIZE_TOTAL;$EXEC_TIME" >> "$RESULT_DIR/collecte.csv"