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

* Made the debugger command "team_images" a bit more useful: it now accepts a

Browse Source 
team ID argument, instead of only being able to dump the images of the current
  team.
* The debugger commands are now now also built-in without the DEBUG flag set
  (for now).
* _get_next_image_info() now also supports the B_SYSTEM_TEAM constant.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23011 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-11-28 11:56:06 +00:00
parent 78fc510a76
commit 6244441ad4
1 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/image.c
+34 -25
View File
@@ -1,9 +1,9 @@
/* /*
* Copyright 2003-2005, Axel Dörfler, [email protected]. All rights reserved. * Copyright 2003-2007, Axel Dörfler, [email protected]. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
/* User Runtime Loader support in the kernel */ /*! User Runtime Loader support in the kernel */
#include <KernelExport.h> #include <KernelExport.h>
@@ -28,6 +28,7 @@
# define TRACE(x) ; # define TRACE(x) ;
#endif #endif
#define ADD_DEBUGGER_COMMANDS
struct image { struct image {
struct image *next; struct image *next;
@@ -40,9 +41,8 @@ static image_id sNextImageID = 1;
static mutex sImageMutex; static mutex sImageMutex;
/** Registers an image with the specified team. /*! Registers an image with the specified team.
*/ */
image_id image_id
register_image(struct team *team, image_info *_info, size_t size) register_image(struct team *team, image_info *_info, size_t size)
{ {
@@ -67,9 +67,8 @@ register_image(struct team *team, image_info *_info, size_t size)
} }
/** Unregisters an image from the specified team. /*! Unregisters an image from the specified team.
*/ */
status_t status_t
unregister_image(struct team *team, image_id id) unregister_image(struct team *team, image_id id)
{ {
@@ -99,10 +98,9 @@ unregister_image(struct team *team, image_id id)
} }
/** Counts the registered images from the specified team. /*! Counts the registered images from the specified team.
* The team lock must be hold when you call this function. The team lock must be hold when you call this function.
*/ */
int32 int32
count_images(struct team *team) count_images(struct team *team)
{ {
@@ -117,11 +115,10 @@ count_images(struct team *team)
} }
/** Removes all images from the specified team. Must only be called /*! Removes all images from the specified team. Must only be called
* with the team lock hold or a team that has already been removed with the team lock hold or a team that has already been removed
* from the list (in thread_exit()). from the list (in thread_exit()).
*/ */
status_t status_t
remove_images(struct team *team) remove_images(struct team *team)
{ {
@@ -136,11 +133,10 @@ remove_images(struct team *team)
} }
/** Unlike in BeOS, this function only returns images that belong to the /*! Unlike in BeOS, this function only returns images that belong to the
* current team. current team.
* ToDo: we might want to rethink that one day... TODO: we might want to rethink that one day...
*/ */
status_t status_t
_get_image_info(image_id id, image_info *info, size_t size) _get_image_info(image_id id, image_info *info, size_t size)
{ {
@@ -178,8 +174,11 @@ _get_next_image_info(team_id teamID, int32 *cookie, image_info *info, size_t siz
if (teamID == B_CURRENT_TEAM) if (teamID == B_CURRENT_TEAM)
team = thread_get_current_thread()->team; team = thread_get_current_thread()->team;
else if (teamID == B_SYSTEM_TEAM)
team = team_get_kernel_team();
else else
team = team_get_team_struct_locked(teamID); team = team_get_team_struct_locked(teamID);
if (team) { if (team) {
struct image *image = NULL; struct image *image = NULL;
int32 count = 0; int32 count = 0;
@@ -205,12 +204,22 @@ _get_next_image_info(team_id teamID, int32 *cookie, image_info *info, size_t siz
} }
#ifdef DEBUG #ifdef ADD_DEBUGGER_COMMANDS
static int static int
dump_images_list(int argc, char **argv) dump_images_list(int argc, char **argv)
{ {
struct team *team = thread_get_current_thread()->team;
struct image *image = NULL; struct image *image = NULL;
struct team *team;
if (argc > 1) {
team_id id = strtol(argv[1], NULL, 0);
team = team_get_team_struct_locked(id);
if (team == NULL) {
kprintf("No team with ID %ld found\n", id);
return 1;
}
} else
team = thread_get_current_thread()->team;
kprintf("Registered images of team 0x%lx\n", team->id); kprintf("Registered images of team 0x%lx\n", team->id);
kprintf(" ID text size data size name\n"); kprintf(" ID text size data size name\n");
@@ -261,7 +270,7 @@ image_debug_lookup_user_symbol_address(struct team *team, addr_t address,
status_t status_t
image_init(void) image_init(void)
{ {
#ifdef DEBUG #ifdef ADD_DEBUGGER_COMMANDS
add_debugger_command("team_images", &dump_images_list, "Dump all registered images from the current team"); add_debugger_command("team_images", &dump_images_list, "Dump all registered images from the current team");
#endif #endif