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

Fixed makefile

Browse Source
This commit is contained in:
elvis
2022-04-04 22:31:14 +02:00
parent a7b28994b6
commit 044b0f527a
7 changed files with 107 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/threadpool/apiFile.c
View File

@ -268,7 +268,10 @@ void readFile(char *filepath, queueT *q, long fd_c, taglia_t *taglia) {
}
void readNFiles(char *numStr, queueT *q, long fd_c, taglia_t *taglia); // TODO
void readNFiles(char *numStr, queueT *q, long fd_c, taglia_t *taglia){
// TODO
return;
}
void writeFile(char *filepath, size_t size, queueT *q, long fd_c, taglia_t *taglia, int append) {
@ -405,26 +408,42 @@ void writeFile(char *filepath, size_t size, queueT *q, long fd_c, taglia_t *tagl
}
void lockFile(char *filepath, queueT *q, long fd_c, taglia_t *taglia, pthread_mutex_t *lock, waitingT **waiting);
void lockFile(char *filepath, queueT *q, long fd_c, taglia_t *taglia, pthread_mutex_t *lock, waitingT **waiting) {
return;
}
void unlockFile(char *filepath, queueT *q, long fd_c, taglia_t *taglia, pthread_mutex_t *lock, waitingT **waiting);
void unlockFile(char *filepath, queueT *q, long fd_c, taglia_t *taglia, pthread_mutex_t *lock, waitingT **waiting) {
return;
}
void closeFile(char *filepath, queueT *q, long fd_c, taglia_t *taglia, pthread_mutex_t *lock, waitingT **waiting);
void closeFile(char *filepath, queueT *q, long fd_c, taglia_t *taglia, pthread_mutex_t *lock, waitingT **waiting) {
return;
}
void removeFile(char *filepath, queueT *q, long fd_c, taglia_t *taglia, pthread_mutex_t *lock, waitingT **waiting);
void removeFile(char *filepath, queueT *q, long fd_c, taglia_t *taglia, pthread_mutex_t *lock, waitingT **waiting) {
return;
}
int sendFile(fileT *f, long fd_c, taglia_t *taglia);
int sendFile(fileT *f, long fd_c, taglia_t *taglia) {
return;
}
int addWaiting(waitingT **waiting, char *file, int fd);
int addWaiting(waitingT **waiting, char *file, int fd) {
return;
}
int removeFirstWaiting(waitingT **waiting, char *file);
int removeFirstWaiting(waitingT **waiting, char *file) {
return;
}
void clearWaiting(waitingT **waiting);
void clearWaiting(waitingT **waiting) {
return;
}

4
lib/threadpool/apiFile.h
View File

@ -3,7 +3,7 @@
#define _API_FILE
#include <fileQueue.h>
/* TODO: include lib di logging */
#include <taglialegna.h>
/* TODO: finire tutte le descrizioni */
// Lista dei client in attesa su una lock
@ -33,7 +33,7 @@ void readNFiles(char *numStr, queueT *q, long fd_c, taglia_t *taglia);
void writeFile(char *filepath, size_t size, queueT *q, long fd_c, taglia_t *taglia, int append);
// Acquisisci lock di un file
void lockFile(char *filepath, queueT *q, long fd_c, taglia_t *taglia, pthread_mutex_t *lock, waitingT **waiting);
void lockFile(char *filepath, queueT *q, long fd_c, taglia_t *taglia, pthread_mutex_t *lock, waiting_t **waiting);
// Rilascia una Lock di un file
void unlockFile(char *filepath, queueT *q, long fd_c, taglia_t *taglia, pthread_mutex_t *lock, waiting_t **waiting);

31
lib/utils/serverUtil.h
View File

@ -7,24 +7,23 @@
#include <string.h>
#include <inttypes.h>
#define CONFGETINT(var, config, t, q, p, base) \
var = (int) strtol(ini_get(config, t, q), p, base); \
if(var<=0) { \
fprintf(stderr, "ERROR reading config for variable %c\n", t); \
ini_free(config); \
return 1; \
#define CONFGETINT(var, config, t, q, p, base) \
var = (int) strtol(ini_get(config, t, q), p, base); \
if(var<=0) { \
fprintf(stderr, "ERROR reading config for variable %s\n", t); \
ini_free(config); \
return 1; \
}
#define CONFGETSTR(var, config, t, q, buff) \
var = ini_get(config, t, q); \
if(var==NULL) { \
fprintf(stderr, "ERROR reading config for variable %c\n", t); \
ini_free(config); \
return 1; \
} \
buff = calloc(strlen(var)+1, sizeof(char)); \
strncpy(buff, var, strlen(var)+1); \
var = buff;
#define CONFGETSTR(var, config, t, q, buff) \
buff = ini_get(config, t, q); \
if(buff==NULL) { \
fprintf(stderr, "ERROR reading config for variable %s\n", t); \
ini_free(config); \
return 1; \
} \
var = calloc(strlen(var)+1, sizeof(char)); \
strncpy(var, buff, strlen(buff)+1);
#endif /* _SERVER_STATUS */