From 4372ca8f4a3404846414ead05d8855c78f2d70ed Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Wed, 8 Sep 2021 10:29:43 -0300 Subject: [PATCH] Finish implementing signals (almost) Co-authored-by: Ezequiel Bellver Co-authored-by: Juan Barmasch --- .gitignore | 8 --- Backup/master.c | 139 ------------------------------------------------ Makefile | 14 ++--- NotUsed/smf.c | 5 -- master.c | 32 +++++++---- shr_mem.c | 5 +- slave.c | 1 + view.c | 15 ++++-- 8 files changed, 39 insertions(+), 180 deletions(-) delete mode 100644 .gitignore delete mode 100644 Backup/master.c delete mode 100644 NotUsed/smf.c diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 59071d0..0000000 --- a/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Files -*.o -.bash_history - -# Folders -Test/* -Backup/* -NotUsed/* diff --git a/Backup/master.c b/Backup/master.c deleted file mode 100644 index 1f26675..0000000 --- a/Backup/master.c +++ /dev/null @@ -1,139 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "../error.h" - -#define SLAVE_NUM 3 -#define MAX_SIZE 200 - -void create(int ans[2], int pipes[SLAVE_NUM][2]); - -int main(int argc, char *argv[]) { - //setvbuf(stdout, NULL, _IONBF, 0); - - if (argc == 1) - printError("Error: no arguments provided"); - - int ans[2]; - int pipes[SLAVE_NUM][2]; - create(ans, pipes); - //sleep(1); - - fd_set ansSet; - FD_ZERO(&ansSet); - FD_SET(ans[0], &ansSet); - - fd_set fdSet; - FD_ZERO(&fdSet); - int n = 0; - for (; n < SLAVE_NUM; n++) - FD_SET(pipes[n][1], &fdSet); - - int flag = 0, j = 0; - struct stat statBuf; - int i = 1; - for (; i < argc; i++) { - if (stat(argv[i], &statBuf) == -1) - printSystemError("Error, one of the specified paths is incorrect"); - - if (!S_ISREG(statBuf.st_mode)) - continue; - - if (j == SLAVE_NUM) { - j = 0; - flag = 1; - } - if (!flag) { - - if (write(pipes[j++][1], argv[i], strlen(argv[i]) + 1) < 0) { - //if (write(pipes[j++][1], "prueba.cnf\n", strlen(argv[i]) + 1) < 0) { - printSystemError("write() -- ERROR"); - } - //close(pipes[j-1][1]); - } else { - int fd; - if ((fd = select(5, &fdSet, NULL, NULL, NULL) < 0)) - printSystemError("select() -- ERROR"); - char buf[MAX_SIZE]; - if (read(fd, buf, MAX_SIZE) < 0) - printSystemError("read() -- ERROR"); - printf("%s", buf); - int k = 0; - for (; i < SLAVE_NUM; k++) { - if (pipes[k][1] == fd) { - if (write(pipes[k][1], argv[i], strlen(argv[i])) < 0) - printSystemError("write() -- ERROR"); - continue; - } - } - } - } - - int fd; - char buf[MAX_SIZE]; - if ((fd = select(ans[0] + 1, &ansSet, NULL, NULL, NULL)) < 0) - printSystemError("select() -- ERROR"); - while (fd > 0) { - int readBytes = 0; - do { - if ((readBytes += read(ans[0], buf + readBytes, MAX_SIZE)) < 0) - printSystemError("read() -- ERROR"); - } while (buf[readBytes - 1] != '\n'); - buf[readBytes] = 0; - printf("%s\n", buf); - } - /* - readBytes = 0; - do { - if ((readBytes += read(ans[0], buf + readBytes, MAX_SIZE)) < 0) - printSystemError("read() -- ERROR"); - } while (buf[readBytes - 1] != '\n'); - buf[readBytes] = 0; - printf("%s\n", buf); - */ -} - -void create(int ans[2], int pipes[5][2]) { - pid_t pid[SLAVE_NUM]; - if (pipe(ans) < 0) - printSystemError("pipe() -- ERROR"); - - int i = 0; - for (; i < SLAVE_NUM; i++) { - if (pipe(pipes[i]) < 0) - printSystemError("pipe() -- ERROR"); - if ((pid[i] = fork()) == 0) { - if (close(ans[0]) < 0) - printSystemError("close() -- ERROR"); - if (dup2(ans[1], STDOUT_FILENO) < 0) - printSystemError("dup2() -- ERROR 1"); - if (close(ans[1]) < 0) - printSystemError("close() -- ERROR"); - - if (close(pipes[i][1]) < 0) - printSystemError("close() -- ERROR"); - if (dup2(pipes[i][0], STDIN_FILENO) < 0) - printSystemError("dup2() -- ERROR 2"); - if (close(pipes[i][0]) < 0) - printSystemError("close() -- ERROR"); - - if (execv("slave.o", NULL) < 0) - printSystemError("execv() -- ERROR"); - } - else if (pid[i] < 0) - printSystemError("fork() -- ERROR"); - - if (close(pipes[i][0]) < 0) - printSystemError("close() -- ERROR"); - } - - if (close(ans[1]) < 0) - printSystemError("close() -- ERROR"); -} diff --git a/Makefile b/Makefile index c9e1618..1eeb68e 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,10 @@ CC = gcc CCFLAGS = -Wall -std=c99 -pedantic -g -#SOURCES = $(wildcard *.c) -#OBJECTS = $(SOURCES:.c=.o) OBJECTS = master.o error.o slave.o shr_mem.o view.o solve view all: $(OBJECTS) -#%.o : %.c -# $(CC) $(CFLAGS) $^ -o $@ -#all: master.o error.o slave.o shr_mem.o view.o -#$(CC) $(CCFLAGS) -o solve master.o error.o shr_mem.o -lrt -lpthread -#$(CC) $(CCFLAGS) -o view view.o error.o shr_mem.o -lrt -lpthread master.o: master.c error.h $(CC) $(CCFLAGS) -c master.c error.o: error.c error.h @@ -29,14 +22,15 @@ view: view.o error.o shr_mem.o clean: rm -rf $(OBJECTS) - #rm -rf solve view test: pvs-studio-analyzer trace -- make pvs-studio-analyzer analyze plog-converter -a '64:1,2,3;GA:1,2,3;OP:1,2,3' -t tasklist -o report.tasks PVS-Studio.log - # cppcheck --quiet --enable=all --force --inconclusive . - # valgrind (file) + cppcheck --quiet --enable=all --force --inconclusive . + valgrind --leak-check=full ./solve > valgrindSolve.output 2>&1 + valgrind --leak-check=full ./view ~ > valgrindView.output 2>&1 + valgrind --leak-check=full ./slave ~ > valgrindSlave.output 2>&1 .PHONY: all clean test diff --git a/NotUsed/smf.c b/NotUsed/smf.c deleted file mode 100644 index 74f8e0e..0000000 --- a/NotUsed/smf.c +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include - -#define FULL 0x4AC00 -#define EMPTY 0 diff --git a/master.c b/master.c index 6589627..df29ee7 100644 --- a/master.c +++ b/master.c @@ -20,11 +20,12 @@ #include #include #include +#include #define SLAVE_NUM 5 #define MAX_SIZE 300 #define MAX_PATH_SIZE 100 -#define MAX_OUTPUT_SIZE 200 + MAX_PATH_SIZE +#define MAX_OUTPUT_SIZE (200 + MAX_PATH_SIZE) void createPipes(int pipesOutput[SLAVE_NUM][2], int pipesInput[SLAVE_NUM][2]); int writeOutput(char * output, FILE * outputFile, void * shmP, char viewLinked); @@ -46,9 +47,10 @@ int main(int argc, char *argv[]) { if ((outputFile = fopen("outputFile.txt", "w")) == NULL) printSystemError("fopen() -- ERROR"); - //char * shmPointer; - //int shmFd; - //shmFd = createShm((argc - 1) * MAX_OUTPUT_SIZE, &shmPointer); + char * shmPointer; + int shmFd; + shmFd = createShm((argc - 1) * MAX_OUTPUT_SIZE, &shmPointer); + void * shmStart; printf("%d\n", argc - 1); printf("%d\n", getpid()); @@ -59,16 +61,18 @@ int main(int argc, char *argv[]) { if (sigaction(SIGUSR1, &sigAct, NULL) == -1) printSystemError("sigaction() -- ERROR"); - sleep(2); + sleep(5); + /* char * shmPointer; int shmFd; void * shmStart; - + */ if (viewLinked) { - //shmPointer = mmap(0, (argc - 1) * MAX_OUTPUT_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, shmFd, 0); - shmFd = createShm((argc - 1) * MAX_OUTPUT_SIZE, &shmPointer); + shmPointer = mmap(0, (argc - 1) * MAX_OUTPUT_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, shmFd, 0); + //shmFd = createShm((argc - 1) * MAX_OUTPUT_SIZE, &shmPointer); shmStart = shmPointer; + //close(shmFd); } int pipesOutput[SLAVE_NUM][2], pipesInput[SLAVE_NUM][2]; @@ -117,7 +121,7 @@ int main(int argc, char *argv[]) { // printf("\n%s\n", buf); shmPointer += writeOutput(buf, outputFile, shmPointer, viewLinked); count--; - + if (tasks < argc) { if (sendTask(statBuf, argv[tasks++], pipesInput, r) == 0) continue; @@ -129,6 +133,14 @@ int main(int argc, char *argv[]) { } } while (flag); + //sleep(5); + fclose(outputFile); + + for (int i = 0; i < SLAVE_NUM; i++){ + if (wait(NULL) == -1) + printSystemError("wait() -- ERROR"); + } + sigset_t set; sigaddset(&set, SIGUSR2); @@ -139,8 +151,6 @@ int main(int argc, char *argv[]) { closeSem(); } - fclose(outputFile); - //close(shmFd); return EXIT_SUCCESS; } diff --git a/shr_mem.c b/shr_mem.c index 8840a1e..b6184d5 100644 --- a/shr_mem.c +++ b/shr_mem.c @@ -21,7 +21,7 @@ int createShm(int totalSize, void ** shmPointer) { if ((fd = shm_open("/BottlerSHM", O_CREAT | O_RDWR, S_IRWXU)) < 0) printSystemError("shm_open() -- ERROR"); ftruncate(fd, totalSize); - * shmPointer = mmap(0, totalSize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + //* shmPointer = mmap(0, totalSize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); return fd; } @@ -31,7 +31,7 @@ int writeShm(void * shmPointer, char * str, int len) { printSystemError("sem_open() -- ERROR"); } if (memcpy(shmPointer, str, len) == NULL) - return EXIT_FAILURE; + printError("memcpy() -- ERROR"); if (sem_post(sem) < 0) printSystemError("sem_post() -- ERROR"); @@ -58,6 +58,7 @@ void closeSem() { int copyShm(char * destPointer, char * srcPointer, int len) { int i; + //for (i = 0; srcPointer[i] != '\0' && i < len; i++) { for (i = 0; srcPointer[i] != '\n' && srcPointer[i] != '\0' && i < len; i++) { destPointer[i] = srcPointer[i]; } diff --git a/slave.c b/slave.c index 2d3b56c..1fd47ea 100644 --- a/slave.c +++ b/slave.c @@ -63,6 +63,7 @@ void runCommand(char * inputLine, char * output) { output[outputLength] = '\0'; if (ferror(fp)) + printSystemError("slave.c -- ferror()"); if (pclose(fp) < 0) printSystemError("slave.c -- pclose()"); diff --git a/view.c b/view.c index 269fe0e..36c0110 100644 --- a/view.c +++ b/view.c @@ -16,7 +16,7 @@ #define MAX_AMOUNT_SIZE 10 #define MAX_PID_SIZE 10 #define MAX_PATH_SIZE 100 -#define MAX_OUTPUT_SIZE 200 + MAX_PATH_SIZE +#define MAX_OUTPUT_SIZE (200 + MAX_PATH_SIZE) int main(int argc, char * argv[]) { char amount[MAX_AMOUNT_SIZE]; @@ -44,7 +44,7 @@ int main(int argc, char * argv[]) { union sigval value; sigqueue(mPid, SIGUSR1, value); - sleep(2); + //sleep(2); int fd; char * shmPointer; @@ -52,23 +52,28 @@ int main(int argc, char * argv[]) { if ((fd = shm_open("/BottlerSHM", O_RDONLY, S_IRUSR)) < 0) printSystemError("shm_open() -- ERROR"); - if ((shmPointer = mmap(0, (argc - 1) * MAX_OUTPUT_SIZE, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED){ + int totalSize = files * MAX_OUTPUT_SIZE; + + if ((shmPointer = mmap(0, totalSize, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED){ printSystemError("mmap() -- ERROR"); } void * shmStart; shmStart = shmPointer; + int i = 0; char buf[MAX_SIZE]; while (files-- > 0) { + //buf[0] = '\0'; shmPointer += readShm(shmPointer, buf, MAX_SIZE); + printf("%d\t", i++); printf("%s\n", buf); } - if (munmap(shmStart, (argc - 1) * MAX_OUTPUT_SIZE) == -1) + if (munmap(shmStart, totalSize) == -1) printSystemError("munmap() -- ERROR"); close(fd); - // terminateShm("/BottlerSHM", fd, shmPointer, (argc - 1) * MAX_OUTPUT_SIZE); +// terminateShm("/BottlerSHM", fd, shmStart, totalSize); sigqueue(mPid, SIGUSR2, value);