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

Make changes to the pipes implementation 

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-11-01 14:51:45 -03:00
parent 10783bd50e
commit ab402462c5
23 changed files with 131 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Kernel/interruptions/systemCalls.c
View File

@ -21,12 +21,12 @@ uint64_t read(uint64_t fd, uint64_t buffer, uint64_t length) {
char *bufferAux = (char *) buffer;
int readBytes = 0;
if (!isForeground())
return 0;
fd = getFdIn();
if (fd == STDIN) {
if (!isForeground())
return 0;
while (length-- > 0) {
*bufferAux = getKeyFromBuffer();
if (*bufferAux == 0) {
@ -35,12 +35,10 @@ uint64_t read(uint64_t fd, uint64_t buffer, uint64_t length) {
readBytes--;
blockIO();
}
if (*bufferAux == '\v') {
return 0;
// break;
}
readBytes++;
bufferAux++;
if (*bufferAux++ == '\v') {
break;
}
// blockIO();
}
} else {
@ -48,10 +46,13 @@ uint64_t read(uint64_t fd, uint64_t buffer, uint64_t length) {
*bufferAux = readPipe(fd);
if (*bufferAux == 0)
break;
bufferAux++;
readBytes++;
if (*bufferAux++ == '\v') {
break;
}
}
}
// *bufferAux = 0;
return readBytes;
}

8
Kernel/utils/pipe.c
View File

@ -88,20 +88,20 @@ void writePipe(int fd, char c) {
semWait(node->pipe->sem);
semPost(node->pipe->fullSem);
node->pipe->buffer[node->pipe->currentW++ % PIPE_MAX_SIZE] = c;
semPost(node->pipe->sem);
semPost(node->pipe->fullSem);
}
char readPipe(int fd) {
node_t *prev = NULL;
node_t *node = searchRPipe(&prev, fd);
semWait(node->pipe->sem);
semWait(node->pipe->fullSem);
semPost(node->pipe->fullSem);
semWait(node->pipe->sem);
char c = node->pipe->buffer[node->pipe->currentR++ % PIPE_MAX_SIZE];

16
Kernel/utils/scheduler.c
View File

@ -234,14 +234,14 @@ char blockIO() {
currentProcess->state = BLOCKEDIO;
}
processCDT *prev = NULL;
processADT parent = searchProcess(&prev, currentProcess->ppid, firstProcess);
if (currentProcess->foreground) {
if (parent->backWait) {
parent->backWait = 0;
parent->foreground = 1;
}
}
// processCDT *prev = NULL;
// processADT parent = searchProcess(&prev, currentProcess->ppid, firstProcess);
// if (currentProcess->foreground) {
// if (parent->backWait) {
// parent->backWait = 0;
// parent->foreground = 1;
// }
// }
forceTimer();
return EXIT_SUCCESS;

1
Userland/Makefile
View File

@ -14,5 +14,4 @@ clean:
cd SampleCodeModule; make clean
rm -rf *.bin
.PHONY: sampleCodeModule all clean

12
Userland/SampleCodeModule/Makefile
View File

@ -1,7 +1,7 @@
include ../Makefile.inc
MODULE=0000-sampleCodeModule.bin
MODULE_ELF=0000-sampleCodeModule.elf
MODULE=../0000-sampleCodeModule.bin
MODULE_ELF=../0000-sampleCodeModule.elf
SOURCES=$(wildcard *.c)
SOURCES_SHELL=$(wildcard shell/*.c)
SOURCES_ASM=$(wildcard asm/*.asm)
@ -13,17 +13,17 @@ OBJECTS_PROMPT=$(SOURCES_PROMPT:.c=.o)
OBJECTS_BOTTLER=$(SOURCES_BOTTLER:.c=.o)
OBJECTS_ASM=$(SOURCES_ASM:.asm=.o)
ALL_OBJECTS= $(OBJECTS) $(OBJECTS_ASM) $(OBJECTS_SHELL) $(OBJECTS_COMMANDS) $(OBJECTS_PROMPT) $(OBJECTS_BOTTLER)
ALL_OBJECTS= $(OBJECTS) $(OBJECTS_ASM) $(OBJECTS_SHELL) $(OBJECTS_PROMPT) $(OBJECTS_BOTTLER)
STATICLIBS=
all: $(MODULE) $(MODULE_ELF)
$(MODULE): $(STATICLIBS) $(ALL_OBJECTS)
$(LD) $(LDFLAGS) -T sampleCodeModule.ld $(OBJECTS) $(OBJECTS_SHELL) $(OBJECTS_ASM) $(OBJECTS_PROMPT) $(OBJECTS_BOTTLER) -o ../$(MODULE)
$(LD) $(LDFLAGS) -T sampleCodeModule.ld -o $@ $^
$(MODULE_ELF): $(STATICLIBS) $(ALL_OBJECTS)
$(LD) $(LDFLAGS) -I./include -I./shell/include -I./bottler/include -T sampleCodeModule.ld --oformat=elf64-x86-64 $(OBJECTS) $(OBJECTS_SHELL) $(OBJECTS_ASM) $(OBJECTS_PROMPT) $(OBJECTS_BOTTLER) -o ../$(MODULE_ELF)
$(LD) $(LDFLAGS) -T sampleCodeModule.ld --oformat=elf64-x86-64 -o $@ $^
%.o:%.c
$(GCC) $(GCCFLAGS) -T _loader.c -I./include -I./shell/include -I./bottler/include -c $< -o $@
@ -32,6 +32,6 @@ $(MODULE_ELF): $(STATICLIBS) $(ALL_OBJECTS)
$(ASM) $(ASMFLAGS) $< -o $@
clean:
rm -rf $(ALL_OBJECTS)
rm -rf $(ALL_OBJECTS) ../*.bin
.PHONY: all clean print

3
Userland/SampleCodeModule/include/libc.h
View File

@ -7,7 +7,7 @@ void winClear();
void printString(char * string);
void printStringError(char * string);
void printStringLen(char * string, int len);
void new_line();
void newline();
void backspace();
char getChar();
void putChar(char c);
@ -28,5 +28,6 @@ char * strstrip(char * s, char c);
void ftoa(double f, char * buf, int precision);
char * strcat(char * dest, const char * src);
int strcpy(char * strDest, const char * strSrc);
void addEOF();
#endif

31
Userland/SampleCodeModule/shell/commands/cat.c
View File

@ -2,39 +2,28 @@
#define SIZE 1000
/*
void cat(int argc, char ** argv) {
char c;
int i = 0;
char buffer[SIZE] = {0};
while ((c = getChar()) != 0 && c != -1) {
if (i >= SIZE)
break;
buffer[i++] = c;
}
printStringLen(buffer, i);
sys_exit();
}
*/
void cat(int argc, char ** argv) {
char c;
int i = 0, j = 0, line = 0;
char buffer[SIZE] = {0};
while ((c = getChar()) <= 0) {
while ((c = getChar()) > 0) {
if (i >= SIZE)
break;
buffer[i++] = c;
j++;
if (c == '\n') {
printStringLen(buffer[line], j);
printStringLen(buffer + line, j);
j = 0;
line = i;
}
buffer[i++] = c;
j++;
if (c == '\b') {
buffer[--i] = 0;
buffer[--i] = 0;
}
}
printStringLen(buffer + line, j);
printStringLen(buffer, i);
newline();
sys_exit();
}

3
Userland/SampleCodeModule/shell/commands/cpuid.c
View File

@ -104,8 +104,9 @@ void cpufeatures(int argc, char *argv[]) {
for (int i = 0; i < len; i++) {
if (checks[i]()) {
printString(supports[i]);
new_line();
newline();
}
}
addEOF();
sys_exit();
}

37
Userland/SampleCodeModule/shell/commands/filter.c
View File

@ -6,30 +6,31 @@ int isVocal(char c) {
return c == 'A' || c == 'E' || c == 'I' || c == 'O' || c == 'U' || c == 'a' || c == 'e' || c == 'i' || c == 'o' || c == 'u';
}
void debug8()
{
return;
}
void debug9()
{
return;
}
void filter(int argc, char ** argv) {
char c;
int i = 0;
int i = 0, j = 0, line = 0;
char buffer[SIZE] = {0};
debug9();
while ((c = getChar()) != 0 && c != -1) {
debug8();
while ((c = getChar()) > 0) {
if (i >= SIZE)
break;
if (isVocal(c))
buffer[i++] = c;
if (!isVocal(c)) {
buffer[i++] = c;
j++;
}
if (c == '\b') {
buffer[--i] = 0;
if (isVocal(buffer[i-1]))
buffer[--i] = 0;
}
if (c == '\n') {
printStringLen(buffer + line, j);
j = 0;
line = i;
}
}
printStringLen(buffer, i);
new_line();
printStringLen(buffer + line, j);
newline();
sys_exit();
}

3
Userland/SampleCodeModule/shell/commands/help.c
View File

@ -7,7 +7,8 @@ static const int len = 9;
void help(int argc, char *argv[]) {
for (int i = 0; i < len; i++) {
printString(info[i]);
new_line();
newline();
}
addEOF();
sys_exit();
}

5
Userland/SampleCodeModule/shell/commands/inforeg.c
View File

@ -17,13 +17,14 @@ void inforeg(int argc, char *argv[]) {
for (int i = 0; i < 17; i++) {
if (i % 5 == 0 && i != 0)
new_line();
newline();
printString(regsNames[i]);
printStringLen("0x", 2);
printString(gtoa(regs[i], bufferAux, 16, 20));
if (i != 14 && i % 5 != 4)
printStringLen(" - ", 3);
}
new_line();
addEOF();
newline();
sys_exit();
}

2
Userland/SampleCodeModule/shell/commands/loop.c
View File

@ -12,7 +12,7 @@ void loop(int argc, char *argv[]) {
buffer = strcat(strcat(itoa(pid, buffer, 10), " "), str);
while (1) {
printString(buffer);
putChar('\n');
newline();
sys_sleep(secs);
}
sys_free(buffer);

73
Userland/SampleCodeModule/shell/commands/phylo.c
View File

@ -1,32 +1,7 @@
#include "phylo.h"
#include <stddef.h>
#include <stdint.h>
#define ARGV_SIZE 2
#define BUFF_SIZE 20
#define MAX_PHILO_SIZE 3
#define MAX_NAME_SIZE 10
#define STARTING 5
int * state;
typedef enum states {EATING = 0, HUNGRY, THINKING} states;
typedef struct philosopher_t {
int debug;
char ** argv;
char * buffer;
sem_t * sem;
int pid;
states state;
struct philosopher_t * left;
struct philosopher_t * right;
} philosopher_t;
philosopher_t * firstPhil;
sem_t * mutex;
philosopher_t *firstPhil;
sem_t *mutex;
int philoCount = STARTING;
void printState() {
@ -37,7 +12,7 @@ void printState() {
else putChar('.');
phil = phil->right;
} while (phil != firstPhil);
putChar('\n');
newline();
}
void test(philosopher_t * phil)
@ -48,8 +23,6 @@ void test(philosopher_t * phil)
}
}
void philosopher(int argc, char ** argv);
void addPhilo() {
philoCount++;
@ -60,8 +33,6 @@ void addPhilo() {
new->sem = sys_semOpen("filosofo", 0);
new->argv[0] = "filosofo";
// new->argv[1] = itoa((uint64_t) new, new->argv[1], 10);
// strcpy(phil->buffer, itoa((uint64_t) phil, phil->buffer, 10));
strcpy(new->buffer, itoa((uint64_t) new, new->buffer, 10));
new->argv[1] = new->buffer;
@ -98,12 +69,9 @@ void take_fork(philosopher_t * phil) {
sys_semPost(mutex);
sys_semWait(phil->sem);
// sys_sleep(1);
}
void put_fork(philosopher_t * phil) {
sys_semWait(mutex);
phil->state = THINKING;
@ -114,8 +82,7 @@ void put_fork(philosopher_t * phil) {
sys_semPost(mutex);
}
void philosopher(int argc, char ** argv)
{
void philosopher(int argc, char ** argv) {
if (argc != 2) {
sys_exit();
}
@ -123,14 +90,12 @@ void philosopher(int argc, char ** argv)
philosopher_t * i = (philosopher_t *) ((uint64_t) atoi(argv[1], -1));
while (1) {
// sys_sleep(1);
sys_sleep(1);
take_fork(i);
printState();
sys_sleep(1);
// sys_sleep(2);
put_fork(i);
printState();
@ -162,7 +127,6 @@ void phylo(int argc, char ** argv) {
phil->sem = sys_semOpen("filosofo", 0);
phil->argv[0] = "filosofo";
// phil->argv[1] = itoa((uint64_t) phil, phil->argv[1], 10);
strcpy(phil->buffer, itoa((uint64_t) phil, phil->buffer, 10));
phil->argv[1] = phil->buffer;
@ -190,24 +154,22 @@ void phylo(int argc, char ** argv) {
} while (phil != firstPhil);
char c;
while (1) {
while ((c = getChar()) != 0 && c != -1) {
if (c == 'a') {
addPhilo();
}
else if (c == 'r') {
removePhilo();
}
else if (c == 'q') {
end();
}
// while (1) {
while ((c = getChar()) != 0 && c != -1) {
if (c == 'a') {
addPhilo();
}
else if (c == 'r') {
removePhilo();
}
else if (c == 'q') {
end();
}
}
// }
sys_exit();
}
#include "ps.h"
void freePhilo(philosopher_t * phil) {
sys_semClose(phil->sem);
sys_free(phil);
@ -232,12 +194,7 @@ void end() {
sys_exit();
}
// La primera es muy similar a:
/*
* Taken from "Operating Systems - Design and Implementation" by Tanenbaum
* Section 2.3, page 91, Figure 2-10
* https://gist.github.com/codelance/4186161
*/

3
Userland/SampleCodeModule/shell/commands/pipes.c
View File

@ -4,7 +4,8 @@
void pipes(int argc, char *argv[]) {
char * output = sys_pipes();
printString(output);
new_line();
newline();
sys_free(output);
addEOF();
sys_exit();
}

3
Userland/SampleCodeModule/shell/commands/printmem.c
View File

@ -28,7 +28,8 @@ void printmem(int argc, char *argv[]) {
char bufferAux[8];
printStringLen("0x", 2);
printString(itoa(buffer[i], bufferAux, 16));
new_line();
newline();
}
addEOF();
sys_exit();
}

3
Userland/SampleCodeModule/shell/commands/ps.c
View File

@ -4,7 +4,8 @@
void ps(int argc, char *argv[]) {
char * output = sys_ps();
printString(output);
new_line();
addEOF();
newline();
sys_free(output);
sys_exit();
}

5
Userland/SampleCodeModule/shell/commands/quadratic.c
View File

@ -32,13 +32,14 @@ void quadratic(int argc, char *argv[]) {
printString("x + ");
ftoa(c, buffer, 10);
printString(buffer);
new_line();
newline();
ftoa(sol1, buffer, 10);
printString(buffer);
printStringLen(" and ", 6);
char buffer2[30] = {0};
ftoa(sol2, buffer2, 10);
printString(buffer2);
new_line();
addEOF();
newline();
sys_exit();
}

3
Userland/SampleCodeModule/shell/commands/semCom.c
View File

@ -4,7 +4,8 @@
void sem(int argc, char *argv[]) {
char * output = sys_sem();
printString(output);
new_line();
newline();
sys_free(output);
addEOF();
sys_exit();
}

2
Userland/SampleCodeModule/shell/commands/time.c
View File

@ -47,5 +47,7 @@ void time(int argc, char *argv[]) {
printTime(getMinutes());
putChar(':');
printTime(getSeconds());
addEOF();
newline();
sys_exit();
}

3
Userland/SampleCodeModule/shell/commands/wc.c
View File

@ -6,7 +6,7 @@ void wc(int argc, char ** argv) {
char c;
int i = 0;
char buffer[SIZE] = {0};
while ((c = getChar()) != 0 && c != -1) {
while ((c = getChar()) > 0) {
if (i >= SIZE)
break;
if (c == '\n')
@ -14,5 +14,6 @@ void wc(int argc, char ** argv) {
}
printStringLen(gtoa(i, buffer, 10, SIZE), SIZE);
newline();
sys_exit();
}

30
Userland/SampleCodeModule/shell/include/phylo.h
View File

@ -1,9 +1,33 @@
#ifndef PHYLO_LIB
#define PHYLO_LIB
#ifndef PHYLO_H
#define PHYLO_H
#include <stddef.h>
#include <stdint.h>
#include "libc.h"
#include "system.h"
#include "phyloLib.h"
#define ARGV_SIZE 2
#define BUFF_SIZE 20
#define MAX_PHILO_SIZE 3
#define MAX_NAME_SIZE 10
#define STARTING 5
void phylo(int argc, char *argv[]);
int * state;
typedef enum states {EATING = 0, HUNGRY, THINKING} states;
typedef struct philosopher_t {
int debug;
char ** argv;
char * buffer;
sem_t * sem;
int pid;
states state;
struct philosopher_t * left;
struct philosopher_t * right;
} philosopher_t;
void philosopher(int argc, char ** argv);
#endif

6
Userland/SampleCodeModule/shell/include/phyloLib.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef PHYLOLIB_H
#define PHYLOLIB_H
void phylo(int argc, char *argv[]);
#endif

2
Userland/SampleCodeModule/shell/include/shell.h
View File

@ -21,7 +21,7 @@
#include "semCom.h"
#include "stddef.h"
#include "nice.h"
#include "phylo.h"
#include "phyloLib.h"
#include "kill.h"
#include "block.h"
#include "unblock.h"