bug fixes and test2

Makefile

@@ -29,7 +29,7 @@ VPATH           := $(SRC_DIR) $(wildcard $(LIB_DIR)/*)
 
 
 all: $(BUILD_DIR)/server $(BUILD_DIR)/client
-	@echo "done!"
+	@echo "Compiled!"
 
 
 # -SERVER-RULES-----------------------------------------------------------------
@@ -97,8 +97,14 @@ print-%: ; @echo $* = $($*)
 
 # -TESTS------------------------------------------------------------------------
 
-test1:
+test1: all
-	@echo "[threadpool]\n\nquantity = 10\npending = 20\n\n[files]\n\nMaxFiles = 20\n\nMaxSize = 10000000\n\n[log]\n\nlogFile = ./logs/l.log\n\n[socket]\n\nname = ./socket\nbacklog = 100\n" > build/confix.txt
+	@echo "[threadpool]\n\nquantity = 1\npending = 10\n\n[files]\n\nMaxFiles = 10000\nMaxSize = 128000\n\n[log]\n\nlogFile = ./logs/l.log\n\n[socket]\n\nname = ./socket\nbacklog = 100\n" > build/confix.txt
 	valgrind --leak-check=full ./server &
-	./scripts/test1.sh
+	bash scripts/test1.sh
 	pkill -1 memcheck-amd64
+
+test2: all
+	@echo "[threadpool]\n\nquantity = 4\npending = 100\n\n[files]\n\nMaxFiles = 10\nMaxSize = 1000\n\n[log]\n\nlogFile = ./logs/l.log\n\n[socket]\n\nname = ./socket\nbacklog = 100\n" > build/confix.txt
+	$(BUILD_DIR)/server &
+	bash scripts/test2.sh
+	pkill -1 server

lib/log/taglialegna.c

@@ -1,4 +1,4 @@
-#define _POSIX_C_SOURCE 200112L
+#define _POSIX_C_SOURCE 200809L
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -106,12 +106,12 @@ size_t taglia_log(taglia_t *taglia, char *buf) {
 
     size_t n, m;
     pthread_mutex_lock(&taglia->m);
-    if((n = fwrite(buff, sizeof(char), sizeof(buff), taglia->file)) < 0){
+    if((n = fwrite(buff, sizeof(char), strnlen(buff, sizeof(buff)), taglia->file)) < 0){
 	perror("ERROR: fwrite");
 	goto _error_taglia_log_mutex;
     }
 
-    if((m = fwrite(buf, sizeof(char), strlen(buff)+1, taglia->file)) < 0){
+    if((m = fwrite(buf, sizeof(char), strlen(buf)+1, taglia->file)) < 0){
 	// strlen conta il numero di caratteri senza EOF quindi aggiungiamo 1
 	perror("ERROR: fwrite");
 	goto _error_taglia_log_mutex;

lib/threadpool/apiFile.c

@@ -830,7 +830,8 @@ void clearWaiting(waiting_t **waiting) {
 
     while (curr) {
 	next = curr->next;
-	free(curr->file);
+	if(curr->file)
+	    free(curr->file);
 	free(curr);
 	curr = next;
     }

lib/utils/serverUtil.h

@@ -22,7 +22,7 @@
 	ini_free(config);                                               \
 	return 1;                                                       \
     }                                                                   \
-    var = calloc(strlen(var)+1, sizeof(char));                          \
+    var = calloc(strlen(buff)+1, sizeof(char));                         \
     strncpy(var, buff, strlen(buff)+1);
 
 

scripts/test1.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+./client -t 200 -f mysock -w testFiles/1 -D Wdir -W testFiles/1/file1 -r testFiles/1/file1 -d Rdir -R n=3 -p
+
+exit 0
+
+./client -t 200 -f mysock -w test -D Wdir -W test/filepesante -r test/filepesante -d Rdir -R n=3 -l test/filepesante -u test/filepesante -c test/filepesante -p
+
+exit 0

scripts/test2.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+./client -t 200 -f mysock -w testFiles/1 -D Wdir -W testFiles/1/file1 -r testFiles/1/file1 -d Rdir -R n=3 -l testFiles/1/file1 -u testFiles/1/file1 -c testFiles/1/file1 -p &
+./client -t 200 -f mysock -w testFiles/2 -D Wdir -W testFiles/2/file6 -r testFiles/2/file6 -d Rdir -R n=3 -l testFiles/2/file6 -u testFiles/2/file6 -c testFiles/2/file6 -p &
+./client -t 200 -f mysock -w testFiles/3 -D Wdir -W testFiles/3/file11 -r testFiles/3/file11 -d Rdir -R n=3 -l testFiles/3/file11 -u testFiles/3/file11 -c testFiles/3/file11 -p &
+./client -t 200 -f mysock -w testFiles/4 -D Wdir -W testFiles/3/file11 -r testFiles/3/file11 -d Rdir -R n=3 -l testFiles/3/file11 -u testFiles/3/file11 -c testFiles/3/file11 -p &
+./client -t 200 -f mysock -w testFiles/5 -D Wdir -W testFiles/3/file11 -r testFiles/3/file11 -d Rdir -R n=3 -l testFiles/3/file11 -u testFiles/3/file11 -c testFiles/3/file11 -p &
+wait
+
+exit 0

src/server.c

@@ -174,7 +174,7 @@ int main(int argc, char *argv[]) {
     queueT *queue = createQueue(maxFiles, maxSize);
 
     // creo la lista dei client in attesa a una lock
-    waiting_t *waiting;
+    waiting_t *waiting = NULL;
 
     // creo la threadpool
     threadpool_t *pool = NULL;
@@ -186,7 +186,7 @@ int main(int argc, char *argv[]) {
     }
 
     // scrivo sul log
-    n = snprintf(buf, sizeof(buf), "Creato threadpool di dimensione %d e lending size %d\n", threadsInPool, pendingSize);
+    n = snprintf(buf, sizeof(buf), "Creato threadpool di dimensione %d e pending size %d\n", threadsInPool, pendingSize);
     if( n<0 ) {
 	perror("snprintf");
 	goto _cleanup;

testFiles/1/file1

@@ -0,0 +1 @@
+a

testFiles/1/file2

@@ -0,0 +1 @@
+b

testFiles/1/file3

@@ -0,0 +1 @@
+c

testFiles/1/file4

@@ -0,0 +1 @@
+d

testFiles/1/file5

@@ -0,0 +1 @@
+e

testFiles/2/file10

@@ -0,0 +1 @@
+5

testFiles/2/file6

@@ -0,0 +1 @@
+1

testFiles/2/file7

@@ -0,0 +1 @@
+2

testFiles/2/file8

@@ -0,0 +1 @@
+3

testFiles/2/file9

@@ -0,0 +1 @@
+4

testFiles/3/file11

@@ -0,0 +1 @@
+!

testFiles/3/file12

@@ -0,0 +1 @@
+"

testFiles/3/file13

@@ -0,0 +1 @@
+$

testFiles/3/file14

@@ -0,0 +1 @@
+%

testFiles/3/file15

@@ -0,0 +1 @@
+&

testFiles/4/file16

@@ -0,0 +1 @@
+Progetto

testFiles/4/file17

@@ -0,0 +1 @@
+di

testFiles/4/file18

@@ -0,0 +1 @@
+Laboratorio

testFiles/4/file19

@@ -0,0 +1 @@
+di

testFiles/4/file20

@@ -0,0 +1 @@
+Sistemi

testFiles/5/file21

@@ -0,0 +1 @@
+Operativi

testFiles/5/file22

@@ -0,0 +1 @@
+Introduzione

testFiles/5/file23

@@ -0,0 +1 @@
+Lo

testFiles/5/file24

@@ -0,0 +1 @@
+studente

testFiles/5/file25

@@ -0,0 +1 @@
+deve