Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 326334 r=vladimir, darin Multithreaded commit for storage.

Browse Source
This commit is contained in:
brettw%gmail.com 2006-02-16 02:59:42 +00:00
parent 1dd17278e7
commit fc00d8e51b
5 changed files with 1473 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/build/mozStorageModule.cpp
View File

@ -46,7 +46,7 @@
#include "mozStorageCID.h"
NS_GENERIC_FACTORY_CONSTRUCTOR(mozStorageService)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(mozStorageService, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(mozStorageConnection)
NS_GENERIC_FACTORY_CONSTRUCTOR(mozStorageStatementWrapper)

1
storage/src/Makefile.in
View File

@ -58,6 +58,7 @@ REQUIRES = xpcom \
$(NULL)
CPPSRCS = \
mozStorageAsyncIO.cpp \
mozStorageService.cpp \
mozStorageConnection.cpp \
mozStorageStatement.cpp \

1412
storage/src/mozStorageAsyncIO.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

45
storage/src/mozStorageService.cpp
View File

@ -1,5 +1,6 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: sw=4 ts=4 sts=4
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
@ -21,6 +22,7 @@
*
* Contributor(s):
* Vladimir Vukicevic <vladimir.vukicevic@oracle.com>
* Brett Wilson <brettw@gmail.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -38,15 +40,19 @@
#include "mozStorageService.h"
#include "mozStorageConnection.h"
#include "nsCRT.h"
#include "plstr.h"
#include "sqlite3.h"
#include "sqlite3file.h"
NS_IMPL_ISUPPORTS1(mozStorageService, mozIStorageService)
NS_IMPL_THREADSAFE_ISUPPORTS2(mozStorageService, mozIStorageService, nsIObserver)
// XXX this sucks that we have to pull in nsIFile and all that
// just to use NS_GetSpecialDirectory
static const char* gQuitApplicationMessage = "quit-application";
mozStorageService::mozStorageService()
{
@ -54,7 +60,25 @@ mozStorageService::mozStorageService()
mozStorageService::~mozStorageService()
{
/* destructor code */
FreeLocks();
}
nsresult
mozStorageService::Init()
{
sqlite3_enable_shared_cache(1);
nsresult rv;
mObserverService = do_GetService("@mozilla.org/observer-service;1", &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = InitStorageAsyncIO();
NS_ENSURE_SUCCESS(rv, rv);
rv = mObserverService->AddObserver(this, gQuitApplicationMessage, PR_FALSE);
NS_ENSURE_SUCCESS(rv, rv);
return NS_OK;
}
#ifndef NS_APP_STORAGE_50_FILE
@ -88,6 +112,7 @@ mozStorageService::OpenSpecialDatabase(const char *aStorageKey, mozIStorageConne
}
mozStorageConnection *msc = new mozStorageConnection();
// FIXME: check for out of memory
nsCOMPtr<mozIStorageConnection> conn = msc;
rv = msc->Initialize (storageFile);
if (NS_FAILED(rv)) return rv;
@ -112,3 +137,15 @@ mozStorageService::OpenDatabase(nsIFile *aDatabaseFile, mozIStorageConnection **
NS_ADDREF(*_retval);
return NS_OK;
}
NS_IMETHODIMP
mozStorageService::Observe(nsISupports *aSubject, const char *aTopic,
const PRUnichar *aData)
{
nsresult rv;
if (nsCRT::strcmp(aTopic, gQuitApplicationMessage) == 0) {
rv = FinishAsyncIO();
NS_ENSURE_SUCCESS(rv, rv);
}
return NS_OK;
}

21
storage/src/mozStorageService.h
View File

@ -1,5 +1,6 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** BEGIN LICENSE BLOCK *****
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: sw=4 ts=4 sts=4
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
@ -21,6 +22,7 @@
*
* Contributor(s):
* Vladimir Vukicevic <vladimir.vukicevic@oracle.com>
* Brett Wilson <brettw@gmail.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -41,24 +43,37 @@
#include "nsCOMPtr.h"
#include "nsIFile.h"
#include "nsIObserver.h"
#include "nsIObserverService.h"
#include "mozIStorageService.h"
class mozStorageService : public mozIStorageService
class mozStorageService : public mozIStorageService,
public nsIObserver
{
public:
mozStorageService();
// two-phase init, must call before using service
nsresult Init();
// nsISupports
NS_DECL_ISUPPORTS
// mozIStorageService
NS_DECL_MOZISTORAGESERVICE
NS_DECL_NSIOBSERVER
private:
~mozStorageService();
protected:
nsCOMPtr<nsIFile> mProfileStorageFile;
nsCOMPtr<nsIObserverService> mObserverService;
nsresult InitStorageAsyncIO();
nsresult FinishAsyncIO();
void FreeLocks();
};
#endif /* _MOZSTORAGESERVICE_H_ */