diff --git a/Makefile b/Makefile index 0b4785c..2efc877 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,18 @@ CCFLAGS = -Wall -std=c99 -pedantic # -g (si queremos debuggear) SOURCES = $(wildcard *.c) OBJECTS = $(SOURCES:.c=.o) -all: $(OBJECTS) +#all: $(OBJECTS) -%.o : %.c - $(CC) $(CFLAGS) $^ -o $@ +#%.o : %.c +# $(CC) $(CFLAGS) $^ -o $@ +all: master.o error.o slave.o + $(CC) $(CFLAGS) -o master master.o error.o +master.o: master.c error.h + $(CC) $(CFLAGS) -c master.c +error.o: error.c error.h + $(CC) $(CFLAGS) -c error.c +slave.o: slave.c error.o + $(CC) $(CFLAGS) slave.c -o slave.o error.o clean: rm -rf $(OBJECTS) diff --git a/error.c b/error.c new file mode 100644 index 0000000..d0a814d --- /dev/null +++ b/error.c @@ -0,0 +1,13 @@ +#include +#include + +void printError(char * string) { + fprintf(stderr, "%s", string); + fprintf(stderr, "\n"); + exit(EXIT_FAILURE); +} + +void printSystemError(char * string) { + perror(string); + exit(EXIT_FAILURE); +} diff --git a/error.h b/error.h new file mode 100644 index 0000000..a234059 --- /dev/null +++ b/error.h @@ -0,0 +1,7 @@ +#ifndef ERRORS_H +#define ERRORS_H + +void printError(char * string); +void printSystemError(char * string); + +#endif \ No newline at end of file diff --git a/master.c b/master.c new file mode 100644 index 0000000..9ed823d --- /dev/null +++ b/master.c @@ -0,0 +1,142 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "error.h" + +#define SLAVE_NUM 1 +#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); + //printf("%d", 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) { + printf("quesesto %d\n", fcntl(pipes[j-1][1], F_GETFD)); + printf("%s\n", argv[i]); + printf("fd write: %d\n", pipes[j-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(4, &ansSet, NULL, NULL, NULL)) < 0) + printSystemError("select() -- ERROR"); + 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); + //write(pipes[j++][1], "prueba.cnf\n", strlen(argv[i]) + 1); + /* + 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/prueba.txt b/prueba.txt deleted file mode 100644 index fb00a7b..0000000 --- a/prueba.txt +++ /dev/null @@ -1,4 +0,0 @@ - p cnf 5 3 - 1 -5 4 0 - -1 5 3 4 0 - -3 -4 0 diff --git a/shr_mem.c b/shr_mem.c new file mode 100644 index 0000000..175f57b --- /dev/null +++ b/shr_mem.c @@ -0,0 +1,5 @@ +#include + +int main() { + return 0; +} diff --git a/slave.c b/slave.c index 002e4dc..5a3c17d 100644 --- a/slave.c +++ b/slave.c @@ -1,9 +1,16 @@ +/* +This is a personal academic project. Dear PVS-Studio, please check it. +PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com +*/ + #include #include #include #include +#include "error.h" #define MAX_SIZE 300 +#define COMMAND_MAX_SIZE 400 /* Recibirá por STDIN los minisat files correspondientes @@ -13,10 +20,9 @@ y, a su vez, entregará por STDOUT el resultado de minisat. Ejemplo de uso: echo "prueba.txt" | ./slave.o */ -void printSystemError(char *); +//void printSystemError(char *); void runCommand(char *, char *); void printOutput(char *, char *); -int copyUpToNewline(char *, char *, int); int main(int argc, char *argv[]) { setvbuf(stdout, NULL, _IONBF, 0); @@ -24,63 +30,54 @@ int main(int argc, char *argv[]) { char output[MAX_SIZE]; char input[MAX_SIZE]; + /* // Falta manejo de errores de fgets! while (fgets(input, MAX_SIZE, stdin)) { - //input[strcspn(input, "\n")] = '\0'; - input[strlen(input) - 1] = '\0'; - runCommand(input, output); - printOutput(output, input); + input[strcspn(input, "\n")] = '\0'; + runCommand(input, output); + printOutput(output, input); + } + */ + + int readChars; + while ((readChars = read(STDIN_FILENO, input, MAX_SIZE) != 0)) { + if (readChars < 0) + printSystemError("slave.c -- read()"); + + char * inputLine = strtok(input, "\n"); + while (inputLine != NULL) { + runCommand(inputLine, output); + printOutput(output, inputLine); + inputLine = strtok(NULL, "\n"); + } } } void runCommand(char * inputLine, char * output) { - char command[MAX_SIZE]; - sprintf(command, "minisat %s | grep -o -e \"Number of .*[0-9]\\+\" -e \"CPU time.*\" -e \".*SATISFIABLE\" | awk '{if (NR == 1) {print $4} ; if (NR == 2) {print $4} ; if (NR == 3) {print $4 $5} ; if (NR == 4) {print $1}}'", inputLine); + 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) {print $4} ; if (NR == 2) {print $4} ; if (NR == 3) {print $4 $5} ; if (NR == 4) {print $1}}'", inputLine); + 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 cláusulas: \" $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; if (!(fp = popen(command, "r"))) - printSystemError("slave.c -- popen()"); + printSystemError("slave.c -- popen()"); // Ver manejo de errores de fread! size_t outputLength = fread(output, sizeof(char), MAX_SIZE, fp); output[outputLength] = '\0'; if (pclose(fp) < 0) - printSystemError("slave.c -- pclose()"); + printSystemError("slave.c -- pclose()"); } void printOutput(char * output, char * fileName) { - printf("Nombre de archivo: %s - ", fileName); - - unsigned char lines = 1; - // Ver si strtok puede fallar! - char * outputLine = strtok(output, "\n"); - while (lines <= 4) { - switch (lines) { - case 1: - printf("Cantidad de variables: %s - ", outputLine); - break; - case 2: - printf("Cantidad de cláusulas: %s - ", outputLine); - break; - case 3: - printf("Tiempo de procesamiento: %s - ", outputLine); - break; - case 4: - printf("Resultado: %s\n", outputLine); - break; - defeault: - break; - } - lines++; - outputLine = strtok(NULL, "\n"); - } - - //printf("Id del esclavo: %s", getpid()); + printf("Nombre del archivo: %s - %s - Id del esclavo: %d\n", fileName, output, getpid()); } +/* void printSystemError(char * string) { perror(string); exit(EXIT_FAILURE); } +*/ \ No newline at end of file diff --git a/smf.c b/smf.c new file mode 100644 index 0000000..175f57b --- /dev/null +++ b/smf.c @@ -0,0 +1,5 @@ +#include + +int main() { + return 0; +} diff --git a/view.c b/view.c new file mode 100644 index 0000000..1a263e5 --- /dev/null +++ b/view.c @@ -0,0 +1,5 @@ +#include + +int main() { + return 0; +} \ No newline at end of file