admin/iloveos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed large file io

Browse Source
This commit is contained in:
FactorialN 2023-12-02 00:24:30 -08:00
parent de198df6d1
commit 998e8a20cc
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/files.cpp
View File

@ -581,6 +581,7 @@ int FilesOperation::fischl_write(const char *path, const char *buf, size_t size,
// Allocate memory for the new buffer // Allocate memory for the new buffer
char* buffer = (char*)malloc(size); char* buffer = (char*)malloc(size);
memcpy(buffer, buf, size); memcpy(buffer, buf, size);
printf("SOME DATA %d %d\n", (int)buffer[0], (int)buffer[1]);
size_t bytes_write = fs->write(&inode, buffer, size, offset); size_t bytes_write = fs->write(&inode, buffer, size, offset);
/*size_t block_index = offset / IO_BLOCK_SIZE; // Starting block index /*size_t block_index = offset / IO_BLOCK_SIZE; // Starting block index
size_t block_offset = offset % IO_BLOCK_SIZE; // Offset within the first block size_t block_offset = offset % IO_BLOCK_SIZE; // Offset within the first block

16
lib/fs/fs_read_write.cpp
View File

@ -15,7 +15,7 @@ int Fs::sweep_inode_datablocks(INode_Data *inode_data,
DatablockOperation *op) { DatablockOperation *op) {
int result; int result;
printf("%llu %llu %llu\n", NUMBER_OF_DIRECT_BLOCKS, INDIRECT_BLOCKS, INDIRECT_BLOCKS * INDIRECT_BLOCKS); printf("NOW AT %llu %llu %llu %llu %llu\n", NUMBER_OF_DIRECT_BLOCKS, INDIRECT_BLOCKS, INDIRECT_BLOCKS * INDIRECT_BLOCKS, inode_data->single_indirect_block, inode_data->double_indirect_block);
u_int64_t start_index = start_block_index; u_int64_t start_index = start_block_index;
for (size_t i = start_index; i < NUMBER_OF_DIRECT_BLOCKS; ++i) { for (size_t i = start_index; i < NUMBER_OF_DIRECT_BLOCKS; ++i) {
@ -63,14 +63,14 @@ int Fs::sweep_datablocks(u_int64_t *block_num, int indirect_num,
int err; int err;
int result = -1; int result = -1;
//printf("SWEEP %llu %d %llu %d\n", *block_num, indirect_num, start_block_index, int(allocate)); if (allocate && (*block_num) == 0){
if (allocate && (*block_num) == 0)
if ((err = datablock_manager->new_datablock(block_num)) < 0) if ((err = datablock_manager->new_datablock(block_num)) < 0)
return err; return err;
}
if (indirect_num == 0) if (indirect_num == 0){
return op->operation(*block_num); return op->operation(*block_num);
}
if ((*block_num) == 0) { if ((*block_num) == 0) {
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
@ -91,7 +91,6 @@ int Fs::sweep_datablocks(u_int64_t *block_num, int indirect_num,
u_int64_t temp; u_int64_t temp;
u_int64_t next_block_num; u_int64_t next_block_num;
bool modified = false; bool modified = false;
//printf("SWEEP TO LOWER LEVEL %llu %llu %llu\n", this_layer_start_index, next_layer_start_index, indirect_block_size);
for (size_t i = this_layer_start_index * sizeof(u_int64_t); i < IO_BLOCK_SIZE; for (size_t i = this_layer_start_index * sizeof(u_int64_t); i < IO_BLOCK_SIZE;
i += sizeof(u_int64_t)) { i += sizeof(u_int64_t)) {
@ -106,6 +105,7 @@ int Fs::sweep_datablocks(u_int64_t *block_num, int indirect_num,
} }
if (result == 0) if (result == 0)
break; break;
next_layer_start_index = 0;
} }
if (modified) if (modified)
if ((err = disk->write_block(*block_num, buf)) < 0) if ((err = disk->write_block(*block_num, buf)) < 0)
@ -205,8 +205,6 @@ ssize_t Fs::write(INode_Data *inode_data, char buf[], size_t count,
op.bytes_completed = 0; op.bytes_completed = 0;
op.disk = disk; op.disk = disk;
printf("trying to write %d %llu %llu\n", op.count, offset, start_block_index);
if ((err = sweep_inode_datablocks(inode_data, start_block_index, true, &op)) < if ((err = sweep_inode_datablocks(inode_data, start_block_index, true, &op)) <
0) 0)
return err; return err;
@ -214,7 +212,5 @@ ssize_t Fs::write(INode_Data *inode_data, char buf[], size_t count,
inode_data->metadata.size = inode_data->metadata.size =
std::max(offset + op.bytes_completed, inode_data->metadata.size); std::max(offset + op.bytes_completed, inode_data->metadata.size);
printf("written %d\n", op.bytes_completed);
return op.bytes_completed; return op.bytes_completed;
} }