augustin64/tipe
1
1
Fork 0
mirror of https://github.com/augustin64/projet-tipe synced 2025-01-23 23:26:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix get_length calling the wrong function

Browse Source
This commit is contained in:
augustin64 2023-02-18 14:06:01 +01:00
parent 444f2b5931
commit 1fdb9ff37a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/memory_management.c
View File

@ -23,7 +23,7 @@ int get_length(Memory* mem) {
if (!mem) { if (!mem) {
return 0; return 0;
} }
return 1 + get_distinct_allocations(mem->next); return 1 + get_length(mem->next);
} }
@ -60,7 +60,7 @@ void* allocate_memory(size_t size, Memory* mem) {
mem->nb_alloc++; mem->nb_alloc++;
return ptr; return ptr;
} else { } else {
printf("Mémoire disponible: %ld. Nécessaire: %ld\n", mem->size - ((intptr_t)mem->cursor - (intptr_t)mem->start), size); //printf("Mémoire disponible: %ld. Nécessaire: %ld\n", mem->size - ((intptr_t)mem->cursor - (intptr_t)mem->start), size);
// Sinon on continue sur l'élément suivant de la liste // Sinon on continue sur l'élément suivant de la liste
if (!mem->next) { if (!mem->next) {
mem->next = create_memory_block(MEMORY_BLOCK < size ? size : MEMORY_BLOCK); mem->next = create_memory_block(MEMORY_BLOCK < size ? size : MEMORY_BLOCK);
@ -106,8 +106,8 @@ void* nalloc(size_t sz) {
// We allocate a new memory block // We allocate a new memory block
memory = create_memory_block(MEMORY_BLOCK < sz ? sz : MEMORY_BLOCK); memory = create_memory_block(MEMORY_BLOCK < sz ? sz : MEMORY_BLOCK);
} }
printf("Distinct allocations: %d Blocks: %d\n", get_distinct_allocations(memory), get_length(memory)); //printf("Distinct allocations: %d Blocks: %d\n", get_distinct_allocations(memory), get_length(memory));
printf("Requested memory of size %ld\n", sz); //printf("Requested memory of size %ld\n", sz);
void* ptr = allocate_memory(sz, memory); void* ptr = allocate_memory(sz, memory);
pthread_mutex_unlock(&memory_lock); pthread_mutex_unlock(&memory_lock);

8
src/memory_management.cu
View File

@ -23,7 +23,7 @@ int get_length(Memory* mem) {
if (!mem) { if (!mem) {
return 0; return 0;
} }
return 1 + get_distinct_allocations(mem->next); return 1 + get_length(mem->next);
} }
@ -60,7 +60,7 @@ void* allocate_memory(size_t size, Memory* mem) {
mem->nb_alloc++; mem->nb_alloc++;
return ptr; return ptr;
} else { } else {
printf("Mémoire disponible: %ld. Nécessaire: %ld\n", mem->size - ((intptr_t)mem->cursor - (intptr_t)mem->start), size); //printf("Mémoire disponible: %ld. Nécessaire: %ld\n", mem->size - ((intptr_t)mem->cursor - (intptr_t)mem->start), size);
// Sinon on continue sur l'élément suivant de la liste // Sinon on continue sur l'élément suivant de la liste
if (!mem->next) { if (!mem->next) {
mem->next = create_memory_block(MEMORY_BLOCK < size ? size : MEMORY_BLOCK); mem->next = create_memory_block(MEMORY_BLOCK < size ? size : MEMORY_BLOCK);
@ -106,8 +106,8 @@ void* nalloc(size_t sz) {
// We allocate a new memory block // We allocate a new memory block
memory = create_memory_block(MEMORY_BLOCK < sz ? sz : MEMORY_BLOCK); memory = create_memory_block(MEMORY_BLOCK < sz ? sz : MEMORY_BLOCK);
} }
printf("Distinct allocations: %d Blocks: %d\n", get_distinct_allocations(memory), get_length(memory)); //printf("Distinct allocations: %d Blocks: %d\n", get_distinct_allocations(memory), get_length(memory));
printf("Requested memory of size %ld\n", sz); //printf("Requested memory of size %ld\n", sz);
void* ptr = allocate_memory(sz, memory); void* ptr = allocate_memory(sz, memory);
pthread_mutex_unlock(&memory_lock); pthread_mutex_unlock(&memory_lock);