improvement-multiple_buffers
Oli 3 years ago
parent 7ff79a535a
commit f39be23c18

@ -22,6 +22,7 @@ typedef struct chunk_array {
buffer_t* buffer1;
buffer_t* buffer2;
buffer_t** buffers;
size_t n_buffers;
}chunk_array_t;
chunk_array_t* chunk_array_create(char* filename, size_t total_size);

@ -3,7 +3,7 @@
#include "stdlib.h"
#include <sys/mman.h>
#define MAX_CHUNK_SIZE 2048
#define MAX_CHUNK_SIZE 2048*2048
#define N_BUFFERS 3
int min(int value1, int value2) {
@ -30,7 +30,7 @@ bool inside_buffer(chunk_array_t* chunk_array,int init_pos, size_t pos) {
void chunk_array_free(chunk_array_t* chunk_array) {
if (chunk_array->mmap_array) munmap(chunk_array->mmap_array, chunk_array->total_size * sizeof(double));
for (int i = 0; i < N_BUFFERS; i++) {
for (int i = 0; i < chunk_array->n_buffers; i++) {
buffer_free(chunk_array->buffers[i]);
}
free(chunk_array->buffers);
@ -38,7 +38,7 @@ void chunk_array_free(chunk_array_t* chunk_array) {
}
void buffer_flush(chunk_array_t* chunk_array, buffer_t* buffer) {
if (buffer->dirty) {
if (buffer->dirty && chunk_array->mmap_array) {
int mod = get_mod(chunk_array, buffer->init_pos);
memcpy(&chunk_array->mmap_array[buffer->init_pos], buffer->data, mod * sizeof(double));
@ -53,8 +53,9 @@ void buffer_update(chunk_array_t* chunk_array, buffer_t* buffer, size_t pos) {
int new_init = pos/chunk_array->chunk_size;
buffer->init_pos = new_init * chunk_array->chunk_size;
int mod = get_mod(chunk_array, buffer->init_pos);
memcpy(buffer->data, &chunk_array->mmap_array[buffer->init_pos], mod * sizeof(double));
if (chunk_array->mmap_array) {
memcpy(buffer->data, &chunk_array->mmap_array[buffer->init_pos], mod * sizeof(double));
}
}
buffer_t* buffer_create(int size) {
@ -105,8 +106,11 @@ chunk_array_t* chunk_array_create(char* filename, size_t total_size) {
chunk_array->buffers[0]->init_pos = 0;
chunk_array->n_buffers = 1;
for (int i = 1; i<N_BUFFERS; i++) {
if (total_size > i*chunk_array->chunk_size) {
chunk_array->n_buffers++;
chunk_array->buffers[i] = buffer_create(chunk_array->chunk_size);
chunk_array->buffers[i]->init_pos = chunk_array->chunk_size;
} else {
@ -124,20 +128,15 @@ buffer_t* chunk_array_update(chunk_array_t* chunk_array, size_t pos) {
buffer_t* buffer = chunk_array->buffers[0];
int distance = abs(buffer->init_pos - pos);
printf("[CHUNK UPDATE][%s] pos: %d \n",chunk_array->filename, pos);
for(int i=1; i<N_BUFFERS; i++) {
for(int i=1; i<chunk_array->n_buffers; i++) {
int new_distance = abs(chunk_array->buffers[i]->init_pos - pos);
if (new_distance < distance) {
distance = new_distance;
buffer = chunk_array->buffers[i];
}
}
buffer_update(chunk_array, buffer, pos);
return buffer;
}
bool chunk_array_get(chunk_array_t* chunk_array, size_t pos, double *valor) {
@ -149,7 +148,7 @@ bool chunk_array_get(chunk_array_t* chunk_array, size_t pos, double *valor) {
// mmap
buffer_t* buffer = NULL;
for (int i = 0; i<N_BUFFERS; i++) {
for (int i = 0; i<chunk_array->n_buffers; i++) {
if (inside_buffer(chunk_array, chunk_array->buffers[i]->init_pos, pos)) {
buffer = chunk_array->buffers[i];
}
@ -176,7 +175,7 @@ bool chunk_array_save(chunk_array_t* chunk_array, size_t pos, double valor) {
// mmap
buffer_t* buffer = NULL;
for (int i = 0; i<N_BUFFERS; i++) {
for (int i = 0; i<chunk_array->n_buffers; i++) {
if (inside_buffer(chunk_array, chunk_array->buffers[i]->init_pos, pos)) {
buffer = chunk_array->buffers[i];
}

@ -335,11 +335,6 @@ void fourt(chunk_array_t* datar, chunk_array_t* datai, int nn[3], int ndim, int
//chunk_array_get(datar, j, &valuerj);
//chunk_array_get(datai, j, &valueij);
printf("start\n");
printf("[GET] %d\n", j);
printf("[SAVE] %d\n", i);
printf("[SAVE] %d\n", j);
printf("end\n");
chunk_array_save(datar, j, valuerj + tempr);
chunk_array_save(datai, j, valueij + tempi);

Loading…
Cancel
Save