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

Format string fixes for TRACE_{THREAD,TEAM}.

Browse Source
This commit is contained in:
Alex Smith
2012-07-23 14:20:29 +01:00
parent fe2e732721
commit 07c6bd65b8
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/team.cpp
+12 -9
View File
@@ -976,7 +976,7 @@ ProcessGroup::ProcessGroup(pid_t id)
ProcessGroup::~ProcessGroup() ProcessGroup::~ProcessGroup()
{ {
TRACE(("ProcessGroup::~ProcessGroup(): id = %ld\n", group->id)); TRACE(("ProcessGroup::~ProcessGroup(): id = %" B_PRId32 "\n", id));
// If the group is in the orphaned check list, remove it. // If the group is in the orphaned check list, remove it.
MutexLocker orphanedCheckLocker(sOrphanedCheckLock); MutexLocker orphanedCheckLocker(sOrphanedCheckLock);
@@ -1482,7 +1482,8 @@ team_create_thread_start_internal(void* args)
team = thread->team; team = thread->team;
cache_node_launched(teamArgs->arg_count, teamArgs->flat_args); cache_node_launched(teamArgs->arg_count, teamArgs->flat_args);
TRACE(("team_create_thread_start: entry thread %ld\n", thread->id)); TRACE(("team_create_thread_start: entry thread %" B_PRId32 "\n",
thread->id));
// Main stack area layout is currently as follows (starting from 0): // Main stack area layout is currently as follows (starting from 0):
// //
@@ -1604,8 +1605,8 @@ load_image_internal(char**& _flatArgs, size_t flatArgsSize, int32 argCount,
const char* path = flatArgs[0]; const char* path = flatArgs[0];
TRACE(("load_image_internal: name '%s', args = %p, argCount = %ld\n", TRACE(("load_image_internal: name '%s', args = %p, argCount = %" B_PRId32
path, flatArgs, argCount)); "\n", path, flatArgs, argCount));
// cut the path from the main thread name // cut the path from the main thread name
const char* threadName = strrchr(path, '/'); const char* threadName = strrchr(path, '/');
@@ -1804,8 +1805,9 @@ exec_team(const char* path, char**& _flatArgs, size_t flatArgsSize,
const char* threadName; const char* threadName;
thread_id nubThreadID = -1; thread_id nubThreadID = -1;
TRACE(("exec_team(path = \"%s\", argc = %ld, envCount = %ld): team %ld\n", TRACE(("exec_team(path = \"%s\", argc = %" B_PRId32 ", envCount = %"
path, argCount, envCount, team->id)); B_PRId32 "): team %" B_PRId32 "\n", path, argCount, envCount,
team->id));
T(ExecTeam(path, argCount, flatArgs, envCount, flatArgs + argCount + 1)); T(ExecTeam(path, argCount, flatArgs, envCount, flatArgs + argCount + 1));
@@ -1942,7 +1944,7 @@ fork_team(void)
status_t status; status_t status;
int32 cookie; int32 cookie;
TRACE(("fork_team(): team %ld\n", parentTeam->id)); TRACE(("fork_team(): team %" B_PRId32 "\n", parentTeam->id));
if (parentTeam == team_get_kernel_team()) if (parentTeam == team_get_kernel_team())
return B_NOT_ALLOWED; return B_NOT_ALLOWED;
@@ -2304,7 +2306,8 @@ wait_for_child(pid_t child, uint32 flags, siginfo_t& _info)
struct job_control_entry* freeDeathEntry = NULL; struct job_control_entry* freeDeathEntry = NULL;
status_t status = B_OK; status_t status = B_OK;
TRACE(("wait_for_child(child = %ld, flags = %ld)\n", child, flags)); TRACE(("wait_for_child(child = %" B_PRId32 ", flags = %" B_PRId32 ")\n",
child, flags));
T(WaitForChild(child, flags)); T(WaitForChild(child, flags));
@@ -4078,7 +4081,7 @@ _user_load_image(const char* const* userFlatArgs, size_t flatArgsSize,
int32 argCount, int32 envCount, int32 priority, uint32 flags, int32 argCount, int32 envCount, int32 priority, uint32 flags,
port_id errorPort, uint32 errorToken) port_id errorPort, uint32 errorToken)
{ {
TRACE(("_user_load_image: argc = %ld\n", argCount)); TRACE(("_user_load_image: argc = %" B_PRId32 "\n", argCount));
if (argCount < 1) if (argCount < 1)
return B_BAD_VALUE; return B_BAD_VALUE;
src/system/kernel/thread.cpp
+8 -6
View File
@@ -1889,8 +1889,8 @@ thread_exit(void)
struct thread_debug_info debugInfo; struct thread_debug_info debugInfo;
team_id teamID = team->id; team_id teamID = team->id;
TRACE(("thread %ld exiting w/return code %#lx\n", thread->id, TRACE(("thread %" B_PRId32 " exiting w/return code %#" B_PRIx32 "\n",
thread->exit.status)); thread->id, thread->exit.status));
if (!are_interrupts_enabled()) if (!are_interrupts_enabled())
panic("thread_exit() called with interrupts disabled!\n"); panic("thread_exit() called with interrupts disabled!\n");
@@ -2095,7 +2095,8 @@ thread_exit(void)
kernelTeam->Unlock(); kernelTeam->Unlock();
} }
TRACE(("thread_exit: thread %ld now a kernel thread!\n", thread->id)); TRACE(("thread_exit: thread %" B_PRId32 " now a kernel thread!\n",
thread->id));
} }
free(threadDeathEntry); free(threadDeathEntry);
@@ -2232,7 +2233,7 @@ thread_at_kernel_entry(bigtime_t now)
{ {
Thread *thread = thread_get_current_thread(); Thread *thread = thread_get_current_thread();
TRACE(("thread_at_kernel_entry: entry thread %ld\n", thread->id)); TRACE(("thread_at_kernel_entry: entry thread %" B_PRId32 "\n", thread->id));
// track user time // track user time
SpinLocker threadTimeLocker(thread->time_lock); SpinLocker threadTimeLocker(thread->time_lock);
@@ -2255,7 +2256,7 @@ thread_at_kernel_exit(void)
{ {
Thread *thread = thread_get_current_thread(); Thread *thread = thread_get_current_thread();
TRACE(("thread_at_kernel_exit: exit thread %ld\n", thread->id)); TRACE(("thread_at_kernel_exit: exit thread %" B_PRId32 "\n", thread->id));
handle_signals(thread); handle_signals(thread);
@@ -2279,7 +2280,8 @@ thread_at_kernel_exit_no_signals(void)
{ {
Thread *thread = thread_get_current_thread(); Thread *thread = thread_get_current_thread();
TRACE(("thread_at_kernel_exit_no_signals: exit thread %ld\n", thread->id)); TRACE(("thread_at_kernel_exit_no_signals: exit thread %" B_PRId32 "\n",
thread->id));
// track kernel time // track kernel time
bigtime_t now = system_time(); bigtime_t now = system_time();