Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the shared recursive lock implementation instead of the home-grown stuff.

Browse Source 
The shared implementation is benaphore style, saving unnecessary syscalls.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34338 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2009-11-29 09:57:26 +00:00
parent 93b9f21335
commit f2bb2575e6
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/runtime_loader/Jamfile
View File

@ -1,6 +1,6 @@
SubDir HAIKU_TOP src system runtime_loader ;
UsePrivateHeaders runtime_loader ;
UsePrivateHeaders runtime_loader shared ;
UsePrivateHeaders kernel ;
# for <util/KMessage.h>
UsePrivateSystemHeaders ;
@ -24,6 +24,7 @@ StaticLibrary libruntime_loader.a :
kernel_cpp.cpp
KMessage.cpp
:
<src!system!libroot!os>locks.o
<src!system!libroot!os>syscalls.o
<src!system!libroot!os>sem.o
@ -90,6 +91,7 @@ Ld runtime_loader :
$(TARGET_STATIC_LIBSUPC++)
$(TARGET_GCC_LIBGCC)
: $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/runtime_loader.ld
: --no-undefined
;
HaikuSubInclude arch $(TARGET_ARCH) ;

37
src/system/runtime_loader/elf.cpp
View File

@ -22,6 +22,8 @@
#include <syscalls.h>
#include <util/kernel_cpp.h>
#include <locks.h>
#include "add_ons.h"
#include "elf_load_image.h"
#include "elf_symbol_lookup.h"
@ -45,31 +47,20 @@ image_t* gProgramImage;
static image_t** sPreloadedImages = NULL;
static uint32 sPreloadedImageCount = 0;
// a recursive lock
static sem_id sSem;
static thread_id sSemOwner;
static int32 sSemCount;
static recursive_lock sLock;
static void
rld_unlock()
static inline void
rld_lock()
{
if (sSemCount-- == 1) {
sSemOwner = -1;
release_sem(sSem);
}
recursive_lock_lock(&sLock);
}
static void
rld_lock()
static inline void
rld_unlock()
{
thread_id self = find_thread(NULL);
if (self != sSemOwner) {
acquire_sem(sSem);
sSemOwner = self;
}
sSemCount++;
recursive_lock_unlock(&sLock);
}
@ -938,9 +929,7 @@ terminate_program(void)
void
rldelf_init(void)
{
sSem = create_sem(1, "runtime loader");
sSemOwner = -1;
sSemCount = 0;
recursive_lock_init(&sLock, "runtime loader");
init_add_ons();
@ -974,9 +963,9 @@ rldelf_init(void)
status_t
elf_reinit_after_fork(void)
{
sSem = create_sem(1, "runtime loader");
if (sSem < 0)
return sSem;
status_t error = recursive_lock_init(&sLock, "runtime loader");
if (error != B_OK)
return error;
// We also need to update the IDs of our images. We are the child and
// and have cloned images with different IDs. Since in most cases (fork()