Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied patch by Vasilis:

Browse Source 
* Fixed various warnings with GCC4 due to the double sHaikuRevision line.
* Turned system_info.c to a C++ file.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24404 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-03-15 16:59:30 +00:00
parent e28ef85ab7
commit fe8b72bc69
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/kernel/Jamfile
View File

@ -36,7 +36,7 @@ KernelMergeObject kernel_core.o :
sem.cpp sem.cpp
shutdown.c shutdown.c
signal.cpp signal.cpp
system_info.c system_info.cpp
smp.c smp.c
syscalls.cpp syscalls.cpp
team.cpp team.cpp

24
src/system/kernel/system_info.c → src/system/kernel/system_info.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004-2007, Haiku, Inc. * Copyright (c) 2004-2008, Haiku, Inc.
* Distributed under the terms of the MIT license. * Distributed under the terms of the MIT license.
* *
* Authors: * Authors:
@ -9,6 +9,9 @@
#include <system_info.h> #include <system_info.h>
#include <arch/system_info.h>
#include <string.h>
#include <OS.h> #include <OS.h>
#include <KernelExport.h> #include <KernelExport.h>
@ -25,10 +28,6 @@
#include <vm.h> #include <vm.h>
#include <vm_page.h> #include <vm_page.h>
#include <arch/system_info.h>
#include <string.h>
const static int64 kKernelVersion = 0x1; const static int64 kKernelVersion = 0x1;
const static char *kKernelName = "kernel_" HAIKU_ARCH; const static char *kKernelName = "kernel_" HAIKU_ARCH;
@ -37,18 +36,15 @@ const static char *kKernelName = "kernel_" HAIKU_ARCH;
// Haiku SVN revision. Will be set when copying the kernel to the image. // Haiku SVN revision. Will be set when copying the kernel to the image.
// Lives in a separate section so that it can easily be found. // Lives in a separate section so that it can easily be found.
static uint32 sHaikuRevision __attribute__((section("_haiku_revision"))); static uint32 sHaikuRevision __attribute__((section("_haiku_revision")));
static uint32 sHaikuRevision = 0;
static int static int
dump_info(int argc, char **argv) dump_info(int argc, char **argv)
{ {
int32 i;
kprintf("kernel build: %s %s\n\n", __DATE__, __TIME__); kprintf("kernel build: %s %s\n\n", __DATE__, __TIME__);
kprintf("cpu count: %ld, active times:\n", smp_get_num_cpus()); kprintf("cpu count: %ld, active times:\n", smp_get_num_cpus());
for (i = 0; i < smp_get_num_cpus(); i++) for (int32 i = 0; i < smp_get_num_cpus(); i++)
kprintf(" [%ld] %Ld\n", i + 1, cpu_get_active_time(i)); kprintf(" [%ld] %Ld\n", i + 1, cpu_get_active_time(i));
// ToDo: Add page_faults // ToDo: Add page_faults
@ -70,8 +66,6 @@ dump_info(int argc, char **argv)
status_t status_t
_get_system_info(system_info *info, size_t size) _get_system_info(system_info *info, size_t size)
{ {
int32 i;
if (size != sizeof(system_info)) if (size != sizeof(system_info))
return B_BAD_VALUE; return B_BAD_VALUE;
@ -80,7 +74,7 @@ _get_system_info(system_info *info, size_t size)
info->boot_time = rtc_boot_time(); info->boot_time = rtc_boot_time();
info->cpu_count = smp_get_num_cpus(); info->cpu_count = smp_get_num_cpus();
for (i = 0; i < info->cpu_count; i++) for (int32 i = 0; i < info->cpu_count; i++)
info->cpu_infos[i].active_time = cpu_get_active_time(i); info->cpu_infos[i].active_time = cpu_get_active_time(i);
// ToDo: Add page_faults // ToDo: Add page_faults
@ -128,15 +122,13 @@ get_haiku_revision(void)
status_t status_t
_user_get_system_info(system_info *userInfo, size_t size) _user_get_system_info(system_info *userInfo, size_t size)
{ {
system_info info;
status_t status;
// The BeBook says get_system_info() always returns B_OK, // The BeBook says get_system_info() always returns B_OK,
// but that ain't true with invalid addresses // but that ain't true with invalid addresses
if (userInfo == NULL || !IS_USER_ADDRESS(userInfo)) if (userInfo == NULL || !IS_USER_ADDRESS(userInfo))
return B_BAD_ADDRESS; return B_BAD_ADDRESS;
status = _get_system_info(&info, size); system_info info;
status_t status = _get_system_info(&info, size);
if (status == B_OK) { if (status == B_OK) {
if (user_memcpy(userInfo, &info, sizeof(system_info)) < B_OK) if (user_memcpy(userInfo, &info, sizeof(system_info)) < B_OK)
return B_BAD_ADDRESS; return B_BAD_ADDRESS;