elvis/progettoso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
elvis
2022-04-24 15:38:30 +02:00
parent 19978f221f
commit d38c4688bb
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -99,7 +99,7 @@ print-%: ; @echo $* = $($*)
test1: all test1: all
@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 @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 & valgrind --leak-check=full --track-origins=yes $(BUILD_DIR)/server &
bash scripts/test1.sh bash scripts/test1.sh
pkill -1 memcheck-amd64 pkill -1 memcheck-amd64

29
lib/api/api.c
View File

@ -37,20 +37,21 @@
#define printOpenedFiles(str) \ #define printOpenedFiles(str) \
fprintf(stdout, "\nInside of function: %s\n", __func__); \
fprintf(stdout, "\t[%s]\n", str); \
fprintf(stdout, "\tcreatedAndlocked: %s\n", openedFiles->createdAndLocked); \ /* #define printOpenedFiles(str) \ */
fprintf(stdout, "\tf: %p\n", (void *)openedFiles->f); \ /* fprintf(stdout, "\nInside of function: %s\n", __func__); \ */
fprintf(stdout, "\tnumOfFiles: %d\n", openedFiles->numOfFiles); \ /* fprintf(stdout, "\t[%s]\n", str); \ */
fprintf(stdout, "\tout: %p\n", (void *)openedFiles->out); \ /* fprintf(stdout, "\tcreatedAndlocked: %s\n", openedFiles->createdAndLocked); \ */
fprintf(stdout, "\tvalidrDir: %d\n", openedFiles->validrDir); \ /* fprintf(stdout, "\tf: %p\n", (void *)openedFiles->f); \ */
fprintf(stdout, "\trDir: %p\n", (void *)openedFiles->rDir); \ /* fprintf(stdout, "\tnumOfFiles: %d\n", openedFiles->numOfFiles); \ */
fprintf(stdout, "\tvalidwDir: %d\n", openedFiles->validwDir); \ /* fprintf(stdout, "\tout: %p\n", (void *)openedFiles->out); \ */
fprintf(stdout, "\twDir: %p\n", (void *)openedFiles->wDir); \ /* fprintf(stdout, "\tvalidrDir: %d\n", openedFiles->validrDir); \ */
fflush(stdout); \ /* fprintf(stdout, "\trDir: %p\n", (void *)openedFiles->rDir); \ */
/* fprintf(stdout, "\tvalidwDir: %d\n", openedFiles->validwDir); \ */
/* fprintf(stdout, "\twDir: %p\n", (void *)openedFiles->wDir); \ */
/* fflush(stdout); \ */
@ -1691,7 +1692,7 @@ int closeEveryFile() {
} }
int createOpenedFiles(void) { int createOpenedFiles(void) {
openedFiles = calloc(1, sizeof(openfiles_t)); openedFiles = calloc(1, sizeof(*openedFiles));
if(!openedFiles) { if(!openedFiles) {
perror("calloc"); perror("calloc");
return -1; return -1;

4
src/server.c
View File

@ -233,9 +233,9 @@ int main(int argc, char *argv[]) {
goto _cleanup; goto _cleanup;
} }
// cerchiamo di capire da quale fd abbiamo ricevuto una richiesta // cerchiamo di capire da quale fd abbiamo ricevuto una richiesta
for(int i=0; i <= fdmax; ++i) { for(long i=0; i <= fdmax; ++i) {
if (FD_ISSET(i, &tmpset)) { if (FD_ISSET(i, &tmpset)) {
int* connfd = malloc(sizeof(long)); long* connfd = malloc(sizeof(long));
if (!connfd) { if (!connfd) {
perror("ERROR FATAL malloc"); perror("ERROR FATAL malloc");
goto _cleanup; goto _cleanup;