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

Fixed a crashing bug in fill_sem_info() - if it was called for a semaphore

Browse Source 
with an empty queue, it crashed. sem_info::latest_holder is obviously not
set correctly, and should be fixed.
Some cosmetics.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9771 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-11-03 15:33:01 +00:00
parent c89cbee2cf
commit 2786541fbe
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/sem.c
+10 -6
View File
@@ -461,7 +461,7 @@ acquire_sem_etc(sem_id id, int32 count, uint32 flags, bigtime_t timeout)
t->sem.acquire_status = B_NO_ERROR; t->sem.acquire_status = B_NO_ERROR;
thread_enqueue(t, &gSems[slot].u.used.q); thread_enqueue(t, &gSems[slot].u.used.q);
if ((flags & (B_TIMEOUT | B_ABSOLUTE_TIMEOUT)) != 0) { if ((flags & (B_RELATIVE_TIMEOUT | B_ABSOLUTE_TIMEOUT)) != 0) {
TRACE(("sem_acquire_etc: setting timeout sem for %Ld usecs, semid %d, tid %d\n", TRACE(("sem_acquire_etc: setting timeout sem for %Ld usecs, semid %d, tid %d\n",
timeout, id, t->id)); timeout, id, t->id));
@@ -469,8 +469,8 @@ acquire_sem_etc(sem_id id, int32 count, uint32 flags, bigtime_t timeout)
args.blocked_sem_id = id; args.blocked_sem_id = id;
args.blocked_thread = t->id; args.blocked_thread = t->id;
args.sem_count = count; args.sem_count = count;
// another evil hack: pass the args into timer->entry.prev // ToDo: another evil hack: pass the args into timer->entry.prev
timeout_timer.entry.prev = (qent *)&args; timeout_timer.entry.prev = (qent *)&args;
add_timer(&timeout_timer, &sem_timeout, timeout, add_timer(&timeout_timer, &sem_timeout, timeout,
flags & B_RELATIVE_TIMEOUT ? flags & B_RELATIVE_TIMEOUT ?
@@ -668,9 +668,13 @@ fill_sem_info(struct sem_entry *sem, sem_info *info, size_t size)
info->team = sem->u.used.owner; info->team = sem->u.used.owner;
strlcpy(info->name, sem->u.used.name, sizeof(info->name)); strlcpy(info->name, sem->u.used.name, sizeof(info->name));
info->count = sem->u.used.count; info->count = sem->u.used.count;
info->latest_holder = sem->u.used.q.head->id;
// ToDo: not sure if this is the latest holder, or the next // ToDo: not sure if this is the latest holder, or the next
// holder... // holder...
if (sem->u.used.q.head != NULL)
info->latest_holder = sem->u.used.q.head->id;
else
info->latest_holder = -1;
} }