slococo-uni
/
bssolver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add master (with pipes working) and change slave printing (and reading) 

Co-authored-by: Ezequiel Bellver <ebellver@itba.edu.ar>
Co-authored-by: Juan Barmasch <jbarmasch@itba.edu.ar>
This commit is contained in:
Santiago Lo Coco 2021-09-04 09:36:00 -03:00
parent b89088a180
commit bf81d337b1
9 changed files with 222 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -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)

13
error.c Normal file
View File

@ -0,0 +1,13 @@
#include <stdio.h>
#include <stdlib.h>
void printError(char * string) {
fprintf(stderr, "%s", string);
fprintf(stderr, "\n");
exit(EXIT_FAILURE);
}
void printSystemError(char * string) {
perror(string);
exit(EXIT_FAILURE);
}

7
error.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef ERRORS_H
#define ERRORS_H
void printError(char * string);
void printSystemError(char * string);
#endif

142
master.c Normal file
View File

@ -0,0 +1,142 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <math.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/select.h>
#include <fcntl.h>
#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");
}

4
prueba.txt
View File

@ -1,4 +0,0 @@
p cnf 5 3
1 -5 4 0
-1 5 3 4 0
-3 -4 0

5
shr_mem.c Normal file
View File

@ -0,0 +1,5 @@
#include <stdio.h>
int main() {
return 0;
}

63
slave.c
View File

@ -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 <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#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,18 +30,33 @@ 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';
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")))
@ -51,36 +72,12 @@ void runCommand(char * inputLine, char * output) {
}
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);
}
*/

5
smf.c Normal file
View File

@ -0,0 +1,5 @@
#include <stdio.h>
int main() {
return 0;
}

5
view.c Normal file
View File

@ -0,0 +1,5 @@
#include <stdio.h>
int main() {
return 0;
}