TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-17 08:37:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

New features of the block cache

Browse Source
This commit is contained in:
Baptiste Wicht 2016-08-08 21:01:40 +02:00
parent d0a6143feb
commit cb64e374dd
2 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/include/block_cache.hpp
View File

@ -22,6 +22,9 @@ struct block_cache {
void init(uint64_t payload_size, uint64_t blocks); void init(uint64_t payload_size, uint64_t blocks);
char* block_if_present(uint16_t device, uint64_t sector);
char* block_if_present(uint64_t key);
char* block(uint16_t device, uint64_t sector, bool& valid); char* block(uint16_t device, uint64_t sector, bool& valid);
char* block(uint64_t key, bool& valid); char* block(uint64_t key, bool& valid);
}; };

43
kernel/src/block_cache.cpp
View File

@ -48,6 +48,32 @@ void block_cache::init(uint64_t payload_size, uint64_t blocks){
rear = previous; rear = previous;
} }
char* block_cache::block_if_present(uint16_t device, uint64_t sector){
return block_if_present((uint64_t(device) << 16) + sector);
}
char* block_cache::block_if_present(uint64_t orig_key){
auto key = orig_key % (blocks * 2);
if(hash_table[key]){
auto* entry = static_cast<uint64_t*>(hash_table[key]);
if(entry[0] == orig_key){
return reinterpret_cast<char*>(reinterpret_cast<size_t>(hash_table[key]) + 4 * sizeof(uint64_t));
} else {
while(entry[1]){
entry = reinterpret_cast<uint64_t*>(entry[1]);
if(entry[0] == orig_key){
return reinterpret_cast<char*>(reinterpret_cast<size_t>(entry) + 4 * sizeof(uint64_t));
}
}
}
}
return nullptr;
}
char* block_cache::block(uint16_t device, uint64_t sector, bool& valid){ char* block_cache::block(uint16_t device, uint64_t sector, bool& valid){
return block((uint64_t(device) << 16) + sector, valid); return block((uint64_t(device) << 16) + sector, valid);
} }
@ -57,22 +83,11 @@ char* block_cache::block(uint64_t orig_key, bool& valid){
// First, try to get it directly from the hash table // First, try to get it directly from the hash table
if(hash_table[key]){ auto direct = block_if_present(orig_key);
auto* entry = static_cast<uint64_t*>(hash_table[key]);
if(entry[0] == orig_key){ if(direct){
valid = true; valid = true;
return reinterpret_cast<char*>(reinterpret_cast<size_t>(hash_table[key]) + 4 * sizeof(uint64_t)); return direct;
} else {
while(entry[1]){
entry = reinterpret_cast<uint64_t*>(entry[1]);
if(entry[0] == orig_key){
valid = true;
return reinterpret_cast<char*>(reinterpret_cast<size_t>(entry) + 4 * sizeof(uint64_t));
}
}
}
} }
// At this point, we will allocate a new block // At this point, we will allocate a new block