enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-05-28 15:34:31 +00:00
Code Issues Actions Releases Wiki Activity

feat(kernel/syscalls): implement semi-stub linux_sysinfo

Browse Source 
Signed-off-by: EnderIce2 <enderice2@protonmail.com>
This commit is contained in:
EnderIce2 2025-04-03 06:46:26 +00:00
parent 75dd958316
commit 1a48d05042
Signed by: enderice2
GPG Key ID: FEB6B8A8507BA62E
2 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Kernel/subsystem/linux/include/defs.hpp
View File

@ -428,4 +428,23 @@ typedef struct cpu_set_t
#define CPU_SET(i, set) CPU_BIT_OP(i, sizeof(cpu_set_t), set, |=) #define CPU_SET(i, set) CPU_BIT_OP(i, sizeof(cpu_set_t), set, |=)
#define CPU_ZERO(set) (memset((set), 0, sizeof(cpu_set_t))) #define CPU_ZERO(set) (memset((set), 0, sizeof(cpu_set_t)))
/* taken from https://man7.org/linux/man-pages/man2/sysinfo.2.html */
struct sysinfo
{
long uptime; /* Seconds since boot */
unsigned long loads[3]; /* 1, 5, and 15 minute load averages */
unsigned long totalram; /* Total usable main memory size */
unsigned long freeram; /* Available memory size */
unsigned long sharedram; /* Amount of shared memory */
unsigned long bufferram; /* Memory used by buffers */
unsigned long totalswap; /* Total swap space size */
unsigned long freeswap; /* Swap space still available */
unsigned short procs; /* Number of current processes */
unsigned long totalhigh; /* Total high memory size */
unsigned long freehigh; /* Available high memory size */
unsigned int mem_unit; /* Memory unit size in bytes */
char _f[20 - 2 * sizeof(long) - sizeof(int)]; /* Padding to 64 bytes */
};
#endif // !__FENNIX_KERNEL_LINUX_DEFS_H__ #endif // !__FENNIX_KERNEL_LINUX_DEFS_H__

36
Kernel/subsystem/linux/syscall.cpp
View File

@ -2547,6 +2547,38 @@ static int linux_getrusage(SysFrm *, int who, struct rusage *usage)
return 0; return 0;
} }
static int linux_sysinfo(SysFrm *, struct sysinfo *info)
{
PCB *pcb = thisProcess;
Memory::VirtualMemoryArea *vma = pcb->vma;
auto pInfo = vma->UserCheckAndGetAddress(info);
if (pInfo == nullptr)
return -linux_EFAULT;
uint64_t nano = TimeManager->GetNanosecondsSinceClassCreation();
if (nano != 0)
nano /= 10000000;
pInfo->uptime = nano;
pInfo->loads[0] = 0;
pInfo->loads[1] = 0;
pInfo->loads[2] = 0;
pInfo->totalram = KernelAllocator.GetTotalMemory() - KernelAllocator.GetReservedMemory();
pInfo->freeram = KernelAllocator.GetFreeMemory();
pInfo->sharedram = 0;
pInfo->bufferram = 0;
pInfo->totalswap = 0;
pInfo->freeswap = 0;
pInfo->procs = TaskManager->GetProcessList().size();
pInfo->totalhigh = 0;
pInfo->freehigh = 0;
pInfo->mem_unit = 1;
if (sizeof(pInfo->_f) != 0)
memset(pInfo->_f, 0, sizeof(pInfo->_f));
return 0;
}
static int linux_syslog(SysFrm *, int type, char *bufp, int size) static int linux_syslog(SysFrm *, int type, char *bufp, int size)
{ {
PCB *pcb = thisProcess; PCB *pcb = thisProcess;
@ -3629,7 +3661,7 @@ static SyscallData LinuxSyscallsTableAMD64[] = {
[__NR_amd64_gettimeofday] = {"gettimeofday", (void *)nullptr}, [__NR_amd64_gettimeofday] = {"gettimeofday", (void *)nullptr},
[__NR_amd64_getrlimit] = {"getrlimit", (void *)nullptr}, [__NR_amd64_getrlimit] = {"getrlimit", (void *)nullptr},
[__NR_amd64_getrusage] = {"getrusage", (void *)linux_getrusage}, [__NR_amd64_getrusage] = {"getrusage", (void *)linux_getrusage},
[__NR_amd64_sysinfo] = {"sysinfo", (void *)nullptr}, [__NR_amd64_sysinfo] = {"sysinfo", (void *)linux_sysinfo},
[__NR_amd64_times] = {"times", (void *)nullptr}, [__NR_amd64_times] = {"times", (void *)nullptr},
[__NR_amd64_ptrace] = {"ptrace", (void *)nullptr}, [__NR_amd64_ptrace] = {"ptrace", (void *)nullptr},
[__NR_amd64_getuid] = {"getuid", (void *)linux_getuid}, [__NR_amd64_getuid] = {"getuid", (void *)linux_getuid},
@ -4096,7 +4128,7 @@ static SyscallData LinuxSyscallsTableI386[] = {
[__NR_i386_vm86old] = {"vm86old", (void *)nullptr}, [__NR_i386_vm86old] = {"vm86old", (void *)nullptr},
[__NR_i386_wait4] = {"wait4", (void *)linux_wait4}, [__NR_i386_wait4] = {"wait4", (void *)linux_wait4},
[__NR_i386_swapoff] = {"swapoff", (void *)nullptr}, [__NR_i386_swapoff] = {"swapoff", (void *)nullptr},
[__NR_i386_sysinfo] = {"sysinfo", (void *)nullptr}, [__NR_i386_sysinfo] = {"sysinfo", (void *)linux_sysinfo},
[__NR_i386_ipc] = {"ipc", (void *)nullptr}, [__NR_i386_ipc] = {"ipc", (void *)nullptr},
[__NR_i386_fsync] = {"fsync", (void *)nullptr}, [__NR_i386_fsync] = {"fsync", (void *)nullptr},
[__NR_i386_sigreturn] = {"sigreturn", (void *)nullptr}, [__NR_i386_sigreturn] = {"sigreturn", (void *)nullptr},