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

Finish implementing signals (almost) 

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-08 10:29:43 -03:00
parent e9162b4f52
commit 4372ca8f4a
8 changed files with 39 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -1,8 +0,0 @@
# Files
*.o
.bash_history
# Folders
Test/*
Backup/*
NotUsed/*

139
Backup/master.c
View File

@ -1,139 +0,0 @@
#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 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");
}

14
Makefile
View File

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

5
NotUsed/smf.c
View File

@ -1,5 +0,0 @@
#include <stdio.h>
#include <semaphore.h>
#define FULL 0x4AC00
#define EMPTY 0

32
master.c
View File

@ -20,11 +20,12 @@
#include <semaphore.h>
#include <signal.h>
#include <sys/mman.h>
#include <sys/wait.h>
#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;
}

5
shr_mem.c
View File

@ -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];
}

1
slave.c
View File

@ -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()");

15
view.c
View File

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