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

Turned the files I intend to devastate to C++.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22074 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2007-08-26 20:37:54 +00:00
parent 9f8f7442f3
commit ebe6d10684
4 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/Jamfile
+3 -3
View File
@@ -33,12 +33,12 @@ KernelMergeObject kernel_core.o :
scheduler.cpp
sem.c
shutdown.c
signal.c
signal.cpp
system_info.c
smp.c
syscalls.c
team.c
thread.c
team.cpp
thread.cpp
timer.c
: $(TARGET_KERNEL_PIC_CCFLAGS)
src/system/kernel/signal.c → src/system/kernel/signal.cpp
View File
src/system/kernel/team.c → src/system/kernel/team.cpp
+24 -19
View File
@@ -65,8 +65,8 @@ struct fork_arg {
};
static void *sTeamHash = NULL;
static void *sGroupHash = NULL;
static hash_table *sTeamHash = NULL;
static hash_table *sGroupHash = NULL;
static struct team *sKernelTeam = NULL;
// some arbitrary chosen limits - should probably depend on the available
@@ -130,7 +130,7 @@ dump_team_info(int argc, char **argv)
// walk through the thread list, trying to match name or id
hash_open(sTeamHash, &iterator);
while ((team = hash_next(sTeamHash, &iterator)) != NULL) {
while ((team = (struct team*)hash_next(sTeamHash, &iterator)) != NULL) {
if ((team->name && strcmp(argv[1], team->name) == 0) || team->id == id) {
_dump_team_info(team);
found = true;
@@ -154,7 +154,7 @@ dump_teams(int argc, char **argv)
kprintf("team id parent name\n");
hash_open(sTeamHash, &iterator);
while ((team = hash_next(sTeamHash, &iterator)) != NULL) {
while ((team = (struct team*)hash_next(sTeamHash, &iterator)) != NULL) {
kprintf("%p%6lx %p %s\n", team, team->id, team->parent, team->name);
}
@@ -301,8 +301,8 @@ copy_strings_array(char * const *strings, int32 count, char ***_strings,
static int
team_struct_compare(void *_p, const void *_key)
{
struct team *p = _p;
const struct team_key *key = _key;
struct team *p = (struct team*)_p;
const struct team_key *key = (const struct team_key*)_key;
if (p->id == key->id)
return 0;
@@ -314,8 +314,8 @@ team_struct_compare(void *_p, const void *_key)
static uint32
team_struct_hash(void *_p, const void *_key, uint32 range)
{
struct team *p = _p;
const struct team_key *key = _key;
struct team *p = (struct team*)_p;
const struct team_key *key = (const struct team_key*)_key;
if (p != NULL)
return p->id % range;
@@ -327,8 +327,8 @@ team_struct_hash(void *_p, const void *_key, uint32 range)
static int
process_group_compare(void *_group, const void *_key)
{
struct process_group *group = _group;
const struct team_key *key = _key;
struct process_group *group = (struct process_group*)_group;
const struct team_key *key = (const struct team_key*)_key;
if (group->id == key->id)
return 0;
@@ -340,8 +340,8 @@ process_group_compare(void *_group, const void *_key)
static uint32
process_group_hash(void *_group, const void *_key, uint32 range)
{
struct process_group *group = _group;
const struct team_key *key = _key;
struct process_group *group = (struct process_group*)_group;
const struct team_key *key = (const struct team_key*)_key;
if (group != NULL)
return group->id % range;
@@ -596,8 +596,10 @@ delete_team_struct(struct team *team)
delete_sem(team->dead_children.sem);
while ((death = list_remove_head_item(&team->dead_children.list)) != NULL)
while ((death = (struct death_entry*)list_remove_head_item(
&team->dead_children.list)) != NULL) {
free(death);
}
free(team);
}
@@ -668,7 +670,7 @@ team_create_thread_start(void *args)
status_t err;
struct thread *t;
struct team *team;
struct team_arg *teamArgs = args;
struct team_arg *teamArgs = (struct team_arg*)args;
const char *path;
addr_t entry;
char ustack_name[128];
@@ -1477,7 +1479,8 @@ team_get_death_entry(struct team *team, thread_id child, struct death_entry *dea
child = -team->group_id;
}
while ((entry = list_get_next_item(&team->dead_children.list, entry)) != NULL) {
while ((entry = (struct death_entry*)list_get_next_item(
&team->dead_children.list, entry)) != NULL) {
if (child != -1 && entry->thread != child && entry->group_id != -child)
continue;
@@ -1530,7 +1533,7 @@ team_get_team_struct_locked(team_id id)
struct team_key key;
key.id = id;
return hash_lookup(sTeamHash, &key);
return (struct team*)hash_lookup(sTeamHash, &key);
}
@@ -1699,7 +1702,8 @@ team_delete_team(struct team *team)
// we're not reachable from anyone anymore at this point, so we
// can safely access the list without any locking
struct team_watcher *watcher;
while ((watcher = list_remove_head_item(&team->watcher_list)) != NULL) {
while ((watcher = (struct team_watcher*)list_remove_head_item(
&team->watcher_list)) != NULL) {
watcher->hook(teamID, watcher->data);
free(watcher);
}
@@ -1793,7 +1797,7 @@ start_watching_team(team_id teamID, void (*hook)(team_id, void *), void *data)
if (hook == NULL || teamID < B_OK)
return B_BAD_VALUE;
watcher = malloc(sizeof(struct team_watcher));
watcher = (struct team_watcher*)malloc(sizeof(struct team_watcher));
if (watcher == NULL)
return B_NO_MEMORY;
@@ -1839,7 +1843,8 @@ stop_watching_team(team_id teamID, void (*hook)(team_id, void *), void *data)
team = team_get_team_struct_locked(teamID);
if (team != NULL) {
// search for watcher
while ((watcher = list_get_next_item(&team->watcher_list, watcher)) != NULL) {
while ((watcher = (struct team_watcher*)list_get_next_item(
&team->watcher_list, watcher)) != NULL) {
if (watcher->hook == hook && watcher->data == data) {
// got it!
list_remove_item(&team->watcher_list, watcher);
src/system/kernel/thread.c → src/system/kernel/thread.cpp
+23 -20
View File
@@ -65,7 +65,7 @@ spinlock thread_spinlock = 0;
// thread list
static struct thread sIdleThreads[B_MAX_CPU_COUNT];
static void *sThreadHash = NULL;
static hash_table *sThreadHash = NULL;
static thread_id sNextThreadID = 1;
// some arbitrary chosen limits - should probably depend on the available
@@ -143,8 +143,8 @@ remove_thread_from_team(struct team *team, struct thread *thread)
static int
thread_struct_compare(void *_t, const void *_key)
{
struct thread *thread = _t;
const struct thread_key *key = _key;
struct thread *thread = (struct thread*)_t;
const struct thread_key *key = (const struct thread_key*)_key;
if (thread->id == key->id)
return 0;
@@ -156,8 +156,8 @@ thread_struct_compare(void *_t, const void *_key)
static uint32
thread_struct_hash(void *_t, const void *_key, uint32 range)
{
struct thread *thread = _t;
const struct thread_key *key = _key;
struct thread *thread = (struct thread*)_t;
const struct thread_key *key = (const struct thread_key*)_key;
if (thread != NULL)
return thread->id % range;
@@ -347,7 +347,7 @@ static int
_create_kernel_thread_kentry(void)
{
struct thread *thread = thread_get_current_thread();
int (*func)(void *args) = (void *)thread->entry;
int (*func)(void *args) = (int (*)(void *))thread->entry;
// call the entry function with the appropriate args
return func(thread->args1);
@@ -663,7 +663,7 @@ make_thread_unreal(int argc, char **argv)
hash_open(sThreadHash, &i);
while ((thread = hash_next(sThreadHash, &i)) != NULL) {
while ((thread = (struct thread*)hash_next(sThreadHash, &i)) != NULL) {
if (id != -1 && thread->id != id)
continue;
@@ -704,7 +704,7 @@ set_thread_prio(int argc, char **argv)
hash_open(sThreadHash, &i);
while ((thread = hash_next(sThreadHash, &i)) != NULL) {
while ((thread = (struct thread*)hash_next(sThreadHash, &i)) != NULL) {
if (thread->id != id)
continue;
thread->priority = thread->next_priority = prio;
@@ -738,7 +738,7 @@ make_thread_suspended(int argc, char **argv)
hash_open(sThreadHash, &i);
while ((thread = hash_next(sThreadHash, &i)) != NULL) {
while ((thread = (struct thread*)hash_next(sThreadHash, &i)) != NULL) {
if (thread->id != id)
continue;
@@ -772,7 +772,7 @@ make_thread_resumed(int argc, char **argv)
hash_open(sThreadHash, &i);
while ((thread = hash_next(sThreadHash, &i)) != NULL) {
while ((thread = (struct thread*)hash_next(sThreadHash, &i)) != NULL) {
if (thread->id != id)
continue;
@@ -881,7 +881,8 @@ _dump_thread_info(struct thread *thread)
kprintf(" exit.reason: 0x%x\n", thread->exit.reason);
kprintf(" exit.signal: 0x%x\n", thread->exit.signal);
kprintf(" exit.waiters:\n");
while ((death = list_get_next_item(&thread->exit.waiters, death)) != NULL) {
while ((death = (struct death_entry*)list_get_next_item(
&thread->exit.waiters, death)) != NULL) {
kprintf("\t%p (group 0x%lx, thread 0x%lx)\n", death, death->group_id, death->thread);
}
@@ -930,7 +931,7 @@ dump_thread_info(int argc, char **argv)
// walk through the thread list, trying to match name or id
hash_open(sThreadHash, &i);
while ((thread = hash_next(sThreadHash, &i)) != NULL) {
while ((thread = (struct thread*)hash_next(sThreadHash, &i)) != NULL) {
if ((name != NULL && !strcmp(name, thread->name)) || thread->id == id) {
_dump_thread_info(thread);
found = true;
@@ -979,7 +980,7 @@ dump_thread_list(int argc, char **argv)
"name\n");
hash_open(sThreadHash, &i);
while ((thread = hash_next(sThreadHash, &i)) != NULL) {
while ((thread = (struct thread*)hash_next(sThreadHash, &i)) != NULL) {
// filter out threads not matching the search criteria
if ((requiredState && thread->state != requiredState)
|| (sem > 0 && thread->sem.blocking != sem)
@@ -1156,7 +1157,8 @@ thread_exit(void)
list_add_link_to_tail(&parent->dead_children.list, death);
if (++parent->dead_children.count > MAX_DEAD_CHILDREN) {
death = list_remove_head_item(&parent->dead_children.list);
death = (struct death_entry*)list_remove_head_item(
&parent->dead_children.list);
parent->dead_children.count--;
} else
death = NULL;
@@ -1244,8 +1246,8 @@ thread_exit(void)
// fill all death entries
death = NULL;
while ((death = list_get_next_item(&thread->exit.waiters,
death)) != NULL) {
while ((death = (struct death_entry*)list_get_next_item(
&thread->exit.waiters, death)) != NULL) {
death->status = thread->exit.status;
death->reason = thread->exit.reason;
death->signal = thread->exit.signal;
@@ -1308,7 +1310,7 @@ thread_get_thread_struct_locked(thread_id id)
key.id = id;
return hash_lookup(sThreadHash, &key);
return (struct thread*)hash_lookup(sThreadHash, &key);
}
@@ -1858,7 +1860,7 @@ receive_data_etc(thread_id *_sender, void *buffer, size_t bufferSize,
}
if (buffer != NULL && bufferSize != 0) {
size = min(bufferSize, thread->msg.size);
size = min_c(bufferSize, thread->msg.size);
status = cbuf_user_memcpy_from_chain(buffer, thread->msg.buffer,
0, size);
if (status < B_OK) {
@@ -1919,7 +1921,7 @@ fill_thread_info(struct thread *thread, thread_info *info, size_t size)
else
info->state = B_THREAD_WAITING;
} else
info->state = thread->state;
info->state = (enum thread_state)thread->state;
info->priority = thread->priority;
info->sem = thread->sem.blocking;
@@ -2026,7 +2028,8 @@ find_thread(const char *name)
// cheap either - although this function is probably used very rarely.
hash_open(sThreadHash, &iterator);
while ((thread = hash_next(sThreadHash, &iterator)) != NULL) {
while ((thread = (struct thread*)hash_next(sThreadHash, &iterator))
!= NULL) {
// Search through hash
if (thread->name != NULL && !strcmp(thread->name, name)) {
thread_id id = thread->id;