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

Fix bugs 

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-08 16:28:56 -03:00
parent 774e5dcdb2
commit c4714fe772
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Kernel/utils/include/sem.h
View File

@ -12,6 +12,7 @@
#define MAX_SEM 100
#define SEM_DATA_MAX_SIZE 100
#define MAX_PID 4
#define MIN_SIZE 32
void enter_region(uint32_t * lock);
void leave_region(uint32_t * lock);

2
Kernel/utils/sem.c
View File

@ -197,7 +197,7 @@ char *getEntering(sem_t *sem) {
}
char *getSems() {
char *ans = pvPortMalloc(1 + counter * SEM_DATA_MAX_SIZE);
char *ans = pvPortMalloc(MIN_SIZE + counter * SEM_DATA_MAX_SIZE);
char *ret = ans;
char *info = "name value pidsWaiting\n";

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

@ -4,10 +4,6 @@
#define SIZE 1000
void debug2() {
return;
}
void cat(int argc, char ** argv) {
char c;
int i = 0, j = 0, line = 0;
@ -31,7 +27,6 @@ void cat(int argc, char ** argv) {
buffer[i++] = c;
j++;
debug2();
printStringLen(buffer + line, j);
newline();

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

@ -32,7 +32,11 @@ void addPhilo() {
new->argv = sys_malloc(sizeof(char *) * ARGV_SIZE);
new->buffer = sys_malloc(sizeof(char) * BUFF_SIZE);
new->state = THINKING;
new->sem = sys_semOpen("filosofo", 0);
char * aux = sys_malloc(sizeof(char) * 20);
aux = strcat(aux, "filosofo");
char buffer[2] = {0};
aux = strcat(aux, itoa(philoCount, buffer, 10));
new->sem = sys_semOpen(aux, 0);
new->argv[0] = "filosofo";
strcpy(new->buffer, itoa((uint64_t) new, new->buffer, 10));
@ -125,7 +129,11 @@ void phylo(int argc, char ** argv) {
phil->argv = sys_malloc(sizeof(char *) * 2);
phil->buffer = sys_malloc(20);
phil->state = THINKING;
phil->sem = sys_semOpen("filosofo", 0);
char * aux = sys_malloc(sizeof(char) * 20);
aux = strcat(aux, "filosofo");
char buffer[2] = {0};
aux = strcat(aux, itoa(i, buffer, 10));
phil->sem = sys_semOpen(aux, 0);
phil->argv[0] = "filosofo";
strcpy(phil->buffer, itoa((uint64_t) phil, phil->buffer, 10));
@ -165,7 +173,9 @@ void phylo(int argc, char ** argv) {
else if (c == 'q') {
end();
}
// sys_sleep(1);
// else {
// end();
// }
}
sys_exit();
}