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

Add support for dynamic values in sysfs

Browse Source
This commit is contained in:
Baptiste Wicht 2014-03-03 16:36:36 +01:00
parent 6acf44ab1a
commit c397f9cedf
5 changed files with 59 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/include/fs/sysfs.hpp
View File

@ -33,7 +33,11 @@ public:
size_t rm(const std::vector<std::string>& file_path);
};
void set_value(const std::string& mount_point, const std::string& path, const std::string& value);
typedef std::string (*dynamic_fun_t)();
void set_constant_value(const std::string& mount_point, const std::string& path, const std::string& value);
void set_dynamic_value(const std::string& mount_point, const std::string& path, dynamic_fun_t fun);
void delete_value(const std::string& mount_point, const std::string& path);
void delete_folder(const std::string& mount_point, const std::string& path);

51
kernel/src/fs/sysfs.cpp
View File

@ -19,12 +19,25 @@ namespace {
struct sys_value {
std::string name;
std::string value;
std::string _value;
sysfs::dynamic_fun_t fun = nullptr;
sys_value(){}
sys_value(std::string name, std::string value) : name(name), value(value){
sys_value(std::string name, std::string value) : name(name), _value(value){
//Nothing else to init
}
sys_value(std::string name, sysfs::dynamic_fun_t fun) : name(name), fun(fun){
//Nothing else to init
}
std::string value() const {
if(fun){
return fun();
} else {
return _value;
}
}
};
struct sys_folder {
@ -110,7 +123,7 @@ size_t get_file(const sys_folder& folder, const std::vector<std::string>& file_p
f.directory = false;
f.hidden = false;
f.system = false;
f.size = file.value.size();
f.size = file.value().size();
return 0;
}
@ -136,7 +149,7 @@ size_t ls(const sys_folder& folder, std::vector<vfs::file>& contents){
f.directory = false;
f.hidden = false;
f.system = false;
f.size = file.value.size();
f.size = file.value().size();
contents.push_back(f);
}
@ -146,7 +159,7 @@ size_t ls(const sys_folder& folder, std::vector<vfs::file>& contents){
size_t read(const sys_folder& folder, const std::vector<std::string>& file_path, std::string& content){
for(auto& file : folder.values){
if(file.name == file_path.back()){
content = file.value;
content = file.value();
return 0;
}
}
@ -163,7 +176,7 @@ size_t read(const sys_folder& folder, const std::vector<std::string>& file_path,
void set_value(sys_folder& folder, const std::string& name, const std::string& value){
for(auto& v : folder.values){
if(v.name == name){
v.value = value;
v._value = value;
return;
}
}
@ -171,6 +184,17 @@ void set_value(sys_folder& folder, const std::string& name, const std::string& v
folder.values.emplace_back(name, value);
}
void set_value(sys_folder& folder, const std::string& name, sysfs::dynamic_fun_t fun){
for(auto& v : folder.values){
if(v.name == name){
v.fun = fun;
return;
}
}
folder.values.emplace_back(name, fun);
}
void delete_value(sys_folder& folder, const std::string& name){
for(size_t i = 0; i < folder.values.size(); ++i){
auto& v = folder.values[i];
@ -280,7 +304,7 @@ size_t sysfs::sysfs_file_system::statfs(statfs_info& file){
return 0;
}
void sysfs::set_value(const std::string& mount_point, const std::string& path, const std::string& value){
void sysfs::set_constant_value(const std::string& mount_point, const std::string& path, const std::string& value){
auto& root_folder = find_root_folder(mount_point);
auto file_path = std::split(path, '/');
@ -293,6 +317,19 @@ void sysfs::set_value(const std::string& mount_point, const std::string& path, c
}
}
void sysfs::set_dynamic_value(const std::string& mount_point, const std::string& path, dynamic_fun_t fun){
auto& root_folder = find_root_folder(mount_point);
auto file_path = std::split(path, '/');
if(file_path.size() == 1){
::set_value(root_folder, file_path.back(), fun);
} else {
auto& folder = find_folder(root_folder, file_path, 0, file_path.size() - 1);
::set_value(folder, file_path.back(), fun);
}
}
void sysfs::delete_value(const std::string& mount_point, const std::string& path){
auto& root_folder = find_root_folder(mount_point);

4
kernel/src/kernel.cpp
View File

@ -84,8 +84,8 @@ void kernel_main(){
init_console();
sysfs::set_value("/sys/", "version", "0.1");
sysfs::set_value("/sys/", "author", "Baptiste Wicht");
sysfs::set_constant_value("/sys/", "version", "0.1");
sysfs::set_constant_value("/sys/", "author", "Baptiste Wicht");
scheduler::init();

8
kernel/src/timer.cpp
View File

@ -19,12 +19,16 @@ uint64_t _timer_seconds = 0;
volatile uint64_t _timer_countdown = 0;
std::string sysfs_uptime(){
return std::to_string(timer::seconds());
}
} //End of anonymous namespace
void timer::install(){
pit::install();
sysfs::set_value("/sys/", "uptime", "0");
sysfs::set_dynamic_value("/sys/", "uptime", &sysfs_uptime);
}
void timer::tick(){
@ -38,8 +42,6 @@ void timer::tick(){
if(_timer_ticks % 1000 == 0){
++_timer_seconds;
sysfs::set_value("/sys/", "uptime", std::to_string(_timer_seconds));
}
}

6
kernel/src/vesa.cpp
View File

@ -77,9 +77,9 @@ bool vesa::init(){
screen = reinterpret_cast<uint32_t*>(virt);
sysfs::set_value("/sys/", "/vesa/enabled", "true");
sysfs::set_value("/sys/", "/vesa/resolution/width", std::to_string(block.width));
sysfs::set_value("/sys/", "/vesa/resolution/height", std::to_string(block.height));
sysfs::set_constant_value("/sys/", "/vesa/enabled", "true");
sysfs::set_constant_value("/sys/", "/vesa/resolution/width", std::to_string(block.width));
sysfs::set_constant_value("/sys/", "/vesa/resolution/height", std::to_string(block.height));
return true;
}