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

Got rid of the static app resources lock. We use pthread_once() now. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34370 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2009-11-30 11:54:30 +00:00
parent 048efdbc0a
commit 879f9a0937
2 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
headers/os/app/Application.h
View File

@ -144,8 +144,10 @@ private:
int32 _CountWindows(bool includeMenus) const;
BWindow* _WindowAt(uint32 index, bool includeMenus) const;
static void _InitAppResources();
private:
static BResources* sAppResources;
static BLocker sAppResourcesLock;
const char* fAppName;
BPrivate::PortLink* fServerLink;

73
src/kits/app/Application.cpp
View File

@ -12,6 +12,7 @@
#include <Application.h>
#include <new>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -43,14 +44,15 @@
#include <ServerMemoryAllocator.h>
#include <ServerProtocol.h>
using namespace BPrivate;
BApplication *be_app = NULL;
BMessenger be_app_messenger;
pthread_once_t sAppResourcesInitOnce = PTHREAD_ONCE_INIT;
BResources *BApplication::sAppResources = NULL;
BLocker BApplication::sAppResourcesLock("_app_resources_lock");
enum {
@ -873,39 +875,8 @@ BApplication::GetAppInfo(app_info *info) const
BResources *
BApplication::AppResources()
{
AutoLocker<BLocker> lock(sAppResourcesLock);
// BApplication caches its resources, so check
// if it already happened.
if (sAppResources != NULL)
return sAppResources;
entry_ref ref;
bool found = false;
// App is already running. Get its entry ref with
// GetAppInfo()
app_info appInfo;
if (be_app && be_app->GetAppInfo(&appInfo) == B_OK) {
ref = appInfo.ref;
found = true;
} else {
// Run() hasn't been called yet
found = BPrivate::get_app_ref(&ref) == B_OK;
}
if (!found)
return NULL;
BFile file(&ref, B_READ_ONLY);
if (file.InitCheck() == B_OK) {
sAppResources = new (std::nothrow) BResources(&file, false);
if (sAppResources != NULL
&& sAppResources->InitCheck() != B_OK) {
delete sAppResources;
sAppResources = NULL;
}
}
if (sAppResources == NULL)
pthread_once(&sAppResourcesInitOnce, &_InitAppResources);
return sAppResources;
}
@ -1514,6 +1485,40 @@ BApplication::_WindowAt(uint32 index, bool includeMenus) const
}
/*static*/ void
BApplication::_InitAppResources()
{
entry_ref ref;
bool found = false;
// App is already running. Get its entry ref with
// GetAppInfo()
app_info appInfo;
if (be_app && be_app->GetAppInfo(&appInfo) == B_OK) {
ref = appInfo.ref;
found = true;
} else {
// Run() hasn't been called yet
found = BPrivate::get_app_ref(&ref) == B_OK;
}
if (!found)
return;
BFile file(&ref, B_READ_ONLY);
if (file.InitCheck() != B_OK)
return;
BResources* resources = new (std::nothrow) BResources(&file, false);
if (resources == NULL || resources->InitCheck() != B_OK) {
delete resources;
return;
}
sAppResources = resources;
}
// #pragma mark -