Fix a minor bug and tidy up the code...

Co-authored-by: Juan Barmasch <jbarmasch@itba.edu.ar>
Co-authored-by: Ezequiel Bellver <ebellver@itba.edu.ar>

master.c

@@ -10,7 +10,6 @@ PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/select.h>
 #include "error.h"
@@ -30,6 +29,7 @@ int main(int argc, char *argv[]) {
         printError("No arguments provided -- ERROR");
 
     slaveNum = floor(log2(argc - 1) * 2);
+    slaveNum = (slaveNum == 0 ? 1 : slaveNum);
     slaveNum = (slaveNum < MAX_SLAVES ? slaveNum : MAX_SLAVES);
 
     FILE * outputFile;
@@ -57,8 +57,7 @@ int main(int argc, char *argv[]) {
 
     int tasks = 1;
     for (int j = 0; tasks <= slaveNum && tasks < argc; tasks++) {
-        if (sendTask(argv[tasks], pipesInput, j++) == 0)
+        sendTask(argv[tasks], pipesInput, j++);
-            continue;
     }
 
     fd_set pipesOutputSet;
@@ -66,7 +65,7 @@ int main(int argc, char *argv[]) {
 
     char buf[MAX_SIZE], notFinished;
     int r, readBytes, count;
-    if (tasks < slaveNum) {
+    if (tasks <= slaveNum) {
         for (int k = tasks - 1; k < slaveNum; k++) {
             closePipes(pipesInput, pipesOutput, k, &pipesOutputSet);
         }
@@ -94,8 +93,7 @@ int main(int argc, char *argv[]) {
                     count--;
 
                     if (tasks < argc) {
-                        if (sendTask(argv[tasks++], pipesInput, r) == 0)
+                        sendTask(argv[tasks++], pipesInput, r);
-                            continue;
                     } else {
                         closePipes(pipesInput, pipesOutput, r, &pipesOutputSet);
                     }
@@ -119,22 +117,14 @@ void changeViewFlag() {
     viewLinked = 1;
 }
 
-char sendTask(char * fileName, int pipesInput[slaveNum][2], int slave) {
+void sendTask(char * fileName, int pipesInput[slaveNum][2], int slave) {
-    struct stat statBuf;
-    if (stat(fileName, &statBuf) == -1)
-        printSystemError("Error, one of the specified paths is incorrect");
-
-    if (!S_ISREG(statBuf.st_mode))
-        return EXIT_FAILURE;
-
     if ((write(pipesInput[slave][1], fileName, strlen(fileName) + 1)) < 0)
         printSystemError("write() -- ERROR");
-
-    return EXIT_SUCCESS;
 }
 
 void closePipes(int pipesInput[][2], int pipesOutput[][2], int slave, fd_set * set) {
-    FD_CLR(pipesOutput[slave][0], set);
+    if (set != NULL)
+        FD_CLR(pipesOutput[slave][0], set);
 
     if (close(pipesOutput[slave][0]) < 0)
         printSystemError("close1() -- ERROR");

master.h

@@ -10,7 +10,7 @@
 void createPipesAndSlaves(int pipesOutput[][2], int pipesInput[][2]);
 int writeOutput(char * output, FILE * outputFile, char * shmPointers);
 void closePipes(int pipesInput[][2], int pipesOutput[][2], int slave, fd_set * set);
-char sendTask(char * fileName, int pipesInput[][2], int slave);
+void sendTask(char * fileName, int pipesInput[][2], int slave);
 void changeViewFlag();
 
 #endif

shr_mem.c

@@ -13,6 +13,7 @@ PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <errno.h>
 #include "shr_mem.h"
 
 sem_t * semEmpty = NULL;
@@ -28,26 +29,28 @@ void openSem(char * semName, sem_t ** sem) {
 void closeSem(char * semName, sem_t ** sem) {
     if (sem_close(* sem) < 0)
         printSystemError("sem_close() -- ERROR");
-    if (sem_unlink(semName) < 0)
+    if (sem_unlink(semName) < 0) {
-        printSystemError("sem_unlink() -- ERROR");
+        if (errno != ENOENT)
+            printSystemError("sem_unlink() -- ERROR");
+    }
 }
 
 int createShm(int totalSize) {
-    openSem(SEM_OPEN_NAME, &semOpen);
-
     int fd;
     if ((fd = shm_open(SHM_NAME, O_CREAT | O_RDWR, S_IRWXU)) < 0)
         printSystemError("shm_open() -- ERROR");
     ftruncate(fd, totalSize);
-
-    if (sem_post(semOpen) < 0)
-        printSystemError("sem_post() --  ERROR");
     return fd;
 }
 
 void mapShm(char ** shmPointer, int totalSize, int fd) {
+    openSem(SEM_OPEN_NAME, &semOpen);
+
     if ((* shmPointer = mmap(0, totalSize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) == MAP_FAILED)
         printSystemError("mmap() -- ERROR");
+
+    if (sem_post(semOpen) < 0)
+        printSystemError("sem_post() --  ERROR");
 }
 
 void writeShm(char * shmPointer, char * str, int len) {

siglib.c

@@ -8,6 +8,7 @@ PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 #include <signal.h>
 #include "error.h"
 #include <unistd.h>
+#include <stdio.h>
 
 void addSignalHandler(void (*changeViewFlag)()) {
     struct sigaction sigAct = {{0}};
@@ -16,24 +17,41 @@ void addSignalHandler(void (*changeViewFlag)()) {
 
     if (sigaction(SIGSTART, &sigAct, NULL) == -1)
         printSystemError("sigaction() -- ERROR");
+    if (sigaction(SIGEND, &sigAct, NULL) == -1)
+        printSystemError("sigaction() -- ERROR");
 }
 
 void blockSignal() {
     sigset_t blockedSet = {{0}};
-    sigaddset(&blockedSet, SIGSTART);
+    if (sigemptyset(&blockedSet) < 0)
-    sigprocmask(SIG_BLOCK, &blockedSet, NULL);
+        printSystemError("sigaction() -- ERROR");
+    if (sigaddset(&blockedSet, SIGSTART) < 0)
+        printSystemError("sigaddset() -- ERROR");
+    if (sigaddset(&blockedSet, SIGEND) < 0)
+        printSystemError("sigaddset() -- ERROR");
+    if (sigprocmask(SIG_SETMASK, &blockedSet, NULL) < 0)
+        printSystemError("sigprocmask() -- ERROR");
 }
 
 void waitForSignal() {
     sigset_t set;
-    sigaddset(&set, SIGEND);
+    if (sigemptyset(&set) < 0)
+        printSystemError("sigemptyset() -- ERROR");
+    sigpending(&set);
+    if (sigismember(&set, SIGEND)) {
+        return;
+    }
+    if (sigaddset(&set, SIGEND) < 0)
+        printSystemError("sigaddset() -- ERROR");
     int temp;
-    sigwait(&set, &temp);
+    if (sigwait(&set, &temp) != 0)
+        printError("sigwait() -- ERROR");
 }
 
 void sendSignal(int pid, int sig) {
     union sigval value = {0};
-    sigqueue(pid, sig, value);
+    if (sigqueue(pid, sig, value) < 0)
+        printSystemError("sigqueue() -- ERROR");
 }
 
 void sendStartSignal(int pid) {

slave.c

@@ -8,13 +8,9 @@ PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <sys/stat.h>
 #include "error.h"
-
+#include "slave.h"
-#define MAX_SIZE 300
-#define COMMAND_MAX_SIZE 400
-
-void runCommand(char *, char *);
-void printOutput(char *, char *);
 
 int main(int argc, char *argv[]) {
     if (setvbuf(stdout, NULL, _IONBF, 0) != 0)
@@ -25,13 +21,17 @@ int main(int argc, char *argv[]) {
     int readChars;
     while ((readChars = read(STDIN_FILENO, input, MAX_SIZE - 1)) != 0) {
         if (readChars < 0)
-            printSystemError("slave.c -- read()");
+            printSystemError("read() -- SLAVE -- ERROR");
         input[readChars] = '\0';
 
         char * inputLine = strtok(input, "\n");
         while (inputLine != NULL) {
-            runCommand(inputLine, output);
+            if (checkFile(inputLine))
-            printOutput(output, inputLine);
+                printf("%s is a folder!\n", inputLine);
+            else {
+                runCommand(inputLine, output);
+                printOutput(output, inputLine);
+            }
             inputLine = strtok(NULL, "\n");
         }
     }
@@ -39,22 +39,33 @@ int main(int argc, char *argv[]) {
     return EXIT_SUCCESS;
 }
 
+char checkFile(char * fileName) {
+    struct stat statBuf;
+    if (stat(fileName, &statBuf) == -1)
+        printSystemError("One of the specified paths is incorrect -- ERROR");
+
+    if (!S_ISREG(statBuf.st_mode))
+        return EXIT_FAILURE;
+
+    return EXIT_SUCCESS;
+}
+
 void runCommand(char * inputLine, char * output) {
     char command[COMMAND_MAX_SIZE];
     sprintf(command, "minisat %s | grep -o -e \"Number of .*[0-9]\\+\" -e \"CPU time.*\" -e \".*SATISFIABLE\" | awk '{if (NR == 1) {printf \"Cantidad de variables: \" $4 \" - \"} ; if (NR == 2) {printf \"Cantidad de clausulas: \" $4 \" - \"} ; if (NR == 3) {printf \"Tiempo de procesamiento: \" $4 $5 \" - \"} ; if (NR == 4) {printf \"Resultado: \" $1}}'", inputLine);
-    // Pequeña ayuda para popen: https://stackoverflow.com/questions/646241/c-run-a-system-command-and-get-output
+
     FILE * fp = popen(command, "r");
     if (fp == NULL)
-        printSystemError("slave.c -- popen()");
+        printSystemError("popen() -- ERROR");
 
     size_t outputLength = fread(output, sizeof(char), MAX_SIZE - 1, fp);
     output[outputLength] = '\0';
 
     if (ferror(fp))
-        printSystemError("slave.c -- ferror()");
+        printSystemError("ferror() -- ERROR");
 
     if (pclose(fp) < 0)
-	    printSystemError("slave.c -- pclose()");
+	    printSystemError("pclose() -- ERROR");
 }
 
 void printOutput(char * output, char * fileName) {

slave.h

@@ -0,0 +1,11 @@
+#ifndef SLAVE_H
+#define SLAVE_H
+
+#define MAX_SIZE 300
+#define COMMAND_MAX_SIZE 400
+
+void runCommand(char *, char *);
+void printOutput(char *, char *);
+char checkFile(char *);
+
+#endif

valAnalysis.sh

@@ -17,4 +17,4 @@ fi
 
 valgrind --leak-check=full --track-origins=yes ./solve ${filesCNF} > valgrindSolve.output 2>&1
 ./solve ${filesCNF} | valgrind --leak-check=full --show-leak-kinds=all ./view > valgrindView.output 2>&1
-ls ${filesCNF} | valgrind --leak-check=full ./slave.o > valgrindSlave.output 2>&1
+ls ${filesCNF} | head -n 1 | valgrind --leak-check=full ./slave.o > valgrindSlave.output 2>&1

view.c

@@ -10,12 +10,7 @@ PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 #include "error.h"
 #include "shr_mem.h"
 #include "siglib.h"
-
+#include "view.h"
-#define MAX_SIZE 300
-#define MAX_AMOUNT_SIZE 10
-#define MAX_PID_SIZE 10
-#define MAX_PATH_SIZE 100
-#define MAX_OUTPUT_SIZE (200 + MAX_PATH_SIZE)
 
 int main(int argc, char * argv[]) {
     char amount[MAX_AMOUNT_SIZE] = {0};
@@ -34,7 +29,7 @@ int main(int argc, char * argv[]) {
             masterPid[MAX_PID_SIZE - 1] = '\0';
             break;
         default:
-            printError("View must receive amount of files and the pid of master process by argument or stdin -- ERROR");
+            printError("View must receive the amount of files and the pid of master process by argument or stdin -- ERROR");
     }
 
     int files = atoi(amount);

view.h

@@ -0,0 +1,10 @@
+#ifndef VIEW_H
+#define VIEW_H
+
+#define MAX_SIZE 300
+#define MAX_AMOUNT_SIZE 10
+#define MAX_PID_SIZE 10
+#define MAX_PATH_SIZE 100
+#define MAX_OUTPUT_SIZE (200 + MAX_PATH_SIZE)
+
+#endif