i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up OS.h a bit more.

Browse Source 
Return type of thread_func is now status_t instead of the previous int32.
Added some more cpuid_info fields - many fields aren't just reserved anymore.
"sysinfo" now supports the extended features of Intel CPUs, and also knows
the "HTT" bit of the standard features indicating the hyper-threading capability.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14533 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-10-26 22:46:30 +00:00
parent 9f2dae6a17
commit 1c016e0e3f
2 changed files with 63 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/kernel/OS.h
+27 -21
View File
@@ -1,6 +1,6 @@
/* Kernel specific structures and functions /* Kernel specific structures and functions
* *
* Copyright 2004, Haiku Inc. All Rights Reserved. * Copyright 2004-2005, Haiku Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _OS_H #ifndef _OS_H
@@ -75,24 +75,25 @@ typedef struct area_info {
#define B_READ_AREA 1 #define B_READ_AREA 1
#define B_WRITE_AREA 2 #define B_WRITE_AREA 2
extern area_id create_area(const char *name, void **start_addr, uint32 addr_spec, extern area_id create_area(const char *name, void **startAddress, uint32 addressSpec,
size_t size, uint32 lock, uint32 protection); size_t size, uint32 lock, uint32 protection);
extern area_id clone_area(const char *name, void **dest_addr, uint32 addr_spec, extern area_id clone_area(const char *name, void **destAddress, uint32 addressSpec,
uint32 protection, area_id source); uint32 protection, area_id source);
extern area_id find_area(const char *name); extern area_id find_area(const char *name);
extern area_id area_for(void *address); extern area_id area_for(void *address);
extern status_t delete_area(area_id id); extern status_t delete_area(area_id id);
extern status_t resize_area(area_id id, size_t new_size); extern status_t resize_area(area_id id, size_t newSize);
extern status_t set_area_protection(area_id id, uint32 new_protection); extern status_t set_area_protection(area_id id, uint32 newProtection);
/* system private, use macros instead */ /* system private, use macros instead */
extern status_t _get_area_info(area_id id, area_info *areaInfo, size_t size); extern status_t _get_area_info(area_id id, area_info *areaInfo, size_t size);
extern status_t _get_next_area_info(team_id team, int32 *cookie, area_info *areaInfo, size_t size); extern status_t _get_next_area_info(team_id team, int32 *cookie,
area_info *areaInfo, size_t size);
#define get_area_info(id, ainfo) \ #define get_area_info(id, areaInfo) \
_get_area_info((id), (ainfo),sizeof(*(ainfo))) _get_area_info((id), (areaInfo),sizeof(*(areaInfo)))
#define get_next_area_info(team, cookie, ainfo) \ #define get_next_area_info(team, cookie, areaInfo) \
_get_next_area_info((team), (cookie), (ainfo), sizeof(*(ainfo))) _get_next_area_info((team), (cookie), (areaInfo), sizeof(*(areaInfo)))
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
@@ -102,9 +103,9 @@ typedef struct port_info {
port_id port; port_id port;
team_id team; team_id team;
char name[B_OS_NAME_LENGTH]; char name[B_OS_NAME_LENGTH];
int32 capacity; /* queue depth */ int32 capacity; // queue depth
int32 queue_count; /* # msgs waiting to be read */ int32 queue_count; // # msgs waiting to be read
int32 total_count; /* total # msgs read so far */ int32 total_count; // total # msgs read so far
} port_info; } port_info;
extern port_id create_port(int32 capacity, const char *name); extern port_id create_port(int32 capacity, const char *name);
@@ -113,8 +114,8 @@ extern ssize_t read_port(port_id port, int32 *code, void *buffer, size_t bufferS
extern ssize_t read_port_etc(port_id port, int32 *code, void *buffer, size_t bufferSize, extern ssize_t read_port_etc(port_id port, int32 *code, void *buffer, size_t bufferSize,
uint32 flags, bigtime_t timeout); uint32 flags, bigtime_t timeout);
extern status_t write_port(port_id port, int32 code, const void *buffer, size_t bufferSize); extern status_t write_port(port_id port, int32 code, const void *buffer, size_t bufferSize);
extern status_t write_port_etc(port_id port, int32 code, const void *buffer, size_t bufferSize, extern status_t write_port_etc(port_id port, int32 code, const void *buffer,
uint32 flags, bigtime_t timeout); size_t bufferSize, uint32 flags, bigtime_t timeout);
extern status_t close_port(port_id port); extern status_t close_port(port_id port);
extern status_t delete_port(port_id port); extern status_t delete_port(port_id port);
@@ -282,8 +283,9 @@ typedef struct {
#define B_SYSTEM_TIMEBASE 0 #define B_SYSTEM_TIMEBASE 0
typedef int32 (*thread_func) (void *); typedef status_t (*thread_func)(void *);
#define thread_entry thread_func /* thread_entry is for backward compatibility only! Use thread_func */ #define thread_entry thread_func
/* thread_entry is for backward compatibility only! Use thread_func */
extern thread_id spawn_thread(thread_func, const char *name, int32 priority, void *data); extern thread_id spawn_thread(thread_func, const char *name, int32 priority, void *data);
extern status_t kill_thread(thread_id thread); extern status_t kill_thread(thread_id thread);
@@ -524,9 +526,13 @@ typedef union {
uint32 extended_family : 8; uint32 extended_family : 8;
uint32 reserved_1 : 4; uint32 reserved_1 : 4;
uint32 reserved_2; uint32 brand_index : 8;
uint32 features; uint32 clflush : 8;
uint32 reserved_3; uint32 logical_cpus : 8;
uint32 apic_id : 8;
uint32 features;
uint32 extended_features; // Intel only
} eax_1; } eax_1;
struct { struct {
@@ -612,7 +618,7 @@ typedef struct {
} system_info; } system_info;
/* system private, use macro instead */ /* system private, use macro instead */
extern status_t _get_system_info(system_info *returned_info, size_t size); extern status_t _get_system_info(system_info *info, size_t size);
#define get_system_info(info) \ #define get_system_info(info) \
_get_system_info((info), sizeof(*(info))) _get_system_info((info), sizeof(*(info)))
src/bin/sysinfo.c
+36 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2004, Axel Dörfler, [email protected]. * Copyright 2004-2005, Axel Dörfler, [email protected].
* Copyright (c) 2002, Carlos Hasan, for Haiku. * Copyright (c) 2002, Carlos Hasan, for Haiku.
* *
* Distributed under the terms of the MIT license. * Distributed under the terms of the MIT license.
@@ -261,6 +261,34 @@ print_amd_features(uint32 features)
} }
static void
print_extended_features(uint32 features)
{
static const char *kFeatures[32] = {
"SSE3", NULL, NULL, "MONITOR", "DS-CPL", NULL, NULL, "EST",
"TM2", NULL, "CNTXT-ID", NULL, NULL, "CMPXCHG16B", NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
};
int32 found = 0;
int32 i;
for (i = 0; i < 32; i++) {
if ((features & (1UL << i)) && kFeatures[i] != NULL) {
printf("%s%s", found == 0 ? "\t\t" : " ", kFeatures[i]);
found++;
if (found > 0 && (found % 16) == 0) {
putchar('\n');
found = 0;
}
}
}
if (found != 0)
putchar('\n');
}
static void static void
print_features(uint32 features) print_features(uint32 features)
{ {
@@ -272,7 +300,7 @@ print_features(uint32 features)
"PAT", "PSE36", "PSN", "CFLUSH", "PAT", "PSE36", "PSN", "CFLUSH",
NULL, "DS", "ACPI", "MMX", NULL, "DS", "ACPI", "MMX",
"FXSTR", "SSE", "SSE2", "SS", "FXSTR", "SSE", "SSE2", "SS",
NULL, "TM", NULL, NULL, "HTT", "TM", NULL, "PBE",
}; };
int32 found = 0; int32 found = 0;
int32 i; int32 i;
@@ -389,6 +417,12 @@ dump_cpu(system_info *info, int32 cpu)
print_processor_signature(&cpuInfo, NULL); print_processor_signature(&cpuInfo, NULL);
print_features(cpuInfo.eax_1.features); print_features(cpuInfo.eax_1.features);
/* Extended features */
if ((info->cpu_type & B_CPU_x86_VENDOR_MASK) == B_CPU_INTEL_x86) {
printf("\tExtended: 0x%08lx\n", cpuInfo.eax_1.extended_features);
print_extended_features(cpuInfo.eax_1.extended_features);
}
/* Extended CPUID */ /* Extended CPUID */
if (max_extended_eax >= 1 && (info->cpu_type & B_CPU_x86_VENDOR_MASK) != B_CPU_INTEL_x86) { if (max_extended_eax >= 1 && (info->cpu_type & B_CPU_x86_VENDOR_MASK) != B_CPU_INTEL_x86) {
get_cpuid(&cpuInfo, 0x80000001, cpu); get_cpuid(&cpuInfo, 0x80000001, cpu);