workaround for bug=30927

git-svn-id: svn://10.0.0.236/branches/M15-patch@72213 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/java/dom/jni/javaDOMGlobals.h

@@ -0,0 +1,105 @@
+/* 
+ The contents of this file are subject to the Mozilla Public
+ License Version 1.1 (the "License"); you may not use this file
+ except in compliance with the License. You may obtain a copy of
+ the License at http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS
+ IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ rights and limitations under the License.
+
+ The Original Code is mozilla.org code.
+
+ The Initial Developer of the Original Code is Sun Microsystems,
+ Inc. Portions created by Sun are
+ Copyright (C) 1999 Sun Microsystems, Inc. All
+ Rights Reserved.
+
+ Contributor(s): 
+*/
+
+#ifndef __JavaDOMGlobals_h__
+#define __JavaDOMGlobals_h__
+
+#include "jni.h"
+#include "prclist.h"
+#include "nsError.h"
+
+#ifdef ERROR
+#undef ERROR
+#endif
+
+class nsISupports;
+class nsIDOMNode;
+struct PRLogModuleInfo;
+struct PRLock;
+
+class JavaDOMGlobals {
+
+ public:
+  static jclass attrClass;
+  static jclass cDataSectionClass;
+  static jclass commentClass;
+  static jclass documentClass;
+  static jclass documentFragmentClass;
+  static jclass documentTypeClass;
+  static jclass domImplementationClass;
+  static jclass elementClass;
+  static jclass entityClass;
+  static jclass entityReferenceClass;
+  static jclass namedNodeMapClass;
+  static jclass nodeClass;
+  static jclass nodeListClass;
+  static jclass notationClass;
+  static jclass processingInstructionClass;
+  static jclass textClass;
+
+  static jfieldID nodePtrFID;
+  static jfieldID nodeListPtrFID;
+  static jfieldID domImplementationPtrFID;
+
+  static jfieldID nodeTypeAttributeFID;
+  static jfieldID nodeTypeCDataSectionFID;
+  static jfieldID nodeTypeCommentFID;
+  static jfieldID nodeTypeDocumentFragmentFID;
+  static jfieldID nodeTypeDocumentFID;
+  static jfieldID nodeTypeDocumentTypeFID;
+  static jfieldID nodeTypeElementFID;
+  static jfieldID nodeTypeEntityFID;
+  static jfieldID nodeTypeEntityReferenceFID;
+  static jfieldID nodeTypeNotationFID;
+  static jfieldID nodeTypeProcessingInstructionFID;
+  static jfieldID nodeTypeTextFID;
+
+  static jclass domExceptionClass;
+  static jmethodID domExceptionInitMID;
+  static jclass runtimeExceptionClass;
+  static jmethodID runtimeExceptionInitMID;
+
+  static const char* const DOM_EXCEPTION_MESSAGE[];
+
+  typedef enum ExceptionType { EXCEPTION_RUNTIME, 
+			       EXCEPTION_DOM } ExceptionType;
+  
+  static PRLogModuleInfo* log;
+  static PRCList garbage;
+  static PRLock* garbageLock;
+
+  static PRInt32 javaMaxInt;
+
+  static void Initialize(JNIEnv *env);
+  static void Destroy(JNIEnv *env);
+  static jobject CreateNodeSubtype(JNIEnv *env, 
+				   nsIDOMNode *node);
+
+  static void AddToGarbage(nsISupports* domObject);
+  static void TakeOutGarbage();
+
+  static void ThrowException(JNIEnv *env,
+                             const char * message = NULL,
+                             nsresult rv = NS_OK,
+                             ExceptionType exceptionType = EXCEPTION_RUNTIME);
+};
+  
+#endif /* __JavaDOMGlobals_h__ */

mozilla/netwerk/cache/Makefile.in

@@ -1,38 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= \
-        public \
-        memcache \
-        filecache \
-        mgr \
-        build \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/cache/Makefile.win

@@ -1,33 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-
-DEPTH=..\..
-DIRS= 	\
-	public                  \
-	mgr			\
-	memcache		\
-	filecache		\
-	build                   \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-

mozilla/netwerk/cache/build/Makefile.in

@@ -1,54 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= nkcacke
-LIBRARY_NAME	= necko_cache
-IS_COMPONENT	= 1
-
-CPPSRCS		= nsNetDataCacheModule.cpp
-
-SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/libnkcachemgr_s.a \
-		$(DIST)/lib/libnkfilecache_s.a \
-		$(DIST)/lib/libnkmemcache_s.a \
-        $(DIST)/lib/libmozdbm_s.a     \
-        $(DIST)/lib/libxpcomio_s.a \
-		$(NULL)
-
-LOCAL_INCLUDES	= \
-		-I$(DEPTH)/netwerk/cache/memcache \
-		-I$(DEPTH)/netwerk/cache/filecache \
-		-I$(DEPTH)/netwerk/cache/mgr \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

mozilla/netwerk/cache/build/makefile.win

@@ -1,51 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-
-DEPTH=..\..\..
-MODULE=nkcache
-
-MAKE_OBJ_TYPE=DLL
-DLLNAME=nkcache
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
-
-CPP_OBJS=                                    \
-        .\$(OBJDIR)\nsNetDataCacheModule.obj \
-	$(NULL)
-
-LLIBS=                                \
-        $(DIST)\lib\nkcachemgr_s.lib  \
-        $(DIST)\lib\nkfilecache_s.lib \
-        $(DIST)\lib\nkmemcache_s.lib  \
-        $(DIST)\lib\dbm32.lib         \
-        $(DIST)\lib\xpcom.lib         \
-        $(LIBNSPR)  
-
-INCS = $(INCS)                             \
-        -I$(DEPTH)\netwerk\cache\memcache  \
-        -I$(DEPTH)\netwerk\cache\filecache \
-        -I$(DEPTH)\netwerk\cache\mgr       \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
-

mozilla/netwerk/cache/build/nsNetDataCacheModule.cpp

@@ -1,49 +0,0 @@
- /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-#include "nsCOMPtr.h"
-#include "nsIModule.h"
-#include "nscore.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIGenericFactory.h"
-
-#include "nsINetDataCache.h"
-#include "nsINetDataCacheManager.h"
-#include "nsMemCacheCID.h"
-#include "nsMemCache.h"
-#include "nsNetDiskCache.h"
-#include "nsNetDiskCacheCID.h"
-#include "nsCacheManager.h"
-
-// Factory method to create a new nsMemCache instance.  Used
-// by nsNetDataCacheModule
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMemCache, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNetDiskCache, Init)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCacheManager, Init)
-
-static nsModuleComponentInfo components[] = {
-    { "Memory Cache", NS_MEM_CACHE_FACTORY_CID, NS_NETWORK_MEMORY_CACHE_PROGID, nsMemCacheConstructor },
-    { "File Cache",   NS_NETDISKCACHE_CID,      NS_NETWORK_FILE_CACHE_PROGID,   nsNetDiskCacheConstructor },
-    { "Cache Manager",NS_CACHE_MANAGER_CID,     NS_NETWORK_CACHE_MANAGER_PROGID,nsCacheManagerConstructor }
-};
-
-NS_IMPL_NSGETMODULE("Network Data Cache", components)

mozilla/netwerk/cache/filecache/Makefile.in

@@ -1,60 +0,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Mozilla Communicator.
-# 
-# The Initial Developer of the Original Code is Intel Corp.
-# Portions created by Intel Corp. are
-# Copyright (C) 1999, 1999 Intel Corp.  All
-# Rights Reserved.
-# 
-# Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
-#                 Carl Wong <carl.wong@intel.com>
-# 
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-VPATH       = @srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = nkcache
-
-LIBRARY_NAME = nkfilecache_s
-
-REQUIRES	= nspr dbm 
-
-EXTRA_DSO_LDOPTS  +=  -L$(DIST)/lib  -lmozdbm_s
-
-EXPORTS=nsNetDiskCacheCID.h \
-	nsNetDiskCache.h \
-	nsIDBAccessor.h \
-	nsDBAccessor.h \
-	$(NULL)
-
-CPPSRCS		= \
-        nsDBAccessor.cpp\
-        nsDBEnumerator.cpp \
-        nsNetDiskCache.cpp \
-        nsDiskCacheRecord.cpp \
-        nsDiskCacheRecordChannel.cpp \
-		$(NULL)
-
-EXTRA_LIBS	= $(NSPR_LIBS) 
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/cache/filecache/makefile.win

@@ -1,44 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH=..\..\..
-
-include <$(DEPTH)/config/config.mak>
-
-MODULE = nkcache
-
-LIBRARY_NAME = nkfilecache_s
-
-CPP_OBJS=                                    \
-        .\$(OBJDIR)\nsDBAccessor.obj         \
-        .\$(OBJDIR)\nsDBEnumerator.obj       \
-        .\$(OBJDIR)\nsNetDiskCache.obj       \
-        .\$(OBJDIR)\nsDiskCacheRecord.obj    \
-        .\$(OBJDIR)\nsDiskCacheRecordChannel.obj    \
-	$(NULL)
-
-EXPORTS=nsNetDiskCacheCID.h
-
-include <$(DEPTH)\config\rules.mak> 
-
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-        rm -rf $(OBJDIR)
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-

mozilla/netwerk/cache/filecache/nsDBAccessor.cpp

@@ -1,416 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Intel Corp.
- * Portions created by Intel Corp. are
- * Copyright (C) 1999, 1999 Intel Corp.  All
- * Rights Reserved.
- * 
- * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
- *                 Carl Wong <carl.wong@intel.com>
- */
-
-/*
- * This file is part of filecache implementation.
- * 
- * nsIDBAccessor is a interface that shields all the direct database access 
- * method from nsNetDiskCache. 
- * 
- * nsDBAccessor is a implementation of the nsIDBAccessor interface. It
- * uses dbm(Berkely) as the database. 
- * 
- * a nsDiskCacheRecord is mapped into two entries in the database, 
- *    key->recordID
- *    recordID->metadata
- */
-
-#include "nsDBAccessor.h"
-#include "nscore.h"
-
-#include "prtypes.h"
-#include "plhash.h"
-#include "nsCRT.h"
-
-nsDBAccessor::nsDBAccessor() :
-  mDB(0) ,
-  mDBFile(0) ,
-  mSessionID(0) ,
-  mSessionCntr(0) ,
-  mDBFilesize(0) 
-{
-  mLastSyncTime = PR_IntervalNow() ;
-
-  NS_INIT_REFCNT();
-}
-
-nsDBAccessor::~nsDBAccessor()
-{
-  Shutdown() ;
-}
-
-//
-// Implement nsISupports methods
-//
-NS_IMPL_ISUPPORTS(nsDBAccessor, NS_GET_IID(nsIDBAccessor))
-
-
-///////////////////////////////////////////////////////////
-// nsIDBAccessor methods 
-
-NS_IMETHODIMP
-nsDBAccessor::Init(nsIFileSpec* dbfile)
-{
-  char* dbname ;
-
-  // this should cover all platforms. 
-  dbfile->GetNativePath(&dbname) ;
-  
-  mDBFile = dbfile ;
-
-  // FUR - how is page size chosen ?  It's worth putting a comment
-  // in here about the possible usefulness of tuning these parameters
-  HASHINFO hash_info = {
-    16*1024 , /* bucket size */
-    0 ,       /* fill factor */
-    0 ,       /* number of elements */
-    0 ,       /* bytes to cache */
-    0 ,       /* hash function */
-    0} ;      /* byte order */
-
-  mDB = dbopen(dbname,
-               O_RDWR | O_CREAT ,
-               0600 ,
-               DB_HASH ,
-               & hash_info) ;
-
-  nsCRT::free(dbname) ;
-
-  if(!mDB)
-    return NS_ERROR_FAILURE ;
-
-  // set mSessionID
-  DBT db_key, db_data ;
-
-  db_key.data = NS_CONST_CAST(char*, SessionKey) ;
-  db_key.size = PL_strlen(SessionKey) ;
-
-  int status = (*mDB->get)(mDB, &db_key, &db_data, 0) ;
-  if(status == -1) {
-    NS_ERROR("ERROR: failed get session id in database.") ;
-    return NS_ERROR_FAILURE ;
-  }
-
-  if(status == 0) {
-    // get the last session id
-    PRInt16 *old_ID = NS_STATIC_CAST(PRInt16*, db_data.data) ;
-    if(*old_ID < ini_sessionID) {
-      NS_ERROR("ERROR: Bad Session ID in database, corrupted db.") ;
-      return NS_ERROR_FAILURE ;
-    }
-
-    mSessionID = *old_ID + 1 ;
-  } 
-  else if(status == 1) {
-    // must be a new db
-    mSessionID = ini_sessionID ;
-  }
-  db_data.data = NS_REINTERPRET_CAST(void*, &mSessionID) ;
-  db_data.size = sizeof(PRInt16) ;
-
-  // store the new session id
-  status = (*mDB->put)(mDB, &db_key, &db_data, 0) ;
-
-  if(status == 0) {
-    (*mDB->sync)(mDB, 0) ;
-
-    // initialize database filesize
-    return mDBFile->GetFileSize(&mDBFilesize) ;
-  } 
-  else {
-    NS_ERROR("reset session ID failure.") ;
-    return NS_ERROR_FAILURE ;
-  }
-  
-}
-
-NS_IMETHODIMP
-nsDBAccessor::Shutdown(void)
-{
-  if(mDB) {
-    (*mDB->sync)(mDB, 0) ;
-    (*mDB->close)(mDB) ;
-    mDB = nsnull ;
-  }
-
-  return NS_OK ;
-}
-  
-NS_IMETHODIMP
-nsDBAccessor::Get(PRInt32 aID, void** anEntry, PRUint32 *aLength) 
-{
-  if(!anEntry)
-    return NS_ERROR_NULL_POINTER ;
-
-  *anEntry = nsnull ;
-  *aLength = 0 ;
-
-  NS_ASSERTION(mDB, "no database") ;
-
-  DBT db_key, db_data ;
-
-  db_key.data = NS_REINTERPRET_CAST(void*, &aID) ;
-  db_key.size = sizeof(PRInt32) ;
-  
-  int status = 0 ;
-  status = (*mDB->get)(mDB, &db_key, &db_data, 0) ;
-
-  if(status == 0) {
-    *anEntry = db_data.data ;
-    *aLength = db_data.size ;
-    return NS_OK ;
-  } 
-  else if(status == 1)
-    return NS_OK ;
-  else
-    return NS_ERROR_FAILURE ;
-
-}
-
-NS_IMETHODIMP
-nsDBAccessor::Put(PRInt32 aID, void* anEntry, PRUint32 aLength)
-{
-  NS_ASSERTION(mDB, "no database") ;
-
-  DBT db_key, db_data ;
-
-  db_key.data = NS_REINTERPRET_CAST(void*, &aID) ;
-  db_key.size = sizeof(PRInt32) ;
-
-  db_data.data = anEntry ;
-  db_data.size = aLength ;
-
-  if(0 == (*mDB->put)(mDB, &db_key, &db_data, 0)) {
-    return Sync() ;
-  }
-  else {
-    return NS_ERROR_FAILURE ;
-  }
-}
-
-/*
- * It's more important to remove the id->metadata entry first since
- * key->id mapping is just a reference
- */
-NS_IMETHODIMP
-nsDBAccessor::Del(PRInt32 aID, void* anEntry, PRUint32 aLength)
-{
-  NS_ASSERTION(mDB, "no database") ;
-
-  DBT db_key ;
-
-  // delete recordID->metadata
-  db_key.data = NS_REINTERPRET_CAST(void*, &aID) ;
-  db_key.size = sizeof(PRInt32) ;
-
-  PRInt32 status = -1 ;
-  status = (*mDB->del)(mDB, &db_key, 0) ;
-
-  if(-1 == status) {
-    return NS_ERROR_FAILURE ;
-  } 
-
-  // delete key->recordID
-  db_key.data = anEntry ;
-  db_key.size = aLength ;
-  status = (*mDB->del)(mDB, &db_key, 0) ;
-  if(-1 == status) {
-    return NS_ERROR_FAILURE ;
-  } 
-
-  return Sync() ;
-}
-
-NS_IMETHODIMP
-nsDBAccessor::GetID(const char* key, PRUint32 length, PRInt32* aID) 
-{
-  NS_ASSERTION(mDB, "no database") ;
-
-  DBT db_key, db_data ;
-
-  db_key.data = NS_CONST_CAST(char*, key) ;
-  db_key.size = length ;
-
-  int status = (*mDB->get)(mDB, &db_key, &db_data, 0) ;
-  if(status == 0) {
-    // found recordID
-    *aID = *(NS_REINTERPRET_CAST(PRInt32*, db_data.data)) ;
-    return NS_OK ;
-  }
-  else if(status == 1) {
-    // create a new one
-    PRInt32 id = 0 ;
-    id = mSessionID << 16 | mSessionCntr++ ;
-
-    // add new id into mDB
-    db_data.data = NS_REINTERPRET_CAST(void*, &id) ;
-    db_data.size = sizeof(PRInt32) ;
-
-    status = (*mDB->put)(mDB, &db_key, &db_data, 0) ;
-    if(status != 0) {
-      NS_ERROR("updating db failure.") ;
-      return NS_ERROR_FAILURE ;
-    }
-    *aID = id ;
-    return Sync() ;
-  } 
-  else {
-    NS_ERROR("ERROR: keydb failure.") ;
-    return NS_ERROR_FAILURE ;
-  }
-}
-
-NS_IMETHODIMP
-nsDBAccessor::EnumEntry(void** anEntry, PRUint32* aLength, PRBool bReset) 
-{
-  if(!anEntry)
-    return NS_ERROR_NULL_POINTER ;
-
-  *anEntry = nsnull ;
-  *aLength = 0 ;
-
-  NS_ASSERTION(mDB, "no database") ;
-
-  PRUint32 flag ;
-
-  if(bReset) 
-    flag = R_FIRST ;
-  else
-    flag = R_NEXT ;
-
-  DBT db_key, db_data ;
-
-  PRUint32 len = PL_strlen(SessionKey) ;
-
-  int status ;
-
-  do {
-    status = (*mDB->seq)(mDB, &db_key, &db_data, flag) ;
-    flag = R_NEXT ;
-    if(status == -1)
-      return NS_ERROR_FAILURE ;
-    // get next if it's a key->recordID 
-    if(db_key.size > sizeof(PRInt32) && db_data.size == sizeof(PRInt32))
-      continue ;
-    // get next if it's a sessionID entry
-    if(db_key.size == len && db_data.size == sizeof(PRInt16))
-      continue ;
-    // recordID is always 32 bits long
-    if(db_key.size == sizeof(PRInt32))
-      break ;
-  } while(!status) ;
-
-  if (0 == status) {
-    *anEntry = db_data.data ;
-    *aLength = db_data.size ;
-  }
-  return NS_OK ;
-}
-
-/*
- * returns the cached database file size.
- * mDBFilesize will be updated during Sync().
- */
-NS_IMETHODIMP
-nsDBAccessor::GetDBFilesize(PRUint32* aSize)
-{
-  *aSize = mDBFilesize ;
-  return NS_OK ; 
-}
-
-NS_IMETHODIMP
-nsDBAccessor::GetSpecialEntry(void** anEntry, PRUint32* aLength)
-{
-  if(!anEntry)
-    return NS_ERROR_NULL_POINTER ;
-
-  *anEntry = nsnull ;
-  *aLength = 0 ;
-
-  DBT db_key, db_data ;
-
-  db_key.data = NS_CONST_CAST(char*, SpecialEntry) ;
-  db_key.size = PL_strlen(SpecialEntry) ;
-
-  int status = (*mDB->get)(mDB, &db_key, &db_data, 0) ;
-
-  if(status == -1) {
-    NS_ERROR("ERROR: failed get special entry in database.") ;
-    return NS_ERROR_FAILURE ;
-  }
-
-  if(status == 0) {
-    *anEntry = db_data.data ;
-    *aLength = db_data.size ;
-  } 
-  
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsDBAccessor::SetSpecialEntry(void* anEntry, PRUint32 aLength)
-{
-  DBT db_key, db_data ;
-
-  db_key.data = NS_CONST_CAST(char*, SpecialEntry) ;
-  db_key.size = PL_strlen(SpecialEntry) ;
-
-  db_data.data = anEntry ;
-  db_data.size = aLength ;
-
-  if(0 == (*mDB->put)(mDB, &db_key, &db_data, 0)) {
-    (*mDB->sync)(mDB, 0) ;
-    return NS_OK ;
-  }
-  else {
-    return NS_ERROR_FAILURE ;
-  }
-}
-
-/*
- * sync routine is only called when the SyncInterval is reached. Otherwise
- * it just returns. If db synced, the filesize will be updated at the
- * same time.
- */
-nsresult
-nsDBAccessor::Sync(void)
-{
-  PRIntervalTime time = PR_IntervalNow() ;
-  PRIntervalTime duration = time - mLastSyncTime ;
-  
-  if (PR_IntervalToMilliseconds(duration) > SyncInterval) {
-    int status = (*mDB->sync)(mDB, 0) ;
-    if(status == 0) {
-//      printf("\tsynced\n") ;
-      mLastSyncTime = time ;
-      
-      // update db filesize here
-      return mDBFile->GetFileSize(&mDBFilesize) ;
-      
-    } else
-      return NS_ERROR_FAILURE ;
-  } else {
-//    printf("\tnot synced\n") ;
-    return NS_OK ;
-  }
-}

mozilla/netwerk/cache/filecache/nsDBAccessor.h

@@ -1,93 +0,0 @@
-/*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Intel Corp.
- * Portions created by Intel Corp. are
- * Copyright (C) 1999, 1999 Intel Corp.  All
- * Rights Reserved.
- * 
- * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
- *                 Carl Wong <carl.wong@intel.com>
- */
-
-/*
- * This file is part of filecache implementation.
- * 
- * nsIDBAccessor is a interface that shields all the direct database access 
- * method from nsNetDiskCache. 
- * 
- * nsDBAccessor is a implementation of the nsIDBAccessor interface. It
- * uses dbm(Berkely) as the database. 
- *
- */
-
-#ifndef _NSIDBACCESSOR_H_
-#define _NSIDBACCESSOR_H_
-
-#include "nsIDBAccessor.h"
-#include "mcom_db.h"
-#include "prinrval.h"
-#include "nsCOMPtr.h"
-
-// bogus string for the key of session id 
-static const char * const SessionKey = "SK" ;
-
-// bogus string for the size 
-static const char * const SpecialEntry = "SE" ;
-
-// initial session id number 
-static const PRInt16 ini_sessionID = 0xff ;
-
-static const PRUint16 SyncInterval = 1000 ;
-
-class nsDBAccessor : public nsIDBAccessor
-{
-  public:
-  NS_DECL_ISUPPORTS
-
-  nsDBAccessor() ;
-  virtual ~nsDBAccessor() ;
-  
-  NS_IMETHOD Init(nsIFileSpec* dbfile) ;
-  NS_IMETHOD Shutdown(void) ; 
-
-  NS_IMETHOD Put(PRInt32 aID, void* anEntry, PRUint32 aLength) ;
-
-  NS_IMETHOD Get(PRInt32 aID, void** anEntry, PRUint32 *aLength) ;
-
-  NS_IMETHOD Del(PRInt32 aID, void* anEntry, PRUint32 aLength) ;
-
-  NS_IMETHOD GetID(const char* key, PRUint32 length, PRInt32* aID) ;
-
-  NS_IMETHOD EnumEntry(void* *anEntry, PRUint32* aLength, PRBool bReset) ;
-  
-  NS_IMETHOD GetDBFilesize(PRUint32* aSize) ;
-  
-  NS_IMETHOD GetSpecialEntry(void** anEntry, PRUint32 *aLength) ;
-  NS_IMETHOD SetSpecialEntry(void* anEntry, PRUint32 aLength) ;
-
-  protected:
-  nsresult Sync(void) ;
-
-  private:
-  DB *                          mDB ;
-  nsCOMPtr<nsIFileSpec>         mDBFile ;
-  PRInt16                       mSessionID ;
-  PRInt16                       mSessionCntr ;
-  PRIntervalTime                mLastSyncTime ;
-  PRUint32                      mDBFilesize ; // cached DB filesize, 
-                                              // updated on every sync for now
-} ;
-
-#endif // _NSIDBACCESSOR_H_

mozilla/netwerk/cache/filecache/nsDBEnumerator.cpp

@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Intel Corp.
- * Portions created by Intel Corp. are
- * Copyright (C) 1999, 1999 Intel Corp.  All
- * Rights Reserved.
- * 
- * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
- *                 Carl Wong <carl.wong@intel.com>
- */
-
-/*
- * This file is part of filecache implementation.
- *
- * It implements a simple iterator for the database, see nsDBAccessor. 
- */
-
-#include "nsDBEnumerator.h"
-#include "nsDiskCacheRecord.h"
-
-nsDBEnumerator::nsDBEnumerator(nsIDBAccessor* aDB, nsNetDiskCache* aCache) :
-  m_DB(aDB) ,
-  m_DiskCache(aCache) ,
-  m_tempEntry(0) ,
-  m_tempEntry_length(0) ,
-  m_CacheEntry(0) ,
-  m_bReset(PR_TRUE) 
-{
-  NS_INIT_REFCNT();
-
-}
-
-nsDBEnumerator::~nsDBEnumerator()
-{
-  NS_IF_RELEASE(m_CacheEntry) ;
-}
-
-//
-// Implement nsISupports methods
-//
-NS_IMPL_ISUPPORTS(nsDBEnumerator, NS_GET_IID(nsIEnumerator))
-
-/////////////////////////////////////////////////////////////////
-// nsISimpleEnumerator methods
-
-NS_IMETHODIMP
-nsDBEnumerator::HasMoreElements(PRBool *_retval)
-{
-  *_retval = PR_FALSE ;
-
-  nsresult rv = m_DB->EnumEntry(&m_tempEntry, &m_tempEntry_length, m_bReset) ;
-
-  if(NS_FAILED(rv)) {
-    // do some error recovery
-    m_DiskCache->DBRecovery() ;
-    return rv ;
-  }
-
-  m_bReset = PR_FALSE ;
-
-  if(m_tempEntry && m_tempEntry_length != 0)
-    *_retval = PR_TRUE ;
-
-  return NS_OK ;
-}
-
-// this routine does not create a new item by itself  
-// Rather it reuses the item inside the object. So if you need to use the 
-// item later, you have to
-// create a new item specifically, using copy constructor or some other dup 
-// function. And don't forget to release it after you're done
-//
-NS_IMETHODIMP
-nsDBEnumerator::GetNext(nsISupports **_retval)
-{
-  if(!m_CacheEntry) {
-    m_CacheEntry = new nsDiskCacheRecord(m_DB, m_DiskCache) ;
-    if(m_CacheEntry)
-      NS_ADDREF(m_CacheEntry) ;
-    else
-      return NS_ERROR_OUT_OF_MEMORY ;
-  }
-
-  if(!_retval)
-    return NS_ERROR_NULL_POINTER ;
-  *_retval = nsnull ;
-
-  nsresult rv = m_CacheEntry->RetrieveInfo(m_tempEntry, m_tempEntry_length) ;
-  if(NS_FAILED(rv))
-    return rv ;
-
-  *_retval = NS_STATIC_CAST(nsISupports*, m_CacheEntry) ;
-  NS_ADDREF(*_retval) ; // all good getter addref 
-
-  return NS_OK ;
-}

mozilla/netwerk/cache/filecache/nsDBEnumerator.h

@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Intel Corp.
- * Portions created by Intel Corp. are
- * Copyright (C) 1999, 1999 Intel Corp.  All
- * Rights Reserved.
- * 
- * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
- *                 Carl Wong <carl.wong@intel.com>
- */
-
-/*
- * This file is part of filecache implementation.
- *
- * It implements a simple iterator for the database, see nsDBAccessor. 
- */
-
-#ifndef _NS_DBENUMERATOR_H_
-#define _NS_DBENUMERATOR_H_
-
-#include "nsISimpleEnumerator.h"
-#include "nsINetDataCacheRecord.h"
-#include "nsIDBAccessor.h"
-#include "nsCOMPtr.h"
-#include "nsNetDiskCache.h"
-#include "nsDiskCacheRecord.h"
-
-class nsCachedDiskData ; /* forward decl */
-
-class nsDBEnumerator : public nsISimpleEnumerator {
-public:
-    NS_DECL_ISUPPORTS
-
-    NS_DECL_NSISIMPLEENUMERATOR 
-
-    nsDBEnumerator(nsIDBAccessor* aDB, nsNetDiskCache* aCache) ;
-    virtual ~nsDBEnumerator() ;
-
-private:
-    nsCOMPtr<nsIDBAccessor>                m_DB ;
-    nsCOMPtr<nsNetDiskCache>               m_DiskCache ;
-    void *                                 m_tempEntry ;
-    PRUint32                               m_tempEntry_length ;
-    nsDiskCacheRecord*                     m_CacheEntry ;
-    PRBool                                 m_bReset ;
-};
-
-#endif // _NS_DBENUMERATOR_H_

mozilla/netwerk/cache/filecache/nsDiskCacheRecord.cpp

@@ -1,456 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Intel Corp.
- * Portions created by Intel Corp. are
- * Copyright (C) 1999, 1999 Intel Corp.  All
- * Rights Reserved.
- * 
- * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
- *                 Carl Wong <carl.wong@intel.com>
- */
-
-#include "nsDiskCacheRecord.h"
-#include "nsINetDataDiskCache.h"
-#include "nsNetDiskCacheCID.h"
-#include "nsDiskCacheRecordChannel.h"
-#include "nsFileStream.h"
-
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIProtocolHandler.h"
-#include "nsIIOService.h"
-#include "nsIAllocator.h"
-
-#include "plstr.h"
-#include "prprf.h"
-#include "prmem.h"
-#include "prlog.h"
-#include "prtypes.h"
-#include "netCore.h"
-
-#include "nsDBAccessor.h"
-
-#if !defined(IS_LITTLE_ENDIAN) && !defined(IS_BIG_ENDIAN)
-ERROR! Must have a byte order
-#endif
-
-#ifdef IS_LITTLE_ENDIAN
-#define COPY_INT32(_a,_b)  memcpy(_a, _b, sizeof(int32))
-#else
-#define COPY_INT32(_a,_b)  /* swap */                   \
-    do {                                                \
-    ((char *)(_a))[0] = ((char *)(_b))[3];              \
-    ((char *)(_a))[1] = ((char *)(_b))[2];              \
-    ((char *)(_a))[2] = ((char *)(_b))[1];              \
-    ((char *)(_a))[3] = ((char *)(_b))[0];              \
-    } while(0)
-#endif
-
-nsDiskCacheRecord::nsDiskCacheRecord(nsIDBAccessor* db, nsNetDiskCache* aCache) :
-  mKey(0) ,
-  mKeyLength(0) ,
-  mRecordID(0) ,
-  mMetaData(0) ,
-  mMetaDataLength(0) ,
-  mDB(db) ,
-  mInfo(0) ,
-  mInfoSize(0) ,
-  mNumChannels(0) ,
-  mDiskCache(aCache) 
-{
-  NS_INIT_REFCNT();
-  NS_ASSERTION(mDiskCache, "Must have an nsNetDiskCache");
-  NS_ADDREF(mDiskCache);
-}
-
-// mem alloced. so caller should do free() on key. 
-NS_IMETHODIMP
-nsDiskCacheRecord::Init(const char* key, PRUint32 length, PRInt32 ID) 
-{
-  NS_NewFileSpec(getter_AddRefs(mFile));
-  if(!mFile)
-    return NS_ERROR_OUT_OF_MEMORY ;
-
-  // copy key
-  mKeyLength = length ;
-  mKey = NS_STATIC_CAST(char*, nsAllocator::Alloc(mKeyLength*sizeof(char))) ;
-  if(!mKey) 
-    return NS_ERROR_OUT_OF_MEMORY ;
-
-  memcpy(mKey, key, length) ;
-
-  // get RecordID
-  mRecordID = ID ;
-
-  // setup the file name
-  nsCOMPtr<nsIFileSpec> dbFolder ;
-  mDiskCache->GetDiskCacheFolder(getter_AddRefs(dbFolder)) ;
-
-  nsresult rv = mFile->FromFileSpec(dbFolder) ;
-  if(NS_FAILED(rv))
-    return NS_ERROR_FAILURE ;
-
-  // dir is a hash result of mRecordID%32, hope it's enough 
-  char filename[9], dirName[3] ;
-  
-  PR_snprintf(dirName, 3, "%02x", (((PRUint32)mRecordID) % 32)) ;
-  mFile->AppendRelativeUnixPath(dirName) ;
-
-  PR_snprintf(filename, 9, "%08x", mRecordID) ;
-  mFile->AppendRelativeUnixPath(filename) ;
-
-  return NS_OK ;
-}
-
-nsDiskCacheRecord::~nsDiskCacheRecord()
-{
-  if(mKey)
-    nsAllocator::Free(mKey) ;
-  if(mMetaData)
-    nsAllocator::Free(mMetaData) ;
-  if(mInfo) 
-    nsAllocator::Free(mInfo) ;
-
-  NS_IF_RELEASE(mDiskCache);
-}
-
-//
-// Implement nsISupports methods
-//
-NS_IMPL_ISUPPORTS(nsDiskCacheRecord, NS_GET_IID(nsINetDataCacheRecord))
-
-///////////////////////////////////////////////////////////////////////
-// nsINetDataCacheRecord methods
-
-// yes, mem alloced on *_retval.
-NS_IMETHODIMP
-nsDiskCacheRecord::GetKey(PRUint32 *length, char** _retval) 
-{
-  if(!_retval)
-    return NS_ERROR_NULL_POINTER ;
-
-  *length = mKeyLength ;
-  *_retval = NS_STATIC_CAST(char*, nsAllocator::Alloc(mKeyLength*sizeof(char))) ;
-  if(!*_retval)
-    return NS_ERROR_OUT_OF_MEMORY ;
-
-  memcpy(*_retval, mKey, mKeyLength) ;
-
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecord::GetRecordID(PRInt32* aRecordID)
-{
-  *aRecordID = mRecordID ;
-  return NS_OK ;
-}
-
-// yes, mem alloced on *_retval. 
-NS_IMETHODIMP
-nsDiskCacheRecord::GetMetaData(PRUint32 *length, char **_retval) 
-{
-  if(!_retval)
-    return NS_ERROR_NULL_POINTER ;
-
-  // always null the return value first. 
-  *_retval = nsnull ;
-
-  *length = mMetaDataLength ;
-
-  if(mMetaDataLength) {
-    *_retval = NS_STATIC_CAST(char*, nsAllocator::Alloc(mMetaDataLength*sizeof(char))) ;
-    if(!*_retval)
-      return NS_ERROR_OUT_OF_MEMORY ;
-
-    memcpy(*_retval, mMetaData, mMetaDataLength) ;
-  }
-
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecord::SetMetaData(PRUint32 length, const char* data)
-{
-  // set the mMetaData
-  mMetaDataLength = length ;
-  if(mMetaData)
-    nsAllocator::Free(mMetaData) ;
-  mMetaData = NS_STATIC_CAST(char*, nsAllocator::Alloc(mMetaDataLength*sizeof(char))) ;
-  if(!mMetaData) {
-    return NS_ERROR_OUT_OF_MEMORY ;
-  }
-  memcpy(mMetaData, data, length) ;
-
-  // Generate mInfo
-  nsresult rv = GenInfo() ;
-  if(NS_FAILED(rv))
-    return rv ;
-
-  // write through into mDB
-  rv = mDB->Put(mRecordID, mInfo, mInfoSize) ;
-
-  return rv ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecord::GetStoredContentLength(PRUint32 *aStoredContentLength)
-{
-  return mFile->GetFileSize(aStoredContentLength) ;
-}
-
-// untill nsIFileSpec::Truncate() is in, we have to do all this ugly stuff
-NS_IMETHODIMP
-nsDiskCacheRecord::SetStoredContentLength(PRUint32 aStoredContentLength)
-{
-  PRUint32 len = 0 ;
-  nsresult rv = mFile->GetFileSize(&len) ;
-  if(NS_FAILED(rv))
-    return rv ;
-
-  if(len < aStoredContentLength)
-  {
-    NS_ERROR("Error: can not set filesize to something bigger than itself.\n") ;
-    return NS_ERROR_FAILURE ;
-  }
-  else {
-    rv = mFile->Truncate(aStoredContentLength) ;
-    if(NS_FAILED(rv))
-      return rv ;
-    
-    mDiskCache->m_StorageInUse -= (len - aStoredContentLength) ;
-    return NS_OK ;
-  }
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecord::Delete(void)
-{
-  if(mNumChannels)
-    return NS_ERROR_NOT_AVAILABLE ;
-
-  PRUint32 len ;
-  mFile->GetFileSize(&len) ;
-
-  nsFileSpec cache_file ;
-  nsresult rv = mFile->GetFileSpec(&cache_file) ;
-
-  if(NS_FAILED(rv)) 
-    return NS_ERROR_FAILURE ;
-
-  cache_file.Delete(PR_TRUE) ;
-
-  // updata the storage size
-  mDiskCache->m_StorageInUse -= len ;
-
-  rv = mDB->Del(mRecordID, mKey, mKeyLength) ;
-  if(NS_FAILED(rv)) 
-    return NS_ERROR_FAILURE ;
-  else
-    return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecord::GetFilename(nsIFileSpec * *aFilename) 
-{
-  if(!aFilename)
-    return NS_ERROR_NULL_POINTER ;
-
-  *aFilename = mFile ;
-  NS_ADDREF(*aFilename) ;
-
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecord::NewChannel(nsILoadGroup *loadGroup, nsIChannel **_retval) 
-{
-  nsDiskCacheRecordChannel* channel = new nsDiskCacheRecordChannel(this, loadGroup) ;
-  if(!channel) 
-    return NS_ERROR_OUT_OF_MEMORY ;
-
-  nsresult rv = channel->Init() ;
-  if(NS_FAILED(rv))
-    return rv ;
-
-  NS_ADDREF(channel) ;
-  *_retval = NS_STATIC_CAST(nsIChannel*, channel) ;
-  return NS_OK ;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// nsDiskCacheRecord methods
-
-// file name is represented by a url string. I hope this would be more
-// generic
-nsresult
-nsDiskCacheRecord::GenInfo() 
-{
-  if(mInfo)
-    nsAllocator::Free(mInfo) ;
-
-  char* file_url=nsnull ;
-  PRUint32 name_len ;
-  mFile->GetURLString(&file_url) ;
-  name_len = PL_strlen(file_url)+1 ;
-
-  mInfoSize  = sizeof(PRUint32) ;    // checksum for mInfoSize
-  mInfoSize += sizeof(PRInt32) ;     // RecordID
-  mInfoSize += sizeof(PRUint32) ;    // key length
-  mInfoSize += mKeyLength ;          // key 
-  mInfoSize += sizeof(PRUint32) ;    // metadata length
-  mInfoSize += mMetaDataLength ;     // metadata 
-  mInfoSize += sizeof(PRUint32) ;    // filename length
-  mInfoSize += name_len ;            // filename 
-
-  void* newInfo = nsAllocator::Alloc(mInfoSize*sizeof(char)) ;
-  if(!newInfo) {
-    return NS_ERROR_OUT_OF_MEMORY ;
-  }
-
-  // copy the checksum mInfoSize
-  char* cur_ptr = NS_STATIC_CAST(char*, newInfo) ;
-  COPY_INT32(cur_ptr, &mInfoSize) ;
-  cur_ptr += sizeof(PRUint32) ;
-
-  // copy RecordID
-  COPY_INT32(cur_ptr, &mRecordID) ;
-  cur_ptr += sizeof(PRInt32) ;
-
-  // copy key length
-  COPY_INT32(cur_ptr, &mKeyLength) ;
-  cur_ptr += sizeof(PRUint32) ;
-
-  // copy key
-  memcpy(cur_ptr, mKey, mKeyLength) ;
-  cur_ptr += mKeyLength ;
-
-  // copy metadata length
-  COPY_INT32(cur_ptr, &mMetaDataLength) ;
-  cur_ptr += sizeof(PRUint32) ;
-
-  // copy metadata
-  memcpy(cur_ptr, mMetaData, mMetaDataLength) ;
-  cur_ptr += mMetaDataLength ;
-
-  // copy file name length 
-  COPY_INT32(cur_ptr, &name_len) ;
-  cur_ptr += sizeof(PRUint32) ;
-
-  // copy file name
-  memcpy(cur_ptr, file_url, name_len) ;
-  cur_ptr += name_len ;
-
-  PR_ASSERT(cur_ptr == NS_STATIC_CAST(char*, newInfo) + mInfoSize);
-  mInfo = newInfo ;
-
-  return NS_OK ;
-}
-
-/*
- * This Method suppose to get all the info from the db record
- * and set them to accroding members. the original values
- * will all be overwritten. only minimal error checking is performed.
- */
-NS_IMETHODIMP
-nsDiskCacheRecord::RetrieveInfo(void* aInfo, PRUint32 aInfoLength) 
-{
-  // reset everything
-  if(mInfo) {
-    nsAllocator::Free(mInfo) ;
-    mInfo = nsnull ;
-  }
-
-  if(mKey) {
-    nsAllocator::Free(mKey) ;
-    mKey = nsnull ;
-  }
-  if(mMetaData) {
-    nsAllocator::Free(mMetaData) ;
-    mMetaData = nsnull ;
-  }
-
-  char * cur_ptr = NS_STATIC_CAST(char*, aInfo) ;
-
-  char* file_url ;
-  PRUint32 name_len ;
-
-  // set mInfoSize 
-  COPY_INT32(&mInfoSize, cur_ptr) ;
-  cur_ptr += sizeof(PRUint32) ;
-
-  // check this at least
-  if(mInfoSize != aInfoLength) 
-    return NS_ERROR_FAILURE ;
-
-  // set mRecordID 
-  COPY_INT32(&mRecordID, cur_ptr) ;
-  cur_ptr += sizeof(PRInt32) ;
-
-  // set mKeyLength
-  COPY_INT32(&mKeyLength, cur_ptr) ;
-  cur_ptr += sizeof(PRUint32) ;
-
-  // set mKey
-  mKey = NS_STATIC_CAST(char*, nsAllocator::Alloc(mKeyLength*sizeof(char))) ;
-  if(!mKey) 
-    return NS_ERROR_OUT_OF_MEMORY ;
-  
-  memcpy(mKey, cur_ptr, mKeyLength) ;
-  cur_ptr += mKeyLength ;
-
-  PRInt32 id ;
-  mDB->GetID(mKey, mKeyLength, &id) ;
-  NS_ASSERTION(id==mRecordID, "\t ++++++ bad record, somethings wrong\n") ;
-
-  // set mMetaDataLength
-  COPY_INT32(&mMetaDataLength, cur_ptr) ;
-  cur_ptr += sizeof(PRUint32) ;
-
-  // set mMetaData
-  mMetaData = NS_STATIC_CAST(char*, nsAllocator::Alloc(mMetaDataLength*sizeof(char))) ;
-  if(!mMetaData) 
-    return NS_ERROR_OUT_OF_MEMORY ;
-  
-  memcpy(mMetaData, cur_ptr, mMetaDataLength) ;
-  cur_ptr += mMetaDataLength ;
-
-  // get mFile name length
-  COPY_INT32(&name_len, cur_ptr) ;
-  cur_ptr += sizeof(PRUint32) ;
-
-  // get mFile native name
-  file_url = NS_STATIC_CAST(char*, nsAllocator::Alloc(name_len*sizeof(char))) ;
-  if(!file_url) 
-    return NS_ERROR_OUT_OF_MEMORY ;
-  
-  memcpy(file_url, cur_ptr, name_len) ;
-  cur_ptr += name_len ;
-
-  PR_ASSERT(cur_ptr == NS_STATIC_CAST(char*, aInfo) + mInfoSize);
-
-  // create mFile if Init() isn't called 
-  if(!mFile) {
-    NS_NewFileSpec(getter_AddRefs(mFile));
-    if(!mFile)
-      return NS_ERROR_OUT_OF_MEMORY ;
-  }
-
-  // setup mFile
-  mFile->SetURLString(file_url) ;
-
-  return NS_OK ;
-}
-

mozilla/netwerk/cache/filecache/nsDiskCacheRecord.h

@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Intel Corp.
- * Portions created by Intel Corp. are
- * Copyright (C) 1999, 1999 Intel Corp.  All
- * Rights Reserved.
- * 
- * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
- *                 Carl Wong <carl.wong@intel.com>
- */
-
-#ifndef _NET_CACHEDDISKDATA_H_
-#define _NET_CACHEDDISKDATA_H_
-
-#include "nsINetDataCacheRecord.h"
-#include "nsCOMPtr.h"
-#include "nsIDBAccessor.h"
-#include "prtypes.h"
-#include "nsILoadGroup.h"
-#include "nsIFileChannel.h" 
-#include "nsNetDiskCache.h"
-
-class nsDiskCacheRecord : public nsINetDataCacheRecord
-{
-  public:
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSINETDATACACHERECORD
-
-  protected: 
-
-  nsDiskCacheRecord(nsIDBAccessor* db, nsNetDiskCache* aCache) ;
-  virtual ~nsDiskCacheRecord() ;
-
-  NS_IMETHOD RetrieveInfo(void* aInfo, PRUint32 aInfoLength) ;
-  NS_IMETHOD Init(const char* key, PRUint32 length, PRInt32 ID) ;
-
-  nsresult GenInfo(void) ;
-
-  private:
-
-  char*                     mKey ;
-  PRUint32                  mKeyLength ;
-  PRInt32                   mRecordID ;
-  char*                     mMetaData ;
-  PRUint32                  mMetaDataLength ;
-  nsCOMPtr<nsIFileSpec>     mFile ;
-  nsCOMPtr<nsIDBAccessor>            mDB ; 
-  void*                     mInfo ;
-  PRUint32                  mInfoSize ;
-  PRUint32                  mNumChannels ;
-  nsNetDiskCache*           mDiskCache ;
-
-  friend class nsDiskCacheRecordChannel ;
-  friend class nsDBEnumerator ;
-  friend class nsNetDiskCache ;
-} ;
-
-#endif // _NET_CACHEDDISKDATA_H_

mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp

@@ -1,552 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Intel Corp.
- * Portions created by Intel Corp. are
- * Copyright (C) 1999, 1999 Intel Corp.  All
- * Rights Reserved.
- * 
- * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
- *                 Carl Wong <carl.wong@intel.com>
- */
-
-/*
- * Most of the code are taken from nsFileChannel.  
- */
-
-#include "nsDiskCacheRecordChannel.h"
-#include "nsIFileTransportService.h"
-//#include "nsIIOService.h"
-#include "nsIServiceManager.h"
-#include "nsIURL.h"
-#include "nsIOutputStream.h"
-#include "netCore.h"
-#include "nsIMIMEService.h"
-#include "nsISupportsUtils.h"
-
-//static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID);
-static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID);
-static NS_DEFINE_CID(kMIMEServiceCID, NS_MIMESERVICE_CID);
-
-// This is copied from nsMemCacheChannel, We should consolidate these two.
-class WriteStreamWrapper : public nsIOutputStream 
-{
-  public:
-  WriteStreamWrapper(nsDiskCacheRecordChannel* aChannel,
-                     nsIOutputStream *aBaseStream) ;
-
-  virtual ~WriteStreamWrapper() ;
-
-  static nsresult
-  Create(nsDiskCacheRecordChannel* aChannel, nsIOutputStream *aBaseStream, nsIOutputStream* *aWrapper) ;
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIBASESTREAM
-  NS_DECL_NSIOUTPUTSTREAM
-
-  private:
-  nsDiskCacheRecordChannel*         mChannel;
-  nsCOMPtr<nsIOutputStream>         mBaseStream;
-} ;
-
-// implement nsISupports
-NS_IMPL_ISUPPORTS(WriteStreamWrapper, NS_GET_IID(nsIOutputStream))
-
-WriteStreamWrapper::WriteStreamWrapper(nsDiskCacheRecordChannel* aChannel, 
-                                       nsIOutputStream *aBaseStream) 
-  : mChannel(aChannel), mBaseStream(aBaseStream)
-{ 
-  NS_INIT_REFCNT(); 
-  NS_ADDREF(mChannel);
-}
-
-WriteStreamWrapper::~WriteStreamWrapper()
-{
-  NS_RELEASE(mChannel);
-}
-
-nsresult 
-WriteStreamWrapper::Create(nsDiskCacheRecordChannel*aChannel, nsIOutputStream *aBaseStream, nsIOutputStream* * aWrapper) 
-{
-  WriteStreamWrapper *wrapper = new WriteStreamWrapper(aChannel, aBaseStream);
-  if (!wrapper) return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(wrapper);
-  *aWrapper = wrapper;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-WriteStreamWrapper::Write(const char *aBuffer, PRUint32 aCount, PRUint32 *aNumWritten) 
-{
-  *aNumWritten = 0;
-  nsresult rv = mBaseStream->Write(aBuffer, aCount, aNumWritten);
-  mChannel->NotifyStorageInUse(*aNumWritten);
-  return rv;
-}
-
-NS_IMETHODIMP
-WriteStreamWrapper::Flush() 
-{ 
-  return mBaseStream->Flush(); 
-}
-
-NS_IMETHODIMP
-WriteStreamWrapper::Close() 
-{ 
-  return mBaseStream->Close(); 
-}
-
-nsDiskCacheRecordChannel::nsDiskCacheRecordChannel(nsDiskCacheRecord *aRecord, 
-                                                   nsILoadGroup *aLoadGroup)
-  : mRecord(aRecord) ,
-    mLoadGroup(aLoadGroup) 
-{
-  NS_INIT_REFCNT() ;
-  NS_ADDREF(mRecord);
-  mRecord->mNumChannels++ ;
-}
-
-nsDiskCacheRecordChannel::~nsDiskCacheRecordChannel()
-{
-  mRecord->mNumChannels-- ;
-  NS_RELEASE(mRecord);
-}
-
-//  I know that I gave conflicting advice on the issue of file
-//  transport versus file protocol handler, but I thought that the
-//  last word was that we would use the raw transport, when I wrote:
-//
-//   > I just thought of an argument for the other side of the coin, i.e. the
-//   > benefit of *not* reusing the file protocol handler: On the Mac, it's
-//   > expensive to convert from a string URL to an nsFileSpec, because the Mac
-//   > is brain-dead and scans every directory on the path to the file.  It's
-//   > cheaper to create a nsFileSpec for a cache file by combining a single,
-//   > static nsFileSpec that corresponds to the cache directory with the
-//   > relative path to the cache file (using nsFileSpec's operator +).  This
-//   > operation is optimized on the Mac to avoid the scanning operation.
-//
-//  The Mac guys will eat us alive if we do path string to nsFileSpec
-//  conversions for every cache file we open.
-
-nsresult 
-nsDiskCacheRecordChannel::Init(void) 
-{
-  nsresult rv = mRecord->mFile->GetFileSpec(&mSpec) ;
-  
-#ifdef XP_MAC
-
-  // Don't assume we actually created a good file spec
-  FSSpec theSpec = mSpec.GetFSSpec();
-  if (!theSpec.name[0]) {
-    NS_ERROR("failed to create a file spec");
-
-    // Since we didn't actually create the file spec
-    // we return an error
-    return NS_ERROR_MALFORMED_URI;
-  }
-#endif
-  
-  return rv ;
-
-}
-
-nsresult 
-nsDiskCacheRecordChannel::NotifyStorageInUse(PRInt32 aBytesUsed)
-{
-  return mRecord->mDiskCache->m_StorageInUse += aBytesUsed ;
-}
-
-// implement nsISupports
-NS_IMPL_ISUPPORTS4(nsDiskCacheRecordChannel, 
-                   nsIChannel, 
-                   nsIRequest,
-                   nsIStreamListener,
-                   nsIStreamObserver)
-
-// implement nsIRequest
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::IsPending(PRBool *aIsPending) 
-{
-  *aIsPending = PR_FALSE ;
-  if(!mFileTransport)
-    return NS_OK ;
-
-  return mFileTransport->IsPending(aIsPending) ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::Cancel(void)
-{
-  if(!mFileTransport)
-    return NS_ERROR_FAILURE ;
-
-  return mFileTransport->Cancel() ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::Suspend(void)
-{
-  if(!mFileTransport)
-    return NS_ERROR_FAILURE ;
-
-  return mFileTransport->Suspend() ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::Resume(void)
-{
-  if(!mFileTransport)
-    return NS_ERROR_FAILURE ;
-
-  return mFileTransport->Resume() ;
-}
-
-// implement nsIChannel
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::GetOriginalURI(nsIURI* *aURI)
-{
-  // FUR - might need to implement this - not sure
-  return NS_ERROR_NOT_IMPLEMENTED ;
-}
-  
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::GetURI(nsIURI * *aURI)
-{
-  if(!mFileTransport)
-    return NS_ERROR_FAILURE ;
-
-  return mFileTransport->GetURI(aURI) ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::OpenInputStream(PRUint32 aStartPosition, 
-                                          PRInt32 aReadCount,
-                                          nsIInputStream* *aResult)
-{
-  nsresult rv ;
-
-  if(mFileTransport)
-    return NS_ERROR_IN_PROGRESS ;
-
-  NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv) ;
-  if(NS_FAILED(rv)) return rv ;
-  
-  rv = fts->CreateTransport(mSpec, "load", 0, 0, getter_AddRefs(mFileTransport)) ;
-  if(NS_FAILED(rv))
-    return rv ;
-  
-  // we don't need to worry about notification callbacks
-  
-  rv = mFileTransport->OpenInputStream(aStartPosition, aReadCount, aResult) ;
-  if(NS_FAILED(rv)) 
-    mFileTransport = nsnull ;
-
-  return rv ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::OpenOutputStream(PRUint32 startPosition, 
-                                           nsIOutputStream* *aResult)
-{
-  nsresult rv ;
-  NS_ENSURE_ARG(aResult) ;
-  
-  if(mFileTransport)
-    return NS_ERROR_IN_PROGRESS ;
-
-  nsCOMPtr<nsIOutputStream> outputStream ;
-
-  NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv) ;
-  if(NS_FAILED(rv)) return rv ;
-  
-  rv = fts->CreateTransport(mSpec, "load", 0, 0, getter_AddRefs(mFileTransport)) ;
-  if(NS_FAILED(rv))
-    return rv ;
- 
-  // we don't need to worry about notification callbacks
-  
-  rv = mFileTransport->OpenOutputStream(startPosition, getter_AddRefs(outputStream)) ;
-  if(NS_FAILED(rv)) {
-    mFileTransport = nsnull ;
-    return rv ;
-  }
- 
-  return WriteStreamWrapper::Create(this, outputStream, aResult) ;
-
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::AsyncOpen(nsIStreamObserver *observer, 
-                                    nsISupports *ctxt)
-{
-  return NS_ERROR_NOT_IMPLEMENTED ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::AsyncRead(PRUint32 aStartPosition, 
-                                    PRInt32 aReadCount,
-                                    nsISupports *aContext, 
-                                    nsIStreamListener *aListener)
-{
-  nsresult rv ;
-
-  if(mFileTransport)
-    return NS_ERROR_IN_PROGRESS ;
-  
-  mRealListener = aListener;
-  nsCOMPtr<nsIStreamListener> tempListener = this;
-
-  if (mLoadGroup) {
-    nsCOMPtr<nsILoadGroupListenerFactory> factory;
-    //
-    // Create a load group "proxy" listener...
-    //
-    rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
-    if (factory) {
-      nsIStreamListener *newListener;
-      rv = factory->CreateLoadGroupListener(mRealListener, &newListener);
-      if (NS_SUCCEEDED(rv)) {
-        mRealListener = newListener;
-        NS_RELEASE(newListener);
-        }
-      }
-
-      rv = mLoadGroup->AddChannel(this, nsnull);
-      if (NS_FAILED(rv)) return rv;
-  }
-
-
-  NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = fts->CreateTransport(mSpec, "load", 0, 0, getter_AddRefs(mFileTransport));
-  if (NS_FAILED(rv)) return rv;
-
-  // no callbacks
-
-  rv = mFileTransport->AsyncRead(aStartPosition, 
-                                 aReadCount, 
-                                 aContext, 
-                                 tempListener);
-
-  if (NS_FAILED(rv)) {
-    // release the transport so that we don't think we're in progress
-    mFileTransport = nsnull;
-  }
-  return rv;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::AsyncWrite(nsIInputStream *fromStream, 
-                                     PRUint32 startPosition,
-                                     PRInt32 writeCount, 
-                                     nsISupports *ctxt,
-                                     nsIStreamObserver *observer)
-
-{
-  /*
-  if(!mFileTransport)
-    return NS_ERROR_FAILURE ;
-
-  return mFileTransport->AsyncWrite(fromStream, 
-                                    startPosition,
-                                    writeCount,
-                                    ctxt,
-                                    observer) ;
-  */
-
-  // I can't do this since the write is not monitored, and I won't be
-  // able to updata the storage. 
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
-{
-  // Not required to be implemented, since it is implemented by cache manager
-  NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes)
-{
-  // Not required to be implemented, since it is implemented by cache manager
-  NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-#define DUMMY_TYPE "text/html"
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::GetContentType(char * *aContentType)
-{
-  nsresult rv ;
-
-  if (mSpec.IsDirectory()) {
-    *aContentType = nsCRT::strdup("application/http-index-format");
-    return *aContentType ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-  }
-  else {
-    // I wish I can make this simplier
-
-    char* urlStr ;
-    mRecord->mFile->GetURLString(&urlStr) ;
-
-    // file: URLs (currently) have no additional structure beyond that provided by standard
-    // URLs, so there is no "outer" given to CreateInstance 
-
-    nsCOMPtr<nsIURI> url;
-    rv = nsComponentManager::CreateInstance(kStandardURLCID, nsnull,
-                                            NS_GET_IID(nsIURI),
-                                            //(void**)&url);
-                                            getter_AddRefs(url)) ;
-    if (NS_FAILED(rv)) return rv;
-
-    rv = url->SetSpec((char*)urlStr);
-    if (NS_FAILED(rv)) 
-        return rv;
-
-    NS_WITH_SERVICE(nsIMIMEService, MIMEService, kMIMEServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = MIMEService->GetTypeFromURI(url, aContentType);
-    if (NS_SUCCEEDED(rv)) return rv;
-  }
-
-  // if all else fails treat it as text/html?
-  *aContentType = nsCRT::strdup(DUMMY_TYPE);
-  if (!*aContentType) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  } else {
-    return NS_OK;
-  }
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::GetContentLength(PRInt32 *aContentLength)
-{
-  nsresult rv;
-  PRUint32 length;
-
-  rv = mRecord->mFile->GetFileSize(&length);
-  if (NS_SUCCEEDED(rv)) {
-    *aContentLength = (PRInt32)length;
-  } else {
-    *aContentLength = -1;
-  }
-  return rv;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::GetOwner(nsISupports* *aOwner)
-{
-  *aOwner = mOwner.get() ;
-  NS_IF_ADDREF(*aOwner) ;
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::SetOwner(nsISupports* aOwner) 
-{
-  mOwner = aOwner ;
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
-      return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
-      return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
-      return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
-      return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIStreamListener methods:
-////////////////////////////////////////////////////////////////////////////////
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::OnStartRequest(nsIChannel* transportChannel, nsISupports* context)
-{
-  NS_ASSERTION(mRealListener, "No listener...");
-  return mRealListener->OnStartRequest(this, context);
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::OnStopRequest(nsIChannel* transportChannel, nsISupports* context,
-                             nsresult aStatus, const PRUnichar* aMsg)
-{
-  nsresult rv;
-
-  rv = mRealListener->OnStopRequest(this, context, aStatus, aMsg);
-
-  if (mLoadGroup) {
-    if (NS_SUCCEEDED(rv)) {
-      mLoadGroup->RemoveChannel(this, context, aStatus, aMsg);
-    }
-  }
-
-  // Release the reference to the consumer stream listener...
-  mRealListener = null_nsCOMPtr();
-  mFileTransport = null_nsCOMPtr();
-  return rv;
-}
-
-NS_IMETHODIMP
-nsDiskCacheRecordChannel::OnDataAvailable(nsIChannel* transportChannel, nsISupports* context,
-                               nsIInputStream *aIStream, PRUint32 aSourceOffset,
-                               PRUint32 aLength)
-{
-  nsresult rv;
-
-  rv = mRealListener->OnDataAvailable(this, context, aIStream,
-                                      aSourceOffset, aLength);
-
-  //
-  // If the connection is being aborted cancel the transport.  This will
-  // insure that the transport will go away even if it is blocked waiting
-  // for the consumer to empty the pipe...
-  //
-  if (NS_FAILED(rv)) {
-    mFileTransport->Cancel();
-  }
-  return rv;
-}
-

mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.h

@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Intel Corp.
- * Portions created by Intel Corp. are
- * Copyright (C) 1999, 1999 Intel Corp.  All
- * Rights Reserved.
- * 
- * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
- *                 Carl Wong <carl.wong@intel.com>
- */
-
-#ifndef _ns_DiskCacheRecordChannel_h_
-#define _ns_DiskCacheRecordChannel_h_
-
-#include "nsIChannel.h"
-#include "nsCOMPtr.h"
-#include "nsDiskCacheRecord.h"
-#include "nsIStreamListener.h"
-
-/*
- * This class is plagiarized from nsMemCacheChannel
- */
-
-class nsDiskCacheRecordChannel : public nsIChannel,
-                                 public nsIStreamListener 
-{
-  public:
-
-  nsDiskCacheRecordChannel(nsDiskCacheRecord *aRecord, nsILoadGroup *aLoadGroup);
-  virtual ~nsDiskCacheRecordChannel() ;
-
-  // Declare nsISupports methods
-  NS_DECL_ISUPPORTS
-
-  // Declare nsIRequest methods
-  NS_DECL_NSIREQUEST
-
-  // Declare nsIChannel methods
-  NS_DECL_NSICHANNEL
-
-  // Declare nsIStreamObserver methods
-  NS_DECL_NSISTREAMOBSERVER
-
-  // Declare nsIStreamListener methods
-  NS_DECL_NSISTREAMLISTENER
-
-  nsresult Init(void) ;
-
-  private:
-
-  nsresult NotifyStorageInUse(PRInt32 aBytesUsed) ;
-
-  nsDiskCacheRecord*                    mRecord ;
-  nsCOMPtr<nsILoadGroup>                mLoadGroup ;
-  nsCOMPtr<nsISupports>                 mOwner ;
-  nsCOMPtr<nsIChannel>                  mFileTransport ;
-  nsFileSpec                            mSpec ;
-  nsCOMPtr<nsIStreamListener>           mRealListener;
-
-  friend class WriteStreamWrapper ;
-} ;
-
-#endif // _ns_DiskCacheRecordChannel_h_
-

mozilla/netwerk/cache/filecache/nsIDBAccessor.h

@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Intel Corp.
- * Portions created by Intel Corp. are
- * Copyright (C) 1999, 1999 Intel Corp.  All
- * Rights Reserved.
- * 
- * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
- *                 Carl Wong <carl.wong@intel.com>
- */
-
-#ifndef _NS_IDBACCESSOR_H_
-#define _NS_IDBACCESSOR_H_
-
-#include "nsISupports.h"
-#include "nsIFileSpec.h"
-
-// nsIDBAccessorIID {6AADD4D0-7785-11d3-87FE-000629D01344}
-#define NS_IDBACCESSOR_IID \
-{ 0x6aadd4d0, 0x7785, 0x11d3, \
- {0x87, 0xfe, 0x0, 0x6, 0x29, 0xd0, 0x13, 0x44}}
-
-// nsDBAccessorCID {6AADD4D1-7785-11d3-87FE-000629D01344}
-#define NS_DBACCESSOR_CID \
-{ 0x6aadd4d1, 0x7785, 0x11d3, \
-  { 0x87, 0xfe, 0x0, 0x6, 0x29, 0xd0, 0x13, 0x44 }} 
-
-class nsIDBAccessor : public nsISupports
-{
-  public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDBACCESSOR_IID)
-
-  NS_IMETHOD Init(nsIFileSpec* DBFile) = 0 ;
-  NS_IMETHOD Shutdown(void) = 0 ;
-
-  NS_IMETHOD Put(PRInt32 aID, void* anEntry, PRUint32 aLength) = 0 ;
-
-  NS_IMETHOD Get(PRInt32 aID, void** anEntry, PRUint32 *aLength) = 0 ;
-
-  NS_IMETHOD Del(PRInt32 aID, void* anEntry, PRUint32 aLength) = 0 ;
-
-  NS_IMETHOD GetID(const char* key, PRUint32 length, PRInt32* aID) = 0 ;
-
-  NS_IMETHOD EnumEntry(void* *anEntry, PRUint32* aLength, PRBool bReset) = 0 ;
-  
-  NS_IMETHOD GetDBFilesize(PRUint32* aSize) = 0 ;
-    
-  NS_IMETHOD GetSpecialEntry(void** anEntry, PRUint32 *aLength) = 0 ;
-  NS_IMETHOD SetSpecialEntry(void* anEntry, PRUint32 aLength) = 0 ;
-
-} ;
-
-#endif // _NS_IDBACCESSOR_H_
-

mozilla/netwerk/cache/filecache/nsNetDiskCache.cpp

@@ -1,704 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Intel Corp.
- * Portions created by Intel Corp. are
- * Copyright (C) 1999, 1999 Intel Corp.  All
- * Rights Reserved.
- * 
- * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
- *                 Carl Wong <carl.wong@intel.com>
- */
-
-#include "nsNetDiskCache.h"
-#include "nscore.h"
-
-#include "plstr.h"
-#include "prprf.h"
-#include "prtypes.h"
-#include "prio.h"
-#include "prsystem.h" // Directory Seperator
-#include "plhash.h"
-#include "prclist.h"
-#include "prmem.h"
-#include "prlog.h"
-
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-
-#include "nsIPref.h"
-#include "mcom_db.h"
-#include "nsDBEnumerator.h"
-
-#include "nsDiskCacheRecord.h"
-#include "netCore.h"
-
-#if !defined(IS_LITTLE_ENDIAN) && !defined(IS_BIG_ENDIAN)
-ERROR! Must have a byte order
-#endif
-
-#ifdef IS_LITTLE_ENDIAN
-#define COPY_INT32(_a,_b)  memcpy(_a, _b, sizeof(int32))
-#else
-#define COPY_INT32(_a,_b)  /* swap */                   \
-    do {                                                \
-    ((char *)(_a))[0] = ((char *)(_b))[3];              \
-    ((char *)(_a))[1] = ((char *)(_b))[2];              \
-    ((char *)(_a))[2] = ((char *)(_b))[1];              \
-    ((char *)(_a))[3] = ((char *)(_b))[0];              \
-    } while(0)
-#endif
-
-static NS_DEFINE_CID(kPrefCID, NS_PREF_CID) ;
-static NS_DEFINE_CID(kDBAccessorCID, NS_DBACCESSOR_CID) ;
-
-static const PRUint32 DISK_CACHE_SIZE_DEFAULT = 5*1024*1024 ; // 5MB
-static const char * const DISK_CACHE_PREF  = "browser.cache.disk_cache_size";
-static const char * const CACHE_DIR_PREF   = "browser.cache.directory";
-
-class nsDiskCacheRecord ;
-
-nsNetDiskCache::nsNetDiskCache() :
-  m_Enabled(PR_TRUE) ,
-  m_NumEntries(0) ,
-  m_pNextCache(0) ,
-  m_pDiskCacheFolder(0) ,
-  m_StorageInUse(0) ,
-  m_DB(0) ,
-  m_DBCorrupted(PR_FALSE) 
-{
-  // set it to INF for now 
-  m_MaxEntries = (PRUint32)-1 ;
-
-  NS_INIT_REFCNT();
-
-}
-
-nsNetDiskCache::~nsNetDiskCache()
-{
-  SetSpecialEntry() ;
-
-  NS_IF_RELEASE(m_DB) ;
-  
-
-  // FUR
-  // I think that, eventually, we also want a distinguished key in the DB which
-  // means "clean cache shutdown".  You clear this flag when the db is first
-  // opened and set it just before the db is closed.  If the db wasn't shutdown
-  // cleanly in a prior session, i.e. because the app crashed, on startup you
-  // scan all the individual files in directories and look for "orphans",
-  // i.e. cache files which don't have corresponding entries in the db.  That's
-  // also when storage-in-use and number of entries would be recomputed.
-  //
-  // We don't necessarily need all this functionality immediately, though.
-
-
-  if(m_DBCorrupted) {
-    
-    nsFileSpec cacheFolder ;
-    m_pDiskCacheFolder->GetFileSpec(&cacheFolder) ;
-    
-    char nameInt[6] ;
-
-    for(nsDirectoryIterator di(cacheFolder, PR_FALSE); di.Exists(); di++) {
-      char* filename = di.Spec().GetLeafName() ;
-      char* pname = nameInt ;
-      pname = PL_strncpyz(pname, filename, 6) ;
-
-      if(PL_strcmp(pname, "trash") == 0)
-        RemoveFolder(di.Spec()) ;
-      
-      nsCRT::free(filename) ;  
-    }
-  }
-}
-
-NS_IMETHODIMP
-nsNetDiskCache::Init(void) 
-{
-  nsresult rv ;
-  
-  // don't initialize if no cache folder is set. 
-  if(!m_pDiskCacheFolder) return NS_OK ;
-
-  if(!m_DB) {
-    m_DB = new nsDBAccessor() ;
-    if(!m_DB)
-      return NS_ERROR_OUT_OF_MEMORY ;
-    else
-      NS_ADDREF(m_DB) ;
-  }
-
-  // create cache sub directories
-  nsCOMPtr<nsIFileSpec> cacheSubDir;
-  rv = NS_NewFileSpec(getter_AddRefs(cacheSubDir));
-
-  for (int i=0; i < 32; i++) {
-    rv = cacheSubDir->FromFileSpec(m_pDiskCacheFolder) ;
-    if(NS_FAILED(rv))
-      return rv ;
-
-    char dirName[3];
-    PR_snprintf (dirName, 3, "%0.2x", i);
-    cacheSubDir->AppendRelativeUnixPath (dirName) ;
-    CreateDir(cacheSubDir);
-  }
-
-  return InitDB() ;
-}
-
-NS_IMETHODIMP
-nsNetDiskCache::InitDB(void)
-{
-  nsresult rv ; 
-
-  if(!m_DBFile) {
-    NS_NewFileSpec(getter_AddRefs(m_DBFile)) ;
-    if(!m_DBFile)
-      return NS_ERROR_OUT_OF_MEMORY ;
-  }
-
-  rv = m_DBFile->FromFileSpec(m_pDiskCacheFolder) ;
-  if(NS_FAILED(rv))
-    return rv ;
-
-  m_DBFile->AppendRelativeUnixPath("cache.db") ;
-
-  rv = m_DB->Init(m_DBFile) ;
-
-  if(rv == NS_ERROR_FAILURE) {
-    // try recovery if error 
-    DBRecovery() ;
-  }
-
-  rv = GetSpecialEntry() ;
-  if(rv == NS_ERROR_FAILURE) {
-    // try recovery if error 
-    DBRecovery() ;
-  }
-
-  return rv ;
-}
-
-//////////////////////////////////////////////////////////////////////////
-// nsISupports methods
-
-NS_IMPL_ISUPPORTS3(nsNetDiskCache,
-                   nsINetDataDiskCache,
-                   nsINetDataCache,
-                   nsISupports) 
-
-///////////////////////////////////////////////////////////////////////////
-// nsINetDataCache Method 
-
-NS_IMETHODIMP
-nsNetDiskCache::GetDescription(PRUnichar* *aDescription) 
-{
-  nsAutoString description("Disk Cache") ;
-  *aDescription = description.ToNewUnicode() ;
-  if(!*aDescription)
-    return NS_ERROR_OUT_OF_MEMORY ;
-
-  return NS_OK ;
-}
-
-/* don't alloc mem for nsICachedNetData. 
- * RecordID is generated using the same scheme in nsCacheDiskData,
- * see GetCachedNetData() for detail.
- */
-NS_IMETHODIMP
-nsNetDiskCache::Contains(const char* key, PRUint32 length, PRBool *_retval) 
-{
-  *_retval = PR_FALSE ;
-
-  NS_ASSERTION(m_DB, "no db.") ;
-
-  PRInt32 id = 0 ;
-  nsresult rv = m_DB->GetID(key, length, &id) ;
-
-  if(NS_FAILED(rv)) {
-    // try recovery if error 
-    DBRecovery() ;
-    return rv ;
-  }
-
-  void* info = 0 ;
-  PRUint32 info_size = 0 ;
-
-  rv = m_DB->Get(id, &info, &info_size) ;
-  if(NS_SUCCEEDED(rv) && info) 
-    *_retval = PR_TRUE ;
-        
-  if(NS_FAILED(rv)) {
-    // try recovery if error 
-    DBRecovery() ;
-  }
-
-  return rv ;
-}
-
-/* regardless if it's cached or not, a copy of nsNetDiskCache would 
- * always be returned. so release it appropriately. 
- * if mem alloced, updata m_NumEntries also.
- * for now, the new nsCachedNetData is not written into db yet since
- * we have nothing to write.
- */
-NS_IMETHODIMP
-nsNetDiskCache::GetCachedNetData(const char* key, PRUint32 length, nsINetDataCacheRecord **_retval) 
-{
-  NS_ASSERTION(m_DB, "no db.") ;
-
-  nsresult rv = 0 ;
-  if (!_retval)
-    return NS_ERROR_NULL_POINTER ;
-
-  *_retval = nsnull ;
-
-  PRInt32 id = 0 ;
-  rv = m_DB->GetID(key, length, &id) ;
-  if(NS_FAILED(rv)) {
-    // try recovery if error 
-    DBRecovery() ;
-    return rv ;
-  }
-
-  // construct an empty record
-  nsDiskCacheRecord* newRecord = new nsDiskCacheRecord(m_DB, this) ;
-  if(!newRecord) 
-    return NS_ERROR_OUT_OF_MEMORY ;
-
-  rv = newRecord->Init(key, length, id) ;
-  if(NS_FAILED(rv)) {
-    delete newRecord ;
-    return rv ;
-  }
-
-  NS_ADDREF(newRecord) ; // addref for _retval 
-  *_retval = (nsINetDataCacheRecord*) newRecord ;
-  
-  void* info = 0 ;
-  PRUint32 info_size = 0 ;
-
-  rv = m_DB->Get(id, &info, &info_size) ;
-  if(NS_SUCCEEDED(rv) && info) {
-
-    // this is a previously cached record 
-    nsresult r1 ;
-    r1 = newRecord->RetrieveInfo(info, info_size) ;
-
-    if(NS_SUCCEEDED(rv)) 
-      return NS_OK ;
-    else { 
-      // probably a bad one
-      NS_RELEASE(newRecord) ;
-      *_retval = nsnull ;
-      return r1;
-    }
-    
-  } else if (NS_SUCCEEDED(rv) && !info) {
-    // this is a new record. 
-    m_NumEntries ++ ;
-    return NS_OK ;
-  } else {
-    // database error.
-    DBRecovery() ;
-    return rv ;
-  }
-}
-
-/* get an nsICachedNetData, mem needs to be de-alloced if not found. */
-NS_IMETHODIMP
-nsNetDiskCache::GetCachedNetDataByID(PRInt32 RecordID, nsINetDataCacheRecord **_retval) 
-{
-  NS_ASSERTION(m_DB, "no db.") ;
-
-  if (!_retval)
-    return NS_ERROR_NULL_POINTER ;
-
-  *_retval = nsnull ;
-  
-  nsresult rv ;
-
-  void* info = 0 ;
-  PRUint32 info_size = 0 ;
-
-  rv = m_DB->Get(RecordID, &info, &info_size) ;
-  if(NS_SUCCEEDED(rv) && info) {
-
-    // construct an empty record if only found in db
-    nsDiskCacheRecord* newRecord = new nsDiskCacheRecord(m_DB, this) ;
-    if(!newRecord) 
-      return NS_ERROR_OUT_OF_MEMORY ;
-
-    NS_ADDREF(newRecord) ; // addref for _retval
-    rv = newRecord->RetrieveInfo(info, info_size) ;
-
-    if(NS_SUCCEEDED(rv)) {
-      *_retval = (nsINetDataCacheRecord*) newRecord ;
-      return NS_OK ;
-    } 
-    else {
-      // bad record, I guess
-      NS_RELEASE(newRecord) ; // release if bad things happen
-      return rv ;
-    }
-  } else {
-    NS_ERROR("Error: RecordID not in DB\n") ;
-    DBRecovery() ;
-    return rv ;
-  }
-}
-
-NS_IMETHODIMP
-nsNetDiskCache::GetEnabled(PRBool *aEnabled) 
-{
-  *aEnabled = m_Enabled ;
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsNetDiskCache::SetEnabled(PRBool aEnabled) 
-{
-  m_Enabled = aEnabled ;
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsNetDiskCache::GetFlags(PRUint32 *aFlags) 
-{
-  *aFlags = FILE_PER_URL_CACHE;
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsNetDiskCache::GetNumEntries(PRUint32 *aNumEntries) 
-{
-  *aNumEntries = m_NumEntries ;
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsNetDiskCache::GetMaxEntries(PRUint32 *aMaxEntries)
-{
-  *aMaxEntries = m_MaxEntries ;
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsNetDiskCache::NewCacheEntryIterator(nsISimpleEnumerator **_retval) 
-{
-  NS_ASSERTION(m_DB, "no db.") ;
-
-  if(!_retval)
-    return NS_ERROR_NULL_POINTER ;
-
-  *_retval = nsnull ;
-
-  nsISimpleEnumerator* enumerator = new nsDBEnumerator(m_DB, this) ;
-  if(enumerator) {
-    NS_ADDREF(enumerator) ;
-    *_retval = enumerator ;
-    return NS_OK ;
-  }
-  else 
-    return NS_ERROR_OUT_OF_MEMORY ;
-}
-
-NS_IMETHODIMP
-nsNetDiskCache::GetNextCache(nsINetDataCache * *aNextCache)
-{
-  if(!aNextCache)
-    return NS_ERROR_NULL_POINTER ;
-
-  *aNextCache = m_pNextCache ;
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsNetDiskCache::SetNextCache(nsINetDataCache *aNextCache)
-{
-  m_pNextCache = aNextCache ;
-  return NS_OK ;
-}
-
-// db size can always be measured at the last minute. Since it's hard
-// to know before hand. 
-NS_IMETHODIMP
-nsNetDiskCache::GetStorageInUse(PRUint32 *aStorageInUse)
-{
-  NS_ASSERTION(m_DB, "no db.") ;
-
-  PRUint32 total_size = m_StorageInUse ;
-
-  /*
-  PRUint32 len = 0 ;
-  // add the size of the db.
-  m_DB->GetDBFilesize(&len) ;
-  total_size += len ;
-  */
-
-  // we need size in kB
-  total_size = total_size >> 10 ;
-
-  *aStorageInUse = total_size ;
-  return NS_OK ;
-}
-
-/*
- * The whole cache dirs can be whiped clean since all the cache 
- * files are resides in seperate hashed dirs. It's safe to do so.
- */
- 
-NS_IMETHODIMP
-nsNetDiskCache::RemoveAll(void)
-{
-  NS_ASSERTION(m_DB, "no db.") ;
-  NS_ASSERTION(m_pDiskCacheFolder, "no cache folder.") ;
-
-  // remove all the sub folders
-  nsFileSpec cacheSubDir;
-
-  for (int i=0; i < 32; i++) {
-    m_pDiskCacheFolder->GetFileSpec(&cacheSubDir) ;
-
-    char dirName[3];
-    PR_snprintf (dirName, 3, "%0.2x", i);
-    cacheSubDir += dirName ;
-    RemoveFolder(cacheSubDir) ;
-  }
-
-  // don't forget the db file itself
-  m_DB->Shutdown() ;
-  nsFileSpec dbfile ;
-  m_DBFile->GetFileSpec(&dbfile) ;
-  dbfile.Delete(PR_TRUE) ;
-
-  // reinitilize
-  return Init() ;
-}
-
-//////////////////////////////////////////////////////////////////
-// nsINetDataDiskCache methods
-
-NS_IMETHODIMP
-nsNetDiskCache::GetDiskCacheFolder(nsIFileSpec * *aDiskCacheFolder)
-{
-  *aDiskCacheFolder = nsnull ;
-  NS_ASSERTION(m_pDiskCacheFolder, "no cache folder.") ;
-
-  *aDiskCacheFolder = m_pDiskCacheFolder ;
-  NS_ADDREF(*aDiskCacheFolder) ;
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsNetDiskCache::SetDiskCacheFolder(nsIFileSpec * aDiskCacheFolder)
-{
-  if(!m_pDiskCacheFolder) {
-    NS_NewFileSpec(getter_AddRefs(m_pDiskCacheFolder));
-    if(!m_pDiskCacheFolder) 
-      return NS_ERROR_OUT_OF_MEMORY ;
-    
-    m_pDiskCacheFolder = aDiskCacheFolder ;
-    return Init() ;
-  } 
-  else {
-    char *newfolder, *oldfolder ;
-    m_pDiskCacheFolder->GetNativePath(&oldfolder) ;
-    aDiskCacheFolder->GetNativePath(&newfolder) ;
-
-    if(PL_strcmp(newfolder, oldfolder) != 0) {
-      m_pDiskCacheFolder = aDiskCacheFolder ;
-
-      // do we need to blow away old cache before building a new one?
-      // return RemoveAll() ;
-
-      m_DB->Shutdown() ;
-      return Init() ;
-
-    } else 
-      return NS_OK ;
-  }
-}
-
-//////////////////////////////////////////////////////////////////
-// nsNetDiskCache methods
-
-// create a directory (recursively)
-NS_IMETHODIMP
-nsNetDiskCache::CreateDir(nsIFileSpec* dir_spec) 
-{
-  PRBool does_exist ;
-  nsCOMPtr<nsIFileSpec> p_spec ;
-
-  dir_spec->Exists(&does_exist) ;
-  if(does_exist) 
-    return NS_OK ;
-
-  nsresult rv = dir_spec->GetParent(getter_AddRefs(p_spec)) ;
-  if(NS_FAILED(rv))
-    return rv ;
-
-  p_spec->Exists(&does_exist) ;
-  if(!does_exist) {
-    CreateDir(p_spec) ;
-    rv = dir_spec->CreateDir() ;
-    if(NS_FAILED(rv))
-      return rv ;
-  }
-  else {
-    rv = dir_spec->CreateDir() ;
-    if(NS_FAILED(rv))
-      return rv ;
-  }
-  
-  return NS_OK ;
-}
-
-// We can't afford to make a *separate* pass over the whole db on every
-// startup, just to figure out m_NumEntries and m_StorageInUse.  (This is a
-// several second operation on a large db).  We'll likely need to store
-// distinguished keys in the db that contain these values and update them
-// incrementally, except when failure to shut down the db cleanly is detected.
-
-NS_IMETHODIMP
-nsNetDiskCache::GetSpecialEntry(void)
-{
-  void* pInfo ;
-  PRUint32 InfoSize ;
-
-  nsresult rv = m_DB->GetSpecialEntry(&pInfo, &InfoSize) ;
-  if(NS_FAILED(rv))
-    return rv ;
-
-  if(!pInfo && InfoSize == 0) {
-    // must be a new DB
-    m_NumEntries = 0 ;
-    m_StorageInUse = 0 ;
-  } 
-  else {
-    char * cur_ptr = NS_STATIC_CAST(char*, pInfo) ;
-    
-    // get m_NumEntries
-    COPY_INT32(&m_NumEntries, cur_ptr) ;
-    cur_ptr += sizeof(PRUint32) ;
-    
-    // get m_StorageInUse
-    COPY_INT32(&m_StorageInUse, cur_ptr) ;
-    cur_ptr += sizeof(PRUint32) ;
-    
-    PR_ASSERT(cur_ptr == NS_STATIC_CAST(char*, pInfo) + InfoSize);
-  }
-
-  return NS_OK ;
-}
-
-NS_IMETHODIMP
-nsNetDiskCache::SetSpecialEntry(void)
-{
-  PRUint32 InfoSize ;
-  
-  InfoSize = sizeof m_NumEntries ;
-  InfoSize += sizeof m_StorageInUse ;
-  
-  void* pInfo = nsAllocator::Alloc(InfoSize*sizeof(char)) ;
-  if(!pInfo) 
-    return NS_ERROR_OUT_OF_MEMORY ;
-  
-  char* cur_ptr = NS_STATIC_CAST(char*, pInfo) ;
-
-  COPY_INT32(cur_ptr, &m_NumEntries) ;
-  cur_ptr += sizeof(PRUint32) ;
-
-  COPY_INT32(cur_ptr, &m_StorageInUse) ;
-  cur_ptr += sizeof(PRUint32) ;
-  
-  PR_ASSERT(cur_ptr == NS_STATIC_CAST(char*, pInfo) + InfoSize);
-  
-  return m_DB->SetSpecialEntry(pInfo, InfoSize) ;
-}
-
-// this routine will be called everytime we have a db corruption. 
-// m_DB will be re-initialized, m_StorageInUse and m_NumEntries will
-// be reset.
-NS_IMETHODIMP
-nsNetDiskCache::DBRecovery(void)
-{
-  // rename all the sub cache dirs and remove them later during dtor. 
-  nsresult rv = RenameCacheSubDirs() ;
-  if(NS_FAILED(rv))
-    return rv ;
-
-  // remove corrupted db file, don't care if db->shutdown fails or not.
-  m_DB->Shutdown() ;
-  
-  nsFileSpec dbfile ;
-  m_DBFile->GetFileSpec(&dbfile) ;
-  dbfile.Delete(PR_TRUE) ;
-
-  // make sure it's not there any more
-  PRBool exists = dbfile.Exists() ;
-  if(exists) {
-    NS_ERROR("can't remove old db.") ;
-    return NS_ERROR_FAILURE ;
-  }
-
-  // reinitilize DB 
-  return InitDB() ;
-}
-
-// this routine will add string "trash" to current CacheSubDir names. 
-// e.g. 00->trash00, 1f->trash1f. and update the m_DBCorrupted. 
-
-NS_IMETHODIMP
-nsNetDiskCache::RenameCacheSubDirs(void) 
-{
-  nsCOMPtr<nsIFileSpec> cacheSubDir;
-  nsresult rv = NS_NewFileSpec(getter_AddRefs(cacheSubDir)) ;
-
-  for (int i=0; i < 32; i++) {
-    rv = cacheSubDir->FromFileSpec(m_pDiskCacheFolder) ;
-    if(NS_FAILED(rv))
-      return rv ;
-
-    char oldName[3], newName[8];
-    PR_snprintf(oldName, 3, "%0.2x", i) ;
-    cacheSubDir->AppendRelativeUnixPath(oldName) ;
-
-    // re-name the directory
-    PR_snprintf(newName, 8, "trash%0.2x", i) ;
-    rv = cacheSubDir->Rename(newName) ;
-    if(NS_FAILED(rv))
-      // TODO, error checking
-      return NS_ERROR_FAILURE ;
-  }
-
-  // update m_DBCorrupted 
-  m_DBCorrupted = PR_TRUE ;
-
-  return NS_OK ;
-}
-
-// this routine is used by dtor and RemoveAll() to clean up dirs.
-NS_IMETHODIMP
-nsNetDiskCache::RemoveFolder(nsFileSpec aFolder)
-{
-  for(nsDirectoryIterator di(aFolder, PR_FALSE); di.Exists(); di++) {
-    di.Spec().Delete(PR_TRUE) ;
-  }
-  
-  aFolder.Delete(PR_FALSE) ; // recursive delete
-  
-  return NS_OK ;
-}

mozilla/netwerk/cache/filecache/nsNetDiskCache.h

@@ -1,91 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Intel Corp.
- * Portions created by Intel Corp. are
- * Copyright (C) 1999, 1999 Intel Corp.  All
- * Rights Reserved.
- * 
- * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
- *                 Carl Wong <carl.wong@intel.com>
- */
-
-/*
- * This file is part of filecache implementation.
- *
- * nsNetDiskCache is the main disk cache module that will create 
- * the cache database, and then store and retrieve nsDiskCacheRecord 
- * objects from it. It also contains some basic error recovery procedure.
- */
-
-#ifndef __gen_nsNetDiskCache_h__
-#define __gen_nsNetDiskCache_h__
-
-#include "nsINetDataDiskCache.h"
-#include "nsNetDiskCacheCID.h"
-#include "nsCOMPtr.h"
-#include "nsIPref.h"
-#include "nsDBAccessor.h"
-
-class nsIURI; /* forward decl */
-class nsICachedNetData; /* forward decl */
-class nsISimpleEnumerator; /* forward decl */
-class nsIFileSpec; /* forward decl */
-
-/* starting interface:    nsNetDiskCache */
-
-class nsNetDiskCache : public nsINetDataDiskCache {
-  public: 
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSINETDATACACHE
-  NS_DECL_NSINETDATADISKCACHE
-
-  NS_IMETHOD Init(void) ;
-
-  nsNetDiskCache() ;
-  virtual ~nsNetDiskCache() ;
-
-  protected:
-
-  NS_IMETHOD InitDB(void) ;
-  NS_IMETHOD CreateDir(nsIFileSpec* dir_spec) ;
-  NS_IMETHOD GetSpecialEntry(void) ;
-  NS_IMETHOD SetSpecialEntry(void) ;
-
-  NS_IMETHOD RenameCacheSubDirs(void) ;
-  NS_IMETHOD DBRecovery(void) ;
-  NS_IMETHOD RemoveFolder(nsFileSpec aFolder) ;
-
-  private:
-
-  PRBool 			                m_Enabled ;
-  PRUint32 			                m_NumEntries ;
-  nsCOMPtr<nsINetDataCache> 	    m_pNextCache ;
-  nsCOMPtr<nsIFileSpec>   	        m_pDiskCacheFolder ;
-  nsCOMPtr<nsIFileSpec>             m_DBFile ;
-
-  PRUint32                          m_MaxEntries ;
-  PRUint32                          m_StorageInUse ;
-  nsIDBAccessor*                    m_DB ;
-
-  // this is used to indicate a db corruption 
-  PRBool                            m_DBCorrupted ;
-
-  friend class nsDiskCacheRecord ;
-  friend class nsDiskCacheRecordChannel ;
-  friend class nsDBEnumerator ;
-} ;
-
-#endif /* __gen_nsNetDiskCache_h__ */

mozilla/netwerk/cache/filecache/nsNetDiskCacheCID.h

@@ -1,32 +0,0 @@
-/*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Intel Corp.
- * Portions created by Intel Corp. are
- * Copyright (C) 1999, 1999 Intel Corp.  All
- * Rights Reserved.
- * 
- * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
- *                 Carl Wong <carl.wong@intel.com>
- */
-
-#ifndef _nsNetDiskCacheCID_h_
-#define _nsNetDiskCacheCID_h_
-
-#define NS_NETDISKCACHE_CID_STR "ECFEEA00-7201-11d3-87FE-000629D01344"
-
-#define NS_NETDISKCACHE_CID \
-{ 0xecfeea00, 0x7201, 0x11d3, \
- { 0x87, 0xfe, 0x0, 0x6, 0x29, 0xd0, 0x13, 0x44 }}
-
-#endif /* _nsNetDiskCacheCID_h_ */

mozilla/netwerk/cache/filecache/test/Makefile.in

@@ -1,50 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-REQUIRES	= libreg xpcom
-
-CPPSRCS		= \
-         diskcache.cpp \
-		$(NULL)
-
-SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
-
-ifdef NO_LD_ARCHIVE_FLAGS
-LOST_SYM_LIBS	= -lxpcomds_s -lxptinfo -lmozreg_s
-endif
-
-LIBS		= \
-		-lmozjs \
-		-lxpcom \
-        -lmozdbm_s \
-		$(MOZ_NECKO_UTIL_LIBS) \
-		$(LOST_SYM_LIBS) \
-		$(NSPR_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES = -I$(srcdir)/..
-
-DEFINES		+= -DUSE_NSREG -DCACHE

mozilla/netwerk/cache/filecache/test/diskcache.cpp

@@ -1,836 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsIStreamListener.h"
-#include "nsIStreamObserver.h"
-#include "nsIServiceManager.h"
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "nsIEventQueue.h"
-#include "nsIEventQueueService.h"
-#include "nsIChannel.h"
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include <stdio.h>
-#include <unistd.h>
-
-#include "nsINetDataCache.h"
-#include "nsINetDataCacheRecord.h"
-//#include "nsMemCacheCID.h"
-#include "nsNetDiskCache.h"
-#include "nsIPref.h"
-#include "prenv.h"
-#include "nsIFileStream.h"
-
-// Number of test entries to be placed in the cache
-#define NUM_CACHE_ENTRIES  250
-
-// Cache content stream length will have random length between zero and
-// MAX_CONTENT_LENGTH bytes
-#define MAX_CONTENT_LENGTH 20000
-
-// Length of random-data cache entry key
-#define CACHE_KEY_LENGTH 15
-
-// Length of random-data cache entry meta-data
-#define CACHE_METADATA_LENGTH 100
-
-//static NS_DEFINE_CID(kMemCacheCID, NS_MEM_CACHE_FACTORY_CID);
-static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
-static NS_DEFINE_CID(kDiskCacheCID, NS_NETDISKCACHE_CID) ;
-static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
-static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID);
-
-// Mapping from test case number to RecordID
-static PRInt32 recordID[NUM_CACHE_ENTRIES];
-
-static PRInt32
-mapRecordIdToTestNum(PRInt32 aRecordID)
-{
-    int i;
-    for (i = 0; i < NUM_CACHE_ENTRIES; i++) {
-        if (recordID[i] == aRecordID)
-            return i;
-    }
-    return -1;
-}
-
-// A supply of stream data to either store or compare with
-class nsITestDataStream {
-public:
-    virtual ~nsITestDataStream() {};
-    virtual PRUint32 Next() = 0;
-    virtual void Read(char* aBuf, PRUint32 aCount) = 0;
-
-    virtual PRBool Match(char* aBuf, PRUint32 aCount) = 0;
-    virtual void Skip(PRUint32 aCount) = 0;
-};
-
-// A reproducible stream of random data.
-class RandomStream : public nsITestDataStream {
-public:
-    RandomStream(PRUint32 aSeed) {
-        mStartSeed = mState = aSeed;
-    }
-    
-    PRUint32 GetStartSeed() {
-        return mStartSeed;
-    }
-    
-    PRUint32 Next() {
-        mState = 1103515245 * mState + 12345;
-        return mState;
-    }
-
-    void Read(char* aBuf, PRUint32 aCount) {
-        PRUint32 i;
-        for (i = 0; i < aCount; i++) {
-            *aBuf++ = Next();
-        }
-    }
-
-    PRBool
-    Match(char* aBuf, PRUint32 aCount) {
-        PRUint32 i;
-        for (i = 0; i < aCount; i++) {
-            if (*aBuf++ != (char)(Next() & 0xff))
-                return PR_FALSE;
-        }
-        return PR_TRUE;
-    }
-
-    void
-    Skip(PRUint32 aCount) {
-        while (aCount--)
-            Next();
-    }
-
-protected:
-    
-    PRUint32 mState;
-    PRUint32 mStartSeed;
-};
-
-// A stream of data that increments on each byte that is read, modulo 256
-class CounterStream : public nsITestDataStream {
-public:
-    CounterStream(PRUint32 aSeed) {
-        mStartSeed = mState = aSeed;
-    }
-    
-    PRUint32 GetStartSeed() {
-        return mStartSeed;
-    }
-    
-    PRUint32 Next() {
-        mState += 1;
-        mState &= 0xff;
-        return mState;
-    }
-
-    void Read(char* aBuf, PRUint32 aCount) {
-        PRUint32 i;
-        for (i = 0; i < aCount; i++) {
-            *aBuf++ = Next();
-        }
-    }
-
-    PRBool
-    Match(char* aBuf, PRUint32 aCount) {
-        PRUint32 i;
-        for (i = 0; i < aCount; i++) {
-            if (*aBuf++ != (char)Next())
-                return PR_FALSE;
-        }
-        return PR_TRUE;
-    }
-
-    void
-    Skip(PRUint32 aCount) {
-        mState += aCount;
-        mState &= 0xff;
-    }
-
-protected:
-    
-    PRUint32 mState;
-    PRUint32 mStartSeed;
-};
-
-static int gNumReaders = 0;
-static PRUint32 gTotalBytesRead = 0;
-static PRUint32 gTotalDuration = 0;
-
-class nsReader : public nsIStreamListener {
-public:
-    NS_DECL_ISUPPORTS
-
-    nsReader()
-        : mStartTime(0), mBytesRead(0)
-    {
-        NS_INIT_REFCNT();
-        gNumReaders++;
-    }
-
-    virtual ~nsReader() {
-        delete mTestDataStream;
-        gNumReaders--;
-    }
-
-    nsresult 
-    Init(nsIChannel *aChannel, nsITestDataStream* aRandomStream, PRUint32 aExpectedStreamLength) {
-        mChannel = aChannel;
-        mTestDataStream = aRandomStream;
-        mExpectedStreamLength = aExpectedStreamLength;
-        mRefCnt = 1;
-        return NS_OK;
-    }
-
-    NS_IMETHOD OnStartRequest(nsIChannel* channel,
-                              nsISupports* context) {
-        mStartTime = PR_IntervalNow();
-        return NS_OK;
-    }
-
-    NS_IMETHOD OnDataAvailable(nsIChannel* channel, 
-                               nsISupports* context,
-                               nsIInputStream *aIStream, 
-                               PRUint32 aSourceOffset,
-                               PRUint32 aLength) {
-        char buf[1025];
-        while (aLength > 0) {
-            PRUint32 amt;
-            PRBool match;
-            aIStream->Read(buf, sizeof buf, &amt);
-            if (amt == 0) break;
-            aLength -= amt;
-            mBytesRead += amt;
-            match = mTestDataStream->Match(buf, amt);
-            NS_ASSERTION(match, "Stored data was corrupted on read");
-        }
-        return NS_OK;
-    }
-
-    NS_IMETHOD OnStopRequest(nsIChannel* channel, 
-                             nsISupports* context,
-                             nsresult aStatus,
-                             const PRUnichar* aMsg) {
-        PRIntervalTime endTime;
-        PRIntervalTime duration;
-        
-        endTime = PR_IntervalNow();
-        duration = (endTime - mStartTime);
-
-        if (NS_FAILED(aStatus)) printf("channel failed.\n");
-        //        printf("read %d bytes\n", mBytesRead);
-
-        NS_ASSERTION(mBytesRead == mExpectedStreamLength,
-                     "Stream in cache is wrong length");
-
-        gTotalBytesRead += mBytesRead;
-        gTotalDuration += duration;
-
-        // Release channel
-        mChannel = 0;
-        return NS_OK;
-    }
-
-protected:
-    PRIntervalTime       mStartTime;
-    PRUint32             mBytesRead;
-    nsITestDataStream*   mTestDataStream;
-    PRUint32             mExpectedStreamLength;
-    nsCOMPtr<nsIChannel> mChannel;
-};
-
-NS_IMPL_ISUPPORTS2(nsReader, nsIStreamListener, nsIStreamObserver)
-
-static nsIEventQueue* eventQueue;
-
-nsresult
-InitQueue() {
-    nsresult rv;
-
-    NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service");
-
-    rv = eventQService->CreateThreadEventQueue();
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create event queue");
-  
-    rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQueue);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue for main thread");
-
-    return NS_OK;
-}
-
-// Process events until all streams are OnStopRequest'ed
-nsresult
-WaitForEvents() {
-    while (gNumReaders) {
-        eventQueue->ProcessPendingEvents();
-    }
-    return NS_OK;
-}
-
-// Read data for a single cache record and compare against testDataStream
-nsresult
-TestReadStream(nsINetDataCacheRecord *record, nsITestDataStream *testDataStream,
-               PRUint32 expectedStreamLength)
-{
-    nsCOMPtr<nsIChannel> channel;
-    nsresult rv;
-    PRUint32 actualContentLength;
-
-    rv = record->NewChannel(0, getter_AddRefs(channel));
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-    rv = record->GetStoredContentLength(&actualContentLength);
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-    NS_ASSERTION(actualContentLength == expectedStreamLength,
-                 "nsINetDataCacheRecord::GetContentLength() busted ?");
-    
-    nsReader *reader = new nsReader;
-    reader->AddRef();
-    rv = reader->Init(channel, testDataStream, expectedStreamLength);
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-    
-    rv = channel->AsyncRead(0, -1, 0, reader);
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-    reader->Release();
-
-    return NS_OK;
-}
-
-// Check that records can be retrieved using their record-ID, in addition
-// to using the opaque key.
-nsresult
-TestRecordID(nsINetDataCache *cache)
-{
-    nsresult rv;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    RandomStream *randomStream;
-    PRUint32 metaDataLength;
-    char cacheKey[CACHE_KEY_LENGTH];
-    char *metaData;
-    PRUint32 testNum;
-    PRBool match;
-
-    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
-        randomStream = new RandomStream(testNum);
-        randomStream->Read(cacheKey, sizeof cacheKey);
-
-        rv = cache->GetCachedNetDataByID(recordID[testNum], getter_AddRefs(record));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't obtain record using record ID");
-
-        // Match against previously stored meta-data
-        rv = record->GetMetaData(&metaDataLength, &metaData);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get record meta-data");
-        match = randomStream->Match(metaData, metaDataLength);
-        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
-
-        nsAllocator::Free(metaData);
-        delete randomStream;
-    }
-    return NS_OK;
-}
-
-// Check that all cache entries in the database are enumerated and that
-// no duplicates appear.
-nsresult
-TestEnumeration(nsINetDataCache *cache)
-{
-    nsresult rv;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    nsCOMPtr<nsISupports> tempISupports;
-    nsCOMPtr<nsISimpleEnumerator> iterator;
-    RandomStream *randomStream;
-    PRUint32 metaDataLength;
-    char cacheKey[CACHE_KEY_LENGTH];
-    char *metaData;
-    PRUint32 testNum;
-    PRBool match;
-    PRInt32 recID;
-
-    int numRecords = 0;
-
-    // Iterate over all records in the cache
-    rv = cache->NewCacheEntryIterator(getter_AddRefs(iterator));
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create new cache entry iterator");
-
-    PRBool notDone;
-    while (1) {
-
-        // Done iterating ?
-        rv = iterator->HasMoreElements(&notDone);
-        if (NS_FAILED(rv)) return rv;
-        if (!notDone)
-            break;
-
-        // Get next record in iteration
-        rv = iterator->GetNext(getter_AddRefs(tempISupports));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "iterator bustage");
-        record = do_QueryInterface(tempISupports);
-
-        numRecords++;
-
-        // Get record ID
-        rv = record->GetRecordID(&recID);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get Record ID");
-        testNum = mapRecordIdToTestNum(recID);
-        NS_ASSERTION(testNum != -1, "Corrupted Record ID ?");
-
-        // Erase mapping from table, so that duplicate enumerations are detected
-        recordID[testNum] = -1;
-
-        // Make sure stream matches test data
-        randomStream = new RandomStream(testNum);
-        randomStream->Read(cacheKey, sizeof cacheKey);
-
-        // Match against previously stored meta-data
-        rv = record->GetMetaData(&metaDataLength, &metaData);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get record meta-data");
-        match = randomStream->Match(metaData, metaDataLength);
-        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
-        nsAllocator::Free(metaData);
-
-        delete randomStream;
-    }
-
-    NS_ASSERTION(numRecords == NUM_CACHE_ENTRIES, "Iteration bug");
-
-    return NS_OK;
-}
-
-// Read the test data that was written in FillCache(), checking for
-// corruption, truncation.
-nsresult
-TestRead(nsINetDataCache *cache)
-{
-    nsresult rv;
-    PRBool inCache;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    RandomStream *randomStream;
-    PRUint32 metaDataLength;
-    char cacheKey[CACHE_KEY_LENGTH];
-    char *metaData, *storedCacheKey;
-    PRUint32 testNum, storedCacheKeyLength;
-    PRBool match;
-
-    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
-        randomStream = new RandomStream(testNum);
-        randomStream->Read(cacheKey, sizeof cacheKey);
-
-        // Ensure that entry is in the cache
-        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        NS_ASSERTION(inCache, "nsINetDataCache::Contains error");
-        
-        rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-        // Match against previously stored meta-data
-        match = record->GetMetaData(&metaDataLength, &metaData);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        match = randomStream->Match(metaData, metaDataLength);
-        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
-        nsAllocator::Free(metaData);
-
-        // Test GetKey() method
-        rv = record->GetKey(&storedCacheKeyLength, &storedCacheKey);
-        NS_ASSERTION(NS_SUCCEEDED(rv) &&
-                     (storedCacheKeyLength == sizeof cacheKey) &&
-                     !memcmp(storedCacheKey, &cacheKey[0], sizeof cacheKey),
-                     "nsINetDataCacheRecord::GetKey failed");
-        nsAllocator::Free(storedCacheKey);
-
-        PRUint32 expectedStreamLength = randomStream->Next() & 0xffff;
-
-        TestReadStream(record, randomStream, expectedStreamLength);
-    }
-
-    WaitForEvents();
-
-    // Compute rate in MB/s
-    double rate = gTotalBytesRead / PR_IntervalToMilliseconds(gTotalDuration);
-    rate *= NUM_CACHE_ENTRIES;
-    rate *= 1000;
-    rate /= (1024 * 1024);
-    printf("Read %d bytes at a rate of %5.1f MB per second \n",
-           gTotalBytesRead, rate);
-
-    return NS_OK;
-}
-
-// Repeatedly call SetStoredContentLength() on a cache entry and make
-// read the stream's data to ensure that it's not corrupted by the effect
-nsresult
-TestTruncation(nsINetDataCache *cache)
-{
-    nsresult rv;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    RandomStream *randomStream;
-    char cacheKey[CACHE_KEY_LENGTH];
-
-    randomStream = new RandomStream(0);
-    randomStream->Read(cacheKey, sizeof cacheKey);
-
-    rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-    randomStream->Skip(CACHE_METADATA_LENGTH);
-    PRUint32 initialStreamLength = randomStream->Next() & 0xffff;
-    delete randomStream;
-
-    PRUint32 i;
-    PRUint32 delta = initialStreamLength / 64;
-    for (i = initialStreamLength; i >= delta; i -= delta) {
-        PRUint32 expectedStreamLength = i;
-
-        // Do the truncation
-        record->SetStoredContentLength(expectedStreamLength);
-        randomStream = new RandomStream(0);
-        randomStream->Skip(CACHE_KEY_LENGTH + CACHE_METADATA_LENGTH + 1);
-
-        TestReadStream(record, randomStream, expectedStreamLength);
-        WaitForEvents();
-    }
-
-    return NS_OK;
-}
-
-// Write known data to random offsets in a single cache entry and test
-// resulting stream for correctness.
-nsresult
-TestOffsetWrites(nsINetDataCache *cache)
-{
-    nsresult rv;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    nsCOMPtr<nsIChannel> channel;
-    nsCOMPtr<nsIOutputStream> outStream;
-    char buf[512];
-    char cacheKey[CACHE_KEY_LENGTH];
-    RandomStream *randomStream;
-
-    randomStream = new RandomStream(0);
-    randomStream->Read(cacheKey, sizeof cacheKey);
-
-    rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't access record via opaque cache key");
-
-
-    nsCOMPtr<nsIFileSpec> file ;
-    record->GetFilename(getter_AddRefs(file)) ;
-    char* name ;
-    file->GetUnixStyleFilePath(&name) ;
-    printf(" file name is %s \n", name) ;
-
-    // Write buffer-fulls of data at random offsets into the cache entry.
-    // Data written is (offset % 0xff)
-    PRUint32 startingOffset;
-    PRUint32 streamLength = 0;
-    PRUint32 len = 0 ;
-    CounterStream *counterStream;
-
-    int i = 0;
-    for (i = 0; i < 257; i++) {
-        rv = record->NewChannel(0, getter_AddRefs(channel));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-        startingOffset = streamLength ? streamLength - (randomStream->Next() % sizeof buf): 0;
-        rv = channel->OpenOutputStream(startingOffset, getter_AddRefs(outStream));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        
-        truncate(name, startingOffset) ;
-
-        counterStream = new CounterStream(startingOffset);
-        counterStream->Read(buf, sizeof buf);
-
-      nsresult status ;
-      nsCOMPtr<nsIRandomAccessStore> ras = do_QueryInterface(outStream, &status);
-      if (NS_FAILED(status)) {
-      //        mState = END_WRITE;
-        return NS_ERROR_FAILURE;
-      }
-      PRIntn offset ;
-      ras->Tell(&offset) ;
-//      printf(" offset is %d \n", offset) ;
-
-        PRUint32 numWritten;
-        rv = outStream->Write(buf, sizeof buf, &numWritten);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        NS_ASSERTION(numWritten == sizeof buf, "Write() bug?");
-        streamLength = startingOffset + sizeof buf;
-
-        rv = outStream->Close();
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't close channel");
-        delete counterStream;
-
-        record->GetStoredContentLength(&len) ;
-        if(len != streamLength) 
-          printf(" offset = %d is wrong, filesize = %d\n", startingOffset, len) ;
-
-    }
-
-        /*
-        rv = record->NewChannel(0, getter_AddRefs(channel));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-        startingOffset = 208;
-        rv = channel->OpenOutputStream(startingOffset, getter_AddRefs(outStream));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        
-        counterStream = new CounterStream(startingOffset);
-        counterStream->Read(buf, sizeof buf);
-
-      nsresult status ;
-      nsCOMPtr<nsIRandomAccessStore> ras = do_QueryInterface(outStream, &status);
-      if (NS_FAILED(status)) {
-      //        mState = END_WRITE;
-        return NS_ERROR_FAILURE;
-      }
-      PRIntn offset = 0 ;
-      ras->Tell(&offset) ;
-      printf(" offset is %d \n", offset) ;
-
-        PRUint32 numWritten;
-        rv = outStream->Write(buf, sizeof buf, &numWritten);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        NS_ASSERTION(numWritten == sizeof buf, "Write() bug?");
-        streamLength = startingOffset + sizeof buf;
-
-        rv = outStream->Close();
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't close channel");
-        delete counterStream;
-
-        record->GetStoredContentLength(&len) ;
-        if(len != streamLength) 
-          printf(" offset = %d is wrong, filesize = %d\n", startingOffset, len) ;
-          */
-    
-    delete randomStream;
-
-    counterStream = new CounterStream(0);
-    TestReadStream(record, counterStream, streamLength);
-    WaitForEvents();
-
-    return NS_OK;
-}
-
-// Create entries in the network data cache, using random data for the
-// key, the meta-data and the stored content data.
-nsresult
-FillCache(nsINetDataCache *cache)
-{
-    nsresult rv;
-    PRBool inCache;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    nsCOMPtr<nsIChannel> channel;
-    nsCOMPtr<nsIOutputStream> outStream;
-    char buf[1000];
-    PRUint32 metaDataLength;
-    char cacheKey[CACHE_KEY_LENGTH];
-    char metaData[CACHE_METADATA_LENGTH];
-    PRUint32 testNum;
-    char *data;
-    RandomStream *randomStream;
-
-    PRIntervalTime startTime = PR_IntervalNow();
-    
-    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
-        randomStream = new RandomStream(testNum);
-        randomStream->Read(cacheKey, sizeof cacheKey);
-
-        // No entry should be in cache until we add it
-        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        NS_ASSERTION(!inCache, "nsINetDataCache::Contains error");
-        
-        rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't access record via opaque cache key");
-
-        // Test nsINetDataCacheRecord::GetRecordID()
-        rv = record->GetRecordID(&recordID[testNum]);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get Record ID");
-
-        // Test nsINetDataCache::GetNumEntries()
-        PRUint32 numEntries = (PRUint32)-1;
-        rv = cache->GetNumEntries(&numEntries);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
-        NS_ASSERTION(numEntries == testNum + 1, "GetNumEntries failure");
-
-        // Record meta-data should be initially empty
-        rv = record->GetMetaData(&metaDataLength, &data);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        if ((metaDataLength != 0) || (data != 0))
-            return NS_ERROR_FAILURE;
-
-        // Store random data as meta-data
-        randomStream->Read(metaData, sizeof metaData);
-        record->SetMetaData(sizeof metaData, metaData);
-
-        rv = record->NewChannel(0, getter_AddRefs(channel));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-        rv = channel->OpenOutputStream(0, getter_AddRefs(outStream));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        
-        PRUint32 beforeOccupancy;
-        rv = cache->GetStorageInUse(&beforeOccupancy);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
-
-        int streamLength = randomStream->Next() & 0xffff;
-        int remaining = streamLength;
-        while (remaining) {
-            PRUint32 numWritten;
-            int amount = PR_MIN(sizeof buf, remaining);
-            randomStream->Read(buf, amount);
-
-            rv = outStream->Write(buf, amount, &numWritten);
-            NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-            NS_ASSERTION(numWritten == (PRUint32)amount, "Write() bug?");
-            
-            remaining -= amount;
-        }
-        outStream->Close();
-
-        PRUint32 afterOccupancy;
-        rv = cache->GetStorageInUse(&afterOccupancy);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
-        PRUint32 streamLengthInKB = streamLength >> 10;
-        NS_ASSERTION((afterOccupancy - beforeOccupancy) >= streamLengthInKB,
-                     "nsINetDataCache::GetStorageInUse() is busted");
-        
-
-        // *Now* there should be an entry in the cache
-        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        NS_ASSERTION(inCache, "nsINetDataCache::Contains error");
-
-        delete randomStream;
-    }
-
-    PRIntervalTime endTime = PR_IntervalNow();
-
-    return NS_OK;
-}
-
-nsresult NS_AutoregisterComponents()
-{
-  nsresult rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,
-                                                 NULL /* default */);
-  return rv;
-}
-
-PRBool initPref ()
-{
-  nsresult rv;
-  NS_WITH_SERVICE(nsIPref, prefPtr, kPrefCID, &rv);
-  if (NS_FAILED(rv))
-    return false;
-
-  nsCOMPtr<nsIFileSpec> fileSpec;
-  rv = NS_NewFileSpec (getter_AddRefs(fileSpec));
-  if (NS_FAILED(rv))
-    return false;
-
-  nsCString defaultPrefFile = PR_GetEnv ("MOZILLA_FIVE_HOME");
-  if (defaultPrefFile.Length())
-    defaultPrefFile += "/";
-  else
-    defaultPrefFile = "./";
-  defaultPrefFile += "default_prefs.js";
-
-  fileSpec->SetUnixStyleFilePath (defaultPrefFile.GetBuffer());
-
-  PRBool exists = false;
-  fileSpec->Exists(&exists);
-  if (exists)
-    prefPtr->ReadUserPrefsFrom(fileSpec);
-  else
-    return false;
-  return true;
-}
-
-int
-main(int argc, char* argv[])
-{
-    initPref() ;
-    nsresult rv;
-    nsCOMPtr<nsINetDataCache> cache;
-
-    rv = NS_AutoregisterComponents();
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't register XPCOM components");
-
-    rv = nsComponentManager::CreateInstance(kDiskCacheCID, nsnull,
-                                            NS_GET_IID(nsINetDataCache),
-                                            getter_AddRefs(cache));
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create memory cache factory");
-
-    InitQueue();
-
-    PRUnichar* description;
-    rv = cache->GetDescription(&description);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache description");
-    nsCAutoString descStr(description);
-    printf("Testing: %s\n", descStr.GetBuffer());
-
-    rv = cache->RemoveAll();
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
-
-    PRUint32 startOccupancy;
-    rv = cache->GetStorageInUse(&startOccupancy);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
-
-    PRUint32 numEntries = (PRUint32)-1;
-    rv = cache->GetNumEntries(&numEntries);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
-    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
-
-    rv = FillCache(cache);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't fill cache with random test data");
-
-    rv = TestRead(cache);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't read random test data from cache");
-
-    rv = TestRecordID(cache);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't index records using record ID");
-
-    rv = TestEnumeration(cache);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully enumerate records");
-
-    rv = TestTruncation(cache);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully truncate records");
-
-    rv = TestOffsetWrites(cache);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully write to records using non-zero offsets");
-
-    rv = cache->RemoveAll();
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
-    rv = cache->GetNumEntries(&numEntries);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
-    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
-
-    PRUint32 endOccupancy;
-    rv = cache->GetStorageInUse(&endOccupancy);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
-
-    NS_ASSERTION(startOccupancy == endOccupancy, "Cache occupancy not correctly computed ?");
-
-    return 0;
-}
-

mozilla/netwerk/cache/memcache/Makefile.in

@@ -1,48 +0,0 @@
-# Generated automatically from Makefile.in by configure.
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-VPATH       = @srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = nkcache
-
-LIBRARY_NAME = nkmemcache_s
-
-REQUIRES	= nspr dbm 
-
-EXPORTS=nsMemCacheCID.h \
-	nsMemCache.h \
-	$(NULL)
-
-CPPSRCS		= \
-        nsMemCache.cpp \
-        nsMemCacheRecord.cpp \
-        nsMemCacheChannel.cpp \
-		$(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/cache/memcache/makefile.win

@@ -1,42 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DEPTH=..\..\..
-
-include <$(DEPTH)/config/config.mak>
-
-MODULE = nkcache
-
-LIBRARY_NAME = nkmemcache_s
-
-CPP_OBJS =                                \
- 	.\$(OBJDIR)\nsMemCache.obj        \
-	.\$(OBJDIR)\nsMemCacheRecord.obj  \
-	.\$(OBJDIR)\nsMemCacheChannel.obj \
-	$(NULL)
-
-EXPORTS=nsMemCacheCID.h
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-        rm -rf $(OBJDIR)
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-

mozilla/netwerk/cache/memcache/nsMemCache.cpp

@@ -1,334 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-/**
- * nsMemCache is the implementation of an in-memory network-data
- * cache, used to cache the responses to network retrieval commands.
- * Each cache entry may contain both content, e.g. GIF image data, and
- * associated metadata, e.g. HTTP headers.  Each entry is indexed by
- * two different keys: a record id number and an opaque key, which is
- * created by the cache manager by combining the URI with a "secondary
- * key", e.g. HTTP post data.
- */
-
-#include "nsMemCache.h"
-#include "nsMemCacheRecord.h"
-#include "nsIGenericFactory.h"
-#include "nsString.h"
-#include "nsHashtable.h"
-#include "nsHashtableEnumerator.h"
-#include "nsEnumeratorUtils.h"
-
-PRInt32 nsMemCache::gRecordSerialNumber = 0;
-
-nsMemCache::nsMemCache()
-    : mNumEntries(0), mOccupancy(0), mEnabled(PR_TRUE),
-      mHashTable(0)
-{
-    NS_INIT_REFCNT();
-}
-
-nsMemCache::~nsMemCache()
-{
-    nsresult rv;
-
-    rv = RemoveAll();
-    NS_ASSERTION(NS_SUCCEEDED(rv) && (mNumEntries == 0),
-                 "Failure to shut down memory cache. "
-                 "Somewhere, someone is holding references to at least one cache record");
-    delete mHashTable;
-}
-
-nsresult
-nsMemCache::Init()
-{
-    mHashTable = new nsHashtable(256);
-    if (!mHashTable)
-        return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMPL_ISUPPORTS(nsMemCache, NS_GET_IID(nsINetDataCache))
-
-NS_IMETHODIMP
-nsMemCache::GetDescription(PRUnichar * *aDescription)
-{
-    nsAutoString description("Memory Cache");
-    *aDescription = description.ToNewUnicode();
-    if (!*aDescription)
-        return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCache::Contains(const char *aKey, PRUint32 aKeyLength, PRBool *aFound)
-{
-    nsOpaqueKey *opaqueKey = new nsOpaqueKey(aKey, aKeyLength);
-    if (!opaqueKey)
-        return NS_ERROR_OUT_OF_MEMORY;
-    *aFound = mHashTable->Exists(opaqueKey);
-    delete opaqueKey;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCache::GetCachedNetData(const char *aKey, PRUint32 aKeyLength,
-                             nsINetDataCacheRecord* *aRecord)
-{
-    nsresult rv;
-    nsMemCacheRecord* record = 0;
-    nsOpaqueKey *opaqueKey2 = 0;
-    nsOpaqueKey *opaqueKey3 = 0;
-    nsOpaqueKey *opaqueKey;
-
-    opaqueKey = new nsOpaqueKey(aKey, aKeyLength);
-    if (!opaqueKey)
-        goto out_of_memory;
-    record = (nsMemCacheRecord*)mHashTable->Get(opaqueKey);
-    delete opaqueKey;
-
-    // No existing cache database entry was found.  Create a new one.
-    // This requires two mappings in the hash table:
-    //    Record ID  ==> record
-    //    Opaque key ==> record
-    if (!record) {
-        record = new nsMemCacheRecord;
-        if (!record)
-            goto out_of_memory;
-        rv = record->Init(aKey, aKeyLength, ++gRecordSerialNumber, this);
-        if (NS_FAILED(rv)) goto out_of_memory;
-
-        // Index the record by opaque key
-        opaqueKey2 = new nsOpaqueKey(record->mKey, record->mKeyLength);
-        if (!opaqueKey2) goto out_of_memory;
-        mHashTable->Put(opaqueKey2, record);
-        
-        // Index the record by it's record ID
-        char *recordIDbytes = NS_REINTERPRET_CAST(char *, &record->mRecordID);
-        opaqueKey3 = new nsOpaqueKey(recordIDbytes,
-                                     sizeof record->mRecordID);
-        if (!opaqueKey3) {
-            // Clean up the first record from the hash table
-            mHashTable->Remove(opaqueKey);
-            goto out_of_memory;
-        }
-        mHashTable->Put(opaqueKey3, record);
-        
-        // The hash table holds on to the record
-        record->AddRef();
-        
-        delete opaqueKey2;
-        delete opaqueKey3;
-        mNumEntries++;
-    }
-
-    record->AddRef();
-    *aRecord = record;
-    return NS_OK;
-
- out_of_memory:
-    delete opaqueKey2;
-    delete opaqueKey3;
-    delete record;
-    return NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP
-nsMemCache::GetCachedNetDataByID(PRInt32 RecordID,
-                                 nsINetDataCacheRecord* *aRecord)
-{
-    nsOpaqueKey opaqueKey(NS_REINTERPRET_CAST(const char *, &RecordID),
-                          sizeof RecordID);
-    *aRecord = (nsINetDataCacheRecord*)mHashTable->Get(&opaqueKey);
-    if (*aRecord) {
-        NS_ADDREF(*aRecord);
-        return NS_OK;
-    }
-    return NS_ERROR_FAILURE;
-}
-
-NS_METHOD
-nsMemCache::Delete(nsMemCacheRecord* aRecord)
-{
-    nsMemCacheRecord *removedRecord;
-
-    char *recordIDbytes = NS_REINTERPRET_CAST(char *, &aRecord->mRecordID);
-    nsOpaqueKey opaqueRecordIDKey(recordIDbytes,
-                                  sizeof aRecord->mRecordID);
-    removedRecord = (nsMemCacheRecord*)mHashTable->Remove(&opaqueRecordIDKey);
-    NS_ASSERTION(removedRecord == aRecord, "memory cache database inconsistent");
-
-    nsOpaqueKey opaqueKey(aRecord->mKey, aRecord->mKeyLength);
-    removedRecord = (nsMemCacheRecord*)mHashTable->Remove(&opaqueKey);
-    NS_ASSERTION(removedRecord == aRecord, "memory cache database inconsistent");
-
-    aRecord->Release();
-
-    mNumEntries--;
-    
-    return NS_OK;
-}
-    
-
-NS_IMETHODIMP
-nsMemCache::GetEnabled(PRBool *aEnabled)
-{
-    NS_ENSURE_ARG(aEnabled);
-    *aEnabled = mEnabled;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCache::SetEnabled(PRBool aEnabled)
-{
-    mEnabled = aEnabled;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCache::GetFlags(PRUint32 *aFlags)
-{
-    NS_ENSURE_ARG(aFlags);
-    *aFlags = MEMORY_CACHE;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCache::GetNumEntries(PRUint32 *aNumEntries)
-{
-    NS_ENSURE_ARG(aNumEntries);
-    *aNumEntries = mNumEntries;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCache::GetMaxEntries(PRUint32 *aMaxEntries)
-{
-    NS_ENSURE_ARG(aMaxEntries);
-    *aMaxEntries = MEM_CACHE_MAX_ENTRIES;
-    return NS_OK;
-}
-
-static NS_METHOD
-HashEntryConverter(nsHashKey *aKey, void *aValue,
-                   void *unused, nsISupports **retval)
-{
-    nsMemCacheRecord *record;
-    nsOpaqueKey *opaqueKey;
-
-    record = (nsMemCacheRecord*)aValue;
-    opaqueKey = (nsOpaqueKey*)aKey;
-
-    // Hash table keys that index cache entries by their record ID
-    // shouldn't be enumerated.
-    if ((opaqueKey->GetKeyLength() == sizeof(PRInt32))) {
-
-#ifdef DEBUG
-        PRInt32 recordID;
-        record->GetRecordID(&recordID);
-        NS_ASSERTION(*((PRInt32*)opaqueKey->GetKey()) == recordID,
-                     "Key has incorrect key length");
-#endif
-        return NS_ERROR_FAILURE;
-    }
-
-    NS_IF_ADDREF(record);
-    *retval = NS_STATIC_CAST(nsISupports*, record);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCache::NewCacheEntryIterator(nsISimpleEnumerator* *aIterator)
-{
-    nsCOMPtr<nsIEnumerator> iterator;
-
-    NS_ENSURE_ARG(aIterator);
-    NS_NewHashtableEnumerator(mHashTable, HashEntryConverter,
-                              mHashTable, getter_AddRefs(iterator));
-    return NS_NewAdapterEnumerator(aIterator, iterator);
-}
-
-NS_IMETHODIMP
-nsMemCache::GetNextCache(nsINetDataCache* *aNextCache)
-{
-    NS_ENSURE_ARG(aNextCache);
-    *aNextCache = mNextCache;
-    NS_ADDREF(*aNextCache);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCache::SetNextCache(nsINetDataCache* aNextCache)
-{
-    mNextCache = aNextCache;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCache::GetStorageInUse(PRUint32 *aStorageInUse)
-{
-    NS_ENSURE_ARG(aStorageInUse);
-
-    // Convert from bytes to KB
-    *aStorageInUse = (mOccupancy >> 10);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCache::RemoveAll(void)
-{
-    PRBool failed;
-
-    nsCOMPtr<nsISimpleEnumerator> iterator;
-    nsCOMPtr<nsISupports> recordSupports;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    nsresult rv;
-
-    failed = PR_FALSE;
-    rv = NewCacheEntryIterator(getter_AddRefs(iterator));
-    if (NS_FAILED(rv))
-        return rv;
-
-    PRBool notDone;
-    while (1) {
-        rv = iterator->HasMoreElements(&notDone);
-        if (NS_FAILED(rv)) return rv;
-        if (!notDone)
-            break;
-        
-        iterator->GetNext(getter_AddRefs(recordSupports));
-        record = do_QueryInterface(recordSupports);
-        recordSupports = 0;
-
-        PRUint32 bytesUsed;
-        record->GetStoredContentLength(&bytesUsed);
-        rv = record->Delete();
-        if (NS_FAILED(rv)) {
-            failed = PR_TRUE;
-            continue;
-        }
-        mOccupancy -= bytesUsed;
-    }
-
-    if (failed)
-        return NS_ERROR_FAILURE;
-    return NS_OK;
-}

mozilla/netwerk/cache/memcache/nsMemCache.h

@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-/**
- * nsMemCache is the implementation of an in-memory network-data
- * cache, used to cache the responses to network retrieval commands.
- * Each cache entry may contain both content, e.g. GIF image data, and
- * associated metadata, e.g. HTTP headers.  Each entry is indexed by
- * two different keys: a record id number and an opaque key, which is
- * created by the cache manager by combining the URI with a "secondary
- * key", e.g. HTTP post data.
- */
-
-#ifndef _nsMemCache_h_
-#define _nsMemCache_h_
-
-#include "nsINetDataCache.h"
-
-// Maximum number of URIs that may be resident in the cache
-#define MEM_CACHE_MAX_ENTRIES 1000
-
-#define MEM_CACHE_SEGMENT_SIZE       (1 << 12)
-#define MEM_CACHE_MAX_ENTRY_SIZE     (1 << 20)
-
-class nsHashtable;
-class nsMemCacheRecord;
-
-class nsMemCache : public nsINetDataCache
-{
-public:
-    nsMemCache();
-    virtual ~nsMemCache();
-    nsresult Init();
-
-    // nsISupports methods
-    NS_DECL_ISUPPORTS
-
-    // nsINetDataCache methods
-    NS_DECL_NSINETDATACACHE
-
-    // Factory
-    static NS_METHOD nsMemCacheConstructor(nsISupports *aOuter, REFNSIID aIID,
-                                           void **aResult);
-
-protected:
-
-    PRUint32         mNumEntries;
-    PRUint32         mOccupancy;   // Memory used, in bytes
-    PRBool           mEnabled;     // If false, bypass mem cache
-
-    nsINetDataCache* mNextCache;
-
-    // Mapping from either opaque key or record ID to nsMemCacheRecord
-    nsHashtable*     mHashTable;
-
-    // Used to assign record ID's
-    static PRInt32   gRecordSerialNumber;
-
-    NS_METHOD Delete(nsMemCacheRecord* aRecord);
-
-    friend class nsMemCacheRecord;
-    friend class nsMemCacheChannel;
-};
-
-#endif // _nsMemCache_h_

mozilla/netwerk/cache/memcache/nsMemCacheCID.h

@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-//  XPCOM Class ID for the network data in-memory cache
-
-#ifndef nsMEMCACHECID_h__
-#define nsMEMCACHECID_h__
-
-// {e4710560-7de2-11d3-90cb-0040056a906e}
-#define NS_MEM_CACHE_FACTORY_CID                          \
-    {                                                     \
-        0xe4710560,                                       \
-	    0x7de2,                                           \
-        0x11d3,                                           \
-	    {0x90, 0xcb, 0x00, 0x40, 0x05, 0x6a, 0x90, 0x6e}  \
-    }
-
-#endif // nsMEMCACHECID_h__

mozilla/netwerk/cache/memcache/nsMemCacheChannel.cpp

@@ -1,462 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-#include "nsMemCache.h"
-#include "nsMemCacheChannel.h"
-#include "nsIStreamListener.h"
-#include "nsIChannel.h"
-#include "nsIStorageStream.h"
-#include "nsIOutputStream.h"
-#include "nsIServiceManager.h"
-#include "nsIEventQueueService.h"
-#include "nsNetUtil.h"
-#include "nsILoadGroup.h"
-
-static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-static NS_DEFINE_CID(kEventQueueService, NS_EVENTQUEUESERVICE_CID);
-
-NS_IMPL_ISUPPORTS(nsMemCacheChannel, NS_GET_IID(nsIChannel))
-
-void
-nsMemCacheChannel::NotifyStorageInUse(PRInt32 aBytesUsed)
-{
-    mRecord->mCache->mOccupancy += aBytesUsed;
-}
-
-/**
- * This class acts as an adaptor around a synchronous input stream to add async
- * read capabilities.  It adds methods for initiating, suspending, resuming and
- * cancelling async reads. 
- */
-class AsyncReadStreamAdaptor : public nsIInputStream {
-public:
-    AsyncReadStreamAdaptor(nsMemCacheChannel* aChannel, nsIInputStream *aSyncStream):
-        mSyncStream(aSyncStream), mDataAvailCursor(0),
-        mRemaining(0), mAvailable(0), mChannel(aChannel), mAborted(PR_FALSE), mSuspended(PR_FALSE)
-        {
-            NS_INIT_REFCNT();
-            NS_ADDREF(mChannel);
-        }
-
-    virtual ~AsyncReadStreamAdaptor() { 
-        mChannel->mAsyncReadStream = 0;
-        NS_RELEASE(mChannel);
-    }
-    
-    NS_DECL_ISUPPORTS
-
-    nsresult
-    IsPending(PRBool* aIsPending) {
-        *aIsPending = (mRemaining != 0) && !mAborted;
-        return NS_OK;
-    }
-
-    nsresult
-    Cancel(void) {
-        mAborted = PR_TRUE;
-        return mStreamListener->OnStopRequest(mChannel, mContext, NS_BINDING_ABORTED, nsnull);
-    }
-
-    nsresult
-    Suspend(void) { mSuspended = PR_TRUE; return NS_OK; }
-
-    nsresult
-    Resume(void) {
-        if (!mSuspended)
-            return NS_ERROR_FAILURE;
-        mSuspended = PR_FALSE;
-        return NextListenerEvent();
-    }
-
-    NS_IMETHOD
-    Available(PRUint32 *aNumBytes) { return mAvailable; }
-
-    NS_IMETHOD
-    Read(char* aBuf, PRUint32 aCount, PRUint32 *aBytesRead) {
-        if (mAborted)
-            return NS_ERROR_ABORT;
-
-        *aBytesRead = 0;
-        aCount = PR_MIN(aCount, mAvailable);
-        nsresult rv = mSyncStream->Read(aBuf, aCount, aBytesRead);
-        mAvailable -= *aBytesRead;
-
-        if (NS_FAILED(rv) && (rv != NS_BASE_STREAM_WOULD_BLOCK)) {
-            Fail();
-            return rv;
-        }
-
-        if (!mSuspended && !mAvailable) {
-            rv = NextListenerEvent();
-            if (NS_FAILED(rv)) {
-                Fail();
-                return rv;
-            }
-        }
-
-        return NS_OK;
-    }
-
-    NS_IMETHOD
-    Close() {
-        nsresult rv = mSyncStream->Close();
-        mSyncStream = 0;
-        mContext = 0;
-        mStreamListener = 0;
-        return rv;
-    }
-
-    nsresult
-    AsyncRead(PRUint32 aStartPosition, PRInt32 aReadCount,
-              nsISupports* aContext, nsIStreamListener* aListener) {
-
-        nsresult rv;
-        nsIEventQueue *eventQ;
-
-        mContext = aContext;
-        mStreamListener = aListener;
-        mRemaining = aReadCount;
-
-        NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-        if (NS_FAILED(rv)) return rv;
-
-        NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv);
-        if (NS_FAILED(rv)) return rv;
-
-        rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQ);
-        if (NS_FAILED(rv)) return rv;
-
-        rv = NS_NewAsyncStreamListener(aListener, eventQ, 
-                                       getter_AddRefs(mStreamListener));
-        NS_RELEASE(eventQ);
-        if (NS_FAILED(rv)) return rv;
-
-        rv = mStreamListener->OnStartRequest(mChannel, aContext);
-        if (NS_FAILED(rv)) return rv;
-
-        return NextListenerEvent();
-    }
-
-protected:
-
-    nsresult
-    Fail(void) {
-        mAborted = PR_TRUE;
-        return mStreamListener->OnStopRequest(mChannel, mContext, NS_BINDING_FAILED, nsnull);
-    }
-
-    nsresult
-    NextListenerEvent() {
-        PRUint32 available;
-        nsresult rv = mSyncStream->Available(&available);
-        if (NS_FAILED(rv)) return rv;
-        available -= mAvailable;
-        available = PR_MIN(available, mRemaining);
-
-        if (available) {
-            PRUint32 size = PR_MIN(available, MEM_CACHE_SEGMENT_SIZE);
-            rv = mStreamListener->OnDataAvailable(mChannel, mContext, this,
-                                                  mDataAvailCursor, size);
-            mDataAvailCursor += size;
-            mRemaining -= size;
-            mAvailable += size;
-            return rv;
-        } else {
-            rv = mStreamListener->OnStopRequest(mChannel, mContext, NS_OK, nsnull);
-            AsyncReadStreamAdaptor* thisAlias = this;
-            NS_RELEASE(thisAlias);
-            return rv;
-        }
-    }
-    
-private:
-    nsCOMPtr<nsISupports>       mContext;        // Opaque context passed to AsyncRead()
-    nsCOMPtr<nsIStreamListener> mStreamListener; // Stream listener that has been proxied
-    nsCOMPtr<nsIInputStream>    mSyncStream;     // Underlying synchronous stream that is
-                                                 //   being converted to an async stream
-    PRUint32                    mDataAvailCursor;
-    PRUint32                    mRemaining;      // Size of AsyncRead request less bytes for
-                                                 //   consumer OnDataAvailable's that were fired
-    PRUint32                    mAvailable;      // Number of bytes for which OnDataAvailable fired
-    nsMemCacheChannel*          mChannel;        // Associated memory cache channel, strong link
-                                                 //   but can not use nsCOMPtr
-    PRBool                      mAborted;        // Abort() has been called
-    PRBool                      mSuspended;      // Suspend() has been called
-};
-
-NS_IMPL_ISUPPORTS(AsyncReadStreamAdaptor,  NS_GET_IID(nsIInputStream))
-
-// The only purpose of this output stream wrapper is to adjust the cache's
-// overall occupancy as new data flows into the cache entry.
-class MemCacheWriteStreamWrapper : public nsIOutputStream {
-public:
-    MemCacheWriteStreamWrapper(nsMemCacheChannel* aChannel, nsIOutputStream *aBaseStream):
-        mBaseStream(aBaseStream), mChannel(aChannel)
-        {
-            NS_INIT_REFCNT();
-            NS_ADDREF(mChannel);
-        }
-
-    virtual ~MemCacheWriteStreamWrapper() { NS_RELEASE(mChannel); };
-    
-    static nsresult
-    Create(nsMemCacheChannel* aChannel, nsIOutputStream *aBaseStream, nsIOutputStream* *aWrapper) {
-        MemCacheWriteStreamWrapper *wrapper =
-            new MemCacheWriteStreamWrapper(aChannel, aBaseStream);
-        if (!wrapper) return NS_ERROR_OUT_OF_MEMORY;
-        NS_ADDREF(wrapper);
-        *aWrapper = wrapper;
-        return NS_OK;
-    }
-    
-    NS_DECL_ISUPPORTS
-
-    NS_IMETHOD
-    Write(const char *aBuffer, PRUint32 aCount, PRUint32 *aNumWritten) {
-        *aNumWritten = 0;
-        nsresult rv = mBaseStream->Write(aBuffer, aCount, aNumWritten);
-        mChannel->NotifyStorageInUse(*aNumWritten);
-        return rv;
-    }
-
-    NS_IMETHOD
-    Flush() { return mBaseStream->Flush(); }
-
-    NS_IMETHOD
-    Close() { return mBaseStream->Close(); }
-
-private:
-    nsCOMPtr<nsIOutputStream>   mBaseStream;
-    nsMemCacheChannel*          mChannel;
-};
-
-NS_IMPL_ISUPPORTS(MemCacheWriteStreamWrapper,  NS_GET_IID(nsIOutputStream))
-
-nsMemCacheChannel::nsMemCacheChannel(nsMemCacheRecord *aRecord, nsILoadGroup *aLoadGroup)
-    : mRecord(aRecord)
-{
-    NS_INIT_REFCNT();
-    mRecord->mNumChannels++;
-}
-
-nsMemCacheChannel::~nsMemCacheChannel()
-{
-    mRecord->mNumChannels--;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::IsPending(PRBool* aIsPending)
-{
-    *aIsPending = PR_FALSE;
-    if (!mAsyncReadStream)
-        return NS_OK;
-    return mAsyncReadStream->IsPending(aIsPending);
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::Cancel(void)
-{
-    if (!mAsyncReadStream)
-        return NS_ERROR_FAILURE;
-    return mAsyncReadStream->Cancel();
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::Suspend(void)
-{
-    if (!mAsyncReadStream)
-        return NS_ERROR_FAILURE;
-    return mAsyncReadStream->Suspend();
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::Resume(void)
-{
-    if (!mAsyncReadStream)
-        return NS_ERROR_FAILURE;
-    return mAsyncReadStream->Resume();
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::GetOriginalURI(nsIURI * *aURI)
-{
-    // Not required
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::GetURI(nsIURI * *aURI)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::OpenInputStream(PRUint32 aStartPosition, PRInt32 aReadCount,
-                                   nsIInputStream* *aResult)
-{
-    nsresult rv;
-    NS_ENSURE_ARG(aResult);
-    if (mInputStream)
-        return NS_ERROR_NOT_AVAILABLE;
-
-    rv = mRecord->mStorageStream->NewInputStream(aStartPosition, getter_AddRefs(mInputStream));
-    *aResult = mInputStream;
-    NS_ADDREF(*aResult);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::OpenOutputStream(PRUint32 startPosition, nsIOutputStream* *aResult)
-{
-    nsresult rv;
-    NS_ENSURE_ARG(aResult);
-
-    nsCOMPtr<nsIOutputStream> outputStream;
-
-    PRUint32 oldLength;
-    mRecord->mStorageStream->GetLength(&oldLength);
-    rv = mRecord->mStorageStream->GetOutputStream(startPosition, getter_AddRefs(outputStream));
-    if (NS_FAILED(rv)) return rv;
-    if (startPosition < oldLength)
-        NotifyStorageInUse(startPosition - oldLength);
-
-    return MemCacheWriteStreamWrapper::Create(this, outputStream, aResult);
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::AsyncOpen(nsIStreamObserver *observer, nsISupports *ctxt)
-{
-    // Not required
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::AsyncRead(PRUint32 aStartPosition, PRInt32 aReadCount,
-                             nsISupports *aContext, nsIStreamListener *aListener)
-{
-    nsCOMPtr<nsIInputStream> inputStream;
-    nsresult rv = OpenInputStream(aStartPosition, aReadCount, getter_AddRefs(inputStream));
-    if (NS_FAILED(rv)) return rv;
-    
-    AsyncReadStreamAdaptor *asyncReadStreamAdaptor;
-    asyncReadStreamAdaptor = new AsyncReadStreamAdaptor(this, inputStream);
-    if (!asyncReadStreamAdaptor)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(asyncReadStreamAdaptor);
-    mAsyncReadStream = asyncReadStreamAdaptor;
-
-    rv = asyncReadStreamAdaptor->AsyncRead(aStartPosition, aReadCount, aContext, aListener);
-    if (NS_FAILED(rv))
-        delete asyncReadStreamAdaptor;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::AsyncWrite(nsIInputStream *fromStream, PRUint32 startPosition,
-                              PRInt32 writeCount, nsISupports *ctxt,
-                              nsIStreamObserver *observer)
-{
-    // Not required to be implemented
-    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::GetContentType(char* *aContentType)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::GetContentLength(PRInt32 *aContentLength)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::GetOwner(nsISupports* *aOwner)
-{
-    *aOwner = mOwner.get();
-    NS_IF_ADDREF(*aOwner);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::SetOwner(nsISupports* aOwner)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    mOwner = aOwner;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMemCacheChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-    // Not required to be implemented, since it is implemented by cache manager
-    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}

mozilla/netwerk/cache/memcache/nsMemCacheChannel.h

@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-#ifndef _nsMemCacheChannel_h_
-#define _nsMemCacheChannel_h_
-
-#include "nsMemCacheRecord.h"
-#include "nsIChannel.h"
-#include "nsIInputStream.h"
-#include "nsCOMPtr.h"
-
-
-class AsyncReadStreamAdaptor;
-
-class nsMemCacheChannel : public nsIChannel
-{
-public:
-    // Constructors and Destructor
-    nsMemCacheChannel(nsMemCacheRecord *aRecord, nsILoadGroup *aLoadGroup);
-    virtual ~nsMemCacheChannel();
-
-    // Declare nsISupports methods
-    NS_DECL_ISUPPORTS
-
-    // Declare nsIRequest methods
-    NS_DECL_NSIREQUEST
-
-    // Declare nsIChannel methods
-    NS_DECL_NSICHANNEL
-
-protected:
-    void NotifyStorageInUse(PRInt32 aBytesUsed);
-
-    nsCOMPtr<nsMemCacheRecord>   mRecord;
-    nsCOMPtr<nsIInputStream>     mInputStream;
-    nsCOMPtr<nsISupports>        mOwner;
-    AsyncReadStreamAdaptor*      mAsyncReadStream; // non-owning pointer
-
-    friend class MemCacheWriteStreamWrapper;
-    friend class AsyncReadStreamAdaptor;
-};
-
-#endif // _nsMemCacheChannel_h_

mozilla/netwerk/cache/memcache/nsMemCacheRecord.cpp

@@ -1,164 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-#include "nsMemCache.h"
-#include "nsMemCacheRecord.h"
-#include "nsMemCacheChannel.h"
-#include "nsIAllocator.h"
-#include "nsStorageStream.h"
-
-static NS_DEFINE_IID(kINetDataCacheRecord, NS_INETDATACACHERECORD_IID);
-
-nsMemCacheRecord::nsMemCacheRecord()
-    : mKey(0), mKeyLength(0), mMetaData(0), mMetaDataLength(0), mNumChannels(0)
-{
-    NS_INIT_REFCNT();
-}
-
-nsMemCacheRecord::~nsMemCacheRecord()
-{
-    if (mMetaData)
-        delete[] mMetaData;
-    if (mKey)
-        delete[] mKey;
-}	
-     
-NS_IMPL_ISUPPORTS(nsMemCacheRecord, NS_GET_IID(nsINetDataCacheRecord))
-
-NS_IMETHODIMP
-nsMemCacheRecord::GetKey(PRUint32 *aLength, char **aResult)
-{
-    NS_ENSURE_ARG(aResult);
-    *aResult = (char *)nsAllocator::Alloc(mKeyLength);
-    if (!*aResult)
-        return NS_ERROR_OUT_OF_MEMORY;
-    memcpy(*aResult, mKey, mKeyLength);
-    *aLength = mKeyLength;
-    return NS_OK;
-}
-
-nsresult
-nsMemCacheRecord::Init(const char *aKey, PRUint32 aKeyLength,
-                       PRUint32 aRecordID, nsMemCache *aCache)
-{
-    nsresult rv;
-
-    NS_ASSERTION(!mKey, "Memory cache record key set multiple times");
-
-    rv = NS_NewStorageStream(MEM_CACHE_SEGMENT_SIZE, MEM_CACHE_MAX_ENTRY_SIZE,
-                             getter_AddRefs(mStorageStream));
-    if (NS_FAILED(rv)) return rv;
-
-    mKey = new char[aKeyLength];
-    if (!mKey)
-        return NS_ERROR_OUT_OF_MEMORY;
-    memcpy(mKey, aKey, aKeyLength);
-    mKeyLength = aKeyLength;
-    mRecordID = aRecordID;
-    mCache = aCache;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCacheRecord::GetRecordID(PRInt32 *aRecordID)
-{
-    NS_ENSURE_ARG(aRecordID);
-    *aRecordID = mRecordID;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCacheRecord::GetMetaData(PRUint32 *aLength, char **aResult)
-{
-    NS_ENSURE_ARG(aResult);
-
-    *aResult = 0;
-    if (mMetaDataLength) {
-        *aResult = (char*)nsAllocator::Alloc(mMetaDataLength);
-        if (!*aResult)
-            return NS_ERROR_OUT_OF_MEMORY;
-        memcpy(*aResult, mMetaData, mMetaDataLength);
-    }
-    *aLength = mMetaDataLength;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCacheRecord::SetMetaData(PRUint32 aLength, const char *aData)
-{
-    if (mMetaData)
-        delete[] mMetaData;
-    mMetaData = new char[aLength];
-    if (!mMetaData)
-        return NS_ERROR_OUT_OF_MEMORY;
-    memcpy(mMetaData, aData, aLength);
-    mMetaDataLength = aLength;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCacheRecord::GetStoredContentLength(PRUint32 *aStoredContentLength)
-{
-    NS_ENSURE_ARG(aStoredContentLength);
-    return mStorageStream->GetLength(aStoredContentLength);
-}
-
-NS_IMETHODIMP
-nsMemCacheRecord::SetStoredContentLength(PRUint32 aStoredContentLength)
-{
-    PRUint32 before, after;
-    mStorageStream->GetLength(&before);
-    nsresult rv = mStorageStream->SetLength(aStoredContentLength);
-    if (NS_FAILED(rv)) return rv;
-    mStorageStream->GetLength(&after);
-    mCache->mOccupancy -= (before - after);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMemCacheRecord::Delete(void)
-{
-    if (mNumChannels)
-        return NS_ERROR_NOT_AVAILABLE;
-  
-    return mCache->Delete(this);
-}
-
-NS_IMETHODIMP
-nsMemCacheRecord::GetFilename(nsIFileSpec* *aFilename)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMemCacheRecord::NewChannel(nsILoadGroup *aLoadGroup, nsIChannel* *aResult)
-{
-    NS_ENSURE_ARG(aResult);
-
-    nsMemCacheChannel* channel = new nsMemCacheChannel(this, aLoadGroup);
-    if (!channel)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(channel);
-    *aResult = NS_STATIC_CAST(nsIChannel*, channel);
-    return NS_OK;
-
-}

mozilla/netwerk/cache/memcache/nsMemCacheRecord.h

@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-#ifndef _nsMemCacheRecord_h_
-#define _nsMemCacheRecord_h_
-
-#include "nsINetDataCacheRecord.h"
-#include "nsIStorageStream.h"
-#include "nsCOMPtr.h"
-
-class nsMemCache;
-
-class nsMemCacheRecord : public nsINetDataCacheRecord
-{
-
-public:
-    // Declare interface methods
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSINETDATACACHERECORD
-
-protected:
-    // Constructors and Destructor
-    nsMemCacheRecord();
-    virtual ~nsMemCacheRecord();
-
-    nsresult Init(const char *aKey, PRUint32 aKeyLength,
-                  PRUint32 aRecordID, nsMemCache *aCache);
-
-    char*       mKey;              // opaque database key for this record
-    PRUint32    mKeyLength;        // length, in bytes, of mKey
-
-    PRInt32     mRecordID;         // An alternate key for this record
-
-    char*       mMetaData;         // opaque URI metadata
-    PRUint32    mMetaDataLength;   // length, in bytes, of mMetaData
-
-    nsMemCache* mCache;            // weak pointer to the cache database
-                                   //  that this record inhabits
-
-    nsCOMPtr<nsIStorageStream> mStorageStream;
-    PRUint32    mNumChannels;      // Count un-Release'ed nsIChannels
-
-    friend class nsMemCache;
-    friend class nsMemCacheChannel;
-};
-
-#endif // _nsMemCacheRecord_h_

mozilla/netwerk/cache/mgr/Makefile.in

@@ -1,55 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= nkcache 
-LIBRARY_NAME	= nkcachemgr_s
-
-REQUIRES	= nspr
-
-EXPORTS		= \
-		nsCacheManager.h \
-		$(NULL)
-
-CPPSRCS		= \
-        nsCacheManager.cpp \
-        nsCachedNetData.cpp \
-        nsReplacementPolicy.cpp \
-        nsCacheEntryChannel.cpp \
-		$(NULL)
-
-LOCAL_INCLUDES	= -I$(srcdir)/../public -I$(srcdir)/../include
-
-EXTRA_LIBS	= $(NSPR_LIBS)
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/cache/mgr/Makefile.win

@@ -1,45 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..
-
-include <$(DEPTH)/config/config.mak>
-
-MODULE = nkcache
-
-LIBRARY_NAME = nkcachemgr_s
-
-CPP_OBJS =                                   \
-	.\$(OBJDIR)\nsCacheManager.obj       \
-	.\$(OBJDIR)\nsCachedNetData.obj      \
-	.\$(OBJDIR)\nsReplacementPolicy.obj  \
-	.\$(OBJDIR)\nsCacheEntryChannel.obj  \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak> 
-
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-        rm -rf $(OBJDIR)
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-

mozilla/netwerk/cache/mgr/nsCacheEntryChannel.cpp

@@ -1,261 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott Furman, fur@netscape.com
- */
-
-#include "nsCacheManager.h"
-#include "nsCacheEntryChannel.h"
-#include "nsIOutputStream.h"
-#include "nsIIOService.h"
-#include "nsIServiceManager.h"
-#include "nsIStreamListener.h"
-
-nsCacheEntryChannel::nsCacheEntryChannel(nsCachedNetData* aCacheEntry, nsIChannel* aChannel,
-                                         nsILoadGroup* aLoadGroup):
-    nsChannelProxy(aChannel), mCacheEntry(aCacheEntry), mLoadGroup(aLoadGroup), mLoadAttributes(0)
-{
-    NS_ASSERTION(aCacheEntry->mChannelCount < 0xFF, "Overflowed channel counter");
-    mCacheEntry->mChannelCount++;
-    NS_INIT_REFCNT();
-}
-
-nsCacheEntryChannel::~nsCacheEntryChannel()
-{
-    mCacheEntry->mChannelCount--;
-}
-
-NS_IMPL_ISUPPORTS3(nsCacheEntryChannel, nsISupports, nsIChannel, nsIRequest)
-
-// A proxy for nsIOutputStream
-class CacheOutputStream : public nsIOutputStream {
-
-public:
-    CacheOutputStream(nsIOutputStream *aOutputStream, nsCachedNetData *aCacheEntry):
-        mOutputStream(aOutputStream), mCacheEntry(aCacheEntry), mStartTime(PR_Now())
-        { NS_INIT_REFCNT(); }
-
-    virtual ~CacheOutputStream() {
-        mCacheEntry->NoteDownloadTime(mStartTime, PR_Now());
-        mCacheEntry->ClearFlag(nsCachedNetData::UPDATE_IN_PROGRESS);
-    }
-    
-    NS_DECL_ISUPPORTS
-
-    NS_IMETHOD Close() {
-        return mOutputStream->Close();
-    }
-
-    NS_IMETHOD Flush() { return mOutputStream->Flush(); }
-
-    NS_IMETHOD
-    Write(const char *aBuf, PRUint32 aCount, PRUint32 *aActualBytes) {
-        nsresult rv;
-    
-        *aActualBytes = 0;
-        rv = mOutputStream->Write(aBuf, aCount, aActualBytes);
-        mCacheEntry->mLogicalLength += *aActualBytes;
-        if (NS_FAILED(rv)) return rv;
-        nsCacheManager::LimitCacheSize();
-        return rv;
-    }
-    
-protected:
-    nsCOMPtr<nsIOutputStream> mOutputStream;
-    nsCOMPtr<nsCachedNetData> mCacheEntry;
-
-    // Time at which stream was opened
-    PRTime mStartTime;
-};
-
-NS_IMPL_ISUPPORTS(CacheOutputStream, NS_GET_IID(nsIOutputStream))
-
-NS_IMETHODIMP
-nsCacheEntryChannel::OpenOutputStream(PRUint32 aStartPosition, nsIOutputStream* *aOutputStream)
-{
-    nsresult rv;
-    nsCOMPtr<nsIOutputStream> baseOutputStream;
-    
-    rv = mChannel->OpenOutputStream(aStartPosition, getter_AddRefs(baseOutputStream));
-    if (NS_FAILED(rv)) return rv;
-
-    mCacheEntry->NoteUpdate();
-    mCacheEntry->NoteAccess();
-    mCacheEntry->mLogicalLength = aStartPosition;
-
-    *aOutputStream = new CacheOutputStream(baseOutputStream, mCacheEntry);
-    if (!*aOutputStream)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(*aOutputStream);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCacheEntryChannel::OpenInputStream(PRUint32 aStartPosition, PRInt32 aReadCount,
-				     nsIInputStream* *aInputStream)
-{
-    mCacheEntry->NoteAccess();
-    return mChannel->OpenInputStream(aStartPosition, aReadCount, aInputStream);
-}
-
-class CacheManagerStreamListener: public nsIStreamListener  {
-
-    public:
-    
-    CacheManagerStreamListener(nsIStreamListener *aListener,
-                               nsILoadGroup *aLoadGroup, nsIChannel *aChannel):
-        mListener(aListener), mLoadGroup(aLoadGroup), mChannel(aChannel)
-        { NS_INIT_REFCNT(); }
-
-    virtual ~CacheManagerStreamListener() {}
-
-    private:
-
-    NS_DECL_ISUPPORTS
-
-    NS_IMETHOD
-    OnDataAvailable(nsIChannel *channel, nsISupports *aContext,
-                    nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count) {
-        return mListener->OnDataAvailable(mChannel, aContext, inStr, sourceOffset, count);
-    }
-
-    NS_IMETHOD
-    OnStartRequest(nsIChannel *channel, nsISupports *aContext) {
-        if (mLoadGroup)
-            mLoadGroup->AddChannel(mChannel, aContext);
-        return mListener->OnStartRequest(mChannel, aContext);
-    }
-
-    NS_IMETHOD
-    OnStopRequest(nsIChannel *channel, nsISupports *aContext,
-                  nsresult status, const PRUnichar *errorMsg) {
-        nsresult rv;
-        rv = mListener->OnStopRequest(mChannel, aContext, status, errorMsg);
-        if (mLoadGroup)
-            mLoadGroup->RemoveChannel(mChannel, aContext, status, errorMsg);
-        return rv;
-    }
-
-    private:
-    
-    nsCOMPtr<nsIStreamListener>  mListener;
-    nsCOMPtr<nsILoadGroup>       mLoadGroup;
-    nsCOMPtr<nsIChannel>         mChannel;
-};
-
-NS_IMPL_ISUPPORTS2(CacheManagerStreamListener, nsIStreamListener, nsIStreamObserver)
-
-NS_IMETHODIMP
-nsCacheEntryChannel::AsyncRead(PRUint32 aStartPosition, PRInt32 aReadCount,
-                               nsISupports *aContext, nsIStreamListener *aListener)
-{
-    nsresult rv;
-
-    mCacheEntry->NoteAccess();
-
-    nsCOMPtr<nsIStreamListener> headListener;
-    if (mLoadGroup) {
-        mLoadGroup->GetDefaultLoadAttributes(&mLoadAttributes);
-
-        // Create a load group "proxy" listener...
-        nsCOMPtr<nsILoadGroupListenerFactory> factory;
-        rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
-        if (NS_SUCCEEDED(rv) && factory) {
-            rv = factory->CreateLoadGroupListener(aListener, 
-                                                  getter_AddRefs(headListener));
-            if (NS_FAILED(rv)) return rv;
-        }
-
-    } else {
-        headListener = aListener;
-    }
-
-    CacheManagerStreamListener* cacheManagerStreamListener;
-    nsIChannel *channelForListener;
-
-    channelForListener = mProxyChannel ? mProxyChannel.get() : NS_STATIC_CAST(nsIChannel*, this);
-    cacheManagerStreamListener =
-        new CacheManagerStreamListener(headListener, mLoadGroup, channelForListener);
-    if (!cacheManagerStreamListener) return NS_ERROR_OUT_OF_MEMORY;
-    
-    NS_ADDREF(cacheManagerStreamListener);
-    rv = mChannel->AsyncRead(aStartPosition, aReadCount, aContext,
-                             cacheManagerStreamListener);
-    NS_RELEASE(cacheManagerStreamListener);
-
-    return rv;
-}
-
-// No async writes allowed to the cache yet
-NS_IMETHODIMP
-nsCacheEntryChannel::AsyncWrite(nsIInputStream *aFromStream, PRUint32 aStartPosition,
-				PRInt32 aWriteCount, nsISupports *aContext,
-				nsIStreamObserver *aObserver)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsCacheEntryChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-    *aLoadGroup = mLoadGroup;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCacheEntryChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
-{
-    *aLoadAttributes = mLoadAttributes;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCacheEntryChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes)
-{
-    mLoadAttributes = aLoadAttributes;
-    return NS_OK;
-}
-
-static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-
-NS_IMETHODIMP
-nsCacheEntryChannel::GetURI(nsIURI * *aURI)
-{
-    char* spec;
-    nsresult rv;
-
-    rv = mCacheEntry->GetUriSpec(&spec);
-    if (NS_FAILED(rv)) return rv;
-
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-    
-    rv = serv->NewURI(spec, 0, aURI);
-    nsAllocator::Free(spec);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsCacheEntryChannel::GetOriginalURI(nsIURI * *aURI)
-{
-    // FIXME - should return original URI passed into NewChannel() ?
-    return NS_ERROR_NOT_IMPLEMENTED;
-}

mozilla/netwerk/cache/mgr/nsCacheEntryChannel.h

@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott Furman, fur@netscape.com
- */
-
-#ifndef _nsCacheEntryChannel_h_
-#define _nsCacheEntryChannel_h_
-
-#include "nsCOMPtr.h"
-#include "nsIChannel.h"
-#include "nsCachedNetData.h"
-#include "nsILoadGroup.h"
-
-class nsIStreamListener;
-
-// A proxy for an nsIChannel, useful when only a few nsIChannel
-// methods must be overridden
-class nsChannelProxy : public nsIChannel {
-
-public:
-    NS_FORWARD_NSICHANNEL(mChannel->)
-    NS_FORWARD_NSIREQUEST(mChannel->)
-
-protected:
-    nsChannelProxy(nsIChannel* aChannel):mChannel(aChannel) {};
-    virtual ~nsChannelProxy() {};
-    nsCOMPtr<nsIChannel>      mChannel;
-};
-
-// Override several nsIChannel methods so that they interact with the cache manager
-class nsCacheEntryChannel : public nsChannelProxy {
-
-public:
-    NS_DECL_ISUPPORTS
-
-    NS_IMETHOD OpenOutputStream(PRUint32 aStartPosition, nsIOutputStream* *aOutputStream);
-    NS_IMETHOD OpenInputStream(PRUint32 aStartPosition, PRInt32 aReadCount,
-			       nsIInputStream* *aInputStream);
-    NS_IMETHOD AsyncRead(PRUint32 aStartPosition, PRInt32 aReadCount,
-			 nsISupports *aContext, nsIStreamListener *aListener);
-    NS_IMETHOD AsyncWrite(nsIInputStream *aFromStream, PRUint32 aStartPosition,
-			  PRInt32 aWriteCount, nsISupports *aContext,
-			  nsIStreamObserver *aObserver);
-    NS_IMETHOD GetLoadAttributes(nsLoadFlags *aLoadAttributes);
-    NS_IMETHOD SetLoadAttributes(nsLoadFlags aLoadAttributes);
-    NS_IMETHOD GetLoadGroup(nsILoadGroup* *aLoadGroup);
-    NS_IMETHOD GetURI(nsIURI * *aURI);
-    NS_IMETHOD GetOriginalURI(nsIURI * *aURI);
-
-protected:
-    nsCacheEntryChannel(nsCachedNetData* aCacheEntry, nsIChannel* aChannel, nsILoadGroup* aLoadGroup);
-    virtual ~nsCacheEntryChannel();
-
-    friend class nsCachedNetData;
-
-private:
-    nsCOMPtr<nsCachedNetData>    mCacheEntry;
-    nsCOMPtr<nsILoadGroup>       mLoadGroup;
-    nsCOMPtr<nsIChannel>         mProxyChannel;
-    nsLoadFlags                  mLoadAttributes;
-};
-
-#endif // _nsCacheEntryChannel_h_

mozilla/netwerk/cache/mgr/nsCacheManager.cpp

@@ -1,497 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * 
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott Furman, fur@netscape.com
- */
-
-#include "nsINetDataCache.h"
-#include "nsCacheManager.h"
-#include "nsCachedNetData.h"
-#include "nsReplacementPolicy.h"
-#include "nsString.h"
-#include "nsIURI.h"
-#include "nsHashtable.h"
-#include "nsIComponentManager.h"
-#include "nsINetDataDiskCache.h"
-
-// Limit the number of entries in the cache to conserve memory space
-// in the nsReplacementPolicy code
-#define MAX_MEM_CACHE_ENTRIES    800
-#define MAX_DISK_CACHE_ENTRIES  3200
-
-// Cache capacities in MB, overridable via APIs
-#define DEFAULT_MEMORY_CACHE_CAPACITY  1024
-#define DEFAULT_DISK_CACHE_CAPACITY   10000
-
-#define CACHE_HIGH_WATER_MARK(capacity) ((PRUint32)(0.98 * (capacity)))
-#define CACHE_LOW_WATER_MARK(capacity)  ((PRUint32)(0.97 * (capacity)))
-
-nsCacheManager* gCacheManager = 0;
-
-NS_IMPL_ISUPPORTS(nsCacheManager, NS_GET_IID(nsINetDataCacheManager))
-
-nsCacheManager::nsCacheManager()
-    : mActiveCacheRecords(0),
-    mDiskCacheCapacity(DEFAULT_DISK_CACHE_CAPACITY),
-    mMemCacheCapacity(DEFAULT_MEMORY_CACHE_CAPACITY)
-{
-    NS_ASSERTION(!gCacheManager, "Multiple cache managers created");
-    gCacheManager = this;
-    NS_INIT_REFCNT();
-}
-
-nsCacheManager::~nsCacheManager()
-{
-    gCacheManager = 0;
-    delete mActiveCacheRecords;
-    delete mMemSpaceManager;
-    delete mDiskSpaceManager;
-}
-
-nsresult
-nsCacheManager::Init()
-{
-    nsresult rv;
-
-    mActiveCacheRecords = new nsHashtable(64);
-    if (!mActiveCacheRecords)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    // Instantiate the memory cache component
-    rv = nsComponentManager::CreateInstance(NS_NETWORK_MEMORY_CACHE_PROGID,
-                                            nsnull,
-                                            NS_GET_IID(nsINetDataCache),
-                                            getter_AddRefs(mMemCache));
-    if (NS_FAILED(rv))
-        return rv;
-
-    rv = nsComponentManager::CreateInstance(NS_NETWORK_FLAT_CACHE_PROGID,
-                                            nsnull,
-                                            NS_GET_IID(nsINetDataCache),
-
-                                            getter_AddRefs(mFlatCache));
-
-    if (NS_FAILED(rv)) {
-        // For now, we don't require a flat cache module to be present
-        if (rv != NS_ERROR_FACTORY_NOT_REGISTERED)
-            return rv;
-    }
-
-#ifdef FILE_CACHE_IS_READY
-    // Instantiate the file cache component
-    rv = nsComponentManager::CreateInstance(NS_NETWORK_FILE_CACHE_PROGID,
-                                            nsnull,
-                                            NS_GET_IID(nsINetDataCache),
-                                            getter_AddRefs(mFileCache));
-    if (NS_FAILED(rv)) {
-        NS_WARNING("No disk cache present");
-    }
-#endif
-
-    // Set up linked list of caches in search order
-    mCacheSearchChain = mMemCache;
-    if (mFlatCache) {
-        mMemCache->SetNextCache(mFlatCache);
-        mFlatCache->SetNextCache(mFileCache);
-    } else {
-        mMemCache->SetNextCache(mFileCache);
-    }
-
-    // TODO - Load any extension caches here
-
-    // Initialize replacement policy for memory cache module
-    mMemSpaceManager = new nsReplacementPolicy;
-    if (!mMemSpaceManager)
-        return NS_ERROR_OUT_OF_MEMORY;
-    rv = mMemSpaceManager->Init(MAX_MEM_CACHE_ENTRIES);
-    if (NS_FAILED(rv)) return rv;
-    rv = mMemSpaceManager->AddCache(mMemCache);
-
-    // Initialize replacement policy for disk cache modules (file
-    // cache and flat cache)
-    mDiskSpaceManager = new nsReplacementPolicy;
-    if (!mDiskSpaceManager)
-        return NS_ERROR_OUT_OF_MEMORY;
-    rv = mDiskSpaceManager->Init(MAX_DISK_CACHE_ENTRIES);
-    if (NS_FAILED(rv)) return rv;
-    if (mFileCache) {
-        rv = mDiskSpaceManager->AddCache(mFileCache);
-        if (NS_FAILED(rv)) return rv;
-    }
-    if (mFlatCache) {
-        rv = mDiskSpaceManager->AddCache(mFlatCache);
-        if (NS_FAILED(rv)) return rv;
-    }
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCacheManager::GetCachedNetData(const char *aUriSpec, const char *aSecondaryKey,
-                                 PRUint32 aSecondaryKeyLength,
-                                 PRUint32 aFlags, nsICachedNetData* *aResult)
-{
-    nsCachedNetData *cachedData;
-    nsresult rv;
-    nsINetDataCache *cache;
-    nsReplacementPolicy *spaceManager;
-
-    if (aFlags & CACHE_AS_FILE) {
-        cache = mFileCache;
-        spaceManager = mDiskSpaceManager;
-
-        // Ensure that cache is initialized
-        if (mDiskCacheCapacity == (PRUint32)-1)
-            return NS_ERROR_NOT_AVAILABLE;
-
-    } else if ((aFlags & BYPASS_PERSISTENT_CACHE) ||
-               (!mFileCache && !mFlatCache) || !mDiskCacheCapacity) {
-        cache = mMemCache;
-        spaceManager = mMemSpaceManager;
-    } else {
-        cache = mFlatCache ? mFlatCache : mFileCache;
-        spaceManager = mDiskSpaceManager;
-    }
-
-    // Construct the cache key by appending the secondary key to the URI spec
-    nsCAutoString cacheKey(aUriSpec);
-
-    // Insert NUL at end of URI spec
-    cacheKey += '\0';
-    if (aSecondaryKey)
-        cacheKey.Append(aSecondaryKey, aSecondaryKeyLength);
-
-    nsStringKey key(cacheKey);
-    cachedData = (nsCachedNetData*)mActiveCacheRecords->Get(&key);
-
-    // There is no existing instance of nsCachedNetData for this URL.
-    // Make one from the corresponding record in the cache module.
-    if (cachedData) {
-        NS_ASSERTION(cache == cachedData->mCache,
-                     "Cannot yet handle simultaneously active requests for the "
-                     "same URL using different caches");
-        NS_ADDREF(cachedData);
-    } else {
-        rv = spaceManager->GetCachedNetData(cacheKey.GetBuffer(), cacheKey.Length(),
-                                            cache, &cachedData);
-        if (NS_FAILED(rv)) return rv;
-
-        mActiveCacheRecords->Put(&key, cachedData);
-    }
-    
-    *aResult = cachedData;
-    return NS_OK;
-}
-
-// Remove this cache entry from the list of active ones
-nsresult
-nsCacheManager::NoteDormant(nsCachedNetData* aEntry)
-{
-    nsresult rv;
-    PRUint32 keyLength;
-    char* key;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    nsCachedNetData* deletedEntry;
-
-    rv = aEntry->GetRecord(getter_AddRefs(record));
-    if (NS_FAILED(rv)) return rv;
-    
-    rv = record->GetKey(&keyLength, &key);
-    if (NS_FAILED(rv)) return rv;
-    
-    nsStringKey hashTableKey(nsCString(key, keyLength));
-    deletedEntry = (nsCachedNetData*)gCacheManager->mActiveCacheRecords->Remove(&hashTableKey);
-//  NS_ASSERTION(deletedEntry == aEntry, "Hash table inconsistency");
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCacheManager::Contains(const char *aUriSpec, const char *aSecondaryKey,
-                         PRUint32 aSecondaryKeyLength,
-                         PRUint32 aFlags, PRBool *aResult)
-{
-    nsINetDataCache *cache;
-    nsReplacementPolicy *spaceManager;
-    nsCachedNetData *cachedData;
-
-    if (aFlags & CACHE_AS_FILE) {
-        cache = mFileCache;
-        spaceManager = mDiskSpaceManager;
-    } else if ((aFlags & BYPASS_PERSISTENT_CACHE) ||
-               (!mFileCache && !mFlatCache) || !mDiskCacheCapacity) {
-        cache = mMemCache;
-        spaceManager = mMemSpaceManager;
-    } else {
-        cache = mFlatCache ? mFlatCache : mFileCache;
-        spaceManager = mDiskSpaceManager;
-    }
-
-    // Construct the cache key by appending the secondary key to the URI spec
-    nsCAutoString cacheKey(aUriSpec);
-
-    // Insert NUL between URI spec and secondary key
-    cacheKey += '\0';
-    cacheKey.Append(aSecondaryKey, aSecondaryKeyLength);
-
-    // Locate the record using (URI + secondary key)
-    nsStringKey key(cacheKey);
-    cachedData = (nsCachedNetData*)mActiveCacheRecords->Get(&key);
-
-    if (cachedData && (cache == cachedData->mCache)) {
-        *aResult = PR_TRUE;
-        return NS_OK;
-    } else {
-        // No active cache entry, see if there is a dormant one
-        return cache->Contains(cacheKey.GetBuffer(), cacheKey.Length(), aResult);
-    }
-}
-
-NS_IMETHODIMP
-nsCacheManager::GetNumEntries(PRUint32 *aNumEntries)
-{
-    nsresult rv;
-    nsCOMPtr<nsISimpleEnumerator> iterator;
-    nsCOMPtr<nsISupports> cacheSupports;
-    nsCOMPtr<nsINetDataCache> cache;
-
-    PRUint32 totalEntries = 0;
-    
-    rv = NewCacheModuleIterator(getter_AddRefs(iterator));
-    if (NS_FAILED(rv)) return rv;
-    while (1) {
-        PRBool notDone;
-        rv = iterator->HasMoreElements(&notDone);
-        if (NS_FAILED(rv)) return rv;
-        if (!notDone)
-            break;
-        
-        iterator->GetNext(getter_AddRefs(cacheSupports));
-        cache = do_QueryInterface(cacheSupports);
-        
-        PRUint32 numEntries;
-        rv = cache->GetNumEntries(&numEntries);
-        if (NS_FAILED(rv)) return rv;
-        totalEntries += numEntries;
-    }
-    
-    *aNumEntries = totalEntries;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCacheManager::NewCacheEntryIterator(nsISimpleEnumerator* *aResult)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-class CacheEnumerator : public nsISimpleEnumerator
-{
-public:
-    CacheEnumerator(nsINetDataCache* aFirstCache):mCache(aFirstCache)
-        { NS_INIT_REFCNT(); }
-
-    virtual ~CacheEnumerator() {};
-    
-    NS_DECL_ISUPPORTS
-
-    NS_IMETHODIMP
-    HasMoreElements(PRBool* aMoreElements) {
-        *aMoreElements = (mCache != 0);
-        return NS_OK;
-    }
-
-    NS_IMETHODIMP
-    GetNext(nsISupports* *aSupports) {
-        *aSupports = mCache;
-        if (!mCache)
-            return NS_ERROR_FAILURE;
-        NS_ADDREF(*aSupports);
-
-        nsCOMPtr<nsINetDataCache> nextCache;
-        nsresult rv = mCache->GetNextCache(getter_AddRefs(nextCache));
-        mCache = nextCache;
-        return rv;
-    }
-
-private:
-    nsCOMPtr<nsINetDataCache> mCache;
-};
-
-NS_IMPL_ISUPPORTS(CacheEnumerator, NS_GET_IID(nsISimpleEnumerator))
-
-NS_IMETHODIMP
-nsCacheManager::NewCacheModuleIterator(nsISimpleEnumerator* *aResult)
-{
-    *aResult = new CacheEnumerator(mCacheSearchChain);
-    if (!*aResult)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(*aResult);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCacheManager::RemoveAll(void)
-{
-    nsresult rv, result;
-    nsCOMPtr<nsISimpleEnumerator> iterator;
-    nsCOMPtr<nsINetDataCache> cache;
-    nsCOMPtr<nsISupports> iSupports;
-
-    result = NS_OK;
-    rv = NewCacheModuleIterator(getter_AddRefs(iterator));
-    if (NS_FAILED(rv)) return rv;
-    while (1) {
-        PRBool notDone;
-        rv = iterator->HasMoreElements(&notDone);
-        if (NS_FAILED(rv)) return rv;
-        if (!notDone)
-            break;
-        
-        iterator->GetNext(getter_AddRefs(iSupports));
-        cache = do_QueryInterface(iSupports);
-
-        PRUint32 cacheFlags;
-        rv = cache->GetFlags(&cacheFlags);
-        if (NS_FAILED(rv)) return rv;
-        
-        if ((cacheFlags & nsINetDataCache::READ_ONLY) == 0) {
-            rv = cache->RemoveAll();
-            if (NS_FAILED(rv))
-                result = rv;
-        }
-    }
-
-    return result;
-}
-
-nsresult
-nsCacheManager::LimitMemCacheSize()
-{
-    nsresult rv;
-    nsReplacementPolicy* spaceManager;
-
-    NS_ASSERTION(gCacheManager, "No cache manager");
-
-    spaceManager = gCacheManager->mMemSpaceManager;
-
-    PRUint32 occupancy;
-    rv = spaceManager->GetStorageInUse(&occupancy);
-    if (NS_FAILED(rv)) return rv;
-
-    PRUint32 memCacheCapacity = gCacheManager->mMemCacheCapacity;
-    if (occupancy > CACHE_HIGH_WATER_MARK(memCacheCapacity))
-        return spaceManager->Evict(CACHE_LOW_WATER_MARK(memCacheCapacity));
-
-    return NS_OK;
-}
-
-nsresult
-nsCacheManager::LimitDiskCacheSize()
-{
-    nsresult rv;
-    nsReplacementPolicy* spaceManager;
-
-    NS_ASSERTION(gCacheManager, "No cache manager");
-
-    spaceManager = gCacheManager->mDiskSpaceManager;
-
-    PRUint32 occupancy;
-    rv = spaceManager->GetStorageInUse(&occupancy);
-    if (NS_FAILED(rv)) return rv;
-
-    PRUint32 diskCacheCapacity = gCacheManager->mDiskCacheCapacity;
-    if (occupancy > CACHE_HIGH_WATER_MARK(diskCacheCapacity))
-        return spaceManager->Evict(CACHE_LOW_WATER_MARK(diskCacheCapacity));
-
-    return NS_OK;
-}
-
-nsresult
-nsCacheManager::LimitCacheSize()
-{
-    nsresult rv;
-
-    rv = LimitDiskCacheSize();
-    if (NS_FAILED(rv)) return rv;
-
-    rv = LimitMemCacheSize();
-    if (NS_FAILED(rv)) return rv;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCacheManager::SetMemCacheCapacity(PRUint32 aCapacity)
-{
-    mMemCacheCapacity = aCapacity;
-    LimitCacheSize();
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCacheManager::GetMemCacheCapacity(PRUint32* aCapacity)
-{
-    NS_ENSURE_ARG_POINTER(aCapacity);
-    *aCapacity = mMemCacheCapacity;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCacheManager::SetDiskCacheCapacity(PRUint32 aCapacity)
-{
-    mDiskCacheCapacity = aCapacity;
-    LimitCacheSize();
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCacheManager::GetDiskCacheCapacity(PRUint32* aCapacity)
-{
-    NS_ENSURE_ARG_POINTER(aCapacity);
-    *aCapacity = mDiskCacheCapacity;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsCacheManager::SetDiskCacheFolder(nsIFileSpec* aFolder)
-{
-    NS_ENSURE_ARG(aFolder);
-
-    if (!mFileCache)
-        return NS_ERROR_NOT_AVAILABLE;
-
-    nsCOMPtr<nsINetDataDiskCache> fileCache;
-    fileCache = do_QueryInterface(mFileCache);
-    return fileCache->SetDiskCacheFolder(aFolder);
-}
-
-NS_IMETHODIMP
-nsCacheManager::GetDiskCacheFolder(nsIFileSpec* *aFolder)
-{
-    NS_ENSURE_ARG(aFolder);
-
-    if (!mFileCache)
-        return NS_ERROR_NOT_AVAILABLE;
-
-    nsCOMPtr<nsINetDataDiskCache> fileCache;
-    fileCache = do_QueryInterface(mFileCache);
-    return fileCache->GetDiskCacheFolder(aFolder);
-}

mozilla/netwerk/cache/mgr/nsCacheManager.h

@@ -1,100 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott Furman, fur@netscape.com
- */
-
-#ifndef _nsCacheManager_h_
-#define _nsCacheManager_h_
-
-// 2030f0b0-9567-11d3-90d3-0040056a906e
-#define NS_CACHE_MANAGER_CID                              \
-    {                                                     \
-        0x2030f0b0,                                       \
-        0x9567,                                           \
-        0x11d3,                                           \
-        {0x90, 0xd3, 0x00, 0x40, 0x05, 0x6a, 0x90, 0x6e}  \
-    }
-
-#include "nsINetDataCacheManager.h"
-#include "nsINetDataCache.h"
-#include "nsCOMPtr.h"
-
-class nsHashtable;
-class nsReplacementPolicy;
-class nsCachedNetData;
-
-class nsCacheManager : public nsINetDataCacheManager {
-
-public:
-    nsCacheManager();
-    virtual ~nsCacheManager();
-
-    NS_METHOD Init();
-
-    // nsISupports methods
-    NS_DECL_ISUPPORTS
-
-    // nsINetDataCacheManager methods
-    NS_DECL_NSINETDATACACHEMANAGER
-
-private:
-	
-    // Mapping from cache key to nsCachedNetData, but only for those cache
-    // entries with external references, i.e. those referred to outside the
-    // cache manager
-    nsHashtable*              mActiveCacheRecords;
-
-    // Memory cache
-    nsCOMPtr<nsINetDataCache> mMemCache;
-
-    // Flat-file database cache; All content aggregated into single disk file
-    nsCOMPtr<nsINetDataCache> mFlatCache;
-
-    // stream-as-file cache
-    nsCOMPtr<nsINetDataCache> mFileCache;
-
-    // Unified replacement policy for flat-cache and file-cache
-    nsReplacementPolicy*      mDiskSpaceManager;
-    
-    // Replacement policy for memory cache
-    nsReplacementPolicy*      mMemSpaceManager;
-
-    // List of caches in search order
-    nsINetDataCache*          mCacheSearchChain;
-
-    // Combined file/flat cache capacity, in KB
-    PRUint32                  mDiskCacheCapacity;
-
-    // Memory cache capacity, in KB
-    PRUint32                  mMemCacheCapacity;
-
-protected:
-    static nsresult NoteDormant(nsCachedNetData* aEntry);
-    static nsresult LimitCacheSize();
-    static nsresult LimitMemCacheSize();
-    static nsresult LimitDiskCacheSize();
-
-    friend class nsCachedNetData;
-    friend class CacheOutputStream;
-};
-
-#endif // _nsCacheManager_h_

mozilla/netwerk/cache/mgr/nsCachedNetData.h

@@ -1,242 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott Furman, fur@netscape.com
- */
-
-#ifndef _nsCachedNetData_h_
-#define _nsCachedNetData_h_
-
-#include "nsICachedNetData.h"
-#include "nsCOMPtr.h"
-#include "nsINetDataCacheRecord.h"
-
-class nsINetDataCache;
-class nsIStreamAsFileObserver;
-class nsIStreamAsFile;
-class nsIArena;
-class StreamAsFileObserverClosure;
-class CacheMetaData;
-
-// Number of recent access times recorded
-#define MAX_K  3
-
-/**
- * FIXME - add comment.  There are a lot of these data structures resident in
- * memory, so be careful about adding members unnecessarily.
- */
-class nsCachedNetData : public nsICachedNetData {
-
-public:
-    NS_DECL_ISUPPORTS
-
-    // nsICachedNetData methods
-    NS_DECL_NSICACHEDNETDATA
-
-    NS_METHOD Init(nsINetDataCacheRecord *aRecord, nsINetDataCache *aCache);
-
-protected:
-
-    // Bits for mFlags, below
-    typedef enum {
-        DIRTY               = 1 << 0, // Cache entry data needs to be flushed to database
-
-    // ==== Flags that can be set by the protocol handler ====
-        ALLOW_PARTIAL       = 1 << 1, // Protocol handler supports partial fetching
-        UPDATE_IN_PROGRESS  = 1 << 2, // Protocol handler now modifying cache data
-
-    // ==== Cache-entry state flags.  At most one of these flags can be set ====
-        TRUNCATED_CONTENT   = 1 << 4, // Entry contains valid content, but it has
-                                      //   been truncated by cache manager
-
-        // A previously-used cache entry, which has been purged of all cached
-        // content and protocol-private data.  This cache entry can be refilled
-        // with new content or it may be retained in this vestigial state
-        // because the usage statistics it contains will be used by the
-        // replacement policy if the same URI is ever cached again.
-        VESTIGIAL           = 1 << 5,
-
-    // ==== Memory usage status bits.  At most one of these flags can be set ====
-        RECYCLED            = 1 << 8, // Previously associated database record has
-                                      //   been deleted; This cache entry is available
-                                      //   for recycling.
-
-        DORMANT             = 1 << 9, // No references to this cache entry, except by
-                                      //   the cache manager itself
-        
-    // ==== Setter bits ====
-        LAST_MODIFIED_KNOWN = 1 <<12, // Protocol handler called SetLastModifiedTime()
-        EXPIRATION_KNOWN    = 1 <<13, // Protocol handler called SetExpirationTime()
-        STALE_TIME_KNOWN    = 1 <<14, // Protocol handler called SetStaleTime()
-
-    // ==== Useful flag combinations ====
-        // Cache entry not eligible for eviction
-        UNEVICTABLE         = VESTIGIAL | RECYCLED | UPDATE_IN_PROGRESS,
-        
-        // State flags that are in-memory only, i.e. not persistent 
-        TRANSIENT_FLAGS     = DIRTY | RECYCLED | DORMANT
-    } Flag;
-
-    PRBool GetFlag(Flag aFlag) { return (mFlags & aFlag) != 0; }
-    nsresult GetFlag(PRBool *aResult, Flag aFlag) { *aResult = GetFlag(aFlag); return NS_OK; }
-
-    // Set a boolean flag for the cache entry
-    nsresult SetFlag(PRBool aValue, Flag aFlag);
-    nsresult SetFlag(Flag aFlag)   { return SetFlag(PR_TRUE,  aFlag); }
-    nsresult ClearFlag(Flag aFlag) { return SetFlag(PR_FALSE, aFlag); }
-
-    void ComputeProfit(PRUint32 aCurrentTime);
-    static int Compare(const void *a, const void *b, void *unused);
-
-    void NoteAccess();
-    void NoteUpdate();
-
-    // Get underlying raw cache database record.
-    nsresult GetRecord(nsINetDataCacheRecord* *aRecord);
-
-    nsresult GetRecordID(PRInt32 *aRecordID);
-
-    nsresult Evict(PRUint32 aTruncatedContentLength);
-    
-    nsresult GetFileSpec(nsIFileSpec* *aFileSpec);
-
-    void NoteDownloadTime(PRTime start, PRTime end);
-
-    // placement new for arena-allocation
-    void *operator new (size_t aSize, nsIArena *aArena);
-
-    friend class nsReplacementPolicy;
-    friend class nsCacheManager;
-    friend class StreamAsFile;
-    friend class nsCacheEntryChannel;
-    friend class CacheOutputStream;
-    friend class InterceptStreamListener;
-
-private:
-
-    nsCachedNetData() {};
-    virtual ~nsCachedNetData() {};
-
-    // Initialize internal fields of this nsCachedNetData instance from the
-    // underlying raw cache database record.
-    nsresult Deserialize(PRBool aDeserializeFlags);
-
-    // Notify stream-as-file observers about change in cache entry status
-    nsresult Notify(PRUint32 aMessage, nsresult aError);
-
-    // Add/Remove stream-as-file observers
-    nsresult AddObserver(nsIStreamAsFile *aStreamAsFile, nsIStreamAsFileObserver* aObserver);
-    nsresult RemoveObserver(nsIStreamAsFileObserver* aObserver);
-
-    // Mark cache entry to indicate a write out to the cache database is required
-    void SetDirty() { mFlags |= DIRTY; }
-
-    nsresult Resurrect(nsINetDataCacheRecord *aRecord);
-
-    nsresult CommitFlags();
-
-    CacheMetaData* FindTaggedMetaData(const char* aTag, PRBool aCreate);
-
-private:
-    
-    // List of nsIStreamAsFileObserver's that will receive notification events
-    // when the cache manager or a client desires to delete/truncate a cache
-    // entry file.
-    StreamAsFileObserverClosure* mObservers;
-
-    // Protocol-specific meta-data, opaque to the cache manager
-    CacheMetaData *mMetaData;
-
-    // Next in chain for a single bucket in the replacement policy hash table
-    // that maps from record ID to nsCachedNetData
-    nsCachedNetData* mNext;
-    
-    // See flag bits, above
-    // NOTE: 16 bit member is combined with members below for
-    //       struct packing efficiency.  Do not change order of members!
-    PRUint16    mFlags;
-
-protected:
-
-    // Number of nsCacheEntryChannels referring to this record
-    PRUint8     mChannelCount;
-
-    // Below members are statistics kept per cache-entry, used to decide how
-    // profitable it will be to evict a record from the cache relative to other
-    // existing records.  Note: times are measured in *seconds* since the
-    // 1/1/70 epoch, same as a unix time_t.
-
-    // Number of accesses for this cache record
-    // NOTE: 8 bit member is combined with members above for
-    //       struct packing efficiency.  Do not change order of members!
-    PRUint8     mNumAccesses;
-
-    // A reference to the underlying, raw cache database record, either as a
-    // pointer to an in-memory object or as a database record identifier
-    union {
-        nsINetDataCacheRecord* mRecord;
-
-        // Database record ID of associated cache record.  See
-        // nsINetDataCache::GetRecordByID().
-        PRInt32  mRecordID;
-    };
-
-    // Weak link to parent cache
-    nsINetDataCache* mCache;
-
-    // Length of stored content, which may be less than storage consumed if
-    // compression is used
-    PRUint32 mLogicalLength;
-
-    // Most recent cache entry access times, used to compute access frequency
-    PRUint32 mAccessTime[MAX_K];
-    
-    // We use modification time of the original document for replacement policy
-    // computations, i.e. to compute a document's age, but if we don't know it,
-    // we use the time that the document was last written to the cache.
-    union {
-        // Document modification time, if known.
-        PRUint32 mLastModifiedTime;
-
-        // Time of last cache update for this doc
-        PRUint32 mLastUpdateTime;
-    };
-
-    union {
-      // Time until which document is fresh, i.e. does not have to be validated
-      // with server and, therefore, data in cache is guaranteed usable
-      PRUint32 mExpirationTime;
-
-      // Heuristic time at which cached document is likely to be out-of-date
-      // with respect to canonical copy on server.  Used for cache replacement
-      // policy, not for validation.
-      PRUint32 mStaleTime;
-    };
-
-    // Download time per byte, measure roughly in units of KB/s
-    float mDownloadRate;
-    
-    // Heuristic estimate of cache entry future benefits, based on above values
-    float mProfit;
-};
-
-#endif // _nsCachedNetData_h_
-

mozilla/netwerk/cache/mgr/nsReplacementPolicy.cpp

@@ -1,666 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott Furman, fur@netscape.com
- */
-
-#include "nsReplacementPolicy.h"
-#include "nsCachedNetData.h"
-
-#include "nsQuickSort.h"
-#include "nsIAllocator.h"
-#include "nsIEnumerator.h"
-#include "prtime.h"
-#include "prbit.h"
-#include "nsCOMPtr.h"
-#include <math.h>
-
-// Constant used to estimate frequency of access to a document based on size
-#define CACHE_CONST_B   1.35
-
-// A cache whose space is managed by this replacement policy
-class nsReplacementPolicy::CacheInfo {
-public:
-    CacheInfo(nsINetDataCache* aCache):mCache(aCache),mNext(0) {}
-
-    nsINetDataCache* mCache;
-    CacheInfo*       mNext;
-};
-
-nsReplacementPolicy::nsReplacementPolicy()
-    : mRankedEntries(0), mCaches(0), mRecordsRemovedSinceLastRanking(0),
-      mNumEntries(0), mCapacityRankedEntriesArray(0), mLastRankTime(0) {}
-
-nsReplacementPolicy::~nsReplacementPolicy()
-{
-    if (mRankedEntries)
-        nsAllocator::Free(mRankedEntries);
-    if (mMapRecordIdToEntry)
-        nsAllocator::Free(mMapRecordIdToEntry);
-}
-
-nsresult
-nsReplacementPolicy::Init(PRUint32 aMaxCacheEntries)
-{
-    nsresult rv;
-
-    rv = NS_NewHeapArena(getter_AddRefs(mArena), sizeof(nsCachedNetData) * 32);
-    if (NS_FAILED(rv)) return rv;
-
-    mMaxEntries = aMaxCacheEntries;
-
-    mHashArrayLength = PR_CeilingLog2(aMaxCacheEntries) >> 3;
-    size_t numBytes = mHashArrayLength * sizeof(*mMapRecordIdToEntry);
-    mMapRecordIdToEntry = (nsCachedNetData**)nsAllocator::Alloc(numBytes);
-    if (!mMapRecordIdToEntry)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    nsCRT::zero(mMapRecordIdToEntry, numBytes);
-
-    return NS_OK;
-}
-
-nsresult
-nsReplacementPolicy::AddCache(nsINetDataCache *aCache)
-{
-    CacheInfo *cacheInfo = new CacheInfo(aCache);
-    if (!cacheInfo)
-        return NS_ERROR_OUT_OF_MEMORY;
-    cacheInfo->mNext = mCaches;
-    mCaches = cacheInfo;
-    return NS_OK;
-}
-
-PRUint32
-nsReplacementPolicy::HashRecordID(PRInt32 aRecordID)
-{
-    return ((aRecordID >> 16) ^ aRecordID) & (mHashArrayLength - 1);
-}
-
-nsCachedNetData*
-nsReplacementPolicy::FindCacheEntryByRecordID(PRInt32 aRecordID, nsINetDataCache *aCache)
-{
-    nsresult rv;
-    nsCachedNetData* cacheEntry;
-    PRUint32 bucket = HashRecordID(aRecordID);
-
-    cacheEntry = mMapRecordIdToEntry[bucket];
-    for (;cacheEntry; cacheEntry = cacheEntry->mNext) {
-
-        PRInt32 recordID;
-        rv = cacheEntry->GetRecordID(&recordID);
-        if (NS_FAILED(rv))
-            continue;
-
-        if ((recordID == aRecordID) && (cacheEntry->mCache == aCache))
-            return cacheEntry;
-    }
-
-    return 0;
-}
-
-// Add a cache entry to the hash table that maps record ID to entries
-void
-nsReplacementPolicy::AddCacheEntry(nsCachedNetData* aCacheEntry, PRInt32 aRecordID)
-{
-    nsCachedNetData** cacheEntryp;
-    PRUint32 bucket = HashRecordID(aRecordID);
-
-    cacheEntryp = &mMapRecordIdToEntry[bucket];
-    while (*cacheEntryp)
-        cacheEntryp = &(*cacheEntryp)->mNext;
-    *cacheEntryp = aCacheEntry;
-    aCacheEntry->mNext = 0;
-}
-
-// Delete a cache entry from the hash table that maps record ID to entries
-nsresult
-nsReplacementPolicy::DeleteCacheEntry(nsCachedNetData* aCacheEntry)
-{
-    nsresult rv;
-    PRInt32 recordID;
-    rv = aCacheEntry->GetRecordID(&recordID);
-    if (NS_FAILED(rv)) return rv;
-
-    PRUint32 bucket = HashRecordID(recordID);
-
-    nsCachedNetData** cacheEntryp;
-    cacheEntryp = &mMapRecordIdToEntry[bucket];
-    while (*cacheEntryp) {
-        if (*cacheEntryp == aCacheEntry) {
-            *cacheEntryp = aCacheEntry->mNext;
-            return NS_OK;
-        }
-        cacheEntryp = &(*cacheEntryp)->mNext;
-    }
-    
-    NS_ASSERTION(0, "hash table inconsistency");
-    return NS_ERROR_FAILURE;
-}
-
-nsresult
-nsReplacementPolicy::AddAllRecordsInCache(nsINetDataCache *aCache)
-{
-    nsresult rv;
-    nsCOMPtr<nsISimpleEnumerator> iterator;
-    nsCOMPtr<nsISupports> iSupports;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    rv = aCache->NewCacheEntryIterator(getter_AddRefs(iterator));
-    if (!NS_SUCCEEDED(rv)) return rv;
-
-    while (1) {
-        PRBool notDone;
-
-        rv = iterator->HasMoreElements(&notDone);
-        if (NS_FAILED(rv)) return rv;
-        if (!notDone)
-            break;
-
-        rv = iterator->GetNext(getter_AddRefs(iSupports));
-        if (!NS_SUCCEEDED(rv)) return rv;
-        record = do_QueryInterface(iSupports);
-        
-        rv = AssociateCacheEntryWithRecord(record, aCache, 0);
-        if (!NS_SUCCEEDED(rv)) return rv;
-    }
-
-    return NS_OK;
-}
-
-// Get current time and convert to seconds since the epoch
-static PRUint32
-now32()
-{
-    double nowFP;
-    PRInt64 now64 = PR_Now();
-    LL_L2D(nowFP, now64);
-    PRUint32 now = (PRUint32)(nowFP * 1e-6);
-    return now;
-}
-
-void
-nsCachedNetData::NoteDownloadTime(PRTime start, PRTime end)
-{
-    double startFP, endFP, rate, duration;
-
-    LL_L2D(startFP, start);
-    LL_L2D(endFP, end);
-
-    duration = endFP - startFP;
-
-    // If the data arrives so fast that it can not be timed due to the clock
-    // granularity, assume a data arrival duration of 10 ms
-    if (!duration)
-        duration = 10000;
-
-    // Compute download rate in kB/s
-    rate = mLogicalLength / (duration * (1e-6 * 1024.0));
-    
-    if (mDownloadRate) {
-        // Exponentially smooth download rate
-        const double alpha = 0.5;
-        mDownloadRate = (float)(mDownloadRate * alpha + rate * (1.0 - alpha));
-    } else {
-        mDownloadRate = (float)rate;
-    }
-}
-
-// 1 hour
-#define MIN_HALFLIFE (60 * 60)
-
-// 1 week
-#define TYPICAL_HALFLIFE (7 * 24 * 60 * 60)
-
-/**
- * Estimate the profit that would be lost if the given cache entry was evicted
- * from the cache.  Profit is defined as the future expected download delay per
- * byte of cached content.  The profit computation is made based on projected
- * frequency of access, prior download performance and a heuristic staleness
- * criteria.  The technique used is a variation of that described in the
- * following paper:
- *
- *    "A Case for Delay-Conscious Caching of Web Documents"
- *    http://www.bell-labs.com/user/rvingral/www97.html
- *
- * Briefly, expected profit is:
- *
- *   (projected frequency of access) * (download time per byte) * (probability freshness)
- */
-void
-nsCachedNetData::ComputeProfit(PRUint32 aNow)
-{
-    PRUint32 K, now;
-
-    if (aNow)
-        now = aNow;
-    else
-        now = now32();
-    
-    K = PR_MIN(MAX_K, mNumAccesses);
-    if (!K) {
-        mProfit = 0;
-        return;
-    }
-
-    // Compute time, in seconds, since k'th most recent access
-    double timeSinceKthAccess = now - mAccessTime[K - 1];
-    if (timeSinceKthAccess <= 0.0)    // Sanity check
-        timeSinceKthAccess = 1.0;
-
-    // Estimate frequency of future document access based on past
-    //  access frequency
-    double frequencyAccess = K / timeSinceKthAccess;
-
-    // If we don't have much historical data on access frequency
-    //   use a heuristic based on document size as an estimate
-    if (mLogicalLength) {
-        if (K == 1) {
-            frequencyAccess /= pow(mLogicalLength, CACHE_CONST_B);
-        } else if (K == 2) {
-            frequencyAccess /= pow(mLogicalLength, CACHE_CONST_B / 2);
-        }
-    }
-
-    // Estimate likelihood that data in cache is fresh, i.e.
-    //  that it corresponds to the document on the server
-    double probabilityFreshness;
-    PRInt32 halfLife, age, docTime;
-    PRBool potentiallyStale;
-
-    docTime = GetFlag(LAST_MODIFIED_KNOWN) ? mLastModifiedTime : mLastUpdateTime;
-    age = now - docTime;
-
-    probabilityFreshness = 1.0; // Optimistic
-
-    if (GetFlag(EXPIRATION_KNOWN)) {
-        potentiallyStale = now > mExpirationTime;
-        halfLife = mExpirationTime - mLastModifiedTime;
-    } else if (GetFlag(STALE_TIME_KNOWN)) {
-        potentiallyStale = PR_TRUE;
-        halfLife = mStaleTime - docTime;
-    } else {
-        potentiallyStale = PR_TRUE;
-        halfLife = TYPICAL_HALFLIFE;
-    }
-    
-    if (potentiallyStale) {
-        if (halfLife < MIN_HALFLIFE)
-            halfLife = MIN_HALFLIFE;
-
-        probabilityFreshness = pow(0.5, (double)age / (double)halfLife);
-    }
-
-    mProfit = (float)(frequencyAccess * probabilityFreshness);
-    if (mDownloadRate)
-        mProfit /= mDownloadRate;
-}
-
-// Number of entries to grow mRankedEntries array when it's full
-#define STATS_GROWTH_INCREMENT  256
-
-
-// Sorting predicate for NS_Quicksort
-int
-nsCachedNetData::Compare(const void *a, const void *b, void *unused)
-{
-    nsCachedNetData* entryA = *(nsCachedNetData**)a;
-    nsCachedNetData* entryB = *(nsCachedNetData**)b;
-
-    // Percolate deleted or empty entries to the end of the mRankedEntries
-    // array, so that they can be recycled.
-    if (!entryA || entryA->GetFlag(RECYCLED)) {
-        if (!entryB || entryB->GetFlag(RECYCLED))
-            return 0;
-        else 
-            return +1;
-    } 
-    if (!entryB || entryB->GetFlag(RECYCLED))
-        return -1;
-
-    // Evicted entries (those with no content data) and active entries (those
-    // currently being updated) are collected towards the end of the sorted
-    // array just prior to the deleted cache entries, since evicted entries
-    // can't be re-evicted.
-    if (entryA->GetFlag(UPDATE_IN_PROGRESS)) {
-        if (entryB->GetFlag(UPDATE_IN_PROGRESS))
-            return 0;
-        else 
-            return +1;
-    } 
-    if (entryB->GetFlag(UPDATE_IN_PROGRESS))
-        return -1;
-
-    PRUint16 Ka = PR_MIN(MAX_K, entryA->mNumAccesses);
-    PRUint16 Kb = PR_MIN(MAX_K, entryB->mNumAccesses);
-
-    // Order cache entries by the number of times they've been accessed
-    if (Ka < Kb)
-        return -1;
-    if (Ka > Kb)
-        return +1;
-
-    /*
-     * Among records that have been accessed an equal number of times, order
-     * them by profit.
-     */
-    if (entryA->mProfit > entryB->mProfit)
-        return +1;
-    if (entryA->mProfit < entryB->mProfit)
-        return -1;
-    return 0;
-}
-
-/**
- * Rank cache entries in terms of their elegibility for eviction.
- */
-nsresult
-nsReplacementPolicy::RankRecords()
-{
-    PRUint32 i, now;
-
-    // Add all cache records if this is the first ranking
-    if (!mLastRankTime) {
-        nsresult rv;
-        CacheInfo *cacheInfo;
-
-        cacheInfo = mCaches;
-        while (cacheInfo) {
-            rv = AddAllRecordsInCache(cacheInfo->mCache);
-            if (NS_FAILED(rv)) return rv;
-
-            cacheInfo = cacheInfo->mNext;
-        }
-    }
-
-    // Get current time and convert to seconds since the epoch
-    now = now32();
-
-    // Recompute profit for every known cache record, except deleted ones
-    for (i = 0; i < mNumEntries; i++) {
-        nsCachedNetData* entry = mRankedEntries[i];
-        if (entry && !entry->GetFlag(nsCachedNetData::RECYCLED))
-            entry->ComputeProfit(now);
-    }
-    NS_QuickSort(mRankedEntries, mNumEntries, sizeof *mRankedEntries, 
-                 nsCachedNetData::Compare, 0);
-
-    mNumEntries -= mRecordsRemovedSinceLastRanking;
-    mRecordsRemovedSinceLastRanking = 0;
-    mLastRankTime = now;
-    return NS_OK;
-}
-
-// A heuristic policy to avoid the cost of re-ranking cache records by
-// profitability every single time space must be made available in the cache.
-void
-nsReplacementPolicy::MaybeRerankRecords()
-{
-    // Rank at most once per minute
-    PRUint32 now = now32();
-    if ((now - mLastRankTime) >= 60)
-        RankRecords();
-}
-
-void
-nsReplacementPolicy::CompactRankedEntriesArray()
-{
-    if (mRecordsRemovedSinceLastRanking || !mLastRankTime)
-        RankRecords();
-}
-
-nsresult
-nsReplacementPolicy::CheckForTooManyCacheEntries()
-{
-    if (mCapacityRankedEntriesArray == mMaxEntries) {
-        return DeleteOneEntry(0);
-    } else {
-        nsresult rv;
-        CacheInfo *cacheInfo;
-
-        cacheInfo = mCaches;
-        while (cacheInfo) {
-            PRUint32 numEntries, maxEntries;
-
-            rv = cacheInfo->mCache->GetNumEntries(&numEntries);
-            if (NS_FAILED(rv)) return rv;
-
-            rv = cacheInfo->mCache->GetMaxEntries(&maxEntries);
-            if (NS_FAILED(rv)) return rv;
-
-            if (numEntries == maxEntries)
-                return DeleteOneEntry(cacheInfo->mCache);
-
-            cacheInfo = cacheInfo->mNext;
-        }
-    }
-    return NS_OK;
-}
-
-
-/** 
- * Create a new association between a low-level cache database record and a
- * cache entry.  Add the entry to the set of entries eligible for eviction from
- * the cache.  This would typically be done when the cache entry is created.
- */
-nsresult
-nsReplacementPolicy::AssociateCacheEntryWithRecord(nsINetDataCacheRecord *aRecord,
-                                                   nsINetDataCache* aCache,
-                                                   nsCachedNetData** aResult)
-{
-    nsCachedNetData* cacheEntry;
-    nsresult rv;
-
-    // First, see if the record is already known to the replacement policy
-    PRInt32 recordID;
-    rv = aRecord->GetRecordID(&recordID);
-    if (NS_FAILED(rv)) return rv;
-    cacheEntry = FindCacheEntryByRecordID(recordID, aCache);
-    if (cacheEntry) {
-        if (aResult) {
-            if (cacheEntry->GetFlag(nsCachedNetData::DORMANT))
-                cacheEntry->Resurrect(aRecord);
-            NS_ADDREF(cacheEntry);
-            *aResult = cacheEntry;
-        }
-        return NS_OK;
-    }
-
-    // Compact the array of cache entry statistics, so that free entries appear
-    // at the end, for possible reuse.
-    if (mNumEntries && (mNumEntries == mCapacityRankedEntriesArray))
-        CompactRankedEntriesArray();
-
-    // If compaction doesn't yield available entries in the
-    // mRankedEntries array, then extend the array.
-    if (mNumEntries == mCapacityRankedEntriesArray) {
-        PRUint32 newCapacity;
-
-        rv = CheckForTooManyCacheEntries();
-        if (NS_FAILED(rv)) return rv;
-
-        newCapacity = mCapacityRankedEntriesArray + STATS_GROWTH_INCREMENT;
-        if (newCapacity > mMaxEntries)
-            newCapacity = mMaxEntries;
-
-        nsCachedNetData** newRankedEntriesArray; 
-        PRUint32 numBytes = sizeof(nsCachedNetData*) * newCapacity;
-        newRankedEntriesArray = 
-            (nsCachedNetData**)nsAllocator::Realloc(mRankedEntries, numBytes);
-        if (!newRankedEntriesArray)
-            return NS_ERROR_OUT_OF_MEMORY;
-        
-        mRankedEntries = newRankedEntriesArray;
-        mCapacityRankedEntriesArray = newCapacity;
-
-        PRUint32 i;
-        for (i = mNumEntries; i < newCapacity; i++)
-            mRankedEntries[i] = 0;
-    }
-
-    // Recycle the record after the last in-use record in the array
-    nsCachedNetData *entry = mRankedEntries[mNumEntries];
-    NS_ASSERTION(!entry || !entry->GetFlag(nsCachedNetData::RECYCLED),
-                 "Only deleted cache entries should appear at end of array");
-
-    if (!entry) {
-        entry = new(mArena) nsCachedNetData;
-        if (!entry)
-            return NS_ERROR_OUT_OF_MEMORY;
-        mRankedEntries[mNumEntries] = entry;
-    } else {
-        // Clear out recycled data structure
-        nsCRT::zero(entry, sizeof(*entry));
-    }
-
-    entry->Init(aRecord, aCache);
-    AddCacheEntry(entry, recordID);
-    
-    // Add one reference to the cache entry from the cache manager
-    NS_ADDREF(entry);
-
-    if (aResult) {
-        // And one reference from our caller
-        NS_ADDREF(entry);
-        *aResult = entry;
-    }
-
-    mNumEntries++;
-    return NS_OK;
-}
-
-nsresult
-nsReplacementPolicy::GetCachedNetData(const char* cacheKey, PRUint32 cacheKeyLength,
-                                      nsINetDataCache* aCache,
-                                      nsCachedNetData** aResult)
-{
-    nsresult rv;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-
-    rv = aCache->GetCachedNetData(cacheKey, cacheKeyLength,
-                                  getter_AddRefs(record));
-    if (NS_FAILED(rv)) return rv;
-    return AssociateCacheEntryWithRecord(record, aCache, aResult);
-}
-
-/**
- * Delete the least desirable record from the cache database.  This is used
- * when the addition of another record would exceed either the cache manager or
- * the cache's maximum permitted number of records.
- */
-nsresult
-nsReplacementPolicy::DeleteOneEntry(nsINetDataCache *aCache)
-{
-    PRUint32 i;
-    nsresult rv;
-    nsCachedNetData *entry;
-
-    i = 0;
-    while (1) {
-        MaybeRerankRecords();
-        for (; i < mNumEntries; i++) {
-            entry = mRankedEntries[i];
-            if (!entry || entry->GetFlag(nsCachedNetData::RECYCLED))
-                continue;
-            if (!aCache || (entry->mCache == aCache))
-                break;
-        }
-
-        // Report error if no record found to delete
-        if (i == mNumEntries)
-            return NS_ERROR_FAILURE;
-        rv = entry->Delete();
-        if (NS_SUCCEEDED(rv)) {
-            rv = DeleteCacheEntry(entry);
-            return rv;
-        }
-    }
-}
-
-nsresult
-nsReplacementPolicy::GetStorageInUse(PRUint32* aStorageInUse)
-{
-    nsresult rv;
-    CacheInfo *cacheInfo;
-
-    *aStorageInUse = 0;
-    cacheInfo = mCaches;
-    while (cacheInfo) {
-        PRUint32 cacheStorage;
-        rv = cacheInfo->mCache->GetStorageInUse(&cacheStorage);
-        if (NS_FAILED(rv)) return rv;
-
-        *aStorageInUse += cacheStorage;
-        cacheInfo = cacheInfo->mNext;
-    }
-    return NS_OK;
-}
-
-/**
- * Delete the least desirable records from the cache until the occupancy of the
- * cache has been reduced by the given number of KB.  This is used when the
- * addition of more cache data would exceed the cache's capacity. 
- */
-nsresult
-nsReplacementPolicy::Evict(PRUint32 aTargetOccupancy)
-{
-    PRUint32 i;
-    nsCachedNetData *entry;
-    nsresult rv;
-    PRUint32 occupancy;
-    PRInt32 truncatedLength;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-
-    MaybeRerankRecords();
-    for (i = 0; i < mNumEntries; i++) {
-        rv = GetStorageInUse(&occupancy);
-        if (!NS_SUCCEEDED(rv)) return rv;
-        
-        if (occupancy <= aTargetOccupancy)
-            return NS_OK;
-
-        entry = mRankedEntries[i];
-
-        // Skip deleted/empty cache entries and ones that have already been evicted
-        if (!entry || entry->GetFlag(nsCachedNetData::UNEVICTABLE))
-            continue;
-
-        if (entry->GetFlag(nsCachedNetData::ALLOW_PARTIAL)) {
-            rv = entry->GetRecord(getter_AddRefs(record));
-            if (NS_FAILED(rv))
-                continue;
-
-            PRUint32 contentLength;
-            rv = record->GetStoredContentLength(&contentLength);
-            if (NS_FAILED(rv))
-                continue;
-            
-            // Additional cache storage required, in KB
-            PRUint32 storageToReclaim = (occupancy - aTargetOccupancy) << 10;
-            
-            truncatedLength = (PRInt32)(contentLength - storageToReclaim);
-            if (truncatedLength < 0)
-                truncatedLength = 0;
-        } else {
-            truncatedLength = 0;
-        }
-        rv = entry->Evict(truncatedLength);
-    }
-    return NS_ERROR_FAILURE;
-}

mozilla/netwerk/cache/mgr/nsReplacementPolicy.h

@@ -1,136 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott Furman, fur@netscape.com
- */
-
-/**
- * This class manages one or more caches that share a storage resource, e.g. a
- * file cache and a flat-database cache might each occupy space on the disk and
- * they would share a single instance of nsReplacementPolicy.  The replacement
- * policy heuristically chooses which cache entries to evict when storage is
- * required to accommodate incoming cache data.
- */
-
-#ifndef _nsReplacementPolicy_h_
-#define _nsReplacementPolicy_h_
-
-#include "nscore.h"
-#include "nsISupportsUtils.h"
-#include "nsINetDataCache.h"
-#include "nsICachedNetData.h"
-#include "nsIArena.h"
-#include "nsCOMPtr.h"
-#include "nsHashtable.h"
-
-class nsCachedNetData;
-struct PL_HashTable;
-
-/**
- * This private class is responsible for implementing the network data cache's
- * replacement policy, i.e. it decides which cache data should be evicted to
- * make room for new incoming data.
- */
-class nsReplacementPolicy {
-
-public:
-
-    nsReplacementPolicy();
-    ~nsReplacementPolicy();
-
-protected:
-
-    nsresult Init(PRUint32 aMaxCacheEntries);
-    nsresult AddCache(nsINetDataCache *aCache);
-    nsresult GetCachedNetData(const char* cacheKey, PRUint32 cacheKeyLength,
-                              nsINetDataCache* aCache,
-                              nsCachedNetData** aResult);
-    nsresult GetStorageInUse(PRUint32* aNumKBytes);
-
-    friend class nsCacheManager;
-
-private:
-    nsresult RankRecords();
-    void MaybeRerankRecords();
-    void CompactRankedEntriesArray();
-    nsresult DeleteOneEntry(nsINetDataCache* aCache);
-    nsresult Evict(PRUint32 aTargetOccupancy);
-
-    nsCachedNetData* FindCacheEntryByRecordID(PRInt32 aRecordID, nsINetDataCache *aCache);
-    void AddCacheEntry(nsCachedNetData* aCacheEntry, PRInt32 aRecordID);
-    nsresult DeleteCacheEntry(nsCachedNetData* aCacheEntry);
-    PRUint32 HashRecordID(PRInt32 aRecordID);
-    nsresult AssociateCacheEntryWithRecord(nsINetDataCacheRecord *aRecord,
-                                           nsINetDataCache* aCache,
-                                           nsCachedNetData** aResult);
-
-    nsresult AddAllRecordsInCache(nsINetDataCache *aCache);
-    nsresult CheckForTooManyCacheEntries();
-
-    class CacheInfo;
-
-private:
-
-    // Growable array of pointers to individual cache entries; It is sorted by
-    // profitability, such that low-numbered array indices refer to cache
-    // entries that are the least profitable to retain.  New cache entries are
-    // added to the end of the array.  Deleted cache entries are specially
-    // marked and percolate to the end of the array for recycling whenever
-    // mRankedEntries is sorted.  Evicted cache entries (those with no
-    // associated content data) are retained for the purpose of improving the
-    // replacement policy efficacy, and are percolated towards the end of the
-    // array, just prior to the deleted cache entries.
-    //
-    // The array is not in sorted order 100% of the time; For efficiency
-    // reasons, sorting is only done when heuristically deemed necessary.
-    nsCachedNetData**   mRankedEntries;
-
-    // Hash table buckets to map Record ID to cache entry.  We use this instead
-    // of a PL_HashTable to reduce storage requirements
-    nsCachedNetData**   mMapRecordIdToEntry;
-
-    // Length of mMapRecordIdToEntry array
-    PRUint32            mHashArrayLength;
-
-    // Linked list of caches that share this replacement policy
-    CacheInfo*          mCaches;
-
-    // Allocation area for cache entry (nsCachedNetData) instances
-    nsCOMPtr<nsIArena>  mArena;
-
-    // Bookkeeping
-    PRUint32            mRecordsRemovedSinceLastRanking;
-
-    // Maximum permitted length of mRankedEntries array
-    PRUint32            mMaxEntries;
-
-    // Number of occupied slots in mRankedEntries array
-    PRUint32            mNumEntries;
-
-    // Capacity of mRankedEntries array
-    PRUint32            mCapacityRankedEntriesArray;
-
-    // Time at which cache entries were last ranked by profitability
-    PRUint32            mLastRankTime;
-};
-
-
-#endif // _nsReplacementPolicy_h_

mozilla/netwerk/cache/public/Makefile.in

@@ -1,43 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-MODULE		= nkcache
-
-include $(DEPTH)/config/autoconf.mk
-
-XPIDLSRCS	= \
-		nsICachedNetData.idl          \
-	        nsINetDataCacheManager.idl    \
-		nsINetDataCache.idl           \
-		nsINetDataCacheRecord.idl     \
-	        nsINetDataDiskCache.idl       \
-		nsIStreamAsFile.idl           \
-	        $(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/cache/public/Makefile.win

@@ -1,41 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-MODULE = nkcache
-
-DEPTH = ..\..\..
-include <$(DEPTH)/config/config.mak>
-
-
-EXPORTS =                   \
-        $(NULL)
-
-XPIDLSRCS =                             \
-        .\nsICachedNetData.idl          \
-        .\nsINetDataCacheManager.idl    \
-        .\nsINetDataCache.idl           \
-        .\nsINetDataCacheRecord.idl     \
-        .\nsINetDataDiskCache.idl       \
-        .\nsIStreamAsFile.idl           \
-        $(NULL)
-
-include <$(DEPTH)/config/rules.mak>
-

mozilla/netwerk/cache/public/nsICachedNetData.idl

@@ -1,229 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsrootidl.idl"
-#include "nsISupports.idl"
-
-interface nsIFileSpec;
-interface nsIURI;
-interface nsIObserver;
-interface nsIChannel;
-interface nsINetDataCache;
-interface nsINetDataCacheRecord;
-interface nsILoadGroup;
-interface nsIStreamListener;
-
-/**
- * The nsICachedNetData interface represents a single entry in a database that
- * caches data retrieved from the network. This interface is implemented by the
- * cache manager on top of the low-level nsINetDataCacheRecord and
- * nsINetDataCache interfaces that are implemented by the database.
- *
- * Each cache record may contain both content and metadata.  The content may
- * be, for example, GIF image data or HTML, and it is accessed through
- * nsIChannel's streaming API.  The opaque metadata, which may contain HTTP
- * headers among other things, is stored as a byte array.  Each entry in the
- * cache is indexed by two different keys: a record id number and a key created
- * by combining the URI with a "secondary key", e.g. HTTP post data.
- *
- * @See nsINetDataCacheRecord
- * @See nsINetDataCache
- * @See nsINetDataDiskCache
- * @See nsINetDataCacheManager
- */
-[scriptable, uuid(6aeb2a40-6d43-11d3-90c8-000064657374)]
-interface nsICachedNetData : nsISupports
-{
-    /**
-     * String form of the URI provided as an argument to the call to
-     * nsINetDataCacheManager::GetCachedNetData() that created this record.
-     */
-    readonly attribute string uriSpec;
-    
-    /**
-     * Getter for the opaque secondary database key provided as an argument to
-     * the call to nsINetDataCacheManager::GetCachedNetData() that created this
-     * record.
-     */
-    void getSecondaryKey(out unsigned long length,
-                         [retval, size_is(length)] out string secondaryKey);
-
-    /**
-     * This flag may be set by a protocol handler to indicate that it supports
-     * partial fetching of data.  In that case, the cache manager is permitted
-     * to truncate the entry's content to accommodate incoming data for other
-     * cache entries rather than deleting it wholesale.
-     */
-    attribute boolean allowPartial;
-    
-    /**
-     * This flag indicates that the write stream supplying content data for the
-     * cache did not complete normally and, therefore, the content may be
-     * truncated.
-     */
-    readonly attribute boolean partialFlag;
-
-    /**
-     * This flag can be set and cleared by a protocol handler as a form of
-     * self-notification, so as to avoid race conditions in which a protocol
-     * handler issues two identical network requests to fill the same cache
-     * entry.  The cache manager itself largely ignores this flag.
-     */
-    attribute boolean updateInProgress;
-
-    /**
-     * inUse is set if any existing channels are associated with this cache
-     * entry or if the updateInProgess flag is set.  This can be used to
-     * prevent writing to a cache entry by a protocol handler if it's being
-     * read or written elsewhere.
-     */
-    readonly attribute boolean inUse;
-
-    /**
-     * Date/time that the document was last stored on the origin server, as
-     * supplied by the protocol handler.  This value is used as input to the
-     * cache replacement policy, i.e. it is not used for validation.  If the
-     * protocol can't supply a last-modified time, this attribute should remain
-     * unset.  When unset, the value of this attribute is zero.
-     *
-     * FIXME: Should use nsIDateTime interface, once it's created
-     * instead of PRTime, for improved scriptability ? 
-     */
-    attribute PRTime lastModifiedTime;
-
-    /**
-     * Supplied by the protocol handler, the expirationTime attribute specifies
-     * the time until which the document is guaranteed fresh, i.e. the document
-     * does not have to be validated with the server and, therefore, any data
-     * in cache is definitely usable.  The value of this attribute serves as a
-     * hint to the cache replacement policy.  Only one of either staleTime or
-     * expirationTime may be set for a single cache record.  When unset, the
-     * value of this attribute is zero. 
-     */
-    attribute PRTime expirationTime;
-
-    /**
-     * Date/time supplied by the protocol handler, at which point the content
-     * is *likely* to be stale, i.e. the data in the cache may be out-of-date
-     * with respect to the data on the server.  This heuristic date does not
-     * necessarily correspond to the HTTP Expires header, as it does not
-     * determine when cached network data must be validated with the origin
-     * server, but only serves as a hint to the cache replacement policy.  Only
-     * one of either staleTime or expirationTime may be set for a single cache
-     * record.  When unset, the value of this attribute is zero.
-     */
-    attribute PRTime staleTime;
-
-    /**
-     * Date/time of last access of the data in this cache record, as determined
-     * by the cache manager.
-     */
-    readonly attribute PRTime lastAccessTime;
-
-    /**
-     * Number of times this record has been accessed since it was first stored.
-     */
-    readonly attribute PRUint16 numberAccesses;
-
-    /**
-     * Accessor methods for opaque meta-data which can be read and updated
-     * independently of the content data.
-     *
-     * The aTag argument can be used to accommodate multiple clients of the
-     * cache API, each of which wants to store its own private meta-data into
-     * the cache.  For example, there could be a "headers" tag that the HTTP
-     * protocol handler uses to store http response headers and a "image size"
-     * tag used to store the image dimensions of a GIF file.  The aData
-     * argument refers to an opaque blob of arbitrary bytes.
-     *
-     * IMPORTANT: If aData does not contain byte-oriented data, i.e. it's not a
-     *            string, the contents of aData must be byte-swapped by the,
-     *            caller, so as to make the cache files endian-independent.
-     */
-    void getAnnotation(in string aTag, 
-                       out PRUint32 aLength, [size_is(aLength), retval] out string aData);
-    void setAnnotation(in string aTag,
-                       in  PRUint32 aLength, [size_is(aLength)] in string aData);
-
-    /**
-     * As a getter, return the number of content bytes stored in the cache,
-     * i.e. via the nsIChannel streaming APIs.  This may be less than the
-     * complete content length if a partial cache fill occurred.  The cached
-     * content can be truncated by setting the value of this attribute.  The
-     * value of the attribute represents a logical, not a physical, length.  If
-     * compression has been used, the content may consume less storage than
-     * indicated by this attribute.
-     *
-     * When this attribute is set to zero the associated cache disk file, if
-     * any, should be deleted.
-     */
-    attribute PRUint32 storedContentLength;
-
-    /** 
-     * Notify any observers associated with this cache entry of the deletion
-     * request.  If all observers drop their reference to the cache entry,
-     * proceed to delete the underlying cache database record and associated
-     * content storage.
-     */
-    void delete();
-
-    /**
-     * Flush any changes in this entry's data to the cache database.  This
-     * method will automatically be called when the last reference to the cache
-     * is dropped, but it can also be called explicitly for a synchronous
-     * effect.
-     */
-    void commit();
-
-    /**
-     * Parent container cache for this entry.
-     */
-    readonly attribute nsINetDataCache cache;
-
-    /**
-     * Create a channel for reading or writing a stream of content into the
-     * entry.  It is expected that many of the nsIChannel methods return
-     * NS_NOT_IMPLEMENTED, including:
-     *
-     *    + GetURI()
-     *    + GetContentType()
-     *    + GetContentLength()
-     *
-     * Though nsIChannel provides for both async and synchronous I/O APIs, both
-     * may not be implemented.  Only AsyncRead() and OpenOutputStream() is
-     * required.  The aProxyChannel argument allows another channel to be
-     * specified as the proffered argument to nsIStreamListener methods rather
-     * than the cache's own channel.
-     */
-    nsIChannel newChannel(in nsILoadGroup aLoadGroup,
-                          in nsIChannel aProxyChannel);
-
-    /**
-     * This method can be used by a caching protocol handler to store data in
-     * the cache by forking an asynchronous read stream so that it is
-     * simultaneously sent to a requester and written into the cache.  This
-     * method implicitly sets the updateInProgress flag, if it has not already
-     * been set.
-     */
-    nsIStreamListener interceptAsyncRead(in nsIStreamListener aOriginalListener,
-                                         in PRUint32 aStartOffset);
-};

mozilla/netwerk/cache/public/nsINetDataCache.idl

@@ -1,143 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-interface nsIURI;
-interface nsINetDataCacheRecord;
-interface nsISimpleEnumerator;
-interface nsIFileSpec;
-
-/**
- * The nsINetDataCache defines the low-level API for a network-data
- * cache, used to cache the responses to network retrieval commands.
- * This interface, along with nsINetDataCacheRecord, is implemented by
- * the memory cache, the file cache and, optionally, by some extension
- * caches.  This interface is essentially a pseudo-private API for the
- * cache manager.  Other clients should never use this interface.
- *
- * Each cache entry may contain both content, e.g. GIF image data, and
- * associated metadata, e.g. HTTP headers.  Each entry is indexed by two
- * different keys: a record id number and a key created by combining the URI
- * with a "secondary key", e.g. HTTP post data.
- *
- * The nsINetDataCache interface is agnostic as to where the data is
- * stored and whether the storage is volatile or persistent.  The
- * memory cache, any disk caches and any extension caches must all
- * implement this interface.
- *
- */
-[scriptable, uuid(ccfc58c0-6dde-11d3-90c8-000064657374)]
-interface nsINetDataCache : nsISupports
-{
-	/**
-	 * Human-readable description of the cache module, e.g. "Disk Cache"
-	 */
-	readonly attribute wstring description;
-  
-    /**
-     * Returns true if cached data is available for the given opaque key,
-     * even if only partial data is stored.
-     */
-    boolean contains([size_is(length)] in string key, in PRUint32 length);
-
-    /**
-     * Fetch the cache entry record for the given opaque key.  If one does not
-     * exist, create a new, empty record.
-     */
-    nsINetDataCacheRecord getCachedNetData([size_is(length)] in string key,
-                                           in PRUint32 length);
-
-    /**
-     * Fetch the cache entry record for the given URI using the record ID as a key.
-     */
-    nsINetDataCacheRecord getCachedNetDataByID(in PRInt32 RecordID);
-
-	/**
-	 * False indicates that this cache is entirely bypassed.
-	 */
-    attribute boolean enabled;
-
-    /**
-     * Constants for flags attribute, below
-     */
-
-    // Used for extension caches, e.g. a CD-ROM cache
-    const long READ_ONLY          = 1 << 0;
-
-    // One of these bits must be set
-    const long MEMORY_CACHE       = 1 << 1;
-    const long FLAT_FILE_CACHE    = 1 << 2;
-    const long FILE_PER_URL_CACHE = 1 << 3;
-
-	/**
-	 * See constants defined above.
-	 */
-	readonly attribute PRUint32 flags;
-
-    /**
-     * Total number of URI entries stored in the cache.
-     */
-    readonly attribute PRUint32 numEntries;
-
-    /**
-     * Maximum number of URI entries that may be stored in the cache.
-     */
-    readonly attribute PRUint32 maxEntries;
-
-    /**
-     * Enumerate the URI entries stored in the cache.
-     */
-    nsISimpleEnumerator newCacheEntryIterator();
-
-	/**
-	 * Contains a reference to the next cache in search order.  For the memory
-	 * cache, this attribute always references the disk cache.  For the disk
-	 * cache, it contains a reference to the first extension cache.
-	 */
-    attribute nsINetDataCache nextCache;
-
-    /**
-     * An estimate of the amount of storage occupied by the cache, in kB.
-     * Actual use may be slightly higher than reported due to cache overhead
-     * and heap fragmentation (in the memory cache) or block quantization (in
-     * the disk cache).
-	 */
-    readonly attribute PRUint32 storageInUse;
-
-    /**
-     * Remove all entries from a writable cache.  This could be used, for
-     * example, after a guest ends a browser session.  This is equivalent to
-     * setting the cache's Capacity to zero, except that all cache entries,
-     * even those in active use, will be deleted.  Also, any global cache
-     * database files will be deleted.
-	 */
-    void removeAll();
-};
-
-%{ C++
-// ProgID prefix for Components that implement this interface
-#define NS_NETWORK_CACHE_PROGID "component://netscape/network/cache"
-#define NS_NETWORK_MEMORY_CACHE_PROGID NS_NETWORK_CACHE_PROGID "?name=memory-cache"
-#define NS_NETWORK_FLAT_CACHE_PROGID   NS_NETWORK_CACHE_PROGID "?name=flat-cache"
-#define NS_NETWORK_FILE_CACHE_PROGID   NS_NETWORK_CACHE_PROGID "?name=file-cache"
-%}

mozilla/netwerk/cache/public/nsINetDataCacheManager.idl

@@ -1,163 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-interface nsISimpleEnumerator;
-interface nsICachedNetData;
-interface nsINetDataCache;
-interface nsINetDataDiskCache;
-interface nsIURI;
-interface nsIFileSpec;
-
-/**
- * The network-response cache manager is partly responsible for the caching of
- * content and associated metadata that has been retrieved via the network.
- * (The remaining responsibility for caching lies with individual network
- * protocol handlers.)
- *
- * The cache manager supervises the actions of individual cache components,
- * such as the memory cache, the disk cache and any extension caches, e.g. a
- * read-only CD-ROM cache.
- *
- * @See nsINetDataCache
- * @See nsICachedNetData
- */
-[scriptable, uuid(71c8ab00-6d5c-11d3-90c8-000064657374)]
-interface nsINetDataCacheManager : nsISupports
-{
-    /**
-     * Flag for the GetCachedNetData() method: If set, the memory cache is
-     * neither searched nor will any data be stored into it.  This might be
-     * appropriate, for example, with images, because they have their own
-     * cache for storing *decoded* images.
-     */
-    const unsigned long BYPASS_MEMORY_CACHE       = 1 << 0;
-
-    /**
-     * Flag for the GetCachedNetData() method: If set, the disk cache
-     * is neither searched nor will any be data stored into it.
-     * However, read-only extension caches may be searched.  This
-     * might be used to avoid leaving persistent records of secure
-     * data.
-     */
-    const unsigned long BYPASS_PERSISTENT_CACHE   = 1 << 1;
-
-    /**
-     * Flag for the GetCachedNetData() method: If set, any stream
-     * content is stored in the cache as a single disk file.  Content
-     * will not be cached in the memory cache nor is it cached in a
-     * flat-file cache database.  This is used to implement the jar
-     * protocol handler and to provide the stream-as-file semantics
-     * required by the classic bowser plugin API.
-     */
-    const unsigned long CACHE_AS_FILE             = 1 << 2;
-
-    /**
-     * Fetch the cache entry record for the given URI.  If one does not exist,
-     * create a new, empty record.  The normal search order for caches is:
-     *   + Memory cache
-     *   + Disk cache
-     *   + File cache (stream-as-file cache)
-     *   + All extension caches
-     *
-     * When writing, data is typically stored in both the memory cache and the
-     * disk cache.  Both the search order and this write policy can be modified by
-     * setting one or more of the flag argument bits, as defined above.
-     *
-     * The optionally-NULL secondaryKey argument can be used, e.g. for form
-     * post data or for HTTP headers in the case of HTTP.
-     */
-    nsICachedNetData getCachedNetData(in string uri,
-                                      [size_is(secondaryKeyLength)] in string secondaryKey,
-                                      in PRUint32 secondaryKeyLength,
-                                      in PRUint32 flags);
-
-    /**
-     * Returns true if cached content is available for the given URI, even if
-     * only partial data is stored.  The flags argument behaves the same as for
-     * the GetCachedNetData() method, above.
-     */
-    boolean contains(in string uri,
-                     [size_is(secondaryKeyLength)] in string secondaryKey,
-                     in PRUint32 secondaryKeyLength,
-                     in PRUint32 flags);
-
-    /**
-     * Total number of unexpired URI entries stored in all caches.  This number
-     * does not take into account duplicate URIs, e.g. because the memory cache
-     * and the disk cache might each contain an entry for the same URI.
-     */
-    readonly attribute PRUint32 numEntries;
-
-    /**
-     * Enumerate the unexpired URI entries stored in all caches.  Some URIs may
-     * be enumerated more than once, e.g.  because the the memory cache and the
-     * disk cache might each contain an entry for the same URI.
-     */
-    nsISimpleEnumerator newCacheEntryIterator();
-
-    /*
-     * Enumerate all the loaded nsINetDataCache-implementing cache modules.
-     * The first module enumerated will be the memory cache, the second will be
-     * the disk cache, then the file cache, followed by all the extension
-     * caches, in search order. 
-     */
-    nsISimpleEnumerator newCacheModuleIterator();
-
-    /**
-     * Remove all entries from all writable caches.  This could be used, for
-     * example, after a guest ends a browser session.  This is equivalent to
-     * setting the DiskCacheCapacity to zero, except that all cache entries,
-     * even those in active use, will be deleted.  Also, any global cache
-     * database files will be deleted.
-     */
-    void RemoveAll();
-
-    /**
-     * The disk cache is made up of the file cache (for stream-as-file
-     * requests) and a (possibly independent) persistent cache that handles all
-     * other cache requests.  This attribute sets/gets the combined capacity of
-     * these caches, measured in KBytes.  Setting the capacity lower than the
-     * current amount of space currently in use may cause cache entries to be
-     * evicted from the cache to accomodate the requested capacity.
-     */
-    attribute PRUint32 diskCacheCapacity;
-
-    /**
-     * This attribute sets/gets the capacity of the memory cache, measured in
-     * KBytes.  Setting the capacity lower than the current amount of space
-     * currently in use may cause cache entries to be evicted from the cache to
-     * accomodate the requested capacity.
-     */
-    attribute PRUint32 memCacheCapacity;
-
-	/**
-	 * This attribute must be set before attempting to store into the disk cache.
-	 */
-    attribute nsIFileSpec diskCacheFolder;
-};
-
-%{ C++
-// ProgID prefix for Components that implement this interface
-#define NS_NETWORK_CACHE_MANAGER_PROGID NS_NETWORK_CACHE_PROGID "?name=manager"
-%}

mozilla/netwerk/cache/public/nsINetDataCacheRecord.idl

@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "nsrootidl.idl"
-
-interface nsIFileSpec;
-interface nsIChannel;
-interface nsINetDataCache;
-
-/**
- * The nsINetDataCacheRecord represents a single entry in a database that
- * caches data retrieved from the network. On top of this low-level interface
- * to the raw record data, the cache manager implements a higher-level record
- * interface, nsICachedNetData.  Each instance of nsINetDataCacheRecord is
- * (internally) associated with a parent database, an instance of the
- * nsINetDataCache interface.  This interface is essentially a pseudo-private
- * API for the cache manager.  Other clients should never use this interface.
- *
- * Each cache record may contain both content and metadata.  The content may
- * be, for example, GIF image data or HTML, and it is accessed through
- * nsIChannel's streaming API.  The opaque metadata, which may contain HTTP
- * headers among other things, is accessed as a contiguous byte array.  Each
- * entry in the cache is indexed by two different keys: a unique record id
- * number, generated by the cache, and an opaque string.  The latter contains
- * the URI and other secondary key information, e.g. HTTP form post key/value
- * pairs.
- *
- * The nsINetDataCacheRecord interface is agnostic as to where the data is
- * stored and whether the storage is volatile or persistent.  The memory cache,
- * the disk cache, a flat-file cache and any read-only extension caches must
- * all implement this interface.
- *
- * @See nsICachedNetData
- * @See nsINetDataCache
- * @See nsINetDataDiskCache
- * @See nsINetDataCacheManager
- */
-
-interface nsILoadGroup;
-
-[scriptable, uuid(fdcdd6a0-7461-11d3-90ca-0040056a906e)]
-interface nsINetDataCacheRecord : nsISupports
-{
-    /**
-     * As far as the nsINetDataCacheRecord implementation is concerned, the
-     * cache entry database key is an opaque blob, but it's intended to contain
-     * both the URI and any secondary keys, such as HTTP post data.
-     */
-    void getKey(out unsigned long length, [size_is(length), retval] out string key);
-
-    /**
-     * A persistent record number assigned by the cache which must be unique
-     * among all entries stored within the same cache.  The record ID serves as
-     * an alternate key to the cache record.  Providing that they satisfy the
-     * afforementioned uniqueness requirement, record IDs can be assigned any
-     * value by the database except that they may never be zero.
-     */
-    readonly attribute PRInt32 recordID;
-
-    /**
-     * Opaque data which can be updated for each cache entry independently of
-     * the content data.  This data is a combination of protocol-independent
-     * data provided by the cache manager and protocol-specific meta-data,
-     * e.g. HTTP headers.
-     */
-    void getMetaData(out PRUint32 length, [size_is(length), retval] out string metaData);
-    void setMetaData(in  PRUint32 length, [size_is(length)] in string data);
-
-    /**
-     * Number of content bytes stored in the cache, i.e. via the nsIChannel
-     * streaming APIs.  This may be less than the complete content length if a
-     * partial cache fill occurred.  Additionally, the cached content can be
-     * truncated by reducing the value of this attribute.  When this attribute
-     * is set to zero the associated cache disk file, if any, should be
-     * deleted.
-     */
-    attribute PRUint32 storedContentLength;
-
-    /** 
-     * Delete this cache entry and its associated content.
-     */
-    void delete();
-
-    /**
-     * Create a channel for reading or writing a stream of content into the
-     * entry.  However, many of the nsIChannel methods may return
-     * NS_NOT_IMPLEMENTED, including:
-     *
-     *    + GetURI()
-     *    + GetContentType()
-     *    + GetContentLength()
-     */
-    nsIChannel newChannel(in nsILoadGroup loadGroup);
-
-    /**
-     * If a cache is implemented such that it stores each URI's content in an
-     * individual disk file, this method will identify the file corresponding
-     * to this record.  This may be used to implement the "stream-as-file"
-     * semantics required by some plugins and by the 'jar:' protocol handler.
-     * However, not all cache implementations are *required* to store the data
-     * from each URI in an individual file, so it is acceptable for an
-     * implementation of this method to signal NS_NOT_IMPLEMENTED.
-     */
-    readonly attribute nsIFileSpec filename;
-};

mozilla/netwerk/cache/public/nsINetDataDiskCache.idl

@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsINetDataCache.idl"
-
-interface nsIFileSpec;
-
-/**
-/**
- * A network-data disk cache is used to persistently cache the responses to
- * network retrieval commands.  Each cache entry may contain both content,
- * e.g. GIF image data, and associated metadata, e.g. HTTP headers.
- */
-[scriptable, uuid(6408e390-6f13-11d3-90c8-000064657374)]
-interface nsINetDataDiskCache : nsINetDataCache
-{
-	/**
-	 * This attribute must be set before calling any other methods of this
-	 * interface.
-	 */
-    attribute nsIFileSpec diskCacheFolder;
-};
-

mozilla/netwerk/cache/public/nsIStreamAsFile.idl

@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Scott Furman, fur@netscape.com
- */
-#include "nsrootidl.idl"
-#include "nsISupports.idl"
-
-interface nsIFileSpec;
-interface nsIStreamAsFileObserver;
-
-/**
- * In addition to enhancing effective network response time via caching, the
- * cache manager serves a second purpose by providing the stream-as-file
- * service required by traditional browser plugins and the jar: protocol
- * handler.  The interface below provides a means for a client to determine the
- * filename associated with a stream and to detect modification/deletion of
- * that file.
- */
-[scriptable, uuid(0eedbbf0-92d9-11d3-90d3-0040056a906e)]
-interface nsIStreamAsFile : nsISupports
-{
-    /**
-     * Filename containing stream-as-file
-     */
-    readonly attribute nsIFileSpec fileSpec;
-
-    /**
-     * Add an observer for this cache record.  When the cache wants to delete
-     * or truncate a record, so as to make space for another cache entry's
-     * content data, it will call <code>aObserver</code>'s Observe() method,
-     * passing the nsIStreamAsFile instance as the <code>aSubject</code>
-     * argument and an appropriate message.  If the observer does not wish to
-     * inhibit deletion/truncation, it should Release() any references it has to the
-     * cache record.
-     *
-     * @See nsIStreamAsFileObserver
-     */
-    void addObserver(in nsIStreamAsFileObserver aObserver);
-
-    /**
-     * Delete an observer that was added by the AddObserver() method.
-     */
-    void removeObserver(in nsIStreamAsFileObserver aObserver);
-};
-
-/**
- * This interface can be implemented by a client to receive notifications of
- * either modification or deletion of a file created by the cache manager using
- * the stream-as-file semantics.
- */
-[scriptable, uuid(a26e27c0-92da-11d3-90d3-0040056a906e)]
-interface nsIStreamAsFileObserver : nsISupports
-{
-    /**
-     * Flag bits for argument to Observe() method.
-     */
-    const long NOTIFY_AVAILABLE    = 1 << 0; // Stream-as-file now available for reading
-    const long NOTIFY_ERROR        = 1 << 1; // Error while loading stream / creating file
-    const long REQUEST_DELETION    = 1 << 2; // Cache manager wishes to delete/truncate file
-    const long INVALIDATE          = 1 << 3; // File is out-of-date
-
-    // Convenience value
-    const long MAKE_UNAVAILABLE    = REQUEST_DELETION | INVALIDATE;
-    
-    /**
-     * Receive either a notification or a request concerning a file that has
-     * been opened using stream-as-file.  The aMessage and aError arguments
-     * have varying values depending on the nature of the notification.
-     * aMessage is set to NOTIFY_AVAILABLE when a complete stream has been read
-     * and stored on disk in a file.  At that point, and no sooner, may the
-     * filename attribute of the associated nsIStreamAsFile be accessed via the
-     * associated nsIStreamAsFile interface.  If the aMessage argument is
-     * NOTIFY_ERROR, the aError argument contains the relevant error code.  If
-     * the aMessage argument is either REQUEST_DELETION or REQUEST_TRUNCATION,
-     * the callee should immediately Release() all references to the
-     * nsIStreamAsFile (and any references to its associated nsICachedNetData
-     * instances), unless it wishes to inhibit the requested file modification.
-     * If the aMessage argument is INVALIDATE, the cache manager is replacing
-     * the file with a more recent version.  If a client wants to continue
-     * using the (now out-of-date) file, it must delete it when it has finished,
-     * as the cache manager will effectively relinquished ownership of the
-     * file.
-     */
-    void ObserveStreamAsFile(in nsIStreamAsFile aStreamAsFile,
-			     in PRUint32 aMessage,
-			     in nsresult aError);
-};

mozilla/netwerk/makefile.win

@@ -1,39 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH = ..
-
-MODULE = necko
-
-DIRS=            \
-	base     \
-	dns      \
-	build    \
-	protocol \
-	socket   \
-	util     \
-	mime     \
-	streamconv \
-	cache    \
-	test     \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>

mozilla/netwerk/protocol/http/public/nsIHTTPHeader.idl

@@ -1,32 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-interface nsIAtom;
-                  
-[scriptable, uuid(a3ec67f0-465a-11d3-9a89-0080c7cb1080)]
-interface nsIHTTPHeader : nsISupports
-{
-    nsIAtom GetField();
-    string GetValue();
-};

mozilla/netwerk/test/TestCacheMgr.cpp

@@ -1,603 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsIStreamListener.h"
-#include "nsIStreamObserver.h"
-#include "nsIServiceManager.h"
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "nsIEventQueue.h"
-#include "nsIEventQueueService.h"
-#include "nsIChannel.h"
-#include "nsCOMPtr.h"
-
-#include "nsINetDataCache.h"
-#include "nsINetDataCacheManager.h"
-#include "nsICachedNetData.h"
-
-
-// Number of test entries to be placed in the cache
-// FIXME - temporary
-#define NUM_CACHE_ENTRIES  25
-
-// Cache content stream length will have random length between zero and
-// MAX_CONTENT_LENGTH bytes
-#define MAX_CONTENT_LENGTH 20000
-
-// Limits, converted to KB
-#define DISK_CACHE_CAPACITY  ((MAX_CONTENT_LENGTH * 4) >> 10)
-#define MEM_CACHE_CAPACITY   ((MAX_CONTENT_LENGTH * 3) >> 10)
-
-// Length of random-data cache entry URI key
-#define CACHE_KEY_LENGTH 13
-
-// Length of random-data cache entry secondary key
-#define CACHE_SECONDARY_KEY_LENGTH 10
-
-// Length of random-data cache entry meta-data
-#define CACHE_PROTOCOL_PRIVATE_LENGTH 10
-
-// Mapping from test case number to RecordID
-static PRInt32 recordID[NUM_CACHE_ENTRIES];
-
-static PRInt32
-mapRecordIdToTestNum(PRInt32 aRecordID)
-{
-    int i;
-    for (i = 0; i < NUM_CACHE_ENTRIES; i++) {
-        if (recordID[i] == aRecordID)
-            return i;
-    }
-    return -1;
-}
-
-// A supply of stream data to either store or compare with
-class nsITestDataStream {
-public:
-    virtual ~nsITestDataStream() {};
-    virtual PRUint32 Next() = 0;
-    virtual void Read(char* aBuf, PRUint32 aCount) = 0;
-    virtual void ReadString(char* aBuf, PRUint32 aCount) = 0;
-
-    virtual PRBool Match(char* aBuf, PRUint32 aCount) = 0;
-    virtual PRBool MatchString(char* aBuf, PRUint32 aCount) = 0;
-    virtual void Skip(PRUint32 aCount) = 0;
-    virtual void SkipString(PRUint32 aCount) = 0;
-};
-
-// A reproducible stream of random data.
-class RandomStream : public nsITestDataStream {
-public:
-    RandomStream(PRUint32 aSeed) {
-        mStartSeed = mState = aSeed;
-    }
-    
-    PRUint32 GetStartSeed() {
-        return mStartSeed;
-    }
-    
-    PRUint32 Next() {
-        mState = 1103515245 * mState + 12345 ^ (mState >> 16);
-        return mState;
-    }
-
-    PRUint8 NextChar() {
-        PRUint8 c;
-        do {
-            c = Next();
-        } while (!isalnum(c));
-        return c;
-    }
-
-    void Read(char* aBuf, PRUint32 aCount) {
-        PRUint32 i;
-        for (i = 0; i < aCount; i++) {
-            *aBuf++ = Next();
-        }
-    }
-
-    // Same as Read(), but using only printable chars and
-    //   with a terminating NUL
-    void ReadString(char* aBuf, PRUint32 aCount) {
-        PRUint32 i;
-        for (i = 0; i < aCount; i++) {
-            *aBuf++ = NextChar();
-        }
-        *aBuf = 0;
-    }
-
-    PRBool
-    Match(char* aBuf, PRUint32 aCount) {
-        PRUint32 i;
-        for (i = 0; i < aCount; i++) {
-            if (*aBuf++ != (char)(Next() & 0xff))
-                return PR_FALSE;
-        }
-        return PR_TRUE;
-    }
-
-    PRBool
-    MatchString(char* aBuf, PRUint32 aCount) {
-        PRUint32 i;
-        for (i = 0; i < aCount; i++) {
-            if (*aBuf++ != (char)(NextChar() & 0xff))
-                return PR_FALSE;
-        }
-        
-        // Check for terminating NUL character
-        if (*aBuf)
-            return PR_FALSE;
-        return PR_TRUE;
-    }
-
-    void
-    Skip(PRUint32 aCount) {
-        while (aCount--)
-            Next();
-    }
-
-    void
-    SkipString(PRUint32 aCount) {
-        while (aCount--)
-            NextChar();
-    }
-
-protected:
-    
-    PRUint32 mState;
-    PRUint32 mStartSeed;
-};
-
-static int gNumReaders = 0;
-static PRUint32 gTotalBytesRead = 0;
-static PRUint32 gTotalBytesWritten = 0;
-static PRUint32 gTotalDuration = 0;
-
-class nsReader : public nsIStreamListener {
-public:
-    NS_DECL_ISUPPORTS
-
-    nsReader()
-        : mStartTime(0), mBytesRead(0)
-    {
-        NS_INIT_REFCNT();
-        gNumReaders++;
-    }
-
-    virtual ~nsReader() {
-        delete mTestDataStream;
-        gNumReaders--;
-    }
-
-    nsresult 
-    Init(nsITestDataStream* aRandomStream, PRUint32 aExpectedStreamLength) {
-        mTestDataStream = aRandomStream;
-        mExpectedStreamLength = aExpectedStreamLength;
-        mRefCnt = 1;
-        return NS_OK;
-    }
-
-    NS_IMETHOD OnStartRequest(nsIChannel* channel,
-                              nsISupports* context) {
-        mStartTime = PR_IntervalNow();
-        return NS_OK;
-    }
-
-    NS_IMETHOD OnDataAvailable(nsIChannel* channel, 
-                               nsISupports* context,
-                               nsIInputStream *aIStream, 
-                               PRUint32 aSourceOffset,
-                               PRUint32 aLength) {
-        char buf[1025];
-        while (aLength > 0) {
-            PRUint32 amt;
-            PRBool match;
-            aIStream->Read(buf, sizeof buf, &amt);
-            if (amt == 0) break;
-            aLength -= amt;
-            mBytesRead += amt;
-            match = mTestDataStream->Match(buf, amt);
-            NS_ASSERTION(match, "Stored data was corrupted on read");
-        }
-        return NS_OK;
-    }
-
-    NS_IMETHOD OnStopRequest(nsIChannel* channel, 
-                             nsISupports* context,
-                             nsresult aStatus,
-                             const PRUnichar* aMsg) {
-        PRIntervalTime endTime;
-        PRIntervalTime duration;
-        
-        endTime = PR_IntervalNow();
-        duration = (endTime - mStartTime);
-
-        if (NS_FAILED(aStatus)) printf("channel failed.\n");
-        //        printf("read %d bytes\n", mBytesRead);
-
-        //FIXME        NS_ASSERTION(mBytesRead == mExpectedStreamLength,
-        // "Stream in cache is wrong length");
-
-        gTotalBytesRead += mBytesRead;
-        gTotalDuration += duration;
-
-        return NS_OK;
-    }
-
-protected:
-    PRIntervalTime       mStartTime;
-    PRUint32             mBytesRead;
-    nsITestDataStream*   mTestDataStream;
-    PRUint32             mExpectedStreamLength;
-};
-
-NS_IMPL_ISUPPORTS2(nsReader, nsIStreamListener, nsIStreamObserver)
-
-static nsIEventQueue* eventQueue;
-
-static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
-
-nsresult
-InitQueue() {
-    nsresult rv;
-
-    NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service");
-
-    rv = eventQService->CreateThreadEventQueue();
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create event queue");
-  
-    rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQueue);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue for main thread");
-
-    return NS_OK;
-}
-
-// Process events until all streams are OnStopRequest'ed
-nsresult
-WaitForEvents() {
-    while (gNumReaders) {
-        eventQueue->ProcessPendingEvents();
-    }
-    return NS_OK;
-}
-
-// Read data for a single cache record and compare against testDataStream
-nsresult
-TestReadStream(nsICachedNetData *cacheEntry, nsITestDataStream *testDataStream,
-               PRUint32 expectedStreamLength)
-{
-    nsCOMPtr<nsIChannel> channel;
-    nsresult rv;
-    PRUint32 actualContentLength;
-
-    rv = cacheEntry->NewChannel(0, 0, getter_AddRefs(channel));
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-    rv = cacheEntry->GetStoredContentLength(&actualContentLength);
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-    // FIXME    NS_ASSERTION(actualContentLength == expectedStreamLength,
-    //                 "nsICachedNetData::GetContentLength() busted ?");
-    
-    nsReader *reader = new nsReader;
-    reader->AddRef();
-    rv = reader->Init(testDataStream, expectedStreamLength);
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-    
-    rv = channel->AsyncRead(0, -1, 0, reader);
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-    reader->Release();
-
-    return NS_OK;
-}
-
-// Convert PRTime to unix-style time_t, i.e. seconds since the epoch
-static PRUint32
-convertPRTimeToSeconds(PRTime aTime64)
-{
-    double fpTime;
-    LL_L2D(fpTime, aTime64);
-    return (PRUint32)(fpTime * 1e-6 + 0.5);
-}
-
-// Convert unix-style time_t, i.e. seconds since the epoch, to PRTime
-static PRTime
-convertSecondsToPRTime(PRUint32 aSeconds)
-{
-    PRInt64 t64;
-    LL_L2I(t64, aSeconds);
-    LL_MUL(t64, t64, 1000000);
-    return t64;
-}
-
-// Read the test data that was written in FillCache(), checking for
-// corruption, truncation.
-nsresult
-TestRead(nsINetDataCacheManager *aCache, PRUint32 aFlags)
-{
-    nsresult rv;
-    PRBool inCache;
-    nsCOMPtr<nsICachedNetData> cacheEntry;
-    RandomStream *randomStream;
-    char uriCacheKey[CACHE_KEY_LENGTH];
-    char secondaryCacheKey[CACHE_SECONDARY_KEY_LENGTH];
-    char *storedUriKey;
-    PRUint32 testNum;
-
-    gTotalBytesRead = 0;
-    gTotalDuration = 0;
-    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
-        randomStream = new RandomStream(testNum);
-        randomStream->ReadString(uriCacheKey, sizeof uriCacheKey - 1);
-        randomStream->Read(secondaryCacheKey, sizeof secondaryCacheKey);
-
-        // Ensure that entry is in the cache
-        rv = aCache->Contains(uriCacheKey,
-                              secondaryCacheKey, sizeof secondaryCacheKey,
-                              aFlags, &inCache);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        NS_ASSERTION(inCache, "nsINetDataCacheManager::Contains error");
-        
-        rv = aCache->GetCachedNetData(uriCacheKey,
-                                      secondaryCacheKey, sizeof secondaryCacheKey,
-                                      aFlags,
-                                      getter_AddRefs(cacheEntry));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-        // Test GetUriSpec() method
-        rv = cacheEntry->GetUriSpec(&storedUriKey);
-        NS_ASSERTION(NS_SUCCEEDED(rv) &&
-                     !memcmp(storedUriKey, &uriCacheKey[0], sizeof uriCacheKey),
-                     "nsICachedNetData::GetKey failed");
-        nsAllocator::Free(storedUriKey);
-
-        // Test GetSecondaryKey() method
-        PRUint32 storedSecondaryKeyLength;
-        char* storedSecondaryKey;
-        rv = cacheEntry->GetSecondaryKey(&storedSecondaryKeyLength, &storedSecondaryKey);
-        NS_ASSERTION(NS_SUCCEEDED(rv) &&
-                     !memcmp(storedSecondaryKey, &secondaryCacheKey[0],
-                             sizeof secondaryCacheKey),
-                     "nsICachedNetData::GetSecondaryKey failed");
-
-        // Compare against stored protocol data
-        char *storedProtocolData;
-        PRUint32 storedProtocolDataLength;
-        rv = cacheEntry->GetAnnotation("test data", &storedProtocolDataLength, &storedProtocolData);
-        NS_ASSERTION(NS_SUCCEEDED(rv) &&
-                     storedProtocolDataLength == CACHE_PROTOCOL_PRIVATE_LENGTH,
-                     "nsICachedNetData::GetAnnotation() failed");
-        randomStream->Match(storedProtocolData, storedProtocolDataLength);
-
-        // Test GetAllowPartial()
-        PRBool allowPartial;
-        rv = cacheEntry->GetAllowPartial(&allowPartial);
-        NS_ASSERTION(NS_SUCCEEDED(rv) &&
-                     (allowPartial == (PRBool)(randomStream->Next() & 1)),
-                     "nsICachedNetData::GetAllowPartial() failed");
-
-        // Test GetExpirationTime()
-        PRTime expirationTime;
-        PRTime expectedExpirationTime = convertSecondsToPRTime(randomStream->Next() & 0xffffff);
-        rv = cacheEntry->GetExpirationTime(&expirationTime);
-
-        NS_ASSERTION(NS_SUCCEEDED(rv) && LL_EQ(expirationTime, expectedExpirationTime),
-                     "nsICachedNetData::GetExpirationTime() failed");
-
-        PRUint32 expectedStreamLength = randomStream->Next() % MAX_CONTENT_LENGTH;
-
-        TestReadStream(cacheEntry, randomStream, expectedStreamLength);
-    }
-
-    WaitForEvents();
-
-    // Compute rate in MB/s
-    double rate = gTotalBytesRead / PR_IntervalToMilliseconds(gTotalDuration);
-    rate *= NUM_CACHE_ENTRIES;
-    rate *= 1000;
-    rate /= (1024 * 1024);
-    printf("Read  %7d bytes at a rate of %5.1f MB per second \n",
-           gTotalBytesRead, rate);
-
-    return NS_OK;
-}
-
-// Create entries in the network data cache, using random data for the
-// key, the meta-data and the stored content data.
-nsresult
-FillCache(nsINetDataCacheManager *aCache, PRUint32 aFlags, PRUint32 aCacheCapacity)
-{
-    nsresult rv;
-    PRBool inCache;
-    nsCOMPtr<nsICachedNetData> cacheEntry;
-    nsCOMPtr<nsIChannel> channel;
-    nsCOMPtr<nsIOutputStream> outStream;
-    nsCOMPtr<nsINetDataCache> containingCache;
-    char buf[1000];
-    PRUint32 protocolDataLength;
-    char cacheKey[CACHE_KEY_LENGTH];
-    char secondaryCacheKey[CACHE_SECONDARY_KEY_LENGTH];
-    char protocolData[CACHE_PROTOCOL_PRIVATE_LENGTH];
-    PRUint32 testNum;
-    RandomStream *randomStream;
-
-    gTotalBytesWritten = 0;
-    PRIntervalTime startTime = PR_IntervalNow();
-    
-    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
-        randomStream = new RandomStream(testNum);
-        randomStream->ReadString(cacheKey, sizeof cacheKey - 1);
-        randomStream->Read(secondaryCacheKey, sizeof secondaryCacheKey);
-
-        // No entry should be in cache until we add it
-        rv = aCache->Contains(cacheKey,
-                              secondaryCacheKey, sizeof secondaryCacheKey,
-                              aFlags, &inCache);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        NS_ASSERTION(!inCache, "nsINetDataCacheManager::Contains error");
-        
-        rv = aCache->GetCachedNetData(cacheKey,
-                                      secondaryCacheKey, sizeof secondaryCacheKey,
-                                      aFlags,
-                                      getter_AddRefs(cacheEntry));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't access cacheEntry via cache key");
-
-        // Test nsINetDataCacheManager::GetNumEntries()
-        PRUint32 numEntries = (PRUint32)-1;
-        rv = aCache->GetNumEntries(&numEntries);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
-        NS_ASSERTION(numEntries == testNum + 1, "GetNumEntries failure");
-
-        // Record meta-data should be initially empty
-        char *protocolDatap;
-        rv = cacheEntry->GetAnnotation("test data", &protocolDataLength, &protocolDatap);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        if ((protocolDataLength != 0) || (protocolDatap != 0))
-            return NS_ERROR_FAILURE;
-
-        // Store random data as meta-data
-        randomStream->Read(protocolData, sizeof protocolData);
-        cacheEntry->SetAnnotation("test data", sizeof protocolData, protocolData);
-
-        // Store random data as allow-partial flag
-        PRBool allowPartial = randomStream->Next() & 1;
-        rv = cacheEntry->SetAllowPartial(allowPartial);
-        NS_ASSERTION(NS_SUCCEEDED(rv),
-                     "nsICachedNetData::SetAllowPartial() failed");
-
-        // Store random data as expiration time
-        PRTime expirationTime = convertSecondsToPRTime(randomStream->Next() & 0xffffff);
-        rv = cacheEntry->SetExpirationTime(expirationTime);
-        NS_ASSERTION(NS_SUCCEEDED(rv),
-                     "nsICachedNetData::SetExpirationTime() failed");
-
-        // Cache manager complains if expiration set without setting last-modified time
-        rv = cacheEntry->SetLastModifiedTime(expirationTime);
-
-        rv = cacheEntry->NewChannel(0, 0, getter_AddRefs(channel));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-        rv = cacheEntry->GetCache(getter_AddRefs(containingCache));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-        rv = channel->OpenOutputStream(0, getter_AddRefs(outStream));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        
-        int streamLength = randomStream->Next() % MAX_CONTENT_LENGTH;
-        int remaining = streamLength;
-        while (remaining) {
-            PRUint32 numWritten;
-            int amount = PR_MIN(sizeof buf, remaining);
-            randomStream->Read(buf, amount);
-
-            rv = outStream->Write(buf, amount, &numWritten);
-            NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-            NS_ASSERTION(numWritten == (PRUint32)amount, "Write() bug?");
-            
-            remaining -= amount;
-
-            PRUint32 storageInUse;
-            rv = containingCache->GetStorageInUse(&storageInUse);
-            NS_ASSERTION(NS_SUCCEEDED(rv) && (storageInUse <= aCacheCapacity),
-                         "Cache manager failed to limit cache growth");
-        }
-        outStream->Close();
-        gTotalBytesWritten += streamLength;
-
-        // *Now* there should be an entry in the cache
-        rv = aCache->Contains(cacheKey,
-                              secondaryCacheKey, sizeof secondaryCacheKey,
-                              aFlags, &inCache);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        NS_ASSERTION(inCache, "nsINetDataCacheManager::Contains error");
-
-        delete randomStream;
-    }
-
-    PRIntervalTime endTime = PR_IntervalNow();
-
-    // Compute rate in MB/s
-    double rate = gTotalBytesWritten / PR_IntervalToMilliseconds(endTime - startTime);
-    rate *= 1000;
-    rate /= (1024 * 1024);
-    printf("Wrote %7d bytes at a rate of %5.1f MB per second \n",
-           gTotalBytesWritten, rate);
-
-    return NS_OK;
-}
-
-nsresult NS_AutoregisterComponents()
-{
-  nsresult rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,
-                                                 NULL /* default */);
-  return rv;
-}
-
-nsresult
-Test(nsINetDataCacheManager *aCache, PRUint32 aFlags, PRUint32 aCacheCapacity)
-{
-    nsresult rv;
-
-    rv = aCache->RemoveAll();
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
-
-    PRUint32 numEntries = (PRUint32)-1;
-    rv = aCache->GetNumEntries(&numEntries);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
-    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
-
-    rv = FillCache(aCache, aFlags, aCacheCapacity);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't fill cache with random test data");
-
-    rv = TestRead(aCache, aFlags);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't read random test data from cache");
-
-    rv = aCache->RemoveAll();
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
-
-    rv = aCache->GetNumEntries(&numEntries);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
-    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
-
-    return 0;
-}
-int
-main(int argc, char* argv[])
-{
-    nsresult rv;
-    nsCOMPtr<nsINetDataCacheManager> cache;
-
-    rv = NS_AutoregisterComponents();
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't register XPCOM components");
-
-    rv = nsComponentManager::CreateInstance(NS_NETWORK_CACHE_MANAGER_PROGID,
-                                            nsnull,
-                                            NS_GET_IID(nsINetDataCacheManager),
-                                            getter_AddRefs(cache));
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create cache manager factory") ;
-
-    cache->SetDiskCacheCapacity(DISK_CACHE_CAPACITY);
-    cache->SetMemCacheCapacity(MEM_CACHE_CAPACITY);
-
-    InitQueue();
-    
-    Test(cache, nsINetDataCacheManager::BYPASS_PERSISTENT_CACHE, MEM_CACHE_CAPACITY);
-    Test(cache, nsINetDataCacheManager::BYPASS_MEMORY_CACHE, DISK_CACHE_CAPACITY);
-    return 0;
-}
-

mozilla/netwerk/test/TestRawCache.cpp

@@ -1,820 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsIStreamListener.h"
-#include "nsIStreamObserver.h"
-#include "nsIServiceManager.h"
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "nsIEventQueue.h"
-#include "nsIEventQueueService.h"
-#include "nsIChannel.h"
-#include "nsCOMPtr.h"
-#include "nsString.h"
-#include <stdio.h>
-
-#include "nsINetDataCache.h"
-#include "nsINetDataDiskCache.h"
-#include "nsINetDataCacheRecord.h"
-#include "nsMemCacheCID.h"
-// file cache include
-#include "nsNetDiskCacheCID.h"
-#include "nsIPref.h"
-#include "prenv.h"
-#include "nsIFileStream.h"
-
-
-// Number of test entries to be placed in the cache
-#define NUM_CACHE_ENTRIES  250
-
-// Cache content stream length will have random length between zero and
-// MAX_CONTENT_LENGTH bytes
-#define MAX_CONTENT_LENGTH 20000
-
-// Length of random-data cache entry key
-#define CACHE_KEY_LENGTH 15
-
-// Length of random-data cache entry meta-data
-#define CACHE_METADATA_LENGTH 100
-
-static NS_DEFINE_CID(kMemCacheCID, NS_MEM_CACHE_FACTORY_CID);
-static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
-
-// file cache cid
-static NS_DEFINE_CID(kDiskCacheCID, NS_NETDISKCACHE_CID) ;
-static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
-static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID);
-
-// Mapping from test case number to RecordID
-static PRInt32 recordID[NUM_CACHE_ENTRIES];
-
-static PRInt32
-mapRecordIdToTestNum(PRInt32 aRecordID)
-{
-    int i;
-    for (i = 0; i < NUM_CACHE_ENTRIES; i++) {
-        if (recordID[i] == aRecordID)
-            return i;
-    }
-    return -1;
-}
-
-// A supply of stream data to either store or compare with
-class nsITestDataStream {
-public:
-    virtual ~nsITestDataStream() {};
-    virtual PRUint32 Next() = 0;
-    virtual void Read(char* aBuf, PRUint32 aCount) = 0;
-
-    virtual PRBool Match(char* aBuf, PRUint32 aCount) = 0;
-    virtual void Skip(PRUint32 aCount) = 0;
-};
-
-// A reproducible stream of random data.
-class RandomStream : public nsITestDataStream {
-public:
-    RandomStream(PRUint32 aSeed) {
-        mStartSeed = mState = aSeed;
-    }
-    
-    PRUint32 GetStartSeed() {
-        return mStartSeed;
-    }
-    
-    PRUint32 Next() {
-        mState = 1103515245 * mState + 12345;
-        return mState;
-    }
-
-    void Read(char* aBuf, PRUint32 aCount) {
-        PRUint32 i;
-        for (i = 0; i < aCount; i++) {
-            *aBuf++ = Next();
-        }
-    }
-
-    PRBool
-    Match(char* aBuf, PRUint32 aCount) {
-        PRUint32 i;
-        for (i = 0; i < aCount; i++) {
-            if (*aBuf++ != (char)(Next() & 0xff))
-                return PR_FALSE;
-        }
-        return PR_TRUE;
-    }
-
-    void
-    Skip(PRUint32 aCount) {
-        while (aCount--)
-            Next();
-    }
-
-protected:
-    
-    PRUint32 mState;
-    PRUint32 mStartSeed;
-};
-
-// A stream of data that increments on each byte that is read, modulo 256
-class CounterStream : public nsITestDataStream {
-public:
-    CounterStream(PRUint32 aSeed) {
-        mStartSeed = mState = aSeed;
-    }
-    
-    PRUint32 GetStartSeed() {
-        return mStartSeed;
-    }
-    
-    PRUint32 Next() {
-        mState += 1;
-        mState &= 0xff;
-        return mState;
-    }
-
-    void Read(char* aBuf, PRUint32 aCount) {
-        PRUint32 i;
-        for (i = 0; i < aCount; i++) {
-            *aBuf++ = Next();
-        }
-    }
-
-    PRBool
-    Match(char* aBuf, PRUint32 aCount) {
-        PRUint32 i;
-        for (i = 0; i < aCount; i++) {
-            if (*aBuf++ != (char)Next())
-                return PR_FALSE;
-        }
-        return PR_TRUE;
-    }
-
-    void
-    Skip(PRUint32 aCount) {
-        mState += aCount;
-        mState &= 0xff;
-    }
-
-protected:
-    
-    PRUint32 mState;
-    PRUint32 mStartSeed;
-};
-
-static int gNumReaders = 0;
-static PRUint32 gTotalBytesRead = 0;
-static PRUint32 gTotalDuration = 0;
-
-class nsReader : public nsIStreamListener {
-public:
-    NS_DECL_ISUPPORTS
-
-    nsReader()
-        : mStartTime(0), mBytesRead(0)
-    {
-        NS_INIT_REFCNT();
-        gNumReaders++;
-    }
-
-    virtual ~nsReader() {
-        delete mTestDataStream;
-        gNumReaders--;
-    }
-
-    nsresult 
-    Init(nsITestDataStream* aRandomStream, PRUint32 aExpectedStreamLength) {
-        mTestDataStream = aRandomStream;
-        mExpectedStreamLength = aExpectedStreamLength;
-        mRefCnt = 1;
-        return NS_OK;
-    }
-
-    NS_IMETHOD OnStartRequest(nsIChannel* channel,
-                              nsISupports* context) {
-        mStartTime = PR_IntervalNow();
-        return NS_OK;
-    }
-
-    NS_IMETHOD OnDataAvailable(nsIChannel* channel, 
-                               nsISupports* context,
-                               nsIInputStream *aIStream, 
-                               PRUint32 aSourceOffset,
-                               PRUint32 aLength) {
-        char buf[1025];
-        while (aLength > 0) {
-            PRUint32 amt;
-            PRBool match;
-            aIStream->Read(buf, sizeof buf, &amt);
-            if (amt == 0) break;
-            aLength -= amt;
-            mBytesRead += amt;
-            match = mTestDataStream->Match(buf, amt);
-            NS_ASSERTION(match, "Stored data was corrupted on read");
-        }
-        return NS_OK;
-    }
-
-    NS_IMETHOD OnStopRequest(nsIChannel* channel, 
-                             nsISupports* context,
-                             nsresult aStatus,
-                             const PRUnichar* aMsg) {
-        PRIntervalTime endTime;
-        PRIntervalTime duration;
-        
-        endTime = PR_IntervalNow();
-        duration = (endTime - mStartTime);
-
-        if (NS_FAILED(aStatus)) printf("channel failed.\n");
-        //        printf("read %d bytes\n", mBytesRead);
-
-        NS_ASSERTION(mBytesRead == mExpectedStreamLength,
-                     "Stream in cache is wrong length");
-
-        gTotalBytesRead += mBytesRead;
-        gTotalDuration += duration;
-
-        return NS_OK;
-    }
-
-protected:
-    PRIntervalTime       mStartTime;
-    PRUint32             mBytesRead;
-    nsITestDataStream*   mTestDataStream;
-    PRUint32             mExpectedStreamLength;
-};
-
-NS_IMPL_ISUPPORTS2(nsReader, nsIStreamListener, nsIStreamObserver)
-
-static nsIEventQueue* eventQueue;
-
-nsresult
-InitQueue() {
-    nsresult rv;
-
-    NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service");
-
-    rv = eventQService->CreateThreadEventQueue();
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create event queue");
-  
-    rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQueue);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue for main thread");
-
-    return NS_OK;
-}
-
-// Process events until all streams are OnStopRequest'ed
-nsresult
-WaitForEvents() {
-    while (gNumReaders) {
-        eventQueue->ProcessPendingEvents();
-    }
-    return NS_OK;
-}
-
-// Read data for a single cache record and compare against testDataStream
-nsresult
-TestReadStream(nsINetDataCacheRecord *record, nsITestDataStream *testDataStream,
-               PRUint32 expectedStreamLength)
-{
-    nsCOMPtr<nsIChannel> channel;
-    nsresult rv;
-    PRUint32 actualContentLength;
-
-    rv = record->NewChannel(0, getter_AddRefs(channel));
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-    rv = record->GetStoredContentLength(&actualContentLength);
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-    NS_ASSERTION(actualContentLength == expectedStreamLength,
-                 "nsINetDataCacheRecord::GetContentLength() busted ?");
-    
-    nsReader *reader = new nsReader;
-    rv = reader->Init(testDataStream, expectedStreamLength);
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-    
-    rv = channel->AsyncRead(0, -1, 0, reader);
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-    reader->Release();
-
-    return NS_OK;
-}
-
-// Check that records can be retrieved using their record-ID, in addition
-// to using the opaque key.
-nsresult
-TestRecordID(nsINetDataCache *cache)
-{
-    nsresult rv;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    RandomStream *randomStream;
-    PRUint32 metaDataLength;
-    char cacheKey[CACHE_KEY_LENGTH];
-    char *metaData;
-    PRUint32 testNum;
-    PRBool match;
-
-    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
-        randomStream = new RandomStream(testNum);
-        randomStream->Read(cacheKey, sizeof cacheKey);
-
-        rv = cache->GetCachedNetDataByID(recordID[testNum], getter_AddRefs(record));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't obtain record using record ID");
-
-        // Match against previously stored meta-data
-        rv = record->GetMetaData(&metaDataLength, &metaData);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get record meta-data");
-        match = randomStream->Match(metaData, metaDataLength);
-        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
-
-        nsAllocator::Free(metaData);
-        delete randomStream;
-    }
-    return NS_OK;
-}
-
-// Check that all cache entries in the database are enumerated and that
-// no duplicates appear.
-nsresult
-TestEnumeration(nsINetDataCache *cache)
-{
-    nsresult rv;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    nsCOMPtr<nsISupports> tempISupports;
-    nsCOMPtr<nsISimpleEnumerator> iterator;
-    RandomStream *randomStream;
-    PRUint32 metaDataLength;
-    char cacheKey[CACHE_KEY_LENGTH];
-    char *metaData;
-    PRUint32 testNum;
-    PRBool match;
-    PRInt32 recID;
-
-    int numRecords = 0;
-
-    // Iterate over all records in the cache
-    rv = cache->NewCacheEntryIterator(getter_AddRefs(iterator));
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create new cache entry iterator");
-
-    PRBool notDone;
-    while (1) {
-
-        // Done iterating ?
-        rv = iterator->HasMoreElements(&notDone);
-        if (NS_FAILED(rv)) return rv;
-        if (!notDone)
-            break;
-
-        // Get next record in iteration
-        rv = iterator->GetNext(getter_AddRefs(tempISupports));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "iterator bustage");
-        record = do_QueryInterface(tempISupports);
-
-        numRecords++;
-
-        // Get record ID
-        rv = record->GetRecordID(&recID);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get Record ID");
-        testNum = mapRecordIdToTestNum(recID);
-        NS_ASSERTION(testNum != -1, "Corrupted Record ID ?");
-
-        // Erase mapping from table, so that duplicate enumerations are detected
-        recordID[testNum] = -1;
-
-        // Make sure stream matches test data
-        randomStream = new RandomStream(testNum);
-        randomStream->Read(cacheKey, sizeof cacheKey);
-
-        // Match against previously stored meta-data
-        rv = record->GetMetaData(&metaDataLength, &metaData);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get record meta-data");
-        match = randomStream->Match(metaData, metaDataLength);
-        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
-        nsAllocator::Free(metaData);
-
-        delete randomStream;
-    }
-
-    NS_ASSERTION(numRecords == NUM_CACHE_ENTRIES, "Iteration bug");
-
-    return NS_OK;
-}
-
-// Read the test data that was written in FillCache(), checking for
-// corruption, truncation.
-nsresult
-TestRead(nsINetDataCache *cache)
-{
-    nsresult rv;
-    PRBool inCache;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    RandomStream *randomStream;
-    PRUint32 metaDataLength;
-    char cacheKey[CACHE_KEY_LENGTH];
-    char *metaData, *storedCacheKey;
-    PRUint32 testNum, storedCacheKeyLength;
-    PRBool match;
-
-    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
-        randomStream = new RandomStream(testNum);
-        randomStream->Read(cacheKey, sizeof cacheKey);
-
-        // Ensure that entry is in the cache
-        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        NS_ASSERTION(inCache, "nsINetDataCache::Contains error");
-        
-        rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-        // Match against previously stored meta-data
-        match = record->GetMetaData(&metaDataLength, &metaData);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        match = randomStream->Match(metaData, metaDataLength);
-        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
-        nsAllocator::Free(metaData);
-
-        // Test GetKey() method
-        rv = record->GetKey(&storedCacheKeyLength, &storedCacheKey);
-        NS_ASSERTION(NS_SUCCEEDED(rv) &&
-                     (storedCacheKeyLength == sizeof cacheKey) &&
-                     !memcmp(storedCacheKey, &cacheKey[0], sizeof cacheKey),
-                     "nsINetDataCacheRecord::GetKey failed");
-        nsAllocator::Free(storedCacheKey);
-
-        PRUint32 expectedStreamLength = randomStream->Next() % MAX_CONTENT_LENGTH;
-
-        TestReadStream(record, randomStream, expectedStreamLength);
-    }
-
-    WaitForEvents();
-
-    // Compute rate in MB/s
-    double rate = gTotalBytesRead / PR_IntervalToMilliseconds(gTotalDuration);
-    rate *= NUM_CACHE_ENTRIES;
-    rate *= 1000;
-    rate /= (1024 * 1024);
-    printf("Read %d bytes at a rate of %5.1f MB per second \n",
-           gTotalBytesRead, rate);
-
-    return NS_OK;
-}
-
-// Repeatedly call SetStoredContentLength() on a cache entry and make
-// read the stream's data to ensure that it's not corrupted by the effect
-nsresult
-TestTruncation(nsINetDataCache *cache)
-{
-    nsresult rv;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    RandomStream *randomStream;
-    char cacheKey[CACHE_KEY_LENGTH];
-
-    randomStream = new RandomStream(0);
-    randomStream->Read(cacheKey, sizeof cacheKey);
-
-    rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
-    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-    randomStream->Skip(CACHE_METADATA_LENGTH);
-    PRUint32 initialStreamLength = randomStream->Next() % MAX_CONTENT_LENGTH;
-    delete randomStream;
-
-    PRUint32 i;
-    PRUint32 delta = initialStreamLength / 64;
-    for (i = initialStreamLength; i >= delta; i -= delta) {
-        PRUint32 expectedStreamLength = i;
-
-        // Do the truncation
-        record->SetStoredContentLength(expectedStreamLength);
-        randomStream = new RandomStream(0);
-        randomStream->Skip(CACHE_KEY_LENGTH + CACHE_METADATA_LENGTH + 1);
-
-        PRUint32 afterContentLength;
-        rv = record->GetStoredContentLength(&afterContentLength);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-        NS_ASSERTION(afterContentLength == expectedStreamLength,
-                     "nsINetDataCacheRecord::SetContentLength() failed to truncate record");
-
-        TestReadStream(record, randomStream, expectedStreamLength);
-        WaitForEvents();
-    }
-
-    return NS_OK;
-}
-
-// Write known data to random offsets in a single cache entry and test
-// resulting stream for correctness.
-nsresult
-TestOffsetWrites(nsINetDataCache *cache)
-{
-    nsresult rv;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    nsCOMPtr<nsIChannel> channel;
-    nsCOMPtr<nsIOutputStream> outStream;
-    char buf[512];
-    char cacheKey[CACHE_KEY_LENGTH];
-    RandomStream *randomStream;
-
-    randomStream = new RandomStream(0);
-    randomStream->Read(cacheKey, sizeof cacheKey);
-
-    rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't access record via opaque cache key");
-
-
-    // Write buffer-fulls of data at random offsets into the cache entry.
-    // Data written is (offset % 0xff)
-    PRUint32 startingOffset;
-    PRUint32 streamLength = 0;
-    CounterStream *counterStream;
-    int i;
-    for (i = 0; i < 100; i++) {
-        rv = record->NewChannel(0, getter_AddRefs(channel));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-        startingOffset = streamLength ? streamLength - (randomStream->Next() % sizeof buf): 0;
-        rv = channel->OpenOutputStream(startingOffset, getter_AddRefs(outStream));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        
-        counterStream = new CounterStream(startingOffset);
-        counterStream->Read(buf, sizeof buf);
-
-        PRUint32 numWritten;
-        rv = outStream->Write(buf, sizeof buf, &numWritten);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        NS_ASSERTION(numWritten == sizeof buf, "Write() bug?");
-        streamLength = startingOffset + sizeof buf;
-
-        rv = outStream->Close();
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't close channel");
-        delete counterStream;
-    }
-    
-    delete randomStream;
-
-    counterStream = new CounterStream(0);
-    TestReadStream(record, counterStream, streamLength);
-    WaitForEvents();
-
-    return NS_OK;
-}
-
-// Create entries in the network data cache, using random data for the
-// key, the meta-data and the stored content data.
-nsresult
-FillCache(nsINetDataCache *cache)
-{
-    nsresult rv;
-    PRBool inCache;
-    nsCOMPtr<nsINetDataCacheRecord> record;
-    nsCOMPtr<nsIChannel> channel;
-    nsCOMPtr<nsIOutputStream> outStream;
-    char buf[1000];
-    PRUint32 metaDataLength;
-    char cacheKey[CACHE_KEY_LENGTH];
-    char metaData[CACHE_METADATA_LENGTH];
-    PRUint32 testNum;
-    char *data;
-    RandomStream *randomStream;
-    PRUint32 totalBytesWritten = 0;
-
-    PRIntervalTime startTime = PR_IntervalNow();
-    
-    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
-        randomStream = new RandomStream(testNum);
-        randomStream->Read(cacheKey, sizeof cacheKey);
-
-        // No entry should be in cache until we add it
-        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        NS_ASSERTION(!inCache, "nsINetDataCache::Contains error");
-        
-        rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't access record via opaque cache key");
-
-        // Test nsINetDataCacheRecord::GetRecordID()
-        rv = record->GetRecordID(&recordID[testNum]);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get Record ID");
-
-        // Test nsINetDataCache::GetNumEntries()
-        PRUint32 numEntries = (PRUint32)-1;
-        rv = cache->GetNumEntries(&numEntries);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
-        NS_ASSERTION(numEntries == testNum + 1, "GetNumEntries failure");
-
-        // Record meta-data should be initially empty
-        rv = record->GetMetaData(&metaDataLength, &data);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        if ((metaDataLength != 0) || (data != 0))
-            return NS_ERROR_FAILURE;
-
-        // Store random data as meta-data
-        randomStream->Read(metaData, sizeof metaData);
-        record->SetMetaData(sizeof metaData, metaData);
-
-        rv = record->NewChannel(0, getter_AddRefs(channel));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-
-        rv = channel->OpenOutputStream(0, getter_AddRefs(outStream));
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        
-        PRUint32 beforeOccupancy;
-        rv = cache->GetStorageInUse(&beforeOccupancy);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
-
-        int streamLength = randomStream->Next() % MAX_CONTENT_LENGTH;
-        int remaining = streamLength;
-        while (remaining) {
-            PRUint32 numWritten;
-            int amount = PR_MIN(sizeof buf, remaining);
-            randomStream->Read(buf, amount);
-
-            rv = outStream->Write(buf, amount, &numWritten);
-            NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-            NS_ASSERTION(numWritten == (PRUint32)amount, "Write() bug?");
-            
-            remaining -= amount;
-        }
-        outStream->Close();
-        totalBytesWritten += streamLength;
-
-        PRUint32 afterOccupancy;
-        rv = cache->GetStorageInUse(&afterOccupancy);
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
-        PRUint32 streamLengthInKB = streamLength >> 10;
-        NS_ASSERTION((afterOccupancy - beforeOccupancy) >= streamLengthInKB,
-                     "nsINetDataCache::GetStorageInUse() is busted");
-        
-
-        // *Now* there should be an entry in the cache
-        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
-        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
-        NS_ASSERTION(inCache, "nsINetDataCache::Contains error");
-
-        delete randomStream;
-    }
-
-    PRIntervalTime endTime = PR_IntervalNow();
-
-    // Compute rate in MB/s
-    double rate = totalBytesWritten / PR_IntervalToMilliseconds(endTime - startTime);
-    rate *= 1000;
-    rate /= (1024 * 1024);
-    printf("Wrote %7d bytes at a rate of %5.1f MB per second \n",
-           totalBytesWritten, rate);
-
-    return NS_OK;
-}
-
-nsresult NS_AutoregisterComponents()
-{
-  nsresult rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,
-                                                 NULL /* default */);
-  return rv;
-}
-
-PRBool initPref ()
-{
-    nsresult rv;
-    NS_WITH_SERVICE(nsIPref, prefPtr, kPrefCID, &rv);
-    if (NS_FAILED(rv))
-        return false;
-               
-    nsCOMPtr<nsIFileSpec> fileSpec;
-    rv = NS_NewFileSpec (getter_AddRefs(fileSpec));
-    if (NS_FAILED(rv))
-        return false;
-                            
-    nsCString defaultPrefFile = PR_GetEnv ("MOZILLA_FIVE_HOME");
-    if (defaultPrefFile.Length())
-        defaultPrefFile += "/";
-    else
-        defaultPrefFile = "./";
-    defaultPrefFile += "default_prefs.js";
-                                                 
-    fileSpec->SetUnixStyleFilePath (defaultPrefFile.GetBuffer());
-                                                    
-    PRBool exists = false;
-    fileSpec->Exists(&exists);
-    if (exists)
-        prefPtr->ReadUserPrefsFrom(fileSpec);
-    else
-        return false;
-    return true;
-}
-
-int
-main(int argc, char* argv[])
-{
-    nsresult rv;
-
-    if(argc <2) {
-      printf(" %s -f to test filecache\n", argv[0]) ;
-      printf(" %s -m to test memcache\n", argv[0]) ;
-      return -1 ;
-    }
-
-
-    rv = NS_AutoregisterComponents();
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't register XPCOM components");
-
-    nsCOMPtr<nsINetDataCache> cache;
-
-    if (PL_strcasecmp(argv[1], "-m") == 0) {
-        rv = nsComponentManager::CreateInstance(kMemCacheCID, nsnull,
-                                            NS_GET_IID(nsINetDataCache),
-                                            getter_AddRefs(cache));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create memory cache factory");
-    } else if (PL_strcasecmp(argv[1], "-f") == 0) {
-
-        nsCOMPtr<nsINetDataDiskCache> diskcache ;
-
-        rv = nsComponentManager::CreateInstance(kDiskCacheCID, nsnull,
-                                            NS_GET_IID(nsINetDataDiskCache),
-                                             getter_AddRefs(diskcache));
-        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create disk cache factory") ;
-        
-        nsCOMPtr<nsIFileSpec> folder ;
-        NS_NewFileSpec(getter_AddRefs(folder)) ;
-        folder->SetUnixStyleFilePath("/tmp") ;
-        diskcache->SetDiskCacheFolder(folder) ;
-
-        cache = diskcache ;
-
-    } else {
-      printf("  %s -f to test filecache\n", argv[0]) ;
-      printf(" %s -m to test memcache\n", argv[0]) ;
-      return -1 ;
-    }
-
-    InitQueue();
-
-    PRUnichar* description;
-    rv = cache->GetDescription(&description);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache description");
-    nsCAutoString descStr(description);
-    printf("Testing: %s\n", descStr.GetBuffer());
-
-    rv = cache->RemoveAll();
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
-
-    PRUint32 startOccupancy;
-    rv = cache->GetStorageInUse(&startOccupancy);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
-
-    PRUint32 numEntries = (PRUint32)-1;
-    rv = cache->GetNumEntries(&numEntries);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
-    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
-
-    rv = FillCache(cache);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't fill cache with random test data");
-
-    rv = TestRead(cache);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't read random test data from cache");
-
-    rv = TestRecordID(cache);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't index records using record ID");
-
-    rv = TestEnumeration(cache);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully enumerate records");
-
-    rv = TestTruncation(cache);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully truncate records");
-
-    rv = TestOffsetWrites(cache);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully write to records using non-zero offsets");
-
-    rv = cache->RemoveAll();
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
-    rv = cache->GetNumEntries(&numEntries);
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
-    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
-
-    PRUint32 endOccupancy;
-    rv = cache->GetStorageInUse(&endOccupancy);
-
-    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
-
-    NS_ASSERTION(startOccupancy == endOccupancy, "Cache occupancy not correctly computed ?");
-
-    return 0;
-}
-

mozilla/netwerk/test/makefile.win

@@ -1,82 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..
-
-MAKE_OBJ_TYPE	= EXE
-PROG1 = .\$(OBJDIR)\TestFileInput.exe
-PROG2 = .\$(OBJDIR)\TestSocketInput.exe
-PROG3 = .\$(OBJDIR)\TestSocketIO.exe
-PROG4 = .\$(OBJDIR)\TestProtocols.exe
-PROG5 = .\$(OBJDIR)\TestSocketTransport.exe
-PROG6 = .\$(OBJDIR)\urltest.exe
-PROG7 = .\$(OBJDIR)\TestFileInput2.exe
-PROG8 = .\$(OBJDIR)\TestFileTransport.exe
-PROG9 = .\$(OBJDIR)\TestRes.exe
-PROGA = .\$(OBJDIR)\TestRawCache.exe
-PROGB = .\$(OBJDIR)\TestCacheMgr.exe
-PROGRAMS = \
-#$(PROG1) $(PROG2) $(PROG3) $(PROG4) $(PROG5) $(PROG6) $(PROG7) $(PROG8) $(PROG9)\
-          $(PROGA) $(PROGB)
-
-LCFLAGS=-DUSE_NSREG -GX
-
-REQUIRES=libreg
-
-INCS = $(INCS)                  \
-        -I$(DEPTH)\dist\include \
-        $(NULL)
-
-LLIBS=                 \
- $(DIST)\lib\xpcom.lib \
- $(LIBNSPR)            \
- $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(PROGRAMS)
-	-for %p in ($(PROGRAMS)) do $(MAKE_INSTALL) %p $(DIST)\bin
-
-clobber::
-	-for %p in ($(PROGRAMS)) do $(RM) %p $(DIST)\bin\%p
-
-$(PROG1): $(OBJDIR) TestFileInput.cpp
-
-$(PROG2): $(OBJDIR) TestSocketInput.cpp
-
-$(PROG3): $(OBJDIR) TestSocketIO.cpp
-
-$(PROG4): $(OBJDIR) TestProtocols.cpp
-
-$(PROG5): $(OBJDIR) TestSocketTransport.cpp
-
-$(PROG6): $(OBJDIR) urltest.cpp
-
-$(PROG7): $(OBJDIR) TestFileInput2.cpp
-
-$(PROG8): $(OBJDIR) TestFileTransport.cpp
-
-$(PROG9): $(OBJDIR) TestRes.cpp
-
-$(PROGA): $(OBJDIR) TestRawCache.cpp
-
-$(PROGB): $(OBJDIR) TestCacheMgr.cpp
-

mozilla/xpcom/base/nsError.h

@@ -1,226 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsError_h
-#define nsError_h
-
-#ifndef prtypes_h___
-#include "prtypes.h"
-#endif
-
-/**
- * Generic result data type
- */
-
-typedef PRUint32 nsresult;
-
-/*
- * To add error code to your module, you need to do the following:
- *
- * 1) Add a module offset code.  Add yours to the bottom of the list 
- *    right below this comment, adding 1.
- *
- * 2) In your module, define a header file which uses one of the
- *    NE_ERROR_GENERATExxxxxx macros.  Some examples below:
- *
- *    #define NS_ERROR_MYMODULE_MYERROR1 NS_ERROR_GENERATE(NS_ERROR_SEVERITY_ERROR,NS_ERROR_MODULE_MYMODULE,1)
- *    #define NS_ERROR_MYMODULE_MYERROR2 NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_MYMODULE,2)
- *    #define NS_ERROR_MYMODULE_MYERROR3 NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_MYMODULE,3)
- *
- */
-
-
-/**
- * @name Standard Module Offset Code. Each Module should identify a unique number
- *       and then all errors associated with that module become offsets from the
- *       base associated with that module id. There are 16 bits of code bits for
- *       each module.
- */
-
-#define NS_ERROR_MODULE_XPCOM      1
-#define NS_ERROR_MODULE_BASE       2
-#define NS_ERROR_MODULE_GFX        3
-#define NS_ERROR_MODULE_WIDGET     4
-#define NS_ERROR_MODULE_CALENDAR   5
-#define NS_ERROR_MODULE_NETWORK    6
-#define NS_ERROR_MODULE_PLUGINS    7
-#define NS_ERROR_MODULE_LAYOUT     8
-#define NS_ERROR_MODULE_HTMLPARSER 9
-#define NS_ERROR_MODULE_RDF        10
-#define NS_ERROR_MODULE_UCONV      11
-#define NS_ERROR_MODULE_REG        12
-#define NS_ERROR_MODULE_FILES      13
-#define NS_ERROR_MODULE_DOM        14
-#define NS_ERROR_MODULE_IMGLIB     15
-#define NS_ERROR_MODULE_MAILNEWS   16
-#define NS_ERROR_MODULE_EDITOR     17
-#define NS_ERROR_MODULE_XPCONNECT  18
-
-/**
- * @name Standard Error Handling Macros
- */
-
-#define NS_FAILED(_nsresult) ((_nsresult) & 0x80000000)
-#define NS_SUCCEEDED(_nsresult) (!((_nsresult) & 0x80000000))
-
-/**
- * @name Severity Code.  This flag identifies the level of warning
- */
-
-#define NS_ERROR_SEVERITY_SUCCESS       0
-#define NS_ERROR_SEVERITY_ERROR         1
-
-/**
- * @name Mozilla Code.  This flag separates consumers of mozilla code
- *       from the native platform
- */
-
-#define NS_ERROR_MODULE_BASE_OFFSET 0x45
-
-/**
- * @name Standard Error Generating Macros
- */
-
-#define NS_ERROR_GENERATE(sev,module,code) \
-    ((nsresult) (((PRUint32)(sev)<<31) | ((PRUint32)(module+NS_ERROR_MODULE_BASE_OFFSET)<<16) | ((PRUint32)(code))) )
-
-#define NS_ERROR_GENERATE_SUCCESS(module,code) \
-    ((nsresult) (((PRUint32)(NS_ERROR_SEVERITY_SUCCESS)<<31) | ((PRUint32)(module+NS_ERROR_MODULE_BASE_OFFSET)<<16) | ((PRUint32)(code))) )
-
-#define NS_ERROR_GENERATE_FAILURE(module,code) \
-    ((nsresult) (((PRUint32)(NS_ERROR_SEVERITY_ERROR)<<31) | ((PRUint32)(module+NS_ERROR_MODULE_BASE_OFFSET)<<16) | ((PRUint32)(code))) )
-
-/**
- * @name Standard Macros for retrieving error bits
- */
-
-#define NS_ERROR_GET_CODE(err)     ((err) & 0xffff)
-#define NS_ERROR_GET_MODULE(err)   (((((err) >> 16) - NS_ERROR_MODULE_BASE_OFFSET) & 0x1fff))
-#define NS_ERROR_GET_SEVERITY(err) (((err) >> 31) & 0x1)
-
-/**
- * @name Standard return values
- */
-
-/*@{*/
-
-/* Standard "it worked" return value */
-#define NS_OK                              0
-
-/* The backwards COM false */
-#define NS_COMFALSE                        1
-
-#define NS_ERROR_BASE                      ((nsresult) 0xC1F30000)
-
-/* Returned when an instance is not initialized */
-#define NS_ERROR_NOT_INITIALIZED           (NS_ERROR_BASE + 1)
-
-/* Returned when an instance is already initialized */
-#define NS_ERROR_ALREADY_INITIALIZED       (NS_ERROR_BASE + 2)
-
-/* Returned by a not implemented function */
-#define NS_ERROR_NOT_IMPLEMENTED           ((nsresult) 0x80004001L)
-
-/* Returned when a given interface is not supported. */
-#define NS_NOINTERFACE                     ((nsresult) 0x80004002L)
-#define NS_ERROR_NO_INTERFACE              NS_NOINTERFACE
-
-#define NS_ERROR_INVALID_POINTER           ((nsresult) 0x80004003L)
-#define NS_ERROR_NULL_POINTER              NS_ERROR_INVALID_POINTER
-
-/* Returned when a function aborts */
-#define NS_ERROR_ABORT                     ((nsresult) 0x80004004L)
-
-/* Returned when a function fails */
-#define NS_ERROR_FAILURE                   ((nsresult) 0x80004005L)
-
-/* Returned when an unexpected error occurs */
-#define NS_ERROR_UNEXPECTED                ((nsresult) 0x8000ffffL)
-
-/* Returned when a memory allocation failes */
-#define NS_ERROR_OUT_OF_MEMORY             ((nsresult) 0x8007000eL)
-
-/* Returned when an illegal value is passed */
-#define NS_ERROR_ILLEGAL_VALUE             ((nsresult) 0x80070057L)
-#define NS_ERROR_INVALID_ARG               NS_ERROR_ILLEGAL_VALUE
-
-/* Returned when a class doesn't allow aggregation */
-#define NS_ERROR_NO_AGGREGATION            ((nsresult) 0x80040110L)
-
-/* Returned when an operation can't complete due to an unavailable resource */
-#define NS_ERROR_NOT_AVAILABLE             ((nsresult) 0x80040111L)
-
-/* Returned when a class is not registered */
-#define NS_ERROR_FACTORY_NOT_REGISTERED    ((nsresult) 0x80040154L)
-
-/* Returned when a class cannot be registered, but may be tried again later */
-#define NS_ERROR_FACTORY_REGISTER_AGAIN    ((nsresult) 0x80040155L)
-
-/* Returned when a dynamically loaded factory couldn't be found */
-#define NS_ERROR_FACTORY_NOT_LOADED        ((nsresult) 0x800401f8L)
-
-/* Returned when a factory doesn't support signatures */
-#define NS_ERROR_FACTORY_NO_SIGNATURE_SUPPORT \
-                                           (NS_ERROR_BASE + 0x101)
-
-/* Returned when a factory already is registered */
-#define NS_ERROR_FACTORY_EXISTS            (NS_ERROR_BASE + 0x100)
-
-
-/* For COM compatibility reasons, we want to use exact error code numbers
-   for NS_ERROR_PROXY_INVALID_IN_PARAMETER and NS_ERROR_PROXY_INVALID_OUT_PARAMETER.
-   The first matches:
-
-     #define RPC_E_INVALID_PARAMETER          _HRESULT_TYPEDEF_(0x80010010L)
-   
-   Errors returning this mean that the xpcom proxy code could not create a proxy for
-   one of the in paramaters.
-
-   Because of this, we are ignoring the convention if using a base and offset for
-   error numbers.
-
-*/
-
-/* Returned when a proxy could not be create a proxy for one of the IN parameters
-   This is returned only when the "real" meathod has NOT been invoked. 
-*/
-
-#define NS_ERROR_PROXY_INVALID_IN_PARAMETER        ((nsresult) 0x80010010L)
-
-/* Returned when a proxy could not be create a proxy for one of the OUT parameters
-   This is returned only when the "real" meathod has ALREADY been invoked. 
-*/
-
-#define NS_ERROR_PROXY_INVALID_OUT_PARAMETER        ((nsresult) 0x80010011L)
-
-
-/*@}*/
-
-////////////////////////////////////////////////////////////////////////////////
-
-#ifdef XP_PC
-#pragma warning(disable: 4251) // 'nsCOMPtr<class nsIInputStream>' needs to have dll-interface to be used by clients of class 'nsInputStream'
-#pragma warning(disable: 4275) // non dll-interface class 'nsISupports' used as base for dll-interface class 'nsIRDFNode'
-#endif
-
-#endif
-

mozilla/xpcom/build/dlldeps.cpp

@@ -1,126 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-// Force references to all of the symbols that we want exported from
-// the dll that are located in the .lib files we link with
-
-#include "nsVoidArray.h"
-#include "nsIAtom.h"
-#include "nsFileSpec.h"
-//#include "nsIBuffer.h"
-//#include "nsIByteBufferInputStream.h"
-#include "nsFileStream.h"
-#include "nsFileSpecStreaming.h"
-#include "nsSpecialSystemDirectory.h"
-#include "nsIThread.h"
-#include "nsDeque.h"
-#include "nsObserver.h"
-#include "nsTraceRefcnt.h"
-#include "nsXPIDLString.h"
-#include "nsIEnumerator.h"
-#include "nsEnumeratorUtils.h"
-#include "nsQuickSort.h"
-#include "nsString2.h"
-#include "nsProxyEventPrivate.h"
-#include "xpt_xdr.h"
-#include "nsInterfaceInfo.h"
-#include "xptcall.h"
-#include "nsIFileSpec.h"
-#include "nsIGenericFactory.h"
-#include "nsAVLTree.h"
-#include "nsHashtableEnumerator.h"
-#include "nsPipe2.h"
-#include "nsCWeakReference.h"
-#include "nsWeakReference.h"
-#include "nsISizeOfHandler.h"
-#include "nsTextFormater.h"
-#include "nsStorageStream.h"
-#include "nsIBinaryInputStream.h"
-#ifdef DEBUG
-#include "pure.h"
-#endif
-
-class dummyComparitor: public nsAVLNodeComparitor {
-public:
-  virtual PRInt32 operator()(void* anItem1,void* anItem2)
-  {
-    return 0;
-  }
-}; 
-
-#ifdef DEBUG
-extern NS_COM void
-TestSegmentedBuffer();
-#endif
-
-void XXXNeverCalled()
-{
-    nsTextFormater::snprintf(nsnull,0,nsnull);
-    dummyComparitor dummy;
-    nsVoidArray();
-    nsAVLTree(dummy, nsnull);
-    NS_GetNumberOfAtoms();
-    nsFileURL(NULL);
-//    NS_NewPipe(NULL, NULL, 0, 0, 0, NULL);
-    NS_NewPipe(NULL, NULL, NULL, 0, 0);
-    nsFileSpec s;
-    NS_NewIOFileStream(NULL, s, 0, 0);
-    nsInputFileStream(s, 0, 0);
-    nsPersistentFileDescriptor d;
-    ReadDescriptor(NULL, d);
-    new nsSpecialSystemDirectory(nsSpecialSystemDirectory::OS_DriveDirectory);
-    nsIThread::GetCurrent(NULL);
-    nsDeque(NULL);
-    NS_NewObserver(NULL, NULL);
-    nsTraceRefcnt::DumpStatistics();
-    nsXPIDLCString::Copy(NULL);
-    NS_NewEmptyEnumerator(NULL);
-    nsArrayEnumerator(NULL);
-    NS_NewIntersectionEnumerator(NULL, NULL, NULL);
-    NS_QuickSort(NULL, 0, 0, NULL, NULL);
-    nsString2();
-    nsProxyObject(NULL, 0, NULL);
-    XPT_DoString(NULL, NULL);
-    XPT_DoHeader(NULL, NULL);
-    nsInterfaceInfo* info = NULL;
-    info->GetName(NULL);
-#ifdef DEBUG
-    info->print(NULL);
-    PurePrintf(0);
-#endif
-    XPTC_InvokeByIndex(NULL, 0, 0, NULL);
-    NS_NewFileSpec(NULL);
-    xptc_dummy();
-    xptc_dummy2();
-    XPTI_GetInterfaceInfoManager();
-    NS_NewGenericFactory(NULL, NULL, NULL);
-    NS_NewHashtableEnumerator(NULL, NULL, NULL, NULL);
-    nsCWeakProxy(0, 0);
-    nsCWeakReferent(0);
-    NS_GetWeakReference(NULL);
-#ifdef DEBUG
-    TestSegmentedBuffer();
-#endif
-    NS_NewSizeOfHandler(0);
-    nsStorageStream();
-    NS_NewBinaryInputStream(0, 0);
-}

mozilla/xpcom/components/nsIGenericFactory.h

@@ -1,170 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsIGenericFactory_h___
-#define nsIGenericFactory_h___
-
-#include "nsIFactory.h"
-
-// {3bc97f01-ccdf-11d2-bab8-b548654461fc}
-#define NS_GENERICFACTORY_CID \
-{ 0x3bc97f01, 0xccdf, 0x11d2, { 0xba, 0xb8, 0xb5, 0x48, 0x65, 0x44, 0x61, 0xfc } }
-
-// {3bc97f00-ccdf-11d2-bab8-b548654461fc}
-#define NS_IGENERICFACTORY_IID \
-{ 0x3bc97f00, 0xccdf, 0x11d2, { 0xba, 0xb8, 0xb5, 0x48, 0x65, 0x44, 0x61, 0xfc } }
-
-#define NS_GENERICFACTORY_PROGID "component:/netscape/generic-factory"
-#define NS_GENERICFACTORY_CLASSNAME "Generic Factory"
-/**
- * Provides a Generic nsIFactory implementation that can be used by
- * DLLs with very simple factory needs.
- */
-class nsIGenericFactory : public nsIFactory {
-public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IGENERICFACTORY_IID; return iid; }
-    
-    typedef NS_CALLBACK(ConstructorProcPtr) (nsISupports *aOuter, REFNSIID aIID, void **aResult);
-    typedef NS_CALLBACK(DestructorProcPtr) (void);
-
-	/**
-	 * Establishes the generic factory's constructor function, which will be called
-	 * by CreateInstance.
-	 */
-    NS_IMETHOD SetConstructor(ConstructorProcPtr constructor) = 0;
-
-	/**
-	 * Establishes the generic factory's destructor function, which will be called
-	 * whe the generic factory is deleted. This is used to notify the DLL that
-	 * an instance of one of its generic factories is going away.
-	 */
-    NS_IMETHOD SetDestructor(DestructorProcPtr destructor) = 0;
-};
-
-extern NS_COM nsresult
-NS_NewGenericFactory(nsIGenericFactory* *result,
-                     nsIGenericFactory::ConstructorProcPtr constructor,
-                     nsIGenericFactory::DestructorProcPtr destructor = NULL);
-
-////////////////////////////////////////////////////////////////////////////////
-// Generic Modules
-// 
-// (See xpcom/sample/nsSampleModule.cpp to see how to use this.)
-
-#include "nsIModule.h"
-
-/**
- * Use this type to define a list of module component info to pass to 
- * NS_NewGenericModule. E.g.:
- *     static nsModuleComponentInfo components[] = { ... };
- * See xpcom/sample/nsSampleModule.cpp for more info.
- */
-struct nsModuleComponentInfo {
-    const char*                                 mDescription;
-    nsCID                                       mCID;
-    const char*                                 mProgID;
-    nsIGenericFactory::ConstructorProcPtr       mConstructor;
-};
-
-extern NS_COM nsresult
-NS_NewGenericModule(const char* moduleName,
-                    PRUint32 componentCount,
-                    nsModuleComponentInfo* components,
-                    nsIModule* *result);
-
-#define NS_IMPL_NSGETMODULE(_name, _components)                              \
-extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr,      \
-                                          nsIFileSpec* location,             \
-                                          nsIModule** result)                \
-{                                                                            \
-    return NS_NewGenericModule((_name),                                      \
-                               sizeof(_components) / sizeof(_components[0]), \
-                               (_components), result);                       \
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-#define NS_GENERIC_FACTORY_CONSTRUCTOR(_InstanceClass)                          \
-static NS_IMETHODIMP                                                            \
-_InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) \
-{                                                                               \
-    nsresult rv;                                                                \
-                                                                                \
-    _InstanceClass * inst;                                                      \
-                                                                                \
-    if (NULL == aResult) {                                                      \
-        rv = NS_ERROR_NULL_POINTER;                                             \
-        return rv;                                                              \
-    }                                                                           \
-    *aResult = NULL;                                                            \
-    if (NULL != aOuter) {                                                       \
-        rv = NS_ERROR_NO_AGGREGATION;                                           \
-        return rv;                                                              \
-    }                                                                           \
-                                                                                \
-    NS_NEWXPCOM(inst, _InstanceClass);                                          \
-    if (NULL == inst) {                                                         \
-        rv = NS_ERROR_OUT_OF_MEMORY;                                            \
-        return rv;                                                              \
-    }                                                                           \
-    NS_ADDREF(inst);                                                            \
-    rv = inst->QueryInterface(aIID, aResult);                                   \
-    NS_RELEASE(inst);                                                           \
-                                                                                \
-    return rv;                                                                  \
-}                                                                               \
-
-
-#define NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(_InstanceClass, _InitMethod)        \
-static NS_IMETHODIMP                                                            \
-_InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) \
-{                                                                               \
-    nsresult rv;                                                                \
-                                                                                \
-    _InstanceClass * inst;                                                      \
-                                                                                \
-    if (NULL == aResult) {                                                      \
-        rv = NS_ERROR_NULL_POINTER;                                             \
-        return rv;                                                              \
-    }                                                                           \
-    *aResult = NULL;                                                            \
-    if (NULL != aOuter) {                                                       \
-        rv = NS_ERROR_NO_AGGREGATION;                                           \
-        return rv;                                                              \
-    }                                                                           \
-                                                                                \
-    NS_NEWXPCOM(inst, _InstanceClass);                                          \
-    if (NULL == inst) {                                                         \
-        rv = NS_ERROR_OUT_OF_MEMORY;                                            \
-        return rv;                                                              \
-    }                                                                           \
-    NS_ADDREF(inst);                                                            \
-	rv = inst->_InitMethod();                                                   \
-    if(NS_SUCCEEDED(rv)) {                                                      \
-        rv = inst->QueryInterface(aIID, aResult);                               \
-    }                                                                           \
-    NS_RELEASE(inst);                                                           \
-                                                                                \
-    return rv;                                                                  \
-}                                                                               \
-
-#endif /* nsIGenericFactory_h___ */

mozilla/xpcom/ds/nsHashtable.cpp

@@ -1,521 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "prmem.h"
-#include "prlog.h"
-#include "nsHashtable.h"
-
-//
-// Key operations
-//
-
-static PR_CALLBACK PLHashNumber _hashValue(const void *key) 
-{
-  return ((const nsHashKey *) key)->HashValue();
-}
-
-static PR_CALLBACK PRIntn _hashKeyCompare(const void *key1, const void *key2) {
-  return ((const nsHashKey *) key1)->Equals((const nsHashKey *) key2);
-}
-
-static PR_CALLBACK PRIntn _hashValueCompare(const void *value1,
-                                            const void *value2) {
-  // We're not going to make any assumptions about value equality
-  return 0;
-}
-
-//
-// Memory callbacks
-//
-
-static PR_CALLBACK void *_hashAllocTable(void *pool, PRSize size) {
-  return PR_MALLOC(size);
-}
-
-static PR_CALLBACK void _hashFreeTable(void *pool, void *item) {
-  PR_DELETE(item);
-}
-
-static PR_CALLBACK PLHashEntry *_hashAllocEntry(void *pool, const void *key) {
-  return PR_NEW(PLHashEntry);
-}
-
-static PR_CALLBACK void _hashFreeEntry(void *pool, PLHashEntry *entry, 
-                                       PRUintn flag) {
-  if (flag == HT_FREE_ENTRY) {
-    delete (nsHashKey *) (entry->key);
-    PR_DELETE(entry);
-  }
-}
-
-static PLHashAllocOps _hashAllocOps = {
-    _hashAllocTable, _hashFreeTable,
-    _hashAllocEntry, _hashFreeEntry
-};
-
-//
-// Enumerator callback
-//
-
-struct _HashEnumerateArgs {
-  nsHashtableEnumFunc fn;
-  void* arg;
-};
-
-static PR_CALLBACK PRIntn _hashEnumerate(PLHashEntry *he, PRIntn i, void *arg)
-{
-  _HashEnumerateArgs* thunk = (_HashEnumerateArgs*)arg;
-  return thunk->fn((nsHashKey *) he->key, he->value, thunk->arg)
-    ? HT_ENUMERATE_NEXT
-    : HT_ENUMERATE_STOP;
-}
-
-//
-// HashKey 
-//
-nsHashKey::nsHashKey(void)
-{
-}
-
-nsHashKey::~nsHashKey(void)
-{
-}
-
-nsHashtable::nsHashtable(PRUint32 aInitSize, PRBool threadSafe)
-  : mLock(NULL)
-{
-  hashtable = PL_NewHashTable(aInitSize,
-                              _hashValue,
-                              _hashKeyCompare,
-                              _hashValueCompare,
-                              &_hashAllocOps,
-                              NULL);
-  if (threadSafe == PR_TRUE)
-  {
-    mLock = PR_NewLock();
-    if (mLock == NULL)
-    {
-      // Cannot create a lock. If running on a multiprocessing system
-      // we are sure to die.
-      PR_ASSERT(mLock != NULL);
-    }
-  }
-}
-
-nsHashtable::~nsHashtable() {
-  PL_HashTableDestroy(hashtable);
-  if (mLock) PR_DestroyLock(mLock);
-}
-
-PRBool nsHashtable::Exists(nsHashKey *aKey)
-{
-  PLHashNumber hash = aKey->HashValue();
-
-  if (mLock) PR_Lock(mLock);
-
-  PLHashEntry **hep = PL_HashTableRawLookup(hashtable, hash, (void *) aKey);
-
-  if (mLock) PR_Unlock(mLock);
-
-  return *hep != NULL;
-}
-
-void *nsHashtable::Put(nsHashKey *aKey, void *aData) {
-  void *res =  NULL;
-  PLHashNumber hash = aKey->HashValue();
-  PLHashEntry *he;
-
-  if (mLock) PR_Lock(mLock);
-
-  PLHashEntry **hep = PL_HashTableRawLookup(hashtable, hash, (void *) aKey);
-
-  if ((he = *hep) != NULL) {
-    res = he->value;
-    he->value = aData;
-  } else {
-    PL_HashTableRawAdd(hashtable, hep, hash,
-                       (void *) aKey->Clone(), aData);
-  }
-
-  if (mLock) PR_Unlock(mLock);
-
-  return res;
-}
-
-void *nsHashtable::Get(nsHashKey *aKey) {
-
-  if (mLock) PR_Lock(mLock);
-
-  void *ret = PL_HashTableLookup(hashtable, (void *) aKey);
-
-  if (mLock) PR_Unlock(mLock);
-
-  return ret;
-}
-
-void *nsHashtable::Remove(nsHashKey *aKey) {
-  PLHashNumber hash = aKey->HashValue();
-  PLHashEntry *he;
-
-  if (mLock) PR_Lock(mLock);
-
-  PLHashEntry **hep = PL_HashTableRawLookup(hashtable, hash, (void *) aKey);
-  void *res = NULL;
-  
-  if ((he = *hep) != NULL) {
-    res = he->value;
-    PL_HashTableRawRemove(hashtable, hep, he);
-  }
-
-  if (mLock) PR_Unlock(mLock);
-
-  return res;
-}
-
-// XXX This method was called _hashEnumerateCopy, but it didn't copy the element!
-// I don't know how this was supposed to work since the elements are neither copied
-// nor refcounted.
-static PR_CALLBACK PRIntn _hashEnumerateShare(PLHashEntry *he, PRIntn i, void *arg)
-{
-  nsHashtable *newHashtable = (nsHashtable *)arg;
-  newHashtable->Put((nsHashKey *) he->key, he->value);
-  return HT_ENUMERATE_NEXT;
-}
-
-nsHashtable * nsHashtable::Clone() {
-  PRBool threadSafe = PR_FALSE;
-  if (mLock)
-    threadSafe = PR_TRUE;
-  nsHashtable *newHashTable = new nsHashtable(hashtable->nentries, threadSafe);
-
-  PL_HashTableEnumerateEntries(hashtable, _hashEnumerateShare, newHashTable);
-  return newHashTable;
-}
-
-void nsHashtable::Enumerate(nsHashtableEnumFunc aEnumFunc, void* closure) {
-  _HashEnumerateArgs thunk;
-  thunk.fn = aEnumFunc;
-  thunk.arg = closure;
-  PL_HashTableEnumerateEntries(hashtable, _hashEnumerate, &thunk);
-}
-
-static PR_CALLBACK PRIntn _hashEnumerateRemove(PLHashEntry *he, PRIntn i, void *arg)
-{
-  _HashEnumerateArgs* thunk = (_HashEnumerateArgs*)arg;
-  if (thunk)
-      return thunk->fn((nsHashKey *) he->key, he->value, thunk->arg)
-          ? HT_ENUMERATE_REMOVE
-          : HT_ENUMERATE_STOP;
-  else
-      return HT_ENUMERATE_REMOVE;
-}
-
-void nsHashtable::Reset() {
-  Reset(NULL);
-}
-
-void nsHashtable::Reset(nsHashtableEnumFunc destroyFunc, void* closure)
-{
-  if (destroyFunc != NULL)
-  {
-      _HashEnumerateArgs thunk;
-      thunk.fn = destroyFunc;
-      thunk.arg = closure;
-      PL_HashTableEnumerateEntries(hashtable, _hashEnumerateRemove, &thunk);
-  }
-  else
-      PL_HashTableEnumerateEntries(hashtable, _hashEnumerateRemove, NULL);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsStringKey::nsStringKey(const char* str)
-{
-	mStr.Assign(str);
-}
-
-nsStringKey::nsStringKey(const PRUnichar* str)
-{
-	mStr.Assign(str);
-}
-
-nsStringKey::nsStringKey(const nsStr& str)
-{
-	mStr.Assign(str);
-}
-
-nsStringKey::~nsStringKey(void)
-{
-}
-
-PRUint32 nsStringKey::HashValue(void) const
-{
-	if(mStr.IsUnicode())
-		{
-		PRUint32 h;
-		PRUint32 n;
-		PRUint32 m;
-		const PRUnichar* c;
-
-		h = 0;
-		n = mStr.Length();
-		c = mStr.GetUnicode();
-		if(n < 16)
-			{	/* Hash every char in a short string. */
-			for(; n; c++, n--)
-				h = (h >> 28) ^ (h << 4) ^ *c;
-			}
-		else
-			{	/* Sample a la jave.lang.String.hash(). */
-			for(m = n / 8; n >= m; c += m, n -= m)
-				h = (h >> 28) ^ (h << 4) ^ *c;
-			}
-		return h; 
-		}
-	return (PRUint32)PL_HashString((const void*) mStr.GetBuffer());
-}
-
-PRBool nsStringKey::Equals(const nsHashKey* aKey) const
-{
-	return ((nsStringKey*)aKey)->mStr == mStr;
-}
-
-nsHashKey* nsStringKey::Clone() const
-{
-	return new nsStringKey(mStr);
-}
-
-const nsString& nsStringKey::GetString() const
-{
-    return mStr;
-}    
-
-////////////////////////////////////////////////////////////////////////////////
-// nsObjectHashtable: an nsHashtable where the elements are C++ objects to be
-// deleted
-
-nsObjectHashtable::nsObjectHashtable(nsHashtableCloneElementFunc cloneElementFun,
-                                     void* cloneElementClosure,
-                                     nsHashtableEnumFunc destroyElementFun,
-                                     void* destroyElementClosure,
-                                     PRUint32 aSize, PRBool threadSafe)
-    : nsHashtable(aSize, threadSafe),
-      mCloneElementFun(cloneElementFun),
-      mCloneElementClosure(cloneElementClosure),
-      mDestroyElementFun(destroyElementFun),
-      mDestroyElementClosure(destroyElementClosure)
-{
-}
-
-nsObjectHashtable::~nsObjectHashtable()
-{
-    Reset();
-}
-
-PR_CALLBACK PRIntn 
-nsObjectHashtable::CopyElement(PLHashEntry *he, PRIntn i, void *arg)
-{
-  nsObjectHashtable *newHashtable = (nsObjectHashtable *)arg;
-  void* newElement = 
-      newHashtable->mCloneElementFun((nsHashKey*)he->key, he->value, 
-                                     newHashtable->mCloneElementClosure);
-  if (newElement == nsnull)
-      return HT_ENUMERATE_STOP;
-  newHashtable->Put((nsHashKey*)he->key, newElement);
-  return HT_ENUMERATE_NEXT;
-}
-
-nsHashtable*
-nsObjectHashtable::Clone()
-{
-    PRBool threadSafe = PR_FALSE;
-    if (mLock)
-        threadSafe = PR_TRUE;
-    nsObjectHashtable* newHashTable = 
-        new nsObjectHashtable(mCloneElementFun, mCloneElementClosure,
-                              mDestroyElementFun, mDestroyElementClosure,
-                              hashtable->nentries, threadSafe);
-
-    PL_HashTableEnumerateEntries(hashtable, CopyElement, newHashTable);
-    return newHashTable;
-}
-
-void 
-nsObjectHashtable::Reset()
-{
-    nsHashtable::Reset(mDestroyElementFun, mDestroyElementClosure);
-}
-
-PRBool
-nsObjectHashtable::RemoveAndDelete(nsHashKey *aKey)
-{
-    void *value = Remove(aKey);
-    if (value && mDestroyElementFun)
-    {
-        return (*mDestroyElementFun)(aKey, value, mDestroyElementClosure);
-    }
-    else
-        return PR_FALSE;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsSupportsHashtable: an nsHashtable where the elements are nsISupports*
-
-static PR_CALLBACK PRBool
-_ReleaseElement(nsHashKey *aKey, void *aData, void* closure)
-{
-    nsISupports* element = NS_STATIC_CAST(nsISupports*, aData);
-    NS_IF_RELEASE(element);
-    return PR_TRUE;
-}
-
-nsSupportsHashtable::~nsSupportsHashtable()
-{
-    Enumerate(_ReleaseElement, nsnull);
-}
-
-void*
-nsSupportsHashtable::Put(nsHashKey *aKey, void *aData)
-{
-    nsISupports* element = NS_STATIC_CAST(nsISupports*, aData);
-    NS_IF_ADDREF(element);
-    return nsHashtable::Put(aKey, aData);
-}
-
-void*
-nsSupportsHashtable::Get(nsHashKey *aKey)
-{
-    void* data = nsHashtable::Get(aKey);
-    if (!data)
-        return nsnull;
-    nsISupports* element = NS_STATIC_CAST(nsISupports*, data);
-    NS_IF_ADDREF(element);
-    return data;
-}
-
-void*
-nsSupportsHashtable::Remove(nsHashKey *aKey)
-{
-    void* data = nsHashtable::Remove(aKey);
-    if (!data)
-        return nsnull;
-    nsISupports* element = NS_STATIC_CAST(nsISupports*, data);
-    NS_IF_RELEASE(element);
-    return data;
-}
-
-static PR_CALLBACK PRIntn
-_hashEnumerateCopy(PLHashEntry *he, PRIntn i, void *arg)
-{
-    nsHashtable *newHashtable = (nsHashtable *)arg;
-    nsISupports* element = NS_STATIC_CAST(nsISupports*, he->value);
-    NS_IF_ADDREF(element);
-    newHashtable->Put((nsHashKey*)he->key, he->value);
-    return HT_ENUMERATE_NEXT;
-}
-
-nsHashtable*
-nsSupportsHashtable::Clone()
-{
-    PRBool threadSafe = PR_FALSE;
-    if (mLock)
-        threadSafe = PR_TRUE;
-    nsSupportsHashtable* newHashTable = 
-        new nsSupportsHashtable(hashtable->nentries, threadSafe);
-
-    PL_HashTableEnumerateEntries(hashtable, _hashEnumerateCopy, newHashTable);
-    return newHashTable;
-}
-
-void 
-nsSupportsHashtable::Reset()
-{
-    Enumerate(_ReleaseElement, nsnull);
-    nsHashtable::Reset();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsOpaqueKey: Where keys are opaque byte array blobs
-//
-
-// Note opaque keys are not copied by this constructor.  If you want a private
-// copy in each hash key, you must create one and pass it in to this function.
-nsOpaqueKey::nsOpaqueKey(const char *aOpaqueKey, PRUint32 aKeyLength)
-{
-    mOpaqueKey = aOpaqueKey;
-    mKeyLength = aKeyLength;
-}
-
-nsOpaqueKey::~nsOpaqueKey(void)
-{
-}
-
-PRUint32
-nsOpaqueKey::HashValue(void) const
-{
-    PRUint32 h, i, k;
-
-    h = 0;
-
-    // Same hashing technique as for java.lang.String.hashCode()
-    if (mKeyLength <= 15) {
-        // A short key; Use a dense sampling to compute the hash code
-        for (i = 0; i < mKeyLength; i++)
-            h += 37 * mOpaqueKey[i];
-    } else {
-        // A long key; Use a sparse sampling to compute the hash code
-        k = mKeyLength >> 3;
-        for (i = 0; i < mKeyLength; i += k)
-            h += 39 * mOpaqueKey[i];
-    }
-    return h;
-}
-
-PRBool
-nsOpaqueKey::Equals(const nsHashKey* aKey) const
-{
-    nsOpaqueKey *otherKey = (nsOpaqueKey*)aKey;
-    if (mKeyLength !=  otherKey->mKeyLength)
-        return PR_FALSE;
-	return !(PRBool)memcmp(otherKey->mOpaqueKey, mOpaqueKey, mKeyLength);
-}
-
-nsHashKey*
-nsOpaqueKey::Clone() const
-{
-	return new nsOpaqueKey(mOpaqueKey, mKeyLength);
-}
-
-PRUint32
-nsOpaqueKey::GetKeyLength() const
-{
-    return mKeyLength;
-}
-
-const char*
-nsOpaqueKey::GetKey() const
-{
-    return mOpaqueKey;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-

mozilla/xpcom/ds/nsHashtable.h

@@ -1,248 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsHashtable_h__
-#define nsHashtable_h__
-
-#include "plhash.h"
-#include "prlock.h"
-#include "nsCom.h"
-
-class NS_COM nsHashKey {
-protected:
-  nsHashKey(void);
-public:
-  virtual ~nsHashKey(void);
-  virtual PRUint32 HashValue(void) const = 0;
-  virtual PRBool Equals(const nsHashKey *aKey) const = 0;
-  virtual nsHashKey *Clone(void) const = 0;
-};
-
-// Enumerator callback function. Use
-
-typedef PRBool (*nsHashtableEnumFunc)(nsHashKey *aKey, void *aData, void* closure);
-
-class NS_COM nsHashtable {
-protected:
-  // members  
-  PLHashTable *hashtable;
-  PRLock *mLock;
-
-public:
-  nsHashtable(PRUint32 aSize = 256, PRBool threadSafe = PR_FALSE);
-  ~nsHashtable();
-
-  PRInt32 Count(void) { return hashtable->nentries; }
-  PRBool Exists(nsHashKey *aKey);
-  void *Put(nsHashKey *aKey, void *aData);
-  void *Get(nsHashKey *aKey);
-  void *Remove(nsHashKey *aKey);
-  nsHashtable *Clone();
-  void Enumerate(nsHashtableEnumFunc aEnumFunc, void* closure = NULL);
-  void Reset();
-  void Reset(nsHashtableEnumFunc destroyFunc, void* closure = NULL);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// nsObjectHashtable: an nsHashtable where the elements are C++ objects to be
-// deleted
-
-typedef void* (*nsHashtableCloneElementFunc)(nsHashKey *aKey, void *aData, void* closure);
-
-class NS_COM nsObjectHashtable : public nsHashtable {
-public:
-  nsObjectHashtable(nsHashtableCloneElementFunc cloneElementFun,
-                    void* cloneElementClosure,
-                    nsHashtableEnumFunc destroyElementFun,
-                    void* destroyElementClosure,
-                    PRUint32 aSize = 256, PRBool threadSafe = PR_FALSE);
-  ~nsObjectHashtable();
-
-  nsHashtable *Clone();
-  void Reset();
-  PRBool RemoveAndDelete(nsHashKey *aKey);
-
-protected:
-  static PR_CALLBACK PRIntn CopyElement(PLHashEntry *he, PRIntn i, void *arg);
-  
-  nsHashtableCloneElementFunc   mCloneElementFun;
-  void*                         mCloneElementClosure;
-  nsHashtableEnumFunc           mDestroyElementFun;
-  void*                         mDestroyElementClosure;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// nsSupportsHashtable: an nsHashtable where the elements are nsISupports*
-
-class NS_COM nsSupportsHashtable : public nsHashtable {
-public:
-  nsSupportsHashtable(PRUint32 aSize = 256, PRBool threadSafe = PR_FALSE)
-    : nsHashtable(aSize, threadSafe) {}
-  ~nsSupportsHashtable();
-
-  void *Put(nsHashKey *aKey, void *aData);
-  void *Get(nsHashKey *aKey);
-  void *Remove(nsHashKey *aKey);
-  nsHashtable *Clone();
-  void Reset();
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// nsISupportsKey: Where keys are nsISupports objects that get refcounted.
-
-#include "nsISupports.h"
-
-class nsISupportsKey : public nsHashKey {
-protected:
-  nsISupports* mKey;
-  
-public:
-  nsISupportsKey(nsISupports* key) {
-    mKey = key;
-    NS_IF_ADDREF(mKey);
-  }
-  
-  ~nsISupportsKey(void) {
-    NS_IF_RELEASE(mKey);
-  }
-  
-  PRUint32 HashValue(void) const {
-    return (PRUint32)mKey;
-  }
-
-  PRBool Equals(const nsHashKey *aKey) const {
-    return (mKey == ((nsISupportsKey *) aKey)->mKey);
-  }
-
-  nsHashKey *Clone(void) const {
-    return new nsISupportsKey(mKey);
-  }
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// nsVoidKey: Where keys are void* objects that don't get refcounted.
-
-class nsVoidKey : public nsHashKey {
-protected:
-  const void* mKey;
-  
-public:
-  nsVoidKey(const void* key) {
-    mKey = key;
-  }
-  
-  PRUint32 HashValue(void) const {
-    return (PRUint32)mKey;
-  }
-
-  PRBool Equals(const nsHashKey *aKey) const {
-    return (mKey == ((const nsVoidKey *) aKey)->mKey);
-  }
-
-  nsHashKey *Clone(void) const {
-    return new nsVoidKey(mKey);
-  }
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIDKey: Where keys are nsIDs (e.g. nsIID, nsCID).
-
-#include "nsID.h"
-
-class nsIDKey : public nsHashKey {
-protected:
-  nsID mID;
-  
-public:
-  nsIDKey(const nsID &aID) {
-    mID = aID;
-  }
-  
-  PRUint32 HashValue(void) const {
-    return mID.m0;
-  }
-
-  PRBool Equals(const nsHashKey *aKey) const {
-    return (mID.Equals(((const nsIDKey *) aKey)->mID));
-  }
-
-  nsHashKey *Clone(void) const {
-    return new nsIDKey(mID);
-  }
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// nsStringKey: Where keys are PRUnichar* or char*
-// Some uses: hashing ProgIDs, filenames, URIs
-
-#include "nsString.h"
-
-class NS_COM nsStringKey : public nsHashKey {
-protected:
-  nsAutoString mStr;
-
-public:
-  nsStringKey(const char* str);
-  nsStringKey(const PRUnichar* str);
-  nsStringKey(const nsStr& str);
-
-  ~nsStringKey(void);
-
-  PRUint32 HashValue(void) const;
-
-  PRBool Equals(const nsHashKey* aKey) const;
-
-  nsHashKey* Clone() const;
-
-  // For when the owner of the hashtable wants to peek at the actual
-  // string in the key. No copy is made, so be careful.
-  const nsString& GetString() const;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// nsOpaqueKey: Where keys are opaque byte-array blobs
-
-#include "nsString.h"
-
-class NS_COM nsOpaqueKey : public nsHashKey {
-protected:
-  const char* mOpaqueKey;         // Byte array of opaque data
-  PRUint32    mKeyLength;         // Length, in bytes, of mOpaqueKey
-
-public:
-  // Note opaque keys are not copied by this constructor.  If you want a private
-  // copy in each hash key, you must create one and pass it in to this function.
-  nsOpaqueKey(const char* aOpaqueKey, PRUint32 aKeyLength);
-
-  ~nsOpaqueKey(void);
-
-  PRUint32 HashValue(void) const;
-  PRBool Equals(const nsHashKey* aKey) const;
-  nsHashKey* Clone() const;
-
-  // For when the owner of the hashtable wants to peek at the actual
-  // opaque array in the key. No copy is made, so be careful.
-  const char* GetKey() const;
-  PRUint32 GetKeyLength() const;
-};
-
-#endif

mozilla/xpcom/ds/nsHashtableEnumerator.cpp

@@ -1,247 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-/*
- * Implementation of nsHashEnumerator.
- * Use it to expose nsIEnumerator interfaces around nsHashtable objects.  
- * Contributed by Rob Ginda, rginda@ix.netcom.com
- */
-
-#include "nscore.h"
-#include "nsHashtableEnumerator.h"
-
-class nsHashtableEnumerator : public nsIBidirectionalEnumerator
-{
-  public:    
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIENUMERATOR
-    NS_DECL_NSIBIDIRECTIONALENUMERATOR
-
-  public:    
-    virtual ~nsHashtableEnumerator ();
-    nsHashtableEnumerator (nsHashtable *aHash, 
-                           NS_HASH_ENUMERATOR_CONVERTER aConverter,
-                           void *aData);
-    nsHashtableEnumerator (); /* no implementation */
-
-  private:
-    NS_IMETHOD Reset(nsHashtable *aHash, 
-                     NS_HASH_ENUMERATOR_CONVERTER aConverter,
-                     void *aData);
-    NS_IMETHOD ReleaseElements();
-
-    nsISupports  **mElements;
-    PRInt16      mCount, mCurrent;
-    PRBool       mDoneFlag;
-    
-};
-
-struct nsHashEnumClosure
-{
-    NS_HASH_ENUMERATOR_CONVERTER Converter;
-    nsISupports                  **Elements;
-    PRInt16                      Current;
-    void                         *Data;
-};
-
-extern "C" NS_COM nsresult
-NS_NewHashtableEnumerator (nsHashtable *aHash, 
-                           NS_HASH_ENUMERATOR_CONVERTER aConverter,
-                           void *aData, nsIEnumerator **retval)
-{
-    NS_PRECONDITION (retval, "null ptr");
-
-    *retval = nsnull;
-    
-    nsHashtableEnumerator *hte = new nsHashtableEnumerator (aHash, aConverter,
-                                                            aData);
-    if (!hte)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    return hte->QueryInterface (nsCOMTypeInfo<nsIEnumerator>::GetIID(),
-                                (void **)retval);
-}
-
-nsHashtableEnumerator::nsHashtableEnumerator (nsHashtable *aHash,
-                                        NS_HASH_ENUMERATOR_CONVERTER aConverter,
-                                        void *aData)
-        : mElements(nsnull), mCount(0), mDoneFlag(PR_TRUE)
-{
-    NS_INIT_REFCNT();
-    Reset (aHash, aConverter, aData);
-    
-}
-
-PRBool
-hash_enumerator (nsHashKey *aKey, void *aObject, void *closure)
-{
-    nsresult rv;
-    
-    nsHashEnumClosure *c = (nsHashEnumClosure *)closure;
-    
-    rv = c->Converter (aKey, (void *)aObject, (void *)c->Data,
-                       &c->Elements[c->Current]);
-
-    if (!NS_FAILED(rv))
-        c->Current++;
-    
-    return PR_TRUE;
-
-}
-
-NS_IMETHODIMP
-nsHashtableEnumerator::Reset (nsHashtable *aHash,
-                              NS_HASH_ENUMERATOR_CONVERTER aConverter,
-                              void *aData)
-{
-    nsHashEnumClosure c;
-    
-    ReleaseElements();
-
-    mCurrent = c.Current = 0;
-    mCount = aHash->Count();
-    if (mCount == 0)
-        return NS_ERROR_FAILURE;
-
-    mElements = c.Elements = new nsISupports*[mCount];
-    c.Data = aData;
-    c.Converter = aConverter;
-    aHash->Enumerate (&hash_enumerator, &c);
-
-    mCount = c.Current;  /* some items may not have converted correctly */
-    mDoneFlag = PR_FALSE;
-    
-    return NS_OK;
-    
-}
-
-NS_IMETHODIMP
-nsHashtableEnumerator::ReleaseElements()
-{
-    
-    for (; mCount > 0; mCount--)
-        if (mElements[mCount - 1])
-            NS_RELEASE(mElements[mCount - 1]);
-
-    delete[] mElements;
-    mElements = nsnull;
-    
-    return NS_OK;
-    
-}
-
-NS_IMPL_ISUPPORTS2(nsHashtableEnumerator, nsIBidirectionalEnumerator, nsIEnumerator)
-
-nsHashtableEnumerator::~nsHashtableEnumerator() 
-{
-    ReleaseElements();
-}
-
-NS_IMETHODIMP
-nsHashtableEnumerator::First ()
-{
-    if (!mElements || (mCount == 0))
-        return NS_ERROR_FAILURE;
-
-    mCurrent = 0;
-    mDoneFlag = PR_FALSE;
-    
-    return NS_OK;
-
-}
-
-NS_IMETHODIMP
-nsHashtableEnumerator::Last ()
-{
-    if (!mElements || (mCount == 0))
-        return NS_ERROR_FAILURE;
-    
-    mCurrent = mCount - 1;
-    mDoneFlag = PR_FALSE;
-    
-    return NS_OK;
-
-}
-
-NS_IMETHODIMP
-nsHashtableEnumerator::Prev ()
-{
-    if (!mElements || (mCount == 0) || (mCurrent == 0)) {
-        mDoneFlag = PR_TRUE;
-        return NS_ERROR_FAILURE;
-    }
-
-    mCurrent--;
-    mDoneFlag = PR_FALSE;
-
-    return NS_OK;
-    
-}
-
-NS_IMETHODIMP
-nsHashtableEnumerator::Next ()
-{
-    if (!mElements || (mCount == 0) || (mCurrent == mCount - 1)) {
-        mDoneFlag = PR_TRUE;
-        return NS_ERROR_FAILURE;
-    }
-
-    mCurrent++;
-    mDoneFlag = PR_FALSE;
-    
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHashtableEnumerator::CurrentItem (nsISupports **retval)
-{
-    NS_PRECONDITION (retval, "null ptr");
-    NS_PRECONDITION (mElements, "invalid state");
-    NS_ASSERTION (mCurrent >= 0, "mCurrent less than zero");
-
-    if (mCount == 0)
-    {
-        *retval = nsnull;
-        return NS_ERROR_FAILURE;
-    }
-
-    NS_ASSERTION (mCurrent <= mCount - 1, "mCurrent too high");
-
-    *retval = mElements[mCurrent];
-
-    /* who says the item can't be null? */
-    if (*retval)
-        NS_ADDREF(*retval);
-
-    return NS_OK;
-    
-}
-
-NS_IMETHODIMP
-nsHashtableEnumerator::IsDone ()
-{
-
-    if ((!mElements) || (mCount == 0) || (mDoneFlag))
-        return NS_OK;
-
-    return NS_COMFALSE;
-}

mozilla/xpcom/ds/nsHashtableEnumerator.h

@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-/*
- * This class can be used to expose nsI(BiDirectional)Enumerator interfaces
- * around nsHashtable objects.  
- * Contributed by Rob Ginda, rginda@ix.netcom.com
- */
-
-#ifndef nsHashtableEnumerator_h___
-#define nsHashtableEnumerator_h___
-
-#include "nscore.h"
-#include "nsIEnumerator.h"
-#include "nsHashtable.h"
-
-typedef NS_CALLBACK(NS_HASH_ENUMERATOR_CONVERTER) (nsHashKey *key, void *data,
-                                                   void *convert_data,
-                                                   nsISupports **retval);
-
-extern "C" NS_COM nsresult
-NS_NewHashtableEnumerator (nsHashtable *aHash, 
-                           NS_HASH_ENUMERATOR_CONVERTER aConverter,
-                           void *aData, nsIEnumerator **retval);
-
-
-#endif /* nsHashtableEnumerator_h___ */
-

mozilla/xpcom/glue/nsIGenericFactory.h

@@ -1,170 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsIGenericFactory_h___
-#define nsIGenericFactory_h___
-
-#include "nsIFactory.h"
-
-// {3bc97f01-ccdf-11d2-bab8-b548654461fc}
-#define NS_GENERICFACTORY_CID \
-{ 0x3bc97f01, 0xccdf, 0x11d2, { 0xba, 0xb8, 0xb5, 0x48, 0x65, 0x44, 0x61, 0xfc } }
-
-// {3bc97f00-ccdf-11d2-bab8-b548654461fc}
-#define NS_IGENERICFACTORY_IID \
-{ 0x3bc97f00, 0xccdf, 0x11d2, { 0xba, 0xb8, 0xb5, 0x48, 0x65, 0x44, 0x61, 0xfc } }
-
-#define NS_GENERICFACTORY_PROGID "component:/netscape/generic-factory"
-#define NS_GENERICFACTORY_CLASSNAME "Generic Factory"
-/**
- * Provides a Generic nsIFactory implementation that can be used by
- * DLLs with very simple factory needs.
- */
-class nsIGenericFactory : public nsIFactory {
-public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IGENERICFACTORY_IID; return iid; }
-    
-    typedef NS_CALLBACK(ConstructorProcPtr) (nsISupports *aOuter, REFNSIID aIID, void **aResult);
-    typedef NS_CALLBACK(DestructorProcPtr) (void);
-
-	/**
-	 * Establishes the generic factory's constructor function, which will be called
-	 * by CreateInstance.
-	 */
-    NS_IMETHOD SetConstructor(ConstructorProcPtr constructor) = 0;
-
-	/**
-	 * Establishes the generic factory's destructor function, which will be called
-	 * whe the generic factory is deleted. This is used to notify the DLL that
-	 * an instance of one of its generic factories is going away.
-	 */
-    NS_IMETHOD SetDestructor(DestructorProcPtr destructor) = 0;
-};
-
-extern NS_COM nsresult
-NS_NewGenericFactory(nsIGenericFactory* *result,
-                     nsIGenericFactory::ConstructorProcPtr constructor,
-                     nsIGenericFactory::DestructorProcPtr destructor = NULL);
-
-////////////////////////////////////////////////////////////////////////////////
-// Generic Modules
-// 
-// (See xpcom/sample/nsSampleModule.cpp to see how to use this.)
-
-#include "nsIModule.h"
-
-/**
- * Use this type to define a list of module component info to pass to 
- * NS_NewGenericModule. E.g.:
- *     static nsModuleComponentInfo components[] = { ... };
- * See xpcom/sample/nsSampleModule.cpp for more info.
- */
-struct nsModuleComponentInfo {
-    const char*                                 mDescription;
-    nsCID                                       mCID;
-    const char*                                 mProgID;
-    nsIGenericFactory::ConstructorProcPtr       mConstructor;
-};
-
-extern NS_COM nsresult
-NS_NewGenericModule(const char* moduleName,
-                    PRUint32 componentCount,
-                    nsModuleComponentInfo* components,
-                    nsIModule* *result);
-
-#define NS_IMPL_NSGETMODULE(_name, _components)                              \
-extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr,      \
-                                          nsIFileSpec* location,             \
-                                          nsIModule** result)                \
-{                                                                            \
-    return NS_NewGenericModule((_name),                                      \
-                               sizeof(_components) / sizeof(_components[0]), \
-                               (_components), result);                       \
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-#define NS_GENERIC_FACTORY_CONSTRUCTOR(_InstanceClass)                          \
-static NS_IMETHODIMP                                                            \
-_InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) \
-{                                                                               \
-    nsresult rv;                                                                \
-                                                                                \
-    _InstanceClass * inst;                                                      \
-                                                                                \
-    if (NULL == aResult) {                                                      \
-        rv = NS_ERROR_NULL_POINTER;                                             \
-        return rv;                                                              \
-    }                                                                           \
-    *aResult = NULL;                                                            \
-    if (NULL != aOuter) {                                                       \
-        rv = NS_ERROR_NO_AGGREGATION;                                           \
-        return rv;                                                              \
-    }                                                                           \
-                                                                                \
-    NS_NEWXPCOM(inst, _InstanceClass);                                          \
-    if (NULL == inst) {                                                         \
-        rv = NS_ERROR_OUT_OF_MEMORY;                                            \
-        return rv;                                                              \
-    }                                                                           \
-    NS_ADDREF(inst);                                                            \
-    rv = inst->QueryInterface(aIID, aResult);                                   \
-    NS_RELEASE(inst);                                                           \
-                                                                                \
-    return rv;                                                                  \
-}                                                                               \
-
-
-#define NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(_InstanceClass, _InitMethod)        \
-static NS_IMETHODIMP                                                            \
-_InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) \
-{                                                                               \
-    nsresult rv;                                                                \
-                                                                                \
-    _InstanceClass * inst;                                                      \
-                                                                                \
-    if (NULL == aResult) {                                                      \
-        rv = NS_ERROR_NULL_POINTER;                                             \
-        return rv;                                                              \
-    }                                                                           \
-    *aResult = NULL;                                                            \
-    if (NULL != aOuter) {                                                       \
-        rv = NS_ERROR_NO_AGGREGATION;                                           \
-        return rv;                                                              \
-    }                                                                           \
-                                                                                \
-    NS_NEWXPCOM(inst, _InstanceClass);                                          \
-    if (NULL == inst) {                                                         \
-        rv = NS_ERROR_OUT_OF_MEMORY;                                            \
-        return rv;                                                              \
-    }                                                                           \
-    NS_ADDREF(inst);                                                            \
-	rv = inst->_InitMethod();                                                   \
-    if(NS_SUCCEEDED(rv)) {                                                      \
-        rv = inst->QueryInterface(aIID, aResult);                               \
-    }                                                                           \
-    NS_RELEASE(inst);                                                           \
-                                                                                \
-    return rv;                                                                  \
-}                                                                               \
-
-#endif /* nsIGenericFactory_h___ */

mozilla/xpcom/io/Makefile.in

@@ -1,84 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= xpcom
-XPIDL_MODULE	= xpcom_io
-LIBRARY_NAME	= xpcomio_s
-
-REQUIRES	= xpcom uconv unicharutil
-
-CPPSRCS		= \
-		nsEscape.cpp \
-		nsFileSpec.cpp \
-		nsFileSpecStreaming.cpp \
-		nsFileStream.cpp \
-		nsFileSpecImpl.cpp \
-		nsIFileStream.cpp \
-		nsIStringStream.cpp \
-		nsSegmentedBuffer.cpp \
-		nsPipe2.cpp \
-		nsSpecialSystemDirectory.cpp \
-		nsUnicharInputStream.cpp \
-        nsBinaryStream.cpp \
-        nsStorageStream.cpp \
-		$(NULL)
-
-EXPORTS		= \
-		nsEscape.h \
-		nsFileSpec.h \
-		nsFileSpecStreaming.h \
-		nsFileStream.h \
-		nsIFileStream.h \
-		nsIStringStream.h \
-		nsIUnicharInputStream.h \
-		nsSpecialSystemDirectory.h \
-		$(NULL)			
-
-XPIDLSRCS	= \
-		nsIPipe.idl \
-		nsIFileSpec.idl \
-		nsIBaseStream.idl \
-		nsIInputStream.idl \
-		nsIOutputStream.idl \
-		nsIBufferInputStream.idl \
-		nsIBufferOutputStream.idl \
-        nsIBinaryInputStream.idl \
-        nsIBinaryOutputStream.idl  \
-        nsIStorageStream.idl \
-		$(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
-
-ifeq ($(OS_ARCH), Linux)
-DEFINES		+= -D_BSD_SOURCE
-endif
-

mozilla/xpcom/io/makefile.win

@@ -1,91 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-
-
-DEPTH=..\..
-MODULE = xpcom 
-
-################################################################################
-## exports
-
-EXPORTS =                          \
-        nsEscape.h                 \
-        nsFileSpec.h               \
-        nsFileSpecStreaming.h      \
-        nsFileStream.h             \
-        nsIFileStream.h            \
-        nsIStringStream.h          \
-        nsIUnicharInputStream.h    \
-        nsSpecialSystemDirectory.h \
-        nsStorageStream.h          \
-        $(NULL)			
-
-NO_XPT_GEN=1
-XPIDL_MODULE = xpcom_io
-
-XPIDLSRCS =                         \
-        .\nsIPipe.idl               \
-        .\nsIFileSpec.idl           \
-        .\nsIBaseStream.idl         \
-        .\nsIBinaryInputStream.idl  \
-        .\nsIBinaryOutputStream.idl \
-        .\nsIInputStream.idl        \
-        .\nsIOutputStream.idl       \
-        .\nsIBufferInputStream.idl  \
-        .\nsIBufferOutputStream.idl \
-        .\nsIStorageStream.idl      \
-        $(NULL)
-
-################################################################################
-## library
-
-LIBRARY_NAME=xpcomio_s
-
-LINCS =                         \
-	-I$(PUBLIC)\xpcom       \
-        -I$(PUBLIC)\uconv       \
-        -I$(PUBLIC)\unicharutil \
-	$(NULL)
-
-LINCS = $(LINCS) -I$(PUBLIC)\raptor     # until we sort out the filespec/widgets dependency
-
-LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
-
-CPP_OBJS =                                       \
-        .\$(OBJDIR)\nsBinaryStream.obj           \
-        .\$(OBJDIR)\nsEscape.obj                 \
-        .\$(OBJDIR)\nsFileSpec.obj               \
-        .\$(OBJDIR)\nsFileSpecImpl.obj           \
-        .\$(OBJDIR)\nsFileSpecStreaming.obj      \
-        .\$(OBJDIR)\nsFileStream.obj             \
-        .\$(OBJDIR)\nsIFileStream.obj            \
-        .\$(OBJDIR)\nsIStringStream.obj          \
-        .\$(OBJDIR)\nsSegmentedBuffer.obj        \
-        .\$(OBJDIR)\nsPipe2.obj                  \
-        .\$(OBJDIR)\nsSpecialSystemDirectory.obj \
-        .\$(OBJDIR)\nsStorageStream.obj          \
-        .\$(OBJDIR)\nsUnicharInputStream.obj     \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-libs:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/xpcom/io/nsBinaryStream.cpp

@@ -1,361 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-/**
- * This file contains implementations of the nsIBinaryInputStream and
- * nsIBinaryOutputStream interfaces.  Together, these interfaces allows reading
- * and writing of primitive data types (integers, floating-point values,
- * booleans, etc.) to a stream in a binary, untagged, fixed-endianness format.
- * This might be used, for example, to implement network protocols or to
- * produce architecture-neutral binary disk files, i.e. ones that can be read
- * and written by both big-endian and little-endian platforms.  Output is
- * written in big-endian order (high-order byte first), as this is traditional
- * network order.
- *
- * @See nsIBinaryInputStream
- * @See nsIBinaryOutputStream
- */
-#include "nsBinaryStream.h"
-#include "nsIAllocator.h"
-
-// Swap macros, used to convert to/from canonical (big-endian) format
-#ifdef IS_LITTLE_ENDIAN
-#    define SWAP16(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff))
-#    define SWAP32(x) ((SWAP16((x) & 0xffff) << 16) | (SWAP16((x) >> 16)))
-#else
-#    ifndef IS_BIG_ENDIAN
-#        error "Unknown endianness"
-#    endif
-#    define SWAP16(x) (x)
-#    define SWAP32(x) (x)
-#endif
-
-nsBinaryOutputStream::nsBinaryOutputStream(nsIOutputStream* aStream): mOutputStream(aStream)
-{
-    NS_INIT_REFCNT();
-}
-
-NS_IMPL_ISUPPORTS(nsBinaryOutputStream, NS_GET_IID(nsIBinaryOutputStream))
-
-NS_IMETHODIMP
-nsBinaryOutputStream::Flush() { return mOutputStream->Flush(); }
-
-NS_IMETHODIMP
-nsBinaryOutputStream::Close() { return mOutputStream->Close(); }
-
-NS_IMETHODIMP
-nsBinaryOutputStream::Write(const char *aBuf, PRUint32 aCount, PRUint32 *aActualBytes)
-{
-    return mOutputStream->Write(aBuf, aCount, aActualBytes);
-}
-
-NS_IMETHODIMP
-nsBinaryOutputStream::SetOutputStream(nsIOutputStream *aOutputStream)
-{
-    NS_ENSURE_ARG_POINTER(aOutputStream);
-    mOutputStream = aOutputStream;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBinaryOutputStream::WriteBoolean(PRBool aBoolean)
-{
-    return Write8(aBoolean);
-}
-
-NS_IMETHODIMP
-nsBinaryOutputStream::Write8(PRUint8 aByte)
-{
-    nsresult rv;
-    PRUint32 bytesWritten;
-
-    rv = Write((const char*)&aByte, sizeof aByte, &bytesWritten);
-    if (bytesWritten != sizeof aByte)
-        return NS_ERROR_FAILURE;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsBinaryOutputStream::Write16(PRUint16 a16)
-{
-    nsresult rv;
-    PRUint32 bytesWritten;
-
-    a16 = SWAP16(a16);
-    rv = Write((const char*)&a16, sizeof a16, &bytesWritten);
-    if (bytesWritten != sizeof a16)
-        return NS_ERROR_FAILURE;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsBinaryOutputStream::Write32(PRUint32 a32)
-{
-    nsresult rv;
-    PRUint32 bytesWritten;
-
-    a32 = SWAP32(a32);
-    rv = Write((const char*)&a32, sizeof a32, &bytesWritten);
-    if (bytesWritten != sizeof a32)
-        return NS_ERROR_FAILURE;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsBinaryOutputStream::Write64(PRUint64 a64)
-{
-    nsresult rv;
-    PRUint32* raw32 = (PRUint32*)&a64;
-
-#ifdef IS_BIG_ENDIAN
-    rv = Write32(raw32[0]);
-    if (NS_FAILED(rv)) return rv;
-    return Write32(raw32[1]);
-#else
-    rv = Write32(raw32[1]);
-    if (NS_FAILED(rv)) return rv;
-    return Write32(raw32[0]);
-#endif
-}
-
-NS_IMETHODIMP
-nsBinaryOutputStream::WriteFloat(float aFloat)
-{
-    NS_ASSERTION(sizeof(float) == sizeof (PRUint32),
-                 "False assumption about sizeof(float)");
-    return Write32(*NS_REINTERPRET_CAST(PRUint32*, &aFloat));
-}
-
-NS_IMETHODIMP
-nsBinaryOutputStream::WriteDouble(double aDouble)
-{
-    NS_ASSERTION(sizeof(double) == sizeof(PRUint64),
-                 "False assumption about sizeof(double)");
-    return Write64(*NS_REINTERPRET_CAST(PRUint64*,&aDouble));
-}
-
-NS_IMETHODIMP
-nsBinaryOutputStream::WriteStringZ(const char *aString)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsBinaryOutputStream::WriteWStringZ(const PRUnichar* aString)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsBinaryOutputStream::WriteUtf8Z(const PRUnichar* aString)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsBinaryOutputStream::WriteBytes(const char *aString, PRUint32 aLength)
-{
-    nsresult rv;
-    PRUint32 bytesWritten;
-
-    rv = Write(aString, aLength, &bytesWritten);
-    if (bytesWritten != aLength)
-        return NS_ERROR_FAILURE;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsBinaryOutputStream::WriteString(nsString* aString)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-nsBinaryInputStream::nsBinaryInputStream(nsIInputStream* aStream): mInputStream(aStream) { NS_INIT_REFCNT(); }
-
-NS_IMPL_ISUPPORTS(nsBinaryInputStream, NS_GET_IID(nsIBinaryInputStream))
-
-NS_IMETHODIMP
-nsBinaryInputStream::Available(PRUint32* aResult) { return mInputStream->Available(aResult); }
-
-NS_IMETHODIMP
-nsBinaryInputStream::Read(char* aBuffer, PRUint32 aCount, PRUint32 *aNumRead)
-{
-    return mInputStream->Read(aBuffer, aCount, aNumRead);
-}
-
-NS_IMETHODIMP
-nsBinaryInputStream::Close() { return mInputStream->Close(); }
-
-NS_IMETHODIMP
-nsBinaryInputStream::SetInputStream(nsIInputStream *aInputStream)
-{
-    NS_ENSURE_ARG_POINTER(aInputStream);
-    mInputStream = aInputStream;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBinaryInputStream::ReadBoolean(PRBool* aBoolean)
-{
-    PRUint8 byteResult;
-    nsresult rv = Read8(&byteResult);
-    *aBoolean = byteResult;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsBinaryInputStream::Read8(PRUint8* aByte)
-{
-    nsresult rv;
-    PRUint32 bytesRead;
-    
-    rv = Read((char*)aByte, sizeof(*aByte), &bytesRead);
-    if (bytesRead != sizeof (*aByte))
-        return NS_ERROR_FAILURE;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsBinaryInputStream::Read16(PRUint16* a16)
-{
-    nsresult rv;
-    PRUint32 bytesRead;
-
-    rv = Read((char*)a16, sizeof *a16, &bytesRead);
-    if (bytesRead != sizeof *a16)
-        return NS_ERROR_FAILURE;
-    *a16 = SWAP16(*a16);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsBinaryInputStream::Read32(PRUint32* a32)
-{
-    nsresult rv;
-    PRUint32 bytesRead;
-
-    rv = Read((char*)a32, sizeof *a32, &bytesRead);
-    if (bytesRead != sizeof *a32)
-        return NS_ERROR_FAILURE;
-    *a32 = SWAP32(*a32);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsBinaryInputStream::Read64(PRUint64* a64)
-{
-    nsresult rv;
-    PRUint32* raw32 = (PRUint32*)a64;
-
-#ifdef IS_BIG_ENDIAN
-    rv = Read32(&raw32[0]);
-    if (NS_FAILED(rv)) return rv;
-    return Read32(&raw32[1]);
-#else
-    rv = Read32(&raw32[1]);
-    if (NS_FAILED(rv)) return rv;
-    return Read32(&raw32[0]);
-#endif
-}
-
-NS_IMETHODIMP
-nsBinaryInputStream::ReadFloat(float* aFloat)
-{
-    NS_ASSERTION(sizeof(float) == sizeof (PRUint32),
-		 "False assumption about sizeof(float)");
-    return Read32(NS_REINTERPRET_CAST(PRUint32*, aFloat));
-}
-
-NS_IMETHODIMP
-nsBinaryInputStream::ReadDouble(double* aDouble)
-{
-    NS_ASSERTION(sizeof(double) == sizeof(PRUint64),
-		 "False assumption about sizeof(double)");
-    return Read64(NS_REINTERPRET_CAST(PRUint64*, aDouble));
-}
-
-NS_IMETHODIMP
-nsBinaryInputStream::ReadStringZ(char* *aString)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsBinaryInputStream::ReadWStringZ(PRUnichar* *aString)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsBinaryInputStream::ReadUtf8Z(PRUnichar* *aString)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsBinaryInputStream::ReadBytes(char* *aString, PRUint32 aLength)
-{
-    nsresult rv;
-    PRUint32 bytesRead;
-    char* s;
-
-    s = (char*)nsAllocator::Alloc(aLength);
-    if (!s)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    rv = Read(s, aLength, &bytesRead);
-    if (NS_FAILED(rv)) return rv;
-    if (bytesRead != aLength)
-	return NS_ERROR_FAILURE;
-
-    *aString = s;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBinaryInputStream::ReadString(nsString* *aString)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_COM nsresult
-NS_NewBinaryOutputStream(nsIBinaryOutputStream* *aResult, nsIOutputStream* aDestStream)
-{
-    NS_ENSURE_ARG_POINTER(aResult);
-    nsIBinaryOutputStream *stream = new nsBinaryOutputStream(aDestStream);
-    if (!stream)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(stream);
-    *aResult = stream;
-    return NS_OK;
-}
-
-NS_COM nsresult
-NS_NewBinaryInputStream(nsIBinaryInputStream* *aResult, nsIInputStream* aSrcStream)
-{
-    NS_ENSURE_ARG_POINTER(aResult);
-    nsIBinaryInputStream *stream = new nsBinaryInputStream(aSrcStream);
-    if (!stream)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(stream);
-    *aResult = stream;
-    return NS_OK;
-}

mozilla/xpcom/io/nsBinaryStream.h

@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-#include "nsIBinaryInputStream.h"
-#include "nsIBinaryOutputStream.h"
-#include "nsCOMPtr.h"
-
-class nsBinaryOutputStream : public nsIBinaryOutputStream
-{
-public:
-    nsBinaryOutputStream(nsIOutputStream *aStream);
-    virtual ~nsBinaryOutputStream() {};
-
-private:
-    
-    // nsISupports methods
-    NS_DECL_ISUPPORTS
-
-    // nsIBaseStream methods
-    NS_DECL_NSIBASESTREAM
-
-    // nsIOutputStream methods
-    NS_DECL_NSIOUTPUTSTREAM
-
-    // nsIBinaryOutputStream methods
-    NS_DECL_NSIBINARYOUTPUTSTREAM
-    
-protected:
-    nsCOMPtr<nsIOutputStream> mOutputStream;
-};
-
-class nsBinaryInputStream : public nsIBinaryInputStream
-{
-public:
-    nsBinaryInputStream(nsIInputStream *aStream);
-    virtual ~nsBinaryInputStream() {};
-
-private:
-    // nsISupports methods
-    NS_DECL_ISUPPORTS
-
-    // nsIBaseStream methods
-    NS_DECL_NSIBASESTREAM
-
-    // nsIInputStream methods
-    NS_DECL_NSIINPUTSTREAM
-
-    // nsIBinaryInputStream methods
-    NS_DECL_NSIBINARYINPUTSTREAM
-    
-protected:
-    nsCOMPtr<nsIInputStream> mInputStream;
-};
-

mozilla/xpcom/io/nsFileSpec.h

@@ -1,806 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-//    First checked in on 98/11/20 by John R. McMullen in the wrong directory.
-//    Checked in again 98/12/04.
-//    Polished version 98/12/08.
-
-//========================================================================================
-//
-//  Classes defined:
-//
-//      nsFilePath, nsFileURL, nsFileSpec, nsPersistentFileDescriptor
-//      nsDirectoryIterator. Oh, and a convenience class nsAutoCString.
-//
-//  Q.  How should I represent files at run time?
-//  A.  Use nsFileSpec.  Using char* will lose information on some platforms.
-//
-//  Q.  Then what are nsFilePath and nsFileURL for?
-//  A.  Only when you need a char* parameter for legacy code.
-//
-//  Q.  How should I represent files in a persistent way (eg, in a disk file)?
-//  A.  Use nsPersistentFileDescriptor.  Convert to and from nsFileSpec at run time.
-//
-//  This suite provides the following services:
-//
-//      1.  Encapsulates all platform-specific file details, so that files can be
-//          described correctly without any platform #ifdefs
-//
-//      2.  Type safety.  This will fix the problems that used to occur because people
-//          confused file paths.  They used to use const char*, which could mean three
-//          or four different things.  Bugs were introduced as people coded, right up
-//          to the moment Communicator 4.5 shipped.
-//
-//      3.  Used in conjunction with nsFileStream.h (q.v.), this supports all the power
-//          and readability of the ansi stream syntax.
-//
-//          Basic example:
-//
-//              nsFilePath myPath("/Development/iotest.txt");
-//
-//              nsOutputFileStream testStream(nsFileSpec(myPath));
-//              testStream << "Hello World" << nsEndl;
-//
-//      4.  Handy methods for manipulating file specifiers safely, e.g. MakeUnique(),
-//          SetLeafName(), Exists().
-//
-//      5.  Easy cross-conversion.
-//
-//          Examples:
-//
-//              Initialize a URL from a string
-//
-//                  nsFileURL fileURL("file:///Development/MPW/MPW%20Shell");
-//
-//              Initialize a Unix-style path from a URL
-//
-//                  nsFilePath filePath(fileURL);
-//
-//              Initialize a file spec from a URL
-//
-//                  nsFileSpec fileSpec(fileURL);
-//
-//              Make the spec unique.
-//
-//                  fileSpec.MakeUnique();
-//
-//              Assign the spec to a URL (causing conversion)
-//
-//                  fileURL = fileSpec;
-//
-//              Assign a unix path using a string
-//
-//                  filePath = "/Development/MPW/SysErrs.err";
-//
-//              Assign to a file spec using a unix path (causing conversion).
-//
-//                  fileSpec = filePath;
-//
-//              Make this unique.
-//
-//                  fileSpec.MakeUnique();
-//
-//      6.  Fixes a bug that have been there for a long time, and
-//          is inevitable if you use NSPR alone, where files are described as paths.
-//
-//          The problem affects platforms (Macintosh) in which a path does not fully
-//          specify a file, because two volumes can have the same name.  This
-//          is solved by holding a "private" native file spec inside the
-//          nsFilePath and nsFileURL classes, which is used when appropriate.
-//
-//========================================================================================
-
-#ifndef _FILESPEC_H_
-#define _FILESPEC_H_
-
-#include "nscore.h"
-#include "nsError.h"
-#include "nsString.h"
-#include "nsCRT.h"
-#include "prtypes.h"
-
-//========================================================================================
-//                          Compiler-specific macros, as needed
-//========================================================================================
-#if !defined(NS_USING_NAMESPACE) && (defined(__MWERKS__) || defined(XP_PC))
-#define NS_USING_NAMESPACE
-#endif
-
-#ifdef NS_USING_NAMESPACE
-
-#define NS_NAMESPACE_PROTOTYPE
-#define NS_NAMESPACE namespace
-#define NS_NAMESPACE_END
-#define NS_EXPLICIT explicit
-#else
-
-#define NS_NAMESPACE_PROTOTYPE static
-#define NS_NAMESPACE struct
-#define NS_NAMESPACE_END ;
-#define NS_EXPLICIT
-
-#endif
-//=========================== End Compiler-specific macros ===============================
-
-#ifdef XP_MAC
-#include <Files.h>
-#elif defined(XP_UNIX) || defined (XP_OS2) || defined(XP_BEOS)
-#include <dirent.h>
-#elif defined(XP_PC)
-
-// This clashes with some of the Win32 system headers (specifically,
-// winbase.h). Hopefully they'll have been included first; else we may
-// have problems. We could include winbase.h before doing this;
-// unfortunately, it's bring in too much crap and'd slow stuff down
-// more than it's worth doing.
-#ifdef CreateDirectory
-#undef CreateDirectory
-#endif
-
-#include "prio.h"
-#endif
-
-//========================================================================================
-// Here are the allowable ways to describe a file.
-//========================================================================================
-
-class nsFileSpec;             // Preferred.  For i/o use nsInputFileStream, nsOutputFileStream
-class nsFilePath;
-class nsFileURL;
-class nsNSPRPath;             // This can be passed to NSPR file I/O routines, if you must.
-class nsPersistentFileDescriptor; // Used for storage across program launches.
-
-#define kFileURLPrefix "file://"
-#define kFileURLPrefixLength (7)
-
-class nsOutputStream;
-class nsInputStream;
-class nsIOutputStream;
-class nsIInputStream;
-class nsOutputFileStream;
-class nsInputFileStream;
-class nsOutputConsoleStream;
-
-class nsString;
-
-//========================================================================================
-// Conversion of native file errors to nsresult values. These are really only for use
-// in the file module, clients of this interface shouldn't really need them.
-// Error results returned from this interface have, in the low-order 16 bits,
-// native errors that are masked to 16 bits.  Assumption: a native error of 0 is success
-// on all platforms. Note the way we define this using an inline function.  This
-// avoids multiple evaluation if people go NS_FILE_RESULT(function_call()).
-#define NS_FILE_RESULT(x) ns_file_convert_result((PRInt32)x)
-nsresult ns_file_convert_result(PRInt32 nativeErr);
-#define NS_FILE_FAILURE NS_FILE_RESULT(-1)
-
-//========================================================================================
-class NS_COM nsAutoCString
-//
-// This should be in nsString.h, but the owner would not reply to my proposal.  After four
-// weeks, I decided to put it in here.
-//
-// This is a quiet little class that acts as a sort of autoptr for
-// a const char*.  If you used to call nsString::ToNewCString(), just
-// to pass the result a parameter list, it was a nuisance having to
-// call delete [] on the result after the call.  Now you can say
-//     nsString myStr;
-//     ...
-//     f(nsAutoCString(myStr));
-// where f is declared as void f(const char*);  This call will
-// make a temporary char* pointer on the stack and delete[] it
-// when the function returns.
-//========================================================================================
-{
-public:
-    NS_EXPLICIT                  nsAutoCString(const nsString& other) : mCString(other.ToNewCString()) {}
-    virtual                      ~nsAutoCString();    
-                                 operator const char*() const { return mCString; }
-
-                                 // operator const char*() { return mCString; }
-                                 //  don't need this, since |operator const char*() const| can
-                                 //  serve for both |const| and non-|const| callers
-protected:
-                                 const char* mCString;
-}; // class nsAutoCString
-
-//========================================================================================
-class NS_COM nsSimpleCharString
-//  An envelope for char*: reference counted. Used internally by all the nsFileSpec
-//  classes below.
-//========================================================================================
-{
-public:
-                                 nsSimpleCharString();
-                                 nsSimpleCharString(const char*);
-                                 nsSimpleCharString(const nsString&);
-                                 nsSimpleCharString(const nsSimpleCharString&);
-                                 nsSimpleCharString(const char* inData, PRUint32 inLength);
-                                 
-                                 ~nsSimpleCharString();
-                                 
-    void                         operator = (const char*);
-    void                         operator = (const nsString&);
-    void                         operator = (const nsSimpleCharString&);
-                                 
-                                 operator const char*() const { return mData ? mData->mString : 0; }
-                                 operator char* ()
-                                 {
-                                     ReallocData(Length()); // requires detaching if shared...
-                                     return mData ? mData->mString : 0;
-                                 }
-    PRBool                       operator == (const char*);
-    PRBool                       operator == (const nsString&);
-    PRBool                       operator == (const nsSimpleCharString&);
-
-    void                         operator += (const char* inString);
-    nsSimpleCharString           operator + (const char* inString) const;
-    
-    char                         operator [](int i) const { return mData ? mData->mString[i] : 0; }
-    char&                        operator [](int i)
-                                 {
-                                     if (i >= (int)Length())
-                                         ReallocData((PRUint32)i + 1);
-                                     return mData->mString[i]; // caveat appelator
-                                 }
-    char&                        operator [](unsigned int i) { return (*this)[(int)i]; }
-    
-    void                         Catenate(const char* inString1, const char* inString2);
-   
-    void                         SetToEmpty(); 
-    PRBool                       IsEmpty() const { return Length() == 0; }
-    
-    PRUint32                     Length() const { return mData ? mData->mLength : 0; }
-    void                         SetLength(PRUint32 inLength) { ReallocData(inLength); }
-    void                         CopyFrom(const char* inData, PRUint32 inLength);
-    void                         LeafReplace(char inSeparator, const char* inLeafName);
-    char*                        GetLeaf(char inSeparator) const; // use PR_Free()
-    void                         Unescape();
-
-protected:
-
-    void                         AddRefData();
-    void                         ReleaseData();
-    void                         ReallocData(PRUint32 inLength);
-
-    //--------------------------------------------------
-    // Data
-    //--------------------------------------------------
-
-protected:
-
-    struct Data {
-        int         mRefCount;
-        PRUint32    mLength;
-        char        mString[1];
-        };
-    Data*                        mData;
-}; // class nsSimpleCharString
-
-//========================================================================================
-class NS_COM nsFileSpec
-//    This is whatever each platform really prefers to describe files as.  Declared first
-//  because the other two types have an embedded nsFileSpec object.
-//========================================================================================
-{
-    public:
-                                nsFileSpec();
-                                
-                                // These two meathods take *native* file paths.
-        NS_EXPLICIT             nsFileSpec(const char* inNativePath, PRBool inCreateDirs = PR_FALSE);
-        NS_EXPLICIT             nsFileSpec(const nsString& inNativePath, PRBool inCreateDirs = PR_FALSE);
-                                
-        
-        NS_EXPLICIT             nsFileSpec(const nsFilePath& inPath);
-        NS_EXPLICIT             nsFileSpec(const nsFileURL& inURL);
-        NS_EXPLICIT             nsFileSpec(const nsPersistentFileDescriptor& inURL);
-                                nsFileSpec(const nsFileSpec& inPath);
-        virtual                 ~nsFileSpec();
-
-                                // These two operands take *native* file paths.
-        void                    operator = (const char* inNativePath);
-        void                    operator = (const nsString& inNativePath)
-                                {
-                                    const nsAutoCString path(inNativePath);
-                                    *this = path;
-                                }
-
-        void                    operator = (const nsFilePath& inPath);
-        void                    operator = (const nsFileURL& inURL);
-        void                    operator = (const nsFileSpec& inOther);
-        void                    operator = (const nsPersistentFileDescriptor& inOther);
-
-        PRBool                  operator ==(const nsFileSpec& inOther) const;
-        PRBool                  operator !=(const nsFileSpec& inOther) const;
-
-
-                                // Returns a native path, and allows the
-                                // path to be "passed" to legacy code.  This practice
-                                // is VERY EVIL and should only be used to support legacy
-                                // code.  Using it guarantees bugs on Macintosh.
-                                // The path is cached and freed by the nsFileSpec destructor
-                                // so do not delete (or free) it. See also nsNSPRPath below,
-                                // if you really must pass a string  to PR_OpenFile().
-                                // Doing so will introduce two automatic bugs.
-       const char*              GetCString() const;
-
-                                // Same as GetCString (please read the comments).
-                                // Do not try to free this!
-                                operator const char* () const { return GetCString(); }
-
-                                // Same as GetCString (please read the comments).
-                                // Do not try to free this!
-       const char*              GetNativePathCString() const { return GetCString(); }
-
-
-       PRBool                   IsChildOf(nsFileSpec &possibleParent);
-
-#ifdef XP_MAC
-        // For Macintosh people, this is meant to be useful in its own right as a C++ version
-        // of the FSSpec struct.        
-                                nsFileSpec(
-                                    short vRefNum,
-                                    long parID,
-                                    ConstStr255Param name,
-                                    PRBool resolveAlias = PR_TRUE);
-
-                                nsFileSpec(const FSSpec& inSpec, PRBool resolveAlias = PR_TRUE);
-        void                    operator = (const FSSpec& inSpec);
-
-                                operator FSSpec* () { return &mSpec; }
-                                operator const FSSpec* const () { return &mSpec; }
-                                operator  FSSpec& () { return mSpec; }
-                                operator const FSSpec& () const { return mSpec; }
-                                
-        const FSSpec&           GetFSSpec() const { return mSpec; }
-        FSSpec&                 GetFSSpec() { return mSpec; }
-        ConstFSSpecPtr          GetFSSpecPtr() const { return &mSpec; }
-        FSSpecPtr               GetFSSpecPtr() { return &mSpec; }
-        void                    MakeAliasSafe();
-        void                    MakeUnique(ConstStr255Param inSuggestedLeafName);
-        StringPtr               GetLeafPName() { return mSpec.name; }
-        ConstStr255Param        GetLeafPName() const { return mSpec.name; }
-
-        OSErr                   GetCatInfo(CInfoPBRec& outInfo) const;
-
-        OSErr                   SetFileTypeAndCreator(OSType type, OSType creator);
-        OSErr                   GetFileTypeAndCreator(OSType* type, OSType* creator);
-
-#endif // end of Macintosh utility methods.
-
-        PRBool                  Valid() const { return NS_SUCCEEDED(Error()); }
-        nsresult                Error() const
-                                {
-                                    #ifndef XP_MAC 
-                                    if (mPath.IsEmpty() && NS_SUCCEEDED(mError)) 
-                                        ((nsFileSpec*)this)->mError = NS_ERROR_NOT_INITIALIZED; 
-                                    #endif 
-                                    return mError;
-                                }
-        PRBool                  Failed() const { return (PRBool)NS_FAILED(Error()); }
-
-    //--------------------------------------------------
-    // Queries and path algebra.  These do not modify the disk.
-    //--------------------------------------------------
-
-        char*                   GetLeafName() const; // Allocated.  Use nsCRT::free().
-        
-#if 0
-// needs implementing
-                                // copy the leaf name into the supplied buffer, thus
-                                // getting a copy without allocation. Buffer should be
-                                // 64 chars big.
-        void                    GetLeafNameCopy(char* destBuffer, PRInt32 bufferSize) const;
-#endif        
-                                // inLeafName can be a relative path, so this allows
-                                // one kind of concatenation of "paths".
-        void                    SetLeafName(const char* inLeafName);
-        void                    SetLeafName(const nsString& inLeafName)
-                                {
-                                    const nsAutoCString leafName(inLeafName);
-                                    SetLeafName(leafName);
-                                }
-
-                                // Return the filespec of the parent directory. Used
-                                // in conjunction with GetLeafName(), this lets you
-                                // parse a path into a list of node names.  Beware,
-                                // however, that the top node is still not a name,
-                                // but a spec.  Volumes on Macintosh can have identical
-                                // names.  Perhaps could be used for an operator --() ?
-        void                    GetParent(nsFileSpec& outSpec) const;
-
-
-                                // ie nsFileSpec::TimeStamp.  This is 32 bits now,
-                                // but might change, eg, to a 64-bit class.  So use the
-                                // typedef, and use a streaming operator to convert
-                                // to a string, so that your code won't break.  It's
-                                // none of your business what the number means.  Don't
-                                // rely on the implementation.
-        typedef PRUint32        TimeStamp;
-
-                                // This will return different values on different
-                                // platforms, even for the same file (eg, on a server).
-                                // But if the platform is constant, it will increase after
-                                // every file modification.
-        void                    GetModDate(TimeStamp& outStamp) const;
-
-        PRBool                  ModDateChanged(const TimeStamp& oldStamp) const
-                                {
-                                    TimeStamp newStamp;
-                                    GetModDate(newStamp);
-                                    return newStamp != oldStamp;
-                                }
-        
-        PRUint32                GetFileSize() const;
-        PRInt64                 GetDiskSpaceAvailable() const;
-        
-        nsFileSpec              operator + (const char* inRelativeUnixPath) const;
-        nsFileSpec              operator + (const nsString& inRelativeUnixPath) const
-                                {
-                                    const nsAutoCString 
-                                      relativePath(inRelativeUnixPath);
-                                    return *this + relativePath;
-                                }
-
-                                // Concatenate the relative path to this directory.
-                                // Used for constructing the filespec of a descendant.
-                                // This must be a directory for this to work.  This differs
-                                // from SetLeafName(), since the latter will work
-                                // starting with a sibling of the directory and throws
-                                // away its leaf information, whereas this one assumes
-                                // this is a directory, and the relative path starts
-                                // "below" this.
-        void                    operator += (const char* inRelativeUnixPath);
-
-        void                    operator += (const nsString& inRelativeUnixPath)
-                                {
-                                    const nsAutoCString relativePath(inRelativeUnixPath);
-                                    *this += relativePath;
-                                }
-
-        void                    MakeUnique();
-        void                    MakeUnique(const char* inSuggestedLeafName);
-        void                    MakeUnique(const nsString& inSuggestedLeafName)
-                                {
-                                    const nsAutoCString suggestedLeafName(inSuggestedLeafName);
-                                    MakeUnique(suggestedLeafName);
-                                }
-    
-                               
-        PRBool                  IsDirectory() const;          // More stringent than Exists()                               
-        PRBool                  IsFile() const;               // More stringent than Exists()
-        PRBool                  Exists() const;
-
-        PRBool                  IsHidden() const;
-        
-        PRBool                  IsSymlink() const;
-
-    //--------------------------------------------------
-    // Creation and deletion of objects.  These can modify the disk.
-    //--------------------------------------------------
-
-                                // Called for the spec of an alias.  Modifies the spec to
-                                // point to the original.  Sets mError.
-        nsresult                ResolveSymlink(PRBool& wasSymlink);
-
-        void                    CreateDirectory(int mode = 0700 /* for unix */);
-        void                    CreateDir(int mode = 0700) { CreateDirectory(mode); }
-                                   // workaround for yet another VC++ bug with long identifiers.
-        void                    Delete(PRBool inRecursive) const;
-        void                    RecursiveCopy(nsFileSpec newDir) const;
-        
-        nsresult                Truncate(const PRInt32 offset) const;
-        nsresult                Rename(const char* inNewName); // not const: gets updated
-        nsresult                Rename(const nsString& inNewName)
-                                {
-                                    const nsAutoCString newName(inNewName);
-                                    return Rename(newName);
-                                }
-        nsresult                CopyToDir(const nsFileSpec& inNewParentDirectory) const;
-        nsresult                MoveToDir(const nsFileSpec& inNewParentDirectory);
-        nsresult                Execute(const char* args) const;
-        nsresult                Execute(const nsString& args) const
-                                {
-                                    const nsAutoCString argsString(args);
-                                    return Execute(argsString);
-                                }
-
-    //--------------------------------------------------
-    // Data
-    //--------------------------------------------------
-
-    protected:
-    
-                                // Clear the nsFileSpec contents, resetting it
-                                // to the uninitialized state;
-       void                     Clear();
-       
-                                friend class nsFilePath;
-                                friend class nsFileURL;
-                                friend class nsDirectoryIterator;
-#ifdef XP_MAC
-        FSSpec                  mSpec;
-#endif
-        nsSimpleCharString      mPath;
-        nsresult                mError;
-
-}; // class nsFileSpec
-
-// FOR HISTORICAL REASONS:
-
-typedef nsFileSpec nsNativeFileSpec;
-
-//========================================================================================
-class NS_COM nsFileURL
-//    This is an escaped string that looks like "file:///foo/bar/mumble%20fish".  Since URLs
-//    are the standard way of doing things in mozilla, this allows a string constructor,
-//    which just stashes the string with no conversion.
-//========================================================================================
-{
-    public:
-                                nsFileURL(const nsFileURL& inURL);
-        NS_EXPLICIT             nsFileURL(const char* inURLString, PRBool inCreateDirs = PR_FALSE);
-        NS_EXPLICIT             nsFileURL(const nsString& inURLString, PRBool inCreateDirs = PR_FALSE);
-        NS_EXPLICIT             nsFileURL(const nsFilePath& inPath);
-        NS_EXPLICIT             nsFileURL(const nsFileSpec& inPath);
-        virtual                 ~nsFileURL();
-
-//        nsString             GetString() const { return mPath; }
-                                    // may be needed for implementation reasons,
-                                    // but should not provide a conversion constructor.
-
-        void                    operator = (const nsFileURL& inURL);
-        void                    operator = (const char* inURLString);
-        void                    operator = (const nsString& inURLString)
-                                {
-                                    const nsAutoCString string(inURLString);
-                                    *this = string;
-                                }
-        void                    operator = (const nsFilePath& inOther);
-        void                    operator = (const nsFileSpec& inOther);
-
-        void                    operator +=(const char* inRelativeUnixPath);
-        nsFileURL               operator +(const char* inRelativeUnixPath) const;
-                                operator const char* () const { return (const char*)mURL; } // deprecated.
-        const char*             GetURLString() const { return (const char*)mURL; }
-        							// Not allocated, so don't free it.
-        const char*             GetAsString() const { return (const char*)mURL; }
-        							// Not allocated, so don't free it.
-
-#ifdef XP_MAC
-                                // Accessor to allow quick assignment to a mFileSpec
-        const nsFileSpec&       GetFileSpec() const { return mFileSpec; }
-#endif
-
-    //--------------------------------------------------
-    // Data
-    //--------------------------------------------------
-
-    protected:
-                                friend class nsFilePath; // to allow construction of nsFilePath
-        nsSimpleCharString      mURL;
-
-#ifdef XP_MAC
-        // Since the path on the macintosh does not uniquely specify a file (volumes
-        // can have the same name), stash the secret nsFileSpec, too.
-        nsFileSpec              mFileSpec;
-#endif
-}; // class nsFileURL
-
-//========================================================================================
-class NS_COM nsFilePath
-//    This is a string that looks like "/foo/bar/mumble fish".  Same as nsFileURL, but
-//    without the "file:// prefix", and NOT %20 ENCODED! Strings passed in must be
-//    valid unix-style paths in this format.
-//========================================================================================
-{
-    public:
-                                nsFilePath(const nsFilePath& inPath);
-        NS_EXPLICIT             nsFilePath(const char* inUnixPathString, PRBool inCreateDirs = PR_FALSE);
-        NS_EXPLICIT             nsFilePath(const nsString& inUnixPathString, PRBool inCreateDirs = PR_FALSE);
-        NS_EXPLICIT             nsFilePath(const nsFileURL& inURL);
-        NS_EXPLICIT             nsFilePath(const nsFileSpec& inPath);
-        virtual                 ~nsFilePath();
-
-                                
-                                operator const char* () const { return mPath; }
-                                    // This will return a UNIX string.  If you
-                                    // need a string that can be passed into
-                                    // NSPR, take a look at the nsNSPRPath class.
-
-        void                    operator = (const nsFilePath& inPath);
-        void                    operator = (const char* inUnixPathString);
-        void                    operator = (const nsString& inUnixPathString)
-                                {
-                                    const nsAutoCString string(inUnixPathString);
-                                    *this = string;
-                                }
-        void                    operator = (const nsFileURL& inURL);
-        void                    operator = (const nsFileSpec& inOther);
-
-        void                    operator +=(const char* inRelativeUnixPath);
-        nsFilePath              operator +(const char* inRelativeUnixPath) const;
-
-#ifdef XP_MAC
-    public:
-                                // Accessor to allow quick assignment to a mFileSpec
-        const nsFileSpec&       GetFileSpec() const { return mFileSpec; }
-#endif
-
-    //--------------------------------------------------
-    // Data
-    //--------------------------------------------------
-
-    private:
-
-        nsSimpleCharString       mPath;
-#ifdef XP_MAC
-        // Since the path on the macintosh does not uniquely specify a file (volumes
-        // can have the same name), stash the secret nsFileSpec, too.
-        nsFileSpec               mFileSpec;
-#endif
-}; // class nsFilePath
-
-//========================================================================================
-class NS_COM nsPersistentFileDescriptor
-// To save information about a file's location in another file, initialize
-// one of these from your nsFileSpec, and then write this out to your output stream.
-// To retrieve the info, create one of these, read its value from an input stream.
-// and then make an nsFileSpec from it.
-//========================================================================================
-{
-    public:
-                                nsPersistentFileDescriptor() {}
-                                    // For use prior to reading in from a stream
-                                nsPersistentFileDescriptor(const nsPersistentFileDescriptor& inEncodedData);
-        virtual                 ~nsPersistentFileDescriptor();
-        void					operator = (const nsPersistentFileDescriptor& inEncodedData);
-        
-        // Conversions
-        NS_EXPLICIT             nsPersistentFileDescriptor(const nsFileSpec& inSpec);
-        void					operator = (const nsFileSpec& inSpec);
-        
-		// The following four functions are declared here (as friends). Their implementations
-		// are in mozilla/base/src/nsFileSpecStreaming.cpp.
-	
-    	friend nsresult         Read(nsIInputStream* aStream, nsPersistentFileDescriptor&);
-    	friend nsresult         Write(nsIOutputStream* aStream, const nsPersistentFileDescriptor&);
-    	    // writes the data to a file
-    	friend NS_COM nsInputStream& operator >> (nsInputStream&, nsPersistentFileDescriptor&);
-    		// reads the data from a file
-    	friend NS_COM nsOutputStream& operator << (nsOutputStream&, const nsPersistentFileDescriptor&);
-    	    // writes the data to a file
-        friend class nsFileSpec;
-
-        void                    GetData(nsSimpleCharString& outData) const;
-        void                    SetData(const nsSimpleCharString& inData);
-        void                    GetData(nsSimpleCharString& outData, PRInt32& outSize) const;
-        void                    SetData(const nsSimpleCharString& inData, PRInt32 inSize);
-        void                    SetData(const char* inData, PRInt32 inSize);
-
-    //--------------------------------------------------
-    // Data
-    //--------------------------------------------------
-
-    protected:
-
-        nsSimpleCharString      mDescriptorString;
-
-}; // class nsPersistentFileDescriptor
-
-//========================================================================================
-class NS_COM nsDirectoryIterator
-//  Example:
-//
-//       nsFileSpec parentDir(...); // directory over whose children we shall iterate
-//       for (nsDirectoryIterator i(parentDir, PR_FALSE); i.Exists(); i++)
-//       {
-//              // do something with i.Spec()
-//       }
-//
-//            - or -
-//
-//       for (nsDirectoryIterator i(parentDir, PR_TRUE); i.Exists(); i--)
-//       {
-//              // do something with i.Spec()
-//       }
-//       This one passed the PR_TRUE flag which will resolve any symlink encountered.
-//========================================================================================
-{
-	public:
-	                            nsDirectoryIterator( const nsFileSpec& parent,
-	                            	                 PRBool resoveSymLinks);
-#ifndef XP_MAC
-	// Macintosh currently doesn't allocate, so needn't clean up.
-	    virtual                 ~nsDirectoryIterator();
-#endif
-	    PRBool                  Exists() const { return mExists; }
-	    nsDirectoryIterator&    operator ++(); // moves to the next item, if any.
-	    nsDirectoryIterator&    operator ++(int) { return ++(*this); } // post-increment.
-	    nsDirectoryIterator&    operator --(); // moves to the previous item, if any.
-	    nsDirectoryIterator&    operator --(int) { return --(*this); } // post-decrement.
-	                            operator nsFileSpec&() { return mCurrent; }
-	    
-	    nsFileSpec&             Spec() { return mCurrent; }
-	     
-	private:
-
-#if defined(XP_MAC)
-        OSErr                   SetToIndex();
-#endif
-
-    //--------------------------------------------------
-    // Data
-    //--------------------------------------------------
-
-	private:
-
-	    nsFileSpec              mCurrent;
-	    PRBool                  mExists;
-        PRBool                  mResoveSymLinks;
-
-#if defined(XP_UNIX) || defined(XP_BEOS) || defined (XP_PC)
-	    nsFileSpec		        mStarting;
-#endif
-        
-#if defined(XP_UNIX) || defined(XP_BEOS)
-	    DIR*                    mDir;
-#elif defined(XP_PC)
-        PRDir*                  mDir; // XXX why not use PRDir for Unix too?
-#elif defined(XP_MAC)
-	    short					mVRefNum;
-	    long					mParID;
-	    short                   mIndex;
-	    short                   mMaxIndex;
-#endif
-}; // class nsDirectoryIterator
-
-//========================================================================================
-class NS_COM nsNSPRPath
-//  This class will allow you to pass any one of the nsFile* classes directly into NSPR
-//  without the need to worry about whether you have the right kind of filepath or not.
-//  It will also take care of cleaning up any allocated memory. 
-//========================================================================================
-{
-public:
-    NS_EXPLICIT                  nsNSPRPath(const nsFileSpec& inSpec)
-                                     : mFilePath(inSpec), modifiedNSPRPath(nsnull) {}
-    NS_EXPLICIT                  nsNSPRPath(const nsFileURL& inURL)
-                                     : mFilePath(inURL), modifiedNSPRPath(nsnull) {}
-    NS_EXPLICIT                  nsNSPRPath(const nsFilePath& inUnixPath)
-                                     : mFilePath(inUnixPath), modifiedNSPRPath(nsnull) {}
-    
-    virtual                      ~nsNSPRPath();    
- 
-                                 operator const char*() const;
-                                    // Returns the path
-                                    // that NSPR file routines expect on each platform.
-                                    // Concerning constness, this can modify
-                                    // modifiedNSPRPath, but it's really just "mutable". 
-
-    //--------------------------------------------------
-    // Data
-    //--------------------------------------------------
-
-private:
-
-    nsFilePath                   mFilePath;
-    char*                        modifiedNSPRPath; // Currently used only on XP_PC                           
-}; // class nsNSPRPath
-
-#endif //  _FILESPEC_H_

mozilla/xpcom/io/nsFileSpecImpl.cpp

@@ -1,781 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsFileSpecImpl.h"// Always first, to ensure that it compiles alone.
-
-#include "nsIFileStream.h"
-#include "nsFileStream.h"
-
-#include "prmem.h"
-
-NS_IMPL_ISUPPORTS1(nsFileSpecImpl, nsIFileSpec)
-
-#ifdef NS_DEBUG
-#define TEST_OUT_PTR(p) \
-	if (!(p)) \
-		return NS_ERROR_NULL_POINTER;
-#else
-#define TEST_OUT_PTR(p)
-#endif
-
-//----------------------------------------------------------------------------------------
-nsFileSpecImpl::nsFileSpecImpl()
-//----------------------------------------------------------------------------------------
-	:	mInputStream(nsnull)
-	,	mOutputStream(nsnull)
-{
-	NS_INIT_ISUPPORTS();
-}
-
-//----------------------------------------------------------------------------------------
-nsFileSpecImpl::nsFileSpecImpl(const nsFileSpec& inSpec)
-//----------------------------------------------------------------------------------------
-	:	mFileSpec(inSpec)
-	,	mInputStream(nsnull)
-	,	mOutputStream(nsnull)
-{
-	NS_INIT_ISUPPORTS();
-}
-
-//----------------------------------------------------------------------------------------
-nsFileSpecImpl::~nsFileSpecImpl()
-//----------------------------------------------------------------------------------------
-{
-	CloseStream();
-}
-
-//----------------------------------------------------------------------------------------
-/* static */
-nsresult nsFileSpecImpl::MakeInterface(const nsFileSpec& inSpec, nsIFileSpec** result)
-//----------------------------------------------------------------------------------------
-{
-	nsFileSpecImpl* it = new nsFileSpecImpl(inSpec);
-	if (!it)
-		return NS_ERROR_OUT_OF_MEMORY;
-	return it->QueryInterface(nsIFileSpec::GetIID(), (void **) result);
-} // nsFileSpecImpl::MakeInterface
-
-#define FILESPEC(ifilespec) ((nsFileSpecImpl*)ifilespec)->mFileSpec
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::FromFileSpec(const nsIFileSpec *original)
-//----------------------------------------------------------------------------------------
-{
-	mFileSpec = FILESPEC(original);
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::IsChildOf(nsIFileSpec *possibleParent,
-                                        PRBool *_retval)
-{
-  *_retval = mFileSpec.IsChildOf(FILESPEC(possibleParent));
-  return mFileSpec.Error();
-}
-//----------------------------------------------------------------------------------------
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetURLString(char * *aURLString)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(aURLString)
-	if (mFileSpec.Failed())
-		return mFileSpec.Error();
-	nsFileURL url(mFileSpec);
-	*aURLString = nsCRT::strdup(url.GetURLString());
-	if (!*aURLString)
-		return NS_ERROR_OUT_OF_MEMORY;
-	return NS_OK;
-} // nsFileSpecImpl::GetURLString
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::SetURLString(const char * aURLString)
-//----------------------------------------------------------------------------------------
-{
-	mFileSpec = nsFileURL(aURLString);
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetUnixStyleFilePath(char * *aUnixStyleFilePath)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(aUnixStyleFilePath)
-	if (mFileSpec.Failed())
-		return mFileSpec.Error();
-	nsFilePath path(mFileSpec);
-	*aUnixStyleFilePath = nsCRT::strdup((const char*) path);
-	if (!*aUnixStyleFilePath)
-		return NS_ERROR_OUT_OF_MEMORY;
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::SetUnixStyleFilePath(const char * aUnixStyleFilePath)
-//----------------------------------------------------------------------------------------
-{
-	mFileSpec = nsFilePath(aUnixStyleFilePath);
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetPersistentDescriptorString(char * *aPersistentDescriptorString)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(aPersistentDescriptorString)
-	if (mFileSpec.Failed())
-		return mFileSpec.Error();
-	nsPersistentFileDescriptor desc(mFileSpec);
-	nsSimpleCharString data;
-	desc.GetData(data);
-	*aPersistentDescriptorString = nsCRT::strdup((const char*) data);
-	if (!*aPersistentDescriptorString)
-		return NS_ERROR_OUT_OF_MEMORY;
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::SetPersistentDescriptorString(const char * aPersistentDescriptorString)
-//----------------------------------------------------------------------------------------
-{
-	nsPersistentFileDescriptor desc(mFileSpec);
-	desc.SetData(aPersistentDescriptorString);
-	mFileSpec = desc;
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetNativePath(char * *aNativePath)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(aNativePath)
-	if (mFileSpec.Failed())
-		return mFileSpec.Error();
-	*aNativePath = nsCRT::strdup(mFileSpec.GetNativePathCString());
-	if (!*aNativePath)
-		return NS_ERROR_OUT_OF_MEMORY;
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::SetNativePath(const char * aNativePath)
-//----------------------------------------------------------------------------------------
-{
-	mFileSpec = aNativePath;
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetNSPRPath(char * *aNSPRPath)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(aNSPRPath)
-	if (mFileSpec.Failed())
-		return mFileSpec.Error();
-	nsNSPRPath path(mFileSpec);
-	*aNSPRPath = nsCRT::strdup((const char*) path);
-	if (!*aNSPRPath)
-		return NS_ERROR_OUT_OF_MEMORY;
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::Error()
-//----------------------------------------------------------------------------------------
-{
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::IsValid(PRBool *_retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	*_retval = mFileSpec.Valid();
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::Failed(PRBool *_retval)
-//----------------------------------------------------------------------------------------
-{
-	*_retval = mFileSpec.Failed();
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetLeafName(char * *aLeafName)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(aLeafName)
-	*aLeafName = mFileSpec.GetLeafName();
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::SetLeafName(const char * aLeafName)
-//----------------------------------------------------------------------------------------
-{
-	mFileSpec.SetLeafName(aLeafName);
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetParent(nsIFileSpec * *aParent)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(aParent)
-	nsFileSpec parent;
-	mFileSpec.GetParent(parent);
-	return MakeInterface(parent, aParent);
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::MakeUnique()
-//----------------------------------------------------------------------------------------
-{
-	mFileSpec.MakeUnique();
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::MakeUniqueWithSuggestedName(const char *suggestedName)
-//----------------------------------------------------------------------------------------
-{
-	mFileSpec.MakeUnique(suggestedName);
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetModDate(PRUint32 *aModDate)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(aModDate)
-	nsFileSpec::TimeStamp stamp;
-	mFileSpec.GetModDate(stamp);
-	*aModDate = stamp;
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::ModDateChanged(PRUint32 oldStamp, PRBool *_retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	*_retval = mFileSpec.ModDateChanged(oldStamp);
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::IsDirectory(PRBool *_retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	*_retval = mFileSpec.IsDirectory();
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::IsFile(PRBool *_retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	*_retval = mFileSpec.IsFile();
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::Exists(PRBool *_retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	*_retval = mFileSpec.Exists();
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::IsHidden(PRBool *_retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	*_retval = mFileSpec.IsHidden();
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::IsSymlink(PRBool *_retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	*_retval = mFileSpec.IsSymlink();
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::ResolveSymlink()
-//----------------------------------------------------------------------------------------
-{
-    PRBool ignore;
-	return mFileSpec.ResolveSymlink(ignore);
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetFileSize(PRUint32 *aFileSize)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(aFileSize)
-	*aFileSize = mFileSpec.GetFileSize();
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetDiskSpaceAvailable(PRInt64 *aDiskSpaceAvailable)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(aDiskSpaceAvailable)
-	*aDiskSpaceAvailable = mFileSpec.GetDiskSpaceAvailable();
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::AppendRelativeUnixPath(const char *relativePath)
-//----------------------------------------------------------------------------------------
-{
-	mFileSpec += relativePath;
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::Touch()
-//----------------------------------------------------------------------------------------
-{
-	// create an empty file, like the UNIX touch command.
-	nsresult rv;
-	rv = OpenStreamForReadingAndWriting();
-	if (NS_FAILED(rv)) return rv;
-	rv = CloseStream();
-	return rv;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::CreateDir()
-//----------------------------------------------------------------------------------------
-{
-	mFileSpec.CreateDir();
-	return mFileSpec.Error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::Truncate(const PRInt32 offset)
-//----------------------------------------------------------------------------------------
-{
-      return mFileSpec.Truncate(offset);
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::Rename(const char *newLeafName)
-//----------------------------------------------------------------------------------------
-{
-	return mFileSpec.Rename(newLeafName);
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::CopyToDir(const nsIFileSpec *newParentDir)
-//----------------------------------------------------------------------------------------
-{
-	return mFileSpec.CopyToDir(FILESPEC(newParentDir));
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::MoveToDir(const nsIFileSpec *newParentDir)
-//----------------------------------------------------------------------------------------
-{
-	return mFileSpec.MoveToDir(FILESPEC(newParentDir));
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::Execute(const char *args)
-//----------------------------------------------------------------------------------------
-{
-	return mFileSpec.Execute(args);
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::OpenStreamForReading()
-//----------------------------------------------------------------------------------------
-{
-	if (mInputStream || mOutputStream)
-		return NS_ERROR_FAILURE;
-	return NS_NewTypicalInputFileStream((nsISupports**)&mInputStream, mFileSpec);
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::OpenStreamForWriting()
-//----------------------------------------------------------------------------------------
-{
-	if (mInputStream || mOutputStream)
-		return NS_ERROR_FAILURE;
-	return NS_NewTypicalOutputFileStream((nsISupports**)&mOutputStream, mFileSpec);
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::OpenStreamForReadingAndWriting()
-//----------------------------------------------------------------------------------------
-{
-	if (mInputStream || mOutputStream)
-		return NS_ERROR_FAILURE;
-	nsresult result = NS_NewTypicalInputFileStream((nsISupports**)&mInputStream, mFileSpec);
-	if (NS_SUCCEEDED(result))
-		result = NS_NewTypicalOutputFileStream((nsISupports**)&mOutputStream, mFileSpec);
-	return result;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::CloseStream()
-//----------------------------------------------------------------------------------------
-{
-	NS_IF_RELEASE(mInputStream);
-	NS_IF_RELEASE(mOutputStream);
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::IsStreamOpen(PRBool *_retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	*_retval = (mInputStream || mOutputStream);
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetInputStream(nsIInputStream** _retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	if (!mInputStream) {
-		nsresult rv = OpenStreamForReading();
-		if (NS_FAILED(rv)) return rv;
-	}
-	*_retval = mInputStream;
-	NS_IF_ADDREF(mInputStream);
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetOutputStream(nsIOutputStream** _retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	if (!mOutputStream) {
-		nsresult rv = OpenStreamForWriting();
-		if (NS_FAILED(rv)) return rv;
-	}
-	*_retval = mOutputStream;
-	NS_IF_ADDREF(mOutputStream);
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::SetFileContents(const char* inString)
-//----------------------------------------------------------------------------------------
-{
-	nsresult rv = OpenStreamForWriting();
-	if (NS_FAILED(rv)) return rv;
-	PRInt32 count;
-	rv = Write(inString, PL_strlen(inString), &count);
-	nsresult rv2 = CloseStream();
-	return NS_FAILED(rv) ? rv : rv2;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetFileContents(char** _retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	*_retval = nsnull;
-	nsresult rv = OpenStreamForReading();
-	if (NS_FAILED(rv)) return rv;
-	PRInt32 theSize;
-	rv = GetFileSize((PRUint32*)&theSize);
-	if (NS_SUCCEEDED(rv))
-		rv = Read(_retval, theSize, &theSize);
-	if (NS_SUCCEEDED(rv))
-		(*_retval)[theSize] = 0;
-	nsresult rv2 = CloseStream();
-	return NS_FAILED(rv) ? rv : rv2;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::GetFileSpec(nsFileSpec *aFileSpec)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(aFileSpec)
-	*aFileSpec = mFileSpec;
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::SetFromFileSpec(const nsFileSpec& aFileSpec)
-//----------------------------------------------------------------------------------------
-{
-	mFileSpec = aFileSpec;
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::Eof(PRBool *_retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	if (!mInputStream)
-		return NS_ERROR_NULL_POINTER;
-	nsInputFileStream s(mInputStream);
-	*_retval = s.eof();
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::Read(char** buffer, PRInt32 requestedCount, PRInt32 *_retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	TEST_OUT_PTR(buffer)
-	if (!mInputStream) {
-		nsresult rv = OpenStreamForReading();
-		if (NS_FAILED(rv)) return rv;
-	}
-	if (!*buffer)
-		*buffer = (char*)PR_Malloc(requestedCount + 1);
-	if (!mInputStream)
-		return NS_ERROR_NULL_POINTER;
-	nsInputFileStream s(mInputStream);
-	*_retval = s.read(*buffer, requestedCount);
-	return s.error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::ReadLine(char** line, PRInt32 bufferSize, PRBool *wasTruncated)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(wasTruncated)
-	TEST_OUT_PTR(line)
-	if (!mInputStream) {
-		nsresult rv = OpenStreamForReading();
-		if (NS_FAILED(rv)) return rv;
-	}
-	if (!*line)
-		*line = (char*)PR_Malloc(bufferSize + 1);
-	if (!mInputStream)
-		return NS_ERROR_NULL_POINTER;
-	nsInputFileStream s(mInputStream);
-	*wasTruncated = !s.readline(*line, bufferSize);
-	return s.error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::Write(const char * data, PRInt32 requestedCount, PRInt32 *_retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	//if (!mOutputStream)
-	//	return NS_ERROR_NULL_POINTER;
-	if (!mOutputStream) {
-		nsresult rv = OpenStreamForWriting();
-		if (NS_FAILED(rv))
-			return rv;
-	}
-	nsOutputFileStream s(mOutputStream);
-	*_retval = s.write(data, requestedCount);
-	return s.error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::Flush()
-//----------------------------------------------------------------------------------------
-{
-	if (!mOutputStream)
-		return NS_ERROR_NULL_POINTER;
-	nsOutputFileStream s(mOutputStream);
-	s.flush();
-	return s.error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::Seek(PRInt32 offset)
-//----------------------------------------------------------------------------------------
-{
-	nsresult result = NS_OK;
-	if (mOutputStream)
-	{
-		nsOutputFileStream os(mOutputStream);
-		os.seek(offset);
-		result = os.error();
-	}
-	if (NS_SUCCEEDED(result) && mInputStream)
-	{
-		nsInputFileStream is(mInputStream);
-		is.seek(offset);
-		result = is.error();
-	}
-	return result;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::Tell(PRInt32 *_retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	if (!mInputStream)
-		return NS_ERROR_NULL_POINTER;
-	nsInputFileStream s(mInputStream);
-	*_retval = s.tell();
-	return s.error();
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsFileSpecImpl::EndLine()
-//----------------------------------------------------------------------------------------
-{
-	nsOutputFileStream s(mOutputStream);
-	s << nsEndl;
-	return s.error();
-}
-
-NS_IMPL_ISUPPORTS1(nsDirectoryIteratorImpl, nsIDirectoryIterator)
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIteratorImpl::nsDirectoryIteratorImpl()
-//----------------------------------------------------------------------------------------
-	: mDirectoryIterator(nsnull)
-{
-	NS_INIT_ISUPPORTS();
-}
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIteratorImpl::~nsDirectoryIteratorImpl()
-//----------------------------------------------------------------------------------------
-{
-	delete mDirectoryIterator;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsDirectoryIteratorImpl::Init(nsIFileSpec *parent, PRBool resolveSymlink)
-//----------------------------------------------------------------------------------------
-{
-	delete mDirectoryIterator;
-	mDirectoryIterator = new nsDirectoryIterator(FILESPEC(parent), resolveSymlink);
-	if (!mDirectoryIterator)
-		return NS_ERROR_OUT_OF_MEMORY;
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsDirectoryIteratorImpl::Exists(PRBool *_retval)
-//----------------------------------------------------------------------------------------
-{
-	TEST_OUT_PTR(_retval)
-	if (!mDirectoryIterator)
-		return NS_ERROR_NULL_POINTER;
-	*_retval = mDirectoryIterator->Exists();
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsDirectoryIteratorImpl::Next()
-//----------------------------------------------------------------------------------------
-{
-	if (!mDirectoryIterator)
-		return NS_ERROR_NULL_POINTER;
-	(*mDirectoryIterator)++;
-	return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP nsDirectoryIteratorImpl::GetCurrentSpec(nsIFileSpec * *aCurrentSpec)
-//----------------------------------------------------------------------------------------
-{
-	if (!mDirectoryIterator)
-		return NS_ERROR_NULL_POINTER;
-	return nsFileSpecImpl::MakeInterface(mDirectoryIterator->Spec(), aCurrentSpec);
-}
-
-//----------------------------------------------------------------------------------------
-NS_METHOD nsDirectoryIteratorImpl::Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec)
-//----------------------------------------------------------------------------------------
-{
-  if (aIFileSpec == NULL)
-    return NS_ERROR_NULL_POINTER;
-
-	nsDirectoryIteratorImpl* it = new nsDirectoryIteratorImpl;
-  if (!it)
-		return NS_ERROR_OUT_OF_MEMORY;
-
-  nsresult rv = it->QueryInterface(aIID, aIFileSpec);
-  if (NS_FAILED(rv))
-  {
-    delete it;
-    return rv;
-  }
-  return rv;
-}
-
-//----------------------------------------------------------------------------------------
-NS_METHOD nsFileSpecImpl::Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec)
-//----------------------------------------------------------------------------------------
-{
-  if (aIFileSpec == NULL)
-    return NS_ERROR_NULL_POINTER;
-
-	nsFileSpecImpl* it = new nsFileSpecImpl;
-  if (!it)
-		return NS_ERROR_OUT_OF_MEMORY;
-
-  nsresult rv = it->QueryInterface(aIID, aIFileSpec);
-  if (NS_FAILED(rv))
-  {
-    delete it;
-    return rv;
-  }
-  return rv;
-}
-
-//----------------------------------------------------------------------------------------
-nsresult NS_NewFileSpecWithSpec(const nsFileSpec& aSrcFileSpec, nsIFileSpec **result)
-//----------------------------------------------------------------------------------------
-{
-	if (!result)
-		return NS_ERROR_NULL_POINTER;
-
-	return nsFileSpecImpl::MakeInterface(aSrcFileSpec, result);
-}
-
-//----------------------------------------------------------------------------------------
-nsresult NS_NewFileSpec(nsIFileSpec** result)
-//----------------------------------------------------------------------------------------
-{
-	return nsFileSpecImpl::Create(nsnull, nsIFileSpec::GetIID(), (void**)result);
-}
-
-//----------------------------------------------------------------------------------------
-nsresult NS_NewDirectoryIterator(nsIDirectoryIterator** result)
-//----------------------------------------------------------------------------------------
-{
-	return nsDirectoryIteratorImpl::Create(nsnull, nsIDirectoryIterator::GetIID(), (void**)result);
-}
-

mozilla/xpcom/io/nsFileSpecUnix.cpp

@@ -1,603 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
- 
-//    This file is included by nsFileSpec.cpp, and includes the Unix-specific
-//    implementations.
-
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <errno.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <limits.h>
-#include "nsError.h"
-#include "prio.h"   /* for PR_Rename */
-
-#if defined(_SCO_DS)
-#define _SVID3  /* for statvfs.h */
-#endif
-
-#ifdef HAVE_SYS_STATVFS_H
-#include <sys/statvfs.h>
-#endif
-
-#ifdef HAVE_SYS_VFS_H
-#include <sys/vfs.h>
-#endif
-
-#ifdef HAVE_SYS_STATFS_H
-#include <sys/statfs.h>
-#endif
-
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#ifdef __bsdi__
-#undef Free
-#endif
-#endif
-
-#ifdef HAVE_STATVFS
-#define STATFS	statvfs
-#else
-#define STATFS	statfs
-#endif
-
-#ifndef MAXPATHLEN
-#define MAXPATHLEN	1024  /* Guessing this is okay.  Works for SCO. */
-#endif
- 
-#if defined(__QNX__)
-#include <unix.h>	/* for realpath */
-#define f_bavail	f_bfree
-#endif
-
-#if defined(SUNOS4)
-extern "C" int statfs(char *, struct statfs *);
-#endif
-
-#if defined(OSF1)
-extern "C" int statvfs(const char *, struct statvfs *);
-#endif
-
-//----------------------------------------------------------------------------------------
-void nsFileSpecHelpers::Canonify(nsSimpleCharString& ioPath, PRBool inMakeDirs)
-// Canonify, make absolute, and check whether directories exist
-//----------------------------------------------------------------------------------------
-{
-    if (ioPath.IsEmpty())
-        return;
-    if (inMakeDirs)
-    {
-        const mode_t mode = 0700;
-        nsFileSpecHelpers::MakeAllDirectories((const char*)ioPath, mode);
-    }
-
-    errno = 0;  // needed?
-
-    if (ioPath[0] != '/')
-    {
-        // the ioPath that was passed in is relative.  We must cat it to the cwd.
-        char buffer[MAXPATHLEN];
-
-        (void) getcwd(buffer, MAXPATHLEN);
-
-        strcat(buffer, "/");
-        strcat(buffer, ioPath);
-
-        ioPath = buffer;
-    }
-} // nsFileSpecHelpers::Canonify
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::SetLeafName(const char* inLeafName)
-//----------------------------------------------------------------------------------------
-{
-    mPath.LeafReplace('/', inLeafName);
-} // nsFileSpec::SetLeafName
-
-//----------------------------------------------------------------------------------------
-char* nsFileSpec::GetLeafName() const
-//----------------------------------------------------------------------------------------
-{
-    return mPath.GetLeaf('/');
-} // nsFileSpec::GetLeafName
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::Exists() const
-//----------------------------------------------------------------------------------------
-{
-    struct stat st;
-    return !mPath.IsEmpty() && 0 == stat(mPath, &st); 
-} // nsFileSpec::Exists
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::GetModDate(TimeStamp& outStamp) const
-//----------------------------------------------------------------------------------------
-{
-	struct stat st;
-    if (!mPath.IsEmpty() && stat(mPath, &st) == 0) 
-        outStamp = st.st_mtime; 
-    else
-        outStamp = 0;
-} // nsFileSpec::GetModDate
-
-//----------------------------------------------------------------------------------------
-PRUint32 nsFileSpec::GetFileSize() const
-//----------------------------------------------------------------------------------------
-{
-	struct stat st;
-    if (!mPath.IsEmpty() && stat(mPath, &st) == 0) 
-        return (PRUint32)st.st_size; 
-    return 0;
-} // nsFileSpec::GetFileSize
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::IsFile() const
-//----------------------------------------------------------------------------------------
-{
-    struct stat st;
-    return !mPath.IsEmpty() && stat(mPath, &st) == 0 && S_ISREG(st.st_mode); 
-} // nsFileSpec::IsFile
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::IsDirectory() const
-//----------------------------------------------------------------------------------------
-{
-    struct stat st;
-    return !mPath.IsEmpty() && 0 == stat(mPath, &st) && S_ISDIR(st.st_mode); 
-} // nsFileSpec::IsDirectory
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::IsHidden() const
-//----------------------------------------------------------------------------------------
-{
-    PRBool hidden = PR_FALSE;
-    char *leafname = GetLeafName();
-    if (nsnull != leafname)
-    {
-	// rjc: don't return ".", "..", or any file/directory that begins with a "."
-
-	/*        if ((!strcmp(leafname, ".")) || (!strcmp(leafname, "..")))	*/
-	if (leafname[0] == '.')
-        {
-            hidden = PR_TRUE;
-        }
-        nsCRT::free(leafname);
-    }
-    return hidden;
-} // nsFileSpec::IsHidden
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::IsSymlink() const
-//----------------------------------------------------------------------------------------
-{
-    struct stat st;
-    if (!mPath.IsEmpty() && stat(mPath, &st) == 0 && S_ISLNK(st.st_mode))
-        return PR_TRUE;
-
-    return PR_FALSE;
-} // nsFileSpec::IsSymlink
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::ResolveSymlink(PRBool& wasAliased)
-//----------------------------------------------------------------------------------------
-{
-    wasAliased = PR_FALSE;
-
-    char resolvedPath[MAXPATHLEN];
-    int charCount = readlink(mPath, (char*)&resolvedPath, MAXPATHLEN);
-    if (0 < charCount)
-    {
-        if (MAXPATHLEN > charCount)
-            resolvedPath[charCount] = '\0';
-        
-        wasAliased = PR_TRUE;
-
-	/* if it's not an absolute path,
-		replace the leaf with what got resolved */  
-        if (resolvedPath[0] != '/') {
-		SetLeafName(resolvedPath);
-        }
-        else {
-        	mPath = (char*)&resolvedPath;
-        }
-	
-	char* canonicalPath = realpath((const char *)mPath, resolvedPath);
-	NS_ASSERTION(canonicalPath, "realpath failed");
-	if (canonicalPath) {
-		mPath = (char*)&resolvedPath;
-	}
-	else {
-		return NS_ERROR_FAILURE;
-	}
-    }
-    
-    return NS_OK;
-} // nsFileSpec::ResolveSymlink
-
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::GetParent(nsFileSpec& outSpec) const
-//----------------------------------------------------------------------------------------
-{
-    outSpec.mPath = mPath;
-	char* chars = (char*)outSpec.mPath;
-	chars[outSpec.mPath.Length() - 1] = '\0'; // avoid trailing separator, if any
-    char* cp = strrchr(chars, '/');
-    if (cp++)
-	    outSpec.mPath.SetLength(cp - chars); // truncate.
-} // nsFileSpec::GetParent
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::operator += (const char* inRelativePath)
-//----------------------------------------------------------------------------------------
-{
-	NS_ASSERTION(inRelativePath, "Attempt to do += with a null string");
-
-    if (!inRelativePath || mPath.IsEmpty())
-        return;
-    
-    char endChar = mPath[(int)(strlen(mPath) - 1)];
-    if (endChar == '/')
-        mPath += "x";
-    else
-        mPath += "/x";
-    SetLeafName(inRelativePath);
-} // nsFileSpec::operator +=
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::CreateDirectory(int mode)
-//----------------------------------------------------------------------------------------
-{
-    // Note that mPath is canonical!
-    if (mPath.IsEmpty())
-        return;
-    mkdir(mPath, mode);
-} // nsFileSpec::CreateDirectory
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::Delete(PRBool inRecursive) const
-// To check if this worked, call Exists() afterwards, see?
-//----------------------------------------------------------------------------------------
-{
-    if (IsDirectory())
-    {
-        if (inRecursive)
-        {
-            for (nsDirectoryIterator i(*this, PR_FALSE); i.Exists(); i++)
-            {
-                nsFileSpec& child = (nsFileSpec&)i;
-                child.Delete(inRecursive);
-            }        
-        }
-        rmdir(mPath);
-    }
-    else if (!mPath.IsEmpty())
-        remove(mPath);
-} // nsFileSpec::Delete
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::RecursiveCopy(nsFileSpec newDir) const
-//----------------------------------------------------------------------------------------
-{
-    if (IsDirectory())
-    {
-		if (!(newDir.Exists()))
-		{
-			newDir.CreateDirectory();
-		}
-
-		for (nsDirectoryIterator i(*this, PR_FALSE); i.Exists(); i++)
-		{
-			nsFileSpec& child = (nsFileSpec&)i;
-
-			if (child.IsDirectory())
-			{
-				nsFileSpec tmpDirSpec(newDir);
-
-				char *leafname = child.GetLeafName();
-				tmpDirSpec += leafname;
-				nsCRT::free(leafname);
-
-				child.RecursiveCopy(tmpDirSpec);
-			}
-			else
-			{
-   				child.RecursiveCopy(newDir);
-			}
-		}
-    }
-    else if (!mPath.IsEmpty())
-    {
-		nsFileSpec& filePath = (nsFileSpec&) *this;
-
-		if (!(newDir.Exists()))
-		{
-			newDir.CreateDirectory();
-		}
-
-        filePath.CopyToDir(newDir);
-    }
-} // nsFileSpec::RecursiveCopy
-
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::Truncate(const PRInt32 offset) const
-//----------------------------------------------------------------------------------------
-{
-    char* Path = nsCRT::strdup(mPath);
-
-    PRInt32 rv = truncate(Path, offset) ;
-
-    nsCRT::free(Path) ;
-
-    if(!rv) 
-        return NS_OK ;
-    else
-        return NS_ERROR_FAILURE ;
-} // nsFileSpec::Truncate
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::Rename(const char* inNewName)
-//----------------------------------------------------------------------------------------
-{
-	NS_ASSERTION(inNewName, "Attempt to Rename with a null string");
-
-    // This function should not be used to move a file on disk. 
-    if (mPath.IsEmpty() || strchr(inNewName, '/')) 
-        return NS_FILE_FAILURE;
-
-    char* oldPath = nsCRT::strdup(mPath);
-    
-    SetLeafName(inNewName); 
-
-    if (PR_Rename(oldPath, mPath) != NS_OK)
-    {
-        // Could not rename, set back to the original.
-        mPath = oldPath;
-        return NS_FILE_FAILURE;
-    }
-    
-    nsCRT::free(oldPath);
-
-    return NS_OK;
-} // nsFileSpec::Rename
-
-//----------------------------------------------------------------------------------------
-static int CrudeFileCopy(const char* in, const char* out)
-//----------------------------------------------------------------------------------------
-{
-	struct stat in_stat;
-	int stat_result = -1;
-
-	char	buf [1024];
-	FILE	*ifp, *ofp;
-	int	rbytes, wbytes;
-
-	if (!in || !out)
-		return -1;
-
-	stat_result = stat (in, &in_stat);
-
-	ifp = fopen (in, "r");
-	if (!ifp) 
-	{
-		return -1;
-	}
-
-	ofp = fopen (out, "w");
-	if (!ofp)
-	{
-		fclose (ifp);
-		return -1;
-	}
-
-	while ((rbytes = fread (buf, 1, sizeof(buf), ifp)) > 0)
-	{
-		while (rbytes > 0)
-		{
-			if ( (wbytes = fwrite (buf, 1, rbytes, ofp)) < 0 )
-			{
-				fclose (ofp);
-				fclose (ifp);
-				unlink(out);
-				return -1;
-			}
-			rbytes -= wbytes;
-		}
-	}
-	fclose (ofp);
-	fclose (ifp);
-
-	if (stat_result == 0)
-		chmod (out, in_stat.st_mode & 0777);
-
-	return 0;
-} // nsFileSpec::Rename
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::CopyToDir(const nsFileSpec& inParentDirectory) const
-//----------------------------------------------------------------------------------------
-{
-    // We can only copy into a directory, and (for now) can not copy entire directories
-    nsresult result = NS_FILE_FAILURE;
-
-    if (inParentDirectory.IsDirectory() && (! IsDirectory() ) )
-    {
-        char *leafname = GetLeafName();
-        nsSimpleCharString destPath(inParentDirectory.GetCString());
-        destPath += "/";
-        destPath += leafname;
-        nsCRT::free(leafname);
-        result = NS_FILE_RESULT(CrudeFileCopy(GetCString(), destPath));
-    }
-    return result;
-} // nsFileSpec::CopyToDir
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::MoveToDir(const nsFileSpec& inNewParentDirectory)
-//----------------------------------------------------------------------------------------
-{
-    // We can only copy into a directory, and (for now) can not copy entire directories
-    nsresult result = NS_FILE_FAILURE;
-
-    if (inNewParentDirectory.IsDirectory() && !IsDirectory())
-    {
-        char *leafname = GetLeafName();
-        nsSimpleCharString destPath(inNewParentDirectory.GetCString());
-        destPath += "/";
-        destPath += leafname;
-        nsCRT::free(leafname);
-
-        result = NS_FILE_RESULT(CrudeFileCopy(GetCString(), (const char*)destPath));
-        if (result == NS_OK)
-        {
-            // cast to fix const-ness
-		    ((nsFileSpec*)this)->Delete(PR_FALSE);
-        
-            *this = inNewParentDirectory + GetLeafName(); 
-    	}
-    }
-    return result;
-} 
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::Execute(const char* inArgs ) const
-//----------------------------------------------------------------------------------------
-{
-    nsresult result = NS_FILE_FAILURE;
-    
-    if (!mPath.IsEmpty() && !IsDirectory())
-    {
-        nsSimpleCharString fileNameWithArgs = mPath + " " + inArgs;
-        result = NS_FILE_RESULT(system(fileNameWithArgs));
-    } 
-
-    return result;
-
-} // nsFileSpec::Execute
-
-//----------------------------------------------------------------------------------------
-PRInt64 nsFileSpec::GetDiskSpaceAvailable() const
-//----------------------------------------------------------------------------------------
-{
-    PRInt64 bytes; /* XXX dougt needs to fix this */
-    LL_I2L(bytes , LONG_MAX); // initialize to all the space in the world?
-
-
-#if defined(HAVE_SYS_STATFS_H) || defined(HAVE_SYS_STATVFS_H)
-
-    char curdir [MAXPATHLEN];
-    if (mPath.IsEmpty())
-    {
-        (void) getcwd(curdir, MAXPATHLEN);
-        if (!curdir)
-            return bytes;  /* hope for the best as we did in cheddar */
-    }
-    else
-        sprintf(curdir, "%.200s", (const char*)mPath);
- 
-    struct STATFS fs_buf;
-#if defined(__QNX__) && !defined(HAVE_STATVFS) /* Maybe this should be handled differently? */
-    if (STATFS(curdir, &fs_buf, 0, 0) < 0)
-#else
-    if (STATFS(curdir, &fs_buf) < 0)
-#endif
-        return bytes; /* hope for the best as we did in cheddar */
- 
-#ifdef DEBUG_DISK_SPACE
-    printf("DiskSpaceAvailable: %d bytes\n", 
-       fs_buf.f_bsize * (fs_buf.f_bavail - 1));
-#endif
-
-    LL_I2L( bytes, (fs_buf.f_bsize * (fs_buf.f_bavail - 1) ) );
-    return bytes;
-
-#else 
-    /*
-    ** This platform doesn't have statfs or statvfs, so we don't have much
-    ** choice but to "hope for the best as we did in cheddar".
-    */
-    return bytes;
-#endif /* HAVE_SYS_STATFS_H or HAVE_SYS_STATVFS_H */
-
-} // nsFileSpec::GetDiskSpace()
-
-//========================================================================================
-//                                nsDirectoryIterator
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIterator::nsDirectoryIterator(const nsFileSpec& inDirectory, PRBool resolveSymLinks)
-//----------------------------------------------------------------------------------------
-    : mCurrent(inDirectory)
-    , mExists(PR_FALSE)
-    , mResoveSymLinks(resolveSymLinks)
-    , mStarting(inDirectory)
-    , mDir(nsnull)
-
-{
-    mStarting += "sysygy"; // save off the starting directory 
-    mCurrent += "sysygy"; // prepare the path for SetLeafName
-    mDir = opendir((const char*)nsFilePath(inDirectory));
-    ++(*this);
-} // nsDirectoryIterator::nsDirectoryIterator
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIterator::~nsDirectoryIterator()
-//----------------------------------------------------------------------------------------
-{
-    if (mDir)
-        closedir(mDir);
-} // nsDirectoryIterator::nsDirectoryIterator
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIterator& nsDirectoryIterator::operator ++ ()
-//----------------------------------------------------------------------------------------
-{
-    mExists = PR_FALSE;
-    if (!mDir)
-        return *this;
-    char* dot    = ".";
-    char* dotdot = "..";
-    struct dirent* entry = readdir(mDir);
-    if (entry && strcmp(entry->d_name, dot) == 0)
-        entry = readdir(mDir);
-    if (entry && strcmp(entry->d_name, dotdot) == 0)
-        entry = readdir(mDir);
-    if (entry)
-    {
-        mExists = PR_TRUE;
-	mCurrent = mStarting;	// restore mCurrent to be the starting directory.  ResolveSymlink() may have taken us to another directory
-        mCurrent.SetLeafName(entry->d_name);
-        if (mResoveSymLinks)
-        {   
-            PRBool ignore;
-            mCurrent.ResolveSymlink(ignore);
-        }
-    }
-    return *this;
-} // nsDirectoryIterator::operator ++
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIterator& nsDirectoryIterator::operator -- ()
-//----------------------------------------------------------------------------------------
-{
-    return ++(*this); // can't do it backwards.
-} // nsDirectoryIterator::operator --

mozilla/xpcom/io/nsFileSpecWin.cpp

@@ -1,726 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
- 
-//	This file is included by nsFileSpec.cp, and includes the Windows-specific
-//	implementations.
-
-#include <sys/stat.h>
-#include <direct.h>
-#include <limits.h>
-#include <stdlib.h>
-#include "prio.h"
-#include "nsError.h"
-
-#include "windows.h"
-
-#if (_MSC_VER == 1100)
-#define INITGUID
-#include "objbase.h"
-DEFINE_OLEGUID(IID_IPersistFile, 0x0000010BL, 0, 0);
-#endif
-
-#include "shlobj.h"
-#include "shellapi.h"
-#include "shlguid.h"
-
-#ifdef UNICODE
-#define CreateDirectoryW  CreateDirectory
-#else
-#define CreateDirectoryA  CreateDirectory
-#endif 
-
-//----------------------------------------------------------------------------------------
-void nsFileSpecHelpers::Canonify(nsSimpleCharString& ioPath, PRBool inMakeDirs)
-// Canonify, make absolute, and check whether directories exist. This
-// takes a (possibly relative) native path and converts it into a
-// fully qualified native path.
-//----------------------------------------------------------------------------------------
-{
-    if (ioPath.IsEmpty())
-        return;
-  
-    NS_ASSERTION(strchr((const char*)ioPath, '/') == 0,
-		"This smells like a Unix path. Native path expected! "
-		"Please fix.");
-	if (inMakeDirs)
-    {
-        const int mode = 0700;
-        nsSimpleCharString unixStylePath = ioPath;
-        nsFileSpecHelpers::NativeToUnix(unixStylePath);
-        nsFileSpecHelpers::MakeAllDirectories((const char*)unixStylePath, mode);
-    }
-    char buffer[_MAX_PATH];
-    errno = 0;
-    *buffer = '\0';
-    char* canonicalPath = _fullpath(buffer, ioPath, _MAX_PATH);
-
-    NS_ASSERTION( canonicalPath[0] != '\0', "Uh oh...couldn't convert" );
-    if (canonicalPath[0] == '\0')
-        return;
-
-    ioPath = canonicalPath;
-} // nsFileSpecHelpers::Canonify
-
-//----------------------------------------------------------------------------------------
-void nsFileSpecHelpers::UnixToNative(nsSimpleCharString& ioPath)
-// This just does string manipulation.  It doesn't check reality, or canonify, or
-// anything
-//----------------------------------------------------------------------------------------
-{
-	// Allow for relative or absolute.  We can do this in place, because the
-	// native path is never longer.
-	
-	if (ioPath.IsEmpty())
-		return;
-		
-    // Strip initial slash for an absolute path
-	char* src = (char*)ioPath;
-	if (*src == '/')
-	{
-		// Since it was an absolute path, check for the drive letter
-		char* colonPointer = src + 2;
-		if (strstr(src, "|/") == colonPointer)
-	        *colonPointer = ':';
-	    // allocate new string by copying from ioPath[1]
-	    nsSimpleCharString temp = src + 1;
-	    ioPath = temp;
-	}
-
-	src = (char*)ioPath;
-		
-	// Convert '/' to '\'.
-	while (*++src)
-    {
-        if (*src == '/')
-            *src = '\\';
-    }
-} // nsFileSpecHelpers::UnixToNative
-
-//----------------------------------------------------------------------------------------
-void nsFileSpecHelpers::NativeToUnix(nsSimpleCharString& ioPath)
-// This just does string manipulation.  It doesn't check reality, or canonify, or
-// anything.  The unix path is longer, so we can't do it in place.
-//----------------------------------------------------------------------------------------
-{
-	if (ioPath.IsEmpty())
-		return;
-		
-	// Convert the drive-letter separator, if present
-	nsSimpleCharString temp("/");
-
-	char* cp = (char*)ioPath + 1;
-	if (strstr(cp, ":\\") == cp)
-		*cp = '|';    // absolute path
-    else
-        temp[0] = '\0'; // relative path
-	
-	// Convert '\' to '/'
-	for (; *cp; cp++)
-    {
-      if (*cp == '\\')
-        *cp = '/';
-    }
-	// Add the slash in front.
-	temp += ioPath;
-	ioPath = temp;
-}
-
-//----------------------------------------------------------------------------------------
-nsFileSpec::nsFileSpec(const nsFilePath& inPath)
-//----------------------------------------------------------------------------------------
-{
-	*this = inPath;
-}
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::operator = (const nsFilePath& inPath)
-//----------------------------------------------------------------------------------------
-{
-	mPath = (const char*)inPath;
-	nsFileSpecHelpers::UnixToNative(mPath);
-	mError = NS_OK;
-} // nsFileSpec::operator =
-
-//----------------------------------------------------------------------------------------
-nsFilePath::nsFilePath(const nsFileSpec& inSpec)
-//----------------------------------------------------------------------------------------
-{
-	*this = inSpec;
-} // nsFilePath::nsFilePath
-
-//----------------------------------------------------------------------------------------
-void nsFilePath::operator = (const nsFileSpec& inSpec)
-//----------------------------------------------------------------------------------------
-{
-	mPath = inSpec.mPath;
-	nsFileSpecHelpers::NativeToUnix(mPath);
-} // nsFilePath::operator =
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::SetLeafName(const char* inLeafName)
-//----------------------------------------------------------------------------------------
-{
-	NS_ASSERTION(inLeafName, "Attempt to SetLeafName with a null string");
-	mPath.LeafReplace('\\', inLeafName);
-} // nsFileSpec::SetLeafName
-
-//----------------------------------------------------------------------------------------
-char* nsFileSpec::GetLeafName() const
-//----------------------------------------------------------------------------------------
-{
-    return mPath.GetLeaf('\\');
-} // nsFileSpec::GetLeafName
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::Exists() const
-//----------------------------------------------------------------------------------------
-{
-	struct stat st;
-	return !mPath.IsEmpty() && 0 == stat(nsNSPRPath(*this), &st); 
-} // nsFileSpec::Exists
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::GetModDate(TimeStamp& outStamp) const
-//----------------------------------------------------------------------------------------
-{
-	struct stat st;
-    if (!mPath.IsEmpty() && stat(nsNSPRPath(*this), &st) == 0) 
-        outStamp = st.st_mtime; 
-    else
-        outStamp = 0;
-} // nsFileSpec::GetModDate
-
-//----------------------------------------------------------------------------------------
-PRUint32 nsFileSpec::GetFileSize() const
-//----------------------------------------------------------------------------------------
-{
-	struct stat st;
-    if (!mPath.IsEmpty() && stat(nsNSPRPath(*this), &st) == 0) 
-        return (PRUint32)st.st_size; 
-    return 0;
-} // nsFileSpec::GetFileSize
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::IsFile() const
-//----------------------------------------------------------------------------------------
-{
-  struct stat st;
-  return !mPath.IsEmpty() && 0 == stat(nsNSPRPath(*this), &st) && (_S_IFREG & st.st_mode);
-} // nsFileSpec::IsFile
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::IsDirectory() const
-//----------------------------------------------------------------------------------------
-{
-	struct stat st;
-	return !mPath.IsEmpty() && 0 == stat(nsNSPRPath(*this), &st) && (_S_IFDIR & st.st_mode);
-} // nsFileSpec::IsDirectory
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::IsHidden() const
-//----------------------------------------------------------------------------------------
-{
-    PRBool hidden = PR_FALSE;
-    if (!mPath.IsEmpty())
-    {
-        DWORD attr = GetFileAttributes(mPath);
-        if (FILE_ATTRIBUTE_HIDDEN & attr)
-            hidden = PR_TRUE;
-    }
-    return hidden;
-}
-// nsFileSpec::IsHidden
-
-//----------------------------------------------------------------------------------------
-PRBool nsFileSpec::IsSymlink() const
-//----------------------------------------------------------------------------------------
-{
-    HRESULT hres; 
-    IShellLink* psl; 
-    
-    PRBool isSymlink = PR_FALSE;
-    
-    CoInitialize(NULL);
-    // Get a pointer to the IShellLink interface. 
-    hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (void**)&psl); 
-    if (SUCCEEDED(hres)) 
-    { 
-        IPersistFile* ppf; 
-        
-        // Get a pointer to the IPersistFile interface. 
-        hres = psl->QueryInterface(IID_IPersistFile, (void**)&ppf); 
-        
-        if (SUCCEEDED(hres)) 
-        {
-            WORD wsz[MAX_PATH]; 
-            // Ensure that the string is Unicode. 
-            MultiByteToWideChar(CP_ACP, 0, mPath, -1, wsz, MAX_PATH); 
- 
-            // Load the shortcut. 
-            hres = ppf->Load(wsz, STGM_READ); 
-            if (SUCCEEDED(hres)) 
-            {
-                isSymlink = PR_TRUE;
-            }
-            
-            // Release the pointer to the IPersistFile interface. 
-            ppf->Release(); 
-        }
-        
-        // Release the pointer to the IShellLink interface. 
-        psl->Release();
-    }
-
-    CoUninitialize();
-
-    return isSymlink;
-}
-
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::ResolveSymlink(PRBool& wasSymlink)
-//----------------------------------------------------------------------------------------
-{
-    wasSymlink = PR_FALSE;  // assume failure
-
-    HRESULT hres; 
-    IShellLink* psl; 
-
-    CoInitialize(NULL);
-
-    // Get a pointer to the IShellLink interface. 
-    hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (void**)&psl); 
-    if (SUCCEEDED(hres)) 
-    { 
-        IPersistFile* ppf; 
-        
-        // Get a pointer to the IPersistFile interface. 
-        hres = psl->QueryInterface(IID_IPersistFile, (void**)&ppf); 
-        
-        if (SUCCEEDED(hres)) 
-        {
-            WORD wsz[MAX_PATH]; 
-            // Ensure that the string is Unicode. 
-            MultiByteToWideChar(CP_ACP, 0, mPath, -1, wsz, MAX_PATH); 
- 
-            // Load the shortcut. 
-            hres = ppf->Load(wsz, STGM_READ); 
-            if (SUCCEEDED(hres)) 
-            {
-                wasSymlink = PR_TRUE;
-
-                // Resolve the link. 
-                hres = psl->Resolve(nsnull, SLR_NO_UI ); 
-                if (SUCCEEDED(hres)) 
-                { 
-                    char szGotPath[MAX_PATH]; 
-                    WIN32_FIND_DATA wfd; 
-
-                    // Get the path to the link target. 
-                    hres = psl->GetPath( szGotPath, MAX_PATH, &wfd, SLGP_UNCPRIORITY ); 
-
-                    if (SUCCEEDED(hres))
-                    {
-                        // Here we modify the nsFileSpec;
-                        mPath = szGotPath;
-                        mError = NS_OK;
-                    }
-                } 
-            }
-            // Release the pointer to the IPersistFile interface. 
-            ppf->Release(); 
-        }
-        // Release the pointer to the IShellLink interface. 
-        psl->Release();
-    }
-
-    CoUninitialize();
-
-    if (SUCCEEDED(hres))
-        return NS_OK;
-
-    return NS_FILE_FAILURE;
-}
-
-
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::GetParent(nsFileSpec& outSpec) const
-//----------------------------------------------------------------------------------------
-{
-	outSpec.mPath = mPath;
-	char* chars = (char*)outSpec.mPath;
-	chars[outSpec.mPath.Length() - 1] = '\0'; // avoid trailing separator, if any
-    char* cp = strrchr(chars, '\\');
-    if (cp++)
-	    outSpec.mPath.SetLength(cp - chars); // truncate.
-} // nsFileSpec::GetParent
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::operator += (const char* inRelativePath)
-//----------------------------------------------------------------------------------------
-{
-	NS_ASSERTION(inRelativePath, "Attempt to do += with a null string");
-
-	if (!inRelativePath || mPath.IsEmpty())
-		return;
-	
-	if (mPath[mPath.Length() - 1] == '\\')
-		mPath += "x";
-	else
-		mPath += "\\x";
-	
-	// If it's a (unix) relative path, make it native
-	nsSimpleCharString dosPath = inRelativePath;
-	nsFileSpecHelpers::UnixToNative(dosPath);
-	SetLeafName(dosPath);
-} // nsFileSpec::operator +=
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::CreateDirectory(int /*mode*/)
-//----------------------------------------------------------------------------------------
-{
-	// Note that mPath is canonical!
-	if (!mPath.IsEmpty())
-	    mkdir(nsNSPRPath(*this));
-} // nsFileSpec::CreateDirectory
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::Delete(PRBool inRecursive) const
-//----------------------------------------------------------------------------------------
-{
-    if (IsDirectory())
-    {
-	    if (inRecursive)
-        {
-            for (nsDirectoryIterator i(*this, PR_FALSE); i.Exists(); i++)
-                {
-                    nsFileSpec& child = (nsFileSpec&)i;
-                    child.Delete(inRecursive);
-                }		
-        }
-	    rmdir(nsNSPRPath(*this));
-    }
-	else if (!mPath.IsEmpty())
-    {
-        remove(nsNSPRPath(*this));
-    }
-} // nsFileSpec::Delete
-
-
-//----------------------------------------------------------------------------------------
-void nsFileSpec::RecursiveCopy(nsFileSpec newDir) const
-//----------------------------------------------------------------------------------------
-{
-    if (IsDirectory())
-    {
-		if (!(newDir.Exists()))
-		{
-			newDir.CreateDirectory();
-		}
-
-		for (nsDirectoryIterator i(*this, PR_FALSE); i.Exists(); i++)
-		{
-			nsFileSpec& child = (nsFileSpec&)i;
-
-			if (child.IsDirectory())
-			{
-				nsFileSpec tmpDirSpec(newDir);
-
-				char *leafname = child.GetLeafName();
-				tmpDirSpec += leafname;
-				nsCRT::free(leafname);
-
-				child.RecursiveCopy(tmpDirSpec);
-			}
-			else
-			{
-   				child.RecursiveCopy(newDir);
-			}
-		}
-    }
-    else if (!mPath.IsEmpty())
-    {
-		nsFileSpec& filePath = (nsFileSpec&) *this;
-
-		if (!(newDir.Exists()))
-		{
-			newDir.CreateDirectory();
-		}
-
-        filePath.CopyToDir(newDir);
-    }
-} // nsFileSpec::RecursiveCopy
-
-// We have to implement this since there's no truncate() in system.
-//----------------------------------------------------------------------------------------
-nsresutl nsFileSpec::Truncate(const PRInt32 offset) const
-{
-    char* oldPath = nsCRT::strdup(mPath);
-
-    nsFileSpec newFile = *this ;
-    newFile.MakeUnique() ;
-
-    nsInputFileStream inStream(*this) ;
-    nsOutputFileStream outStream(newFile) ;
-
-    PRUint32 buffer_size = 1024, len ;
-    char buffer[buffer_size]  ;
-    PRUint32 bytes_read=0, bytes_written=0, size_left = offset ;
-
-    do {
-        if(size_left > buffer_size)
-            len = buffer_size ;
-        else 
-            len = size_left ;
-
-        bytes_read = inStream.read((void*)buffer, len) ;
-
-        bytes_written = outStream.write(buffer, bytes_read) ;
-        if(bytes_written != bytes_read) 
-            return NS_ERROR_FAILURE ;
-
-        size_left -= bytes_read ;
-    } while(!set_left) ;
-
-    outStream.flush() ;
-    outStream.close() ;
-    inStream.close() ;
-
-    // remove the original file 
-    Delete(PR_TRUE) ;
-
-    // rename the new file
-    rv = newFile.Rename(oldPath) ;
-
-    return rv ;
-
-} // nsFileSpec::Truncate
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::Rename(const char* inNewName)
-//----------------------------------------------------------------------------------------
-{
-	NS_ASSERTION(inNewName, "Attempt to Rename with a null string");
-
-    // This function should not be used to move a file on disk. 
-    if (strchr(inNewName, '/')) 
-        return NS_FILE_FAILURE;
-
-    char* oldPath = nsCRT::strdup(mPath);
-    
-    SetLeafName(inNewName);        
-
-    if (PR_Rename(oldPath, mPath) != NS_OK)
-    {
-        // Could not rename, set back to the original.
-        mPath = oldPath;
-        return NS_FILE_FAILURE;
-    }
-    
-    nsCRT::free(oldPath);
-    
-    return NS_OK;
-} // nsFileSpec::Rename
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::CopyToDir(const nsFileSpec& inParentDirectory) const
-//----------------------------------------------------------------------------------------
-{
-    // We can only copy into a directory, and (for now) can not copy entire directories
-    if (inParentDirectory.IsDirectory() && (! IsDirectory() ) )
-    {
-        char *leafname = GetLeafName();
-        nsSimpleCharString destPath(inParentDirectory.GetCString());
-        destPath += "\\";
-        destPath += leafname;
-        nsCRT::free(leafname);
-        
-        // CopyFile returns non-zero if succeeds
-        int copyOK = CopyFile(GetCString(), destPath, PR_TRUE);
-        if (copyOK)
-            return NS_OK;
-    }
-    return NS_FILE_FAILURE;
-} // nsFileSpec::CopyToDir
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::MoveToDir(const nsFileSpec& inNewParentDirectory)
-//----------------------------------------------------------------------------------------
-{
-    // We can only copy into a directory, and (for now) can not copy entire directories
-    if (inNewParentDirectory.IsDirectory() && (! IsDirectory() ) )
-    {
-        char *leafname = GetLeafName();
-        nsSimpleCharString destPath(inNewParentDirectory.GetCString());
-        destPath += "\\";
-        destPath += leafname;
-        nsCRT::free(leafname);
-
-        // MoveFile returns non-zero if succeeds
-        int copyOK = MoveFile(GetCString(), destPath);
-
-        if (copyOK)
-        {
-            *this = inNewParentDirectory + GetLeafName(); 
-            return NS_OK;
-        }
-        
-    }
-    return NS_FILE_FAILURE;
-} // nsFileSpec::MoveToDir
-
-//----------------------------------------------------------------------------------------
-nsresult nsFileSpec::Execute(const char* inArgs ) const
-//----------------------------------------------------------------------------------------
-{    
-    if (!IsDirectory())
-    {
-	    nsSimpleCharString fileNameWithArgs = mPath + " " + inArgs;
-        int execResult = WinExec( fileNameWithArgs, SW_NORMAL );     
-        if (execResult > 31)
-            return NS_OK;
-    }
-    return NS_FILE_FAILURE;
-} // nsFileSpec::Execute
-
-
-//----------------------------------------------------------------------------------------
-PRInt64 nsFileSpec::GetDiskSpaceAvailable() const
-//----------------------------------------------------------------------------------------
-{
-    PRInt64 int64;
-    
-    LL_I2L(int64 , LONG_MAX);
-
-    char aDrive[_MAX_DRIVE + 2];
-	_splitpath( (const char*)mPath, aDrive, NULL, NULL, NULL);
-
-	if (aDrive[0] == '\0')
-	{
-        // The back end is always trying to pass us paths that look
-        //   like /c|/netscape/mail.  See if we've got one of them
-        if (mPath.Length() > 2 && mPath[0] == '/' && mPath[2] == '|')
-        {
-            aDrive[0] = mPath[1];
-            aDrive[1] = ':';
-            aDrive[2] = '\0';
-        }
-        else
-        {
-            // Return bogus large number and hope for the best
-            return int64; 
-        }
-    }
-
-	strcat(aDrive, "\\");
-
-    // Check disk space
-    DWORD dwSecPerClus, dwBytesPerSec, dwFreeClus, dwTotalClus;
-    ULARGE_INTEGER liFreeBytesAvailableToCaller, liTotalNumberOfBytes, liTotalNumberOfFreeBytes;
-    double nBytes = 0;
-
-    BOOL (WINAPI* getDiskFreeSpaceExA)(LPCTSTR lpDirectoryName, 
-                                       PULARGE_INTEGER lpFreeBytesAvailableToCaller,
-                                       PULARGE_INTEGER lpTotalNumberOfBytes,    
-                                       PULARGE_INTEGER lpTotalNumberOfFreeBytes) = NULL;
-
-    HINSTANCE hInst = LoadLibrary("KERNEL32.DLL");
-    NS_ASSERTION(hInst != NULL, "COULD NOT LOAD KERNEL32.DLL");
-    if (hInst != NULL)
-    {
-        getDiskFreeSpaceExA =  (BOOL (WINAPI*)(LPCTSTR lpDirectoryName, 
-                                               PULARGE_INTEGER lpFreeBytesAvailableToCaller,
-                                               PULARGE_INTEGER lpTotalNumberOfBytes,    
-                                               PULARGE_INTEGER lpTotalNumberOfFreeBytes)) 
-        GetProcAddress(hInst, "GetDiskFreeSpaceExA");
-        FreeLibrary(hInst);
-    }
-
-    if (getDiskFreeSpaceExA && (*getDiskFreeSpaceExA)(aDrive,
-                                                      &liFreeBytesAvailableToCaller, 
-                                                      &liTotalNumberOfBytes,  
-                                                      &liTotalNumberOfFreeBytes))
-    {
-        nBytes = (double)(signed __int64)liFreeBytesAvailableToCaller.QuadPart;
-    }
-    else if ( GetDiskFreeSpace(aDrive, &dwSecPerClus, &dwBytesPerSec, &dwFreeClus, &dwTotalClus))
-    {
-        nBytes = (double)dwFreeClus*(double)dwSecPerClus*(double) dwBytesPerSec;
-    }
-    return (PRInt64)nBytes;
-}
-
-
-
-//========================================================================================
-//								nsDirectoryIterator
-//========================================================================================
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIterator::nsDirectoryIterator(const nsFileSpec& inDirectory, PRBool resolveSymlink)
-//----------------------------------------------------------------------------------------
-	: mCurrent(inDirectory)
-	, mDir(nsnull)
-    , mStarting(inDirectory)
-	, mExists(PR_FALSE)
-    , mResoveSymLinks(resolveSymlink)
-{
-    mDir = PR_OpenDir(inDirectory);
-	mCurrent += "dummy";
-    mStarting += "dummy";
-    ++(*this);
-} // nsDirectoryIterator::nsDirectoryIterator
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIterator::~nsDirectoryIterator()
-//----------------------------------------------------------------------------------------
-{
-    if (mDir)
-	    PR_CloseDir(mDir);
-} // nsDirectoryIterator::nsDirectoryIterator
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIterator& nsDirectoryIterator::operator ++ ()
-//----------------------------------------------------------------------------------------
-{
-	mExists = PR_FALSE;
-	if (!mDir)
-		return *this;
-    PRDirEntry* entry = PR_ReadDir(mDir, PR_SKIP_BOTH); // Ignore '.' && '..'
-	if (entry)
-    {
-      mExists = PR_TRUE;
-      mCurrent = mStarting;
-      mCurrent.SetLeafName(entry->name);
-      if (mResoveSymLinks)
-      {   
-          PRBool ignore;
-          mCurrent.ResolveSymlink(ignore);
-      }
-    }
-	return *this;
-} // nsDirectoryIterator::operator ++
-
-//----------------------------------------------------------------------------------------
-nsDirectoryIterator& nsDirectoryIterator::operator -- ()
-//----------------------------------------------------------------------------------------
-{
-	return ++(*this); // can't do it backwards.
-} // nsDirectoryIterator::operator --
-

mozilla/xpcom/io/nsIBinaryInputStream.idl

@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-[ptr] native nsString(nsString); 
-%{ C++
-#include "nsString.h"
-%}
-
-#include "nsIOutputStream.idl"
-#include "nsrootidl.idl"
-
-/**
- * This interface allows consumption of primitive data types from a "binary
- * stream" containing untagged, big-endian binary data, i.e. as produced by an
- * implementation of nsIBinaryOutputStream.  This might be used, for example,
- * to implement network protocols or to read from architecture-neutral disk
- * files, i.e. ones that can be read and written by both big-endian and
- * little-endian platforms.
- *
- * @See nsIBinaryOutputStream
- */
-
-[scriptable, uuid(7b456cb0-8772-11d3-90cf-0040056a906e)]
-interface nsIBinaryInputStream : nsIInputStream {
-    void setInputStream(in nsIInputStream aInputStream);
-    
-    PRBool readBoolean();
-
-    PRUint8 read8();
-    PRUint16 read16();
-    PRUint32 read32();
-    PRUint64 read64();
-
-    float readFloat();
-    double readDouble();
-
-    /**
-     * Read a NUL-terminated 8-bit char* string from a binary stream.
-     */
-    string readStringZ();
-
-    /**
-     * Read a NUL-terminated 16-bit PRUnichar* string from a binary stream.
-     */
-    wstring readWStringZ();
-
-    /**
-     * Read a NUL-terminated UTF8-encoded string from a binary stream, producing
-     * a NUL-terminated 16-bit PRUnichar* string argument as a result.
-     */
-    wstring readUtf8Z();
-
-    /**
-     * Read an opaque byte array from a binary stream.
-     */
-    void readBytes([size_is(aLength)] out string aString, in PRUint32 aLength);
-
-    /**
-     * Read a string (possibly containing embedded NULs) from a binary stream.
-     */
-    [noscript] nsString readString();
-};
-
-%{C++
-NS_COM nsresult
-NS_NewBinaryInputStream(nsIBinaryInputStream* *aResult, nsIInputStream* aSrcStream);
-%}

mozilla/xpcom/io/nsIBinaryOutputStream.idl

@@ -1,86 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-[ptr] native nsString(nsString); 
-%{ C++
-#include "nsString.h"
-%}
-
-#include "nsIOutputStream.idl"
-#include "nsrootidl.idl"
-
-/**
- * This interface allows writing of primitive data types (integers,
- * floating-point values, booleans, etc.) to a stream in a binary, untagged,
- * fixed-endianness format.  This might be used, for example, to implement
- * network protocols or to produce architecture-neutral binary disk files,
- * i.e. ones that can be read and written by both big-endian and little-endian
- * platforms.  Output is written in big-endian order (high-order byte first),
- * as this is traditional network order.
- *
- * @See nsIBinaryInputStream
- */
-
-[scriptable, uuid(204ee610-8765-11d3-90cf-0040056a906e)]
-interface nsIBinaryOutputStream : nsIOutputStream {
-    void setOutputStream(in nsIOutputStream aOutputStream);
-    
-    void writeBoolean(in PRBool aBoolean);
-
-    void write8(in PRUint8 aByte);
-    void write16(in PRUint16 a16);
-    void write32(in PRUint32 a32);
-    void write64(in PRUint64 a64);
-
-    void writeFloat(in float aFloat);
-    void writeDouble(in double aDouble);
-
-    /**
-     * Write a NUL-terminated 8-bit char* string to a binary stream.
-     */
-    void writeStringZ(in string aString);
-
-    /**
-     * Write a NUL-terminated 16-bit PRUnichar* string to a binary stream.
-     */
-    void writeWStringZ(in wstring aString);
-
-    /**
-     * Write a NUL-terminated UTF8-encoded string to a binary stream, produced
-     * from a NUL-terminated 16-bit PRUnichar* string argument.
-     */
-    void writeUtf8Z(in wstring aString);
-
-    /**
-     * Write an opaque byte array to a binary stream.
-     */
-    void writeBytes([size_is(aLength)] in string aString, in PRUint32 aLength);
-
-    /**
-     * Write a string (possibly containing embedded NULs) to a binary stream.
-     */
-    [noscript] void writeString(in nsString aString);
-};
-
-%{C++
-NS_COM nsresult
-NS_NewBinaryOutputStream(nsIBinaryOutputStream* *aResult, nsIOutputStream* aDestStream);
-%}

mozilla/xpcom/io/nsIFileSpec.idl

@@ -1,158 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-// This is the only correct cross-platform way to specify a file.
-// Strings are not such a way. If you grew up on windows or unix, you
-// may think they are. Welcome to reality.
-
-#include "nsISupports.idl"
-
-%{C++
-#include "nsFileSpec.h" // for factory method
-%}
-
-interface nsIFileURL;
-interface nsIFilePath;
-interface nsIOutputStream;
-interface nsIInputStream;
-
-// Define Progid and CID
-%{C++
-// {A5740FA2-146E-11d3-B00D-00C04FC2E79B} 
-#define NS_FILESPEC_CID \
-{ 0xa5740fa2, 0x146e, 0x11d3, { 0xb0, 0xd, 0x0, 0xc0, 0x4f, 0xc2, 0xe7, 0x9b } }
-
-#define NS_FILESPEC_PROGID "component://netscape/filespec"
-#define NS_FILESPEC_CLASSNAME "File Spec"
-
-%}
-
-      native nsFileSpec(nsFileSpec);
-[ref] native nsFileSpecRef(nsFileSpec);
-[ptr] native nsFileSpecPtr(nsFileSpec);
-
-[scriptable, uuid(d8c0a080-0868-11d3-915f-d9d889d48e3c)]
-interface nsIFileSpec : nsISupports
-{
-	void fromFileSpec([const] in nsIFileSpec original);
-
-	attribute string URLString;
-	attribute string unixStyleFilePath;
-	attribute string persistentDescriptorString;
-	attribute string nativePath;
-
-	readonly attribute string NSPRPath;
-
-	void error();
-
-	boolean isValid();
-	boolean failed();
-
-	attribute string leafName;
-
-	readonly attribute nsIFileSpec parent;
-	readonly attribute nsIInputStream inputStream;
-	readonly attribute nsIOutputStream outputStream;
-    boolean isChildOf(in nsIFileSpec possibleParent);
-	[noscript] readonly attribute nsFileSpec fileSpec;
-	[noscript] void setFromFileSpec([const] in nsFileSpecRef spec);
-	
-	attribute string fileContents;
-
-	void makeUnique();
-	void makeUniqueWithSuggestedName(in string suggestedName);
-
-	readonly attribute unsigned long modDate;
-	boolean modDateChanged(in unsigned long oldStamp);
-
-	boolean isDirectory();
-	boolean isFile();
-	boolean exists();
-	boolean isHidden();
-
-	readonly attribute unsigned long fileSize;
-	readonly attribute long long diskSpaceAvailable;
-
-	void appendRelativeUnixPath(in string relativePath);
-
-	void createDir();
-	void touch();
-    
-	boolean isSymlink();
-	void resolveSymlink();
-
-    void truncate([const] in long offset) ;
-	void rename([const] in string newLeafName);
-	void copyToDir([const] in nsIFileSpec newParentDir);
-	void moveToDir([const] in nsIFileSpec newParentDir);
-	void execute([const] in string args);
-	
-	void openStreamForReading();
-	void openStreamForWriting();
-	void openStreamForReadingAndWriting();
-	void closeStream();
-	boolean isStreamOpen();
-	
-	boolean eof();
-	long read(inout string buffer, in long requestedCount);
-	void readLine(inout string line, in long bufferSize, out boolean wasTruncated);
-%{C++
-                        // Check eof() before each call.
-                        // CAUTION: false result only indicates line was truncated
-                        // to fit buffer, or an error occurred (OTHER THAN eof).
-%}	
-	long write(in string data, in long requestedCount);
-	void flush();
-	
-	void seek(in long offset);
-	long tell();
-	void endLine();
-	
-};
-	
-// Define Progid and CID
-%{C++
-// {a3020981-2018-11d3-915f-a957795b7ebc}
-#define NS_DIRECTORYITERATOR_CID \
-{ 0xa3020981, 0x2018, 0x11d3, { 0x91, 0x5f, 0xa9, 0x57, 0x79, 0x5b, 0x7e, 0xbc } }
-
-#define NS_DIRECTORYITERATOR_PROGID "component://netscape/directoryiterator"
-#define NS_DIRECTORYITERATOR_CLASSNAME "nsIDirectoryIterator"
-%}
-
-[scriptable, uuid(d8c0a083-0868-11d3-915f-d9d889d48e3c)]
-interface nsIDirectoryIterator : nsISupports
-{
-	void init(in nsIFileSpec parent, in boolean resolveSymlink);
-	boolean exists();
-	void next();
-	readonly attribute nsIFileSpec currentSpec;
-};
-
-%{C++
-// Factory methods if you link with xpcom
-NS_COM nsresult NS_NewFileSpecWithSpec(const nsFileSpec& aSrcFileSpec, nsIFileSpec **result);
-NS_COM nsresult NS_NewFileSpec(nsIFileSpec** result);
-NS_COM nsresult NS_NewDirectoryIterator(nsIDirectoryIterator** result);
-
-#define NS_BOOL_ACCESSOR(_method) { PRBool yes; return NS_SUCCEEDED(f->_method(&yes)) && yes; }
-inline PRBool Exists(nsIFileSpec* f) NS_BOOL_ACCESSOR(Exists)
-inline PRBool Exists(nsIDirectoryIterator* f) NS_BOOL_ACCESSOR(Exists)
-inline PRBool IsDirectory(nsIFileSpec* f) NS_BOOL_ACCESSOR(IsDirectory)
-
-%}

mozilla/xpcom/io/nsIStorageStream.idl

@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-#include "nsISupports.idl"
-#include "nsrootidl.idl"
-
-interface nsIAllocator;
-interface nsIInputStream;
-interface nsIOutputStream;
-
-/**
- * The nsIStorageStream interface maintains an internal data buffer that can be
- * filled using a single output stream.  One or more independent input streams
- * can be created to read the data from the buffer non-destructively.
- */
-
-[scriptable, uuid(604ad9d0-753e-11d3-90ca-0040056a906e)]
-interface nsIStorageStream : nsISupports
-{
-    /**
-     * Get a reference to the one and only output stream for this instance.
-     * The zero-based startPosition argument is used is used to set the initial
-     * write cursor position.  The startPosition cannot be set larger than the
-     * current buffer length.  Calling this method has the side-effect of
-     * truncating the internal buffer to startPosition bytes.
-     */
-    nsIOutputStream getOutputStream(in PRInt32 startPosition);
-
-    /**
-     * Create a new input stream to read data (written by the singleton output
-     * stream) from the internal buffer.  Multiple, independent input streams
-     * can be created.
-     */
-    nsIInputStream newInputStream(in PRInt32 startPosition);
-
-    /** 
-     * The length attribute indicates the total number of bytes stored in the
-     * nsIStorageStream internal buffer, regardless of any consumption by input
-     * streams.  Assigning to the length field can be used to truncate the
-     * buffer data, but can not be used when either the instance's output
-     * stream is in use.
-     *
-     * @See #writeInProgress */
-    attribute PRUint32 length;
-
-    /**
-     * True, when output stream has not yet been Close'ed
-     */
-    readonly attribute boolean writeInProgress;
-};
-
-%{C++
-// Factory method
-NS_COM nsresult
-NS_NewStorageStream(PRUint32 segmentSize, PRUint32 maxSize, nsIStorageStream **result);
-%}

mozilla/xpcom/io/nsIStringStream.cpp

@@ -1,467 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIStringStream.h"
-#include "nsIFileStream.h"
-
-#include "prerror.h"
-#include "nsFileSpec.h"
-#include "plstr.h"
-
-//========================================================================================
-class BasicStringImpl
-    : public nsIOutputStream
-    , public nsIInputStream
-    , public nsIRandomAccessStore
-//========================================================================================
-{
-    public:
-                                        BasicStringImpl()
-                                            : mOffset(0)
-                                            , mLastResult(NS_OK)
-                                            , mEOF(PR_FALSE)
-                                        {
-                                            NS_INIT_REFCNT();
-                                        }
-        virtual                         ~BasicStringImpl()
-                                        {
-                                        }
-        NS_IMETHOD                      Seek(PRSeekWhence whence, PRInt32 offset);
-
-        NS_IMETHOD                      Tell(PRIntn* outWhere)
-                                        {
-                                            *outWhere = mOffset;
-                                            return NS_OK;
-                                        }
-
-        NS_IMETHOD                      GetAtEOF(PRBool* outAtEOF)
-        						        {
-        						            *outAtEOF = mEOF;
-        						            return NS_OK;
-        						        }
-        NS_IMETHOD                      SetAtEOF(PRBool inAtEOF)
-        						        {
-        						            mEOF = inAtEOF;
-        						            return NS_OK;
-        						        }
-
-        NS_IMETHOD                      Available(PRUint32 *aLength)
-                                        {
-                                            NS_PRECONDITION(aLength != nsnull, "null ptr");
-                                            if (!aLength)
-                                                return NS_ERROR_NULL_POINTER;
-                                            *aLength = length();
-                                            return NS_OK;
-                                        }
-		NS_IMETHOD                      Read(char* aBuf,
-			                                PRUint32 aCount,
-					                        PRUint32 *aReadCount)
-								        {
-								            NS_PRECONDITION(aBuf != nsnull, "null ptr");
-								            if (!aBuf)
-								                return NS_ERROR_NULL_POINTER;
-								            NS_PRECONDITION(aReadCount != nsnull, "null ptr");
-								            if (!aReadCount)
-								                return NS_ERROR_NULL_POINTER;
-								            if (NS_FAILED(mLastResult))
-								                return mLastResult;
-								            PRInt32 bytesRead = read(aBuf, aCount);
-								            if (NS_FAILED(mLastResult))
-								            {
-								                *aReadCount = 0;
-								                return mLastResult;
-								            }
-								            *aReadCount = bytesRead;
-								            if (bytesRead < (PRInt32)aCount)
-								                SetAtEOF(PR_TRUE);
-								            return NS_OK;
-								        }
-		// nsIOutputStream interface
-		NS_IMETHOD                      Write(const char* aBuf,
-			                                PRUint32 aCount,
-					                        PRUint32 *aWriteCount)
-								        {
-								            NS_PRECONDITION(aBuf != nsnull, "null ptr");
-								            NS_PRECONDITION(aWriteCount != nsnull, "null ptr");
-
-								            if (NS_FAILED(mLastResult))
-								                return mLastResult;
-								            PRInt32 bytesWrit = write(aBuf, aCount);
-								            if (NS_FAILED(mLastResult))
-								            {
-								                *aWriteCount = 0;
-								                return mLastResult;
-								            }
-								            *aWriteCount = bytesWrit;
-								            return NS_OK;
-								        }
-    public:
-        
-        // nsISupports interface
-                                        NS_DECL_ISUPPORTS
-
-        NS_IMETHOD                      Close() { return NS_OK; }
-
-		// nsIInputStream interface
-        NS_IMETHOD                      Flush() { return NS_OK; }
-
-    
-    public:
-        nsresult                        get_result() const { return mLastResult; }
-        
-    protected:
-    
-        virtual PRInt32                 length() const = 0;
-        virtual PRInt32                 read(char* buf, PRUint32 count) = 0;
-        virtual PRInt32                 write(const char*, PRUint32)
-                                        {
-                                            NS_ASSERTION(PR_FALSE, "Write to a const string");
-                                            mLastResult = NS_FILE_RESULT(PR_ILLEGAL_ACCESS_ERROR);
-                                            return -1;
-                                        }
-        
-    protected:
- 
-        PRUint32                        mOffset;
-        nsresult                        mLastResult;
-        PRBool                          mEOF;
-}; // class BasicStringImpl
-
-//========================================================================================
-class ConstCharImpl
-    : public BasicStringImpl
-//========================================================================================
-{
-    public:
-                                        ConstCharImpl(const char* inString, PRInt32 inLength = -1)
-                                            : mConstString(inString),
-                                            mLength(inLength == -1 ?
-                                                    (inString ? strlen(inString) : 0) : inLength) {}
-                                       
-    protected:
-    
-        virtual PRInt32                 length() const
-                                        {
-                                            return mLength - mOffset;
-                                        }
-
-        virtual PRInt32                 read(char* buf, PRUint32 aCount)
-                                        {
-                                            PRInt32 maxCount = mLength - mOffset;
-                                            if ((PRInt32)aCount > maxCount)
-                                                aCount = maxCount;
-                                            memcpy(buf, mConstString + mOffset, aCount);
-                                            mOffset += aCount;
-                                            return aCount;
-                                        }
-        
-
-    protected:
-    
-        const char*                     mConstString;
-        size_t                          mLength;
-        
-}; // class ConstCharImpl
-
-//========================================================================================
-class CharImpl
-    : public ConstCharImpl
-//========================================================================================
-{
-    enum { kAllocQuantum = 256 };
-    
-    public:
-                                        CharImpl(char** inString, PRInt32 inLength = -1)
-                                            : ConstCharImpl(*inString, inLength)
-                                            , mString(*inString)
-                                            , mAllocLength(mLength + 1)
-                                            , mOriginalLength(mLength)
-                                        {
-                                            if (!mString)
-                                            {
-                                                mAllocLength = kAllocQuantum;
-                                                mString = new char[mAllocLength];
-	                                            if (!mString)
-	                                            {
-	                                                mLastResult = NS_ERROR_OUT_OF_MEMORY;
-	                                                return;
-	                                            }
-	                                            mConstString = mString;
-	                                            *mString = '\0';
-	                                            
-                                            }
-                                        }
-                                        
-                                        ~CharImpl()
-                                        {
-                                            if (mString) 
-                                            {
-                                                delete [] mString;
-                                            }
-                                        }
-
-        virtual PRInt32                 write(const char* buf, PRUint32 aCount)
-                                        {
-                                            if (!buf)
-                                            	return 0;
-                                            PRInt32 maxCount = mAllocLength - 1 - mOffset;
-                                            if ((PRInt32)aCount > maxCount)
-                                            {
-                                                mAllocLength = aCount + 1 + mOffset + kAllocQuantum;
-                                                char* newString = new char[mAllocLength];
-	                                            if (!newString)
-	                                            {
-	                                                mLastResult = NS_ERROR_OUT_OF_MEMORY;
-	                                                return 0;
-	                                            }
-                                                memcpy(newString, mString, mLength);
-                                                delete [] mString;
-                                                mString = newString;
-                                                mConstString = newString;
-                                            }
-                                            memcpy(mString + mOffset, buf, aCount);
-                                            mOffset += aCount;
-                                            if (mOffset > mOriginalLength)
-                                                mString[mOffset] = 0;
-                                            return aCount;
-                                        }
-    protected:
-    
-        char*&                          mString;
-        size_t                          mAllocLength;
-        size_t                          mOriginalLength;
-        
-}; // class CharImpl
-                                       
-//========================================================================================
-class ConstStringImpl
-    : public ConstCharImpl
-//========================================================================================
-{
-    public:
-                                        ConstStringImpl(const nsString& inString)
-                                            : ConstCharImpl(inString.ToNewCString(),
-                                                            inString.Length())
-                                        {
-                                        }
-
-                                        ~ConstStringImpl()
-                                        {
-                                            delete [] (char*)mConstString;
-                                        }
-
-    protected:
-    
-    protected:
-    
-}; // class ConstStringImpl
-
-
-//========================================================================================
-class StringImpl
-    : public ConstStringImpl
-// This is wrong, since it really converts to 1-char strings.
-//========================================================================================
-{
-    public:
-                                        StringImpl(nsString& inString)
-                                            : ConstStringImpl(inString)
-                                            , mString(inString)
-                                        {
-                                        }
-
-    protected:
-    
-        virtual PRInt32                 write(const char* buf, PRUint32 count)
-                                        {
-                                            if (!buf)
-                                                return 0;
-                                            // Clone our string as chars
-                                            char* cstring = mString.ToNewCString();
-                                            // Make a CharImpl and do the write
-                                            CharImpl chars(&cstring, mString.Length());
-                                            chars.Seek(PR_SEEK_SET, mOffset);
-                                            // Get the bytecount and result from the CharImpl
-                                            PRInt32 result = chars.write(buf,count);
-                                            mLastResult = chars.get_result();
-                                            // Set our string to match the new chars
-                                            chars.Seek(PR_SEEK_SET, 0);
-                                            size_t newLength;
-                                            chars.Available(&newLength);
-                                            mString.Assign(cstring, newLength);
-                                            // Set our const string also...
-                                            delete [] (char*)mConstString;
-                                            mConstString = cstring;
-                                            return result;
-                                        }
-    protected:
-    
-        nsString&                       mString;
-        
-}; // class StringImpl
-
-NS_IMPL_RELEASE(BasicStringImpl)
-NS_IMPL_ADDREF(BasicStringImpl)
-
-NS_IMPL_QUERY_HEAD(BasicStringImpl)
-  NS_IMPL_QUERY_BODY(nsIRandomAccessStore)
-  NS_IMPL_QUERY_BODY(nsIOutputStream)
-  NS_IMPL_QUERY_BODY(nsIInputStream)
-  if ( aIID.Equals(NS_GET_IID(nsIBaseStream)) )
-    foundInterface = NS_STATIC_CAST(nsIBaseStream*, NS_STATIC_CAST(nsIOutputStream*, this));
-  else
-NS_IMPL_QUERY_TAIL(nsIOutputStream)
-
-//----------------------------------------------------------------------------------------
-NS_IMETHODIMP BasicStringImpl::Seek(PRSeekWhence whence, PRInt32 offset)
-//----------------------------------------------------------------------------------------
-{
-    mLastResult = NS_OK; // reset on a seek.
-    mEOF = PR_FALSE; // reset on a seek.
-    PRInt32 fileSize = length();
-    PRInt32 newPosition=-1;
-    switch (whence)
-    {
-        case PR_SEEK_CUR: newPosition = mOffset + offset; break;
-        case PR_SEEK_SET: newPosition = offset; break;
-        case PR_SEEK_END: newPosition = fileSize + offset; break;
-    }
-    if (newPosition < 0)
-    {
-        newPosition = 0;
-        mLastResult = NS_FILE_RESULT(PR_FILE_SEEK_ERROR);
-    }
-    if (newPosition >= fileSize)
-    {
-        newPosition = fileSize;
-        mEOF = PR_TRUE;
-    }
-    mOffset = newPosition;
-    return NS_OK;
-} // StringImpl::Seek
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_COM nsresult NS_NewStringInputStream(
-    nsISupports** aStreamResult,
-    const nsString& aStringToRead)
-    // Factory method to get an nsInputStream from a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-//----------------------------------------------------------------------------------------
-{
-    NS_PRECONDITION(aStreamResult != nsnull, "null ptr");
-    if (! aStreamResult)
-        return NS_ERROR_NULL_POINTER;
-
-    ConstStringImpl* stream = new ConstStringImpl(aStringToRead);
-    if (! stream)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(stream);
-    *aStreamResult = (nsISupports*)(void*)stream;
-    return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_COM nsresult NS_NewStringOutputStream(
-    nsISupports** aStreamResult,
-    nsString& aStringToChange)
-    // Factory method to get an nsOutputStream from a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-//----------------------------------------------------------------------------------------
-{
-    NS_PRECONDITION(aStreamResult != nsnull, "null ptr");
-    if (! aStreamResult)
-        return NS_ERROR_NULL_POINTER;
-
-    StringImpl* stream = new StringImpl(aStringToChange);
-    if (! stream)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(stream);
-    *aStreamResult = (nsISupports*)(void*)stream;
-    return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_COM nsresult NS_NewCharInputStream(
-    nsISupports** aStreamResult,
-    const char* aStringToRead)
-    // Factory method to get an nsInputStream from a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-//----------------------------------------------------------------------------------------
-{
-    NS_PRECONDITION(aStreamResult != nsnull, "null ptr");
-    if (! aStreamResult)
-        return NS_ERROR_NULL_POINTER;
-
-    ConstCharImpl* stream = new ConstCharImpl(aStringToRead);
-    if (! stream)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(stream);
-    *aStreamResult = (nsISupports*)(void*)stream;
-    return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_COM nsresult NS_NewCharOutputStream(
-    nsISupports** aStreamResult,
-    char** aStringToChange)
-    // Factory method to get an nsOutputStream to a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-//----------------------------------------------------------------------------------------
-{
-    NS_PRECONDITION(aStreamResult != nsnull, "null ptr");
-    NS_PRECONDITION(aStringToChange != nsnull, "null ptr");
-    if (!aStreamResult || !aStringToChange)
-        return NS_ERROR_NULL_POINTER;
-
-    CharImpl* stream = new CharImpl(aStringToChange);
-    if (! stream)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(stream);
-    *aStreamResult = (nsISupports*)(void*)stream;
-    return NS_OK;
-}
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_COM nsresult NS_NewStringIOStream(
-    nsISupports** aStreamResult,
-    nsString& aStringToChange)
-    // Factory method to get an nsOutputStream to a string.  Result will implement all the
-// file stream interfaces in nsIFileStream.h
-//----------------------------------------------------------------------------------------
-{
-    return NS_NewStringOutputStream(aStreamResult, aStringToChange);
-}
-
-//----------------------------------------------------------------------------------------
-extern "C" NS_COM nsresult NS_NewCharIOStream(
-    nsISupports** aStreamResult,
-    char** aStringToChange)
-    // Factory method to get an nsOutputStream to a string.  Result will implement all the
-    // file stream interfaces in nsIFileStream.h
-//----------------------------------------------------------------------------------------
-{
-    return NS_NewCharOutputStream(aStreamResult, aStringToChange);
-}

mozilla/xpcom/io/nsSegmentedBuffer.cpp

@@ -1,206 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsSegmentedBuffer.h"
-#include "nsCRT.h"
-
-nsSegmentedBuffer::nsSegmentedBuffer()
-    : mSegmentSize(0), mMaxSize(0), 
-      mSegAllocator(nsnull), mSegmentArray(nsnull),
-      mSegmentArrayCount(0),
-      mFirstSegmentIndex(0), mLastSegmentIndex(0)
-{
-}
-
-nsSegmentedBuffer::~nsSegmentedBuffer()
-{
-    Empty();
-    NS_IF_RELEASE(mSegAllocator);
-}
-
-nsresult
-nsSegmentedBuffer::Init(PRUint32 segmentSize, PRUint32 maxSize,
-                        nsIAllocator* allocator)
-{
-    if (mSegmentArrayCount != 0)
-        return NS_ERROR_FAILURE;        // initialized more than once
-    mSegmentSize = segmentSize;
-    mMaxSize = maxSize;
-    mSegAllocator = allocator;
-    if (mSegAllocator == nsnull) {
-        mSegAllocator = nsAllocator::GetGlobalAllocator();
-    }
-    else {
-        NS_ADDREF(mSegAllocator);
-    }
-#if 0 // testing...
-    mSegmentArrayCount = 2;
-#else
-    mSegmentArrayCount = NS_SEGMENTARRAY_INITIAL_COUNT;
-#endif
-    return NS_OK;
-}
-
-char*
-nsSegmentedBuffer::AppendNewSegment()
-{
-    if (GetSize() >= mMaxSize)
-        return nsnull;
-
-    if (mSegmentArray == nsnull) {
-        PRUint32 bytes = mSegmentArrayCount * sizeof(char*);
-        mSegmentArray = (char**)nsAllocator::Alloc(bytes);
-        if (mSegmentArray == nsnull)
-            return nsnull;
-        nsCRT::memset(mSegmentArray, 0, bytes);
-    }
-    
-    if (IsFull()) {
-        PRUint32 newArraySize = mSegmentArrayCount * 2;
-        PRUint32 bytes = newArraySize * sizeof(char*);
-        char** newSegArray = (char**)nsAllocator::Realloc(mSegmentArray, bytes);
-        if (newSegArray == nsnull)
-            return nsnull;
-        mSegmentArray = newSegArray;
-        // copy wrapped content to new extension
-        if (mFirstSegmentIndex > mLastSegmentIndex) {
-            // deal with wrap around case
-            nsCRT::memcpy(&mSegmentArray[mSegmentArrayCount],
-                          mSegmentArray,
-                          mLastSegmentIndex * sizeof(char*));
-            nsCRT::memset(mSegmentArray, 0, mLastSegmentIndex * sizeof(char*));
-            mLastSegmentIndex += mSegmentArrayCount;
-            nsCRT::memset(&mSegmentArray[mLastSegmentIndex], 0,
-                          (newArraySize - mLastSegmentIndex) * sizeof(char*));
-        }
-        else {
-            nsCRT::memset(&mSegmentArray[mLastSegmentIndex], 0,
-                          (newArraySize - mLastSegmentIndex) * sizeof(char*));
-        }
-        mSegmentArrayCount = newArraySize;
-    }
-
-    char* seg = (char*)mSegAllocator->Alloc(mSegmentSize);
-    if (seg == nsnull) {
-        return nsnull;
-    }
-    mSegmentArray[mLastSegmentIndex] = seg;
-    mLastSegmentIndex = ModSegArraySize(mLastSegmentIndex + 1);
-    return seg;
-}
-
-PRBool
-nsSegmentedBuffer::DeleteFirstSegment()
-{
-    NS_ASSERTION(mSegmentArray[mFirstSegmentIndex] != nsnull, "deleting bad segment");
-    (void)mSegAllocator->Free(mSegmentArray[mFirstSegmentIndex]);
-    mSegmentArray[mFirstSegmentIndex] = nsnull;
-    PRInt32 last = ModSegArraySize(mLastSegmentIndex - 1);
-    if (mFirstSegmentIndex == last) {
-        mLastSegmentIndex = last;
-        return PR_TRUE;
-    }
-    else {
-        mFirstSegmentIndex = ModSegArraySize(mFirstSegmentIndex + 1);
-        return PR_FALSE;
-    }
-}
-
-PRBool
-nsSegmentedBuffer::DeleteLastSegment()
-{
-    PRInt32 last = ModSegArraySize(mLastSegmentIndex - 1);
-    NS_ASSERTION(mSegmentArray[last] != nsnull, "deleting bad segment");
-    (void)mSegAllocator->Free(mSegmentArray[last]);
-    mSegmentArray[last] = nsnull;
-    mLastSegmentIndex = last;
-    return (PRBool)(mLastSegmentIndex == mFirstSegmentIndex);
-}
-
-PRBool
-nsSegmentedBuffer::ReallocLastSegment(size_t newSize)
-{
-    PRInt32 last = ModSegArraySize(mLastSegmentIndex - 1);
-    NS_ASSERTION(mSegmentArray[last] != nsnull, "realloc'ing bad segment");
-    char *newSegment =
-        (char*)mSegAllocator->Realloc(mSegmentArray[last], newSize);
-    if (newSegment) {
-        mSegmentArray[last] = newSegment;
-        return PR_TRUE;
-    } else {
-        return PR_FALSE;
-    }
-}
-
-void
-nsSegmentedBuffer::Empty()
-{
-    if (mSegmentArray) {
-        for (PRUint32 i = 0; i < mSegmentArrayCount; i++) {
-            if (mSegmentArray[i])
-                mSegAllocator->Free(mSegmentArray[i]);
-        }
-        nsAllocator::Free(mSegmentArray);
-        mSegmentArray = nsnull;
-    }
-    mSegmentArrayCount = NS_SEGMENTARRAY_INITIAL_COUNT;
-    mFirstSegmentIndex = mLastSegmentIndex = 0;
-}
-
-#ifdef DEBUG
-NS_COM void
-TestSegmentedBuffer()
-{
-    nsSegmentedBuffer* buf = new nsSegmentedBuffer();
-    NS_ASSERTION(buf, "out of memory");
-    buf->Init(4, 16);
-    char* seg;
-    PRBool empty;
-    seg = buf->AppendNewSegment();
-    NS_ASSERTION(seg, "AppendNewSegment failed");
-    seg = buf->AppendNewSegment();
-    NS_ASSERTION(seg, "AppendNewSegment failed");
-    seg = buf->AppendNewSegment();
-    NS_ASSERTION(seg, "AppendNewSegment failed");
-    empty = buf->DeleteFirstSegment();
-    NS_ASSERTION(!empty, "DeleteFirstSegment failed");
-    empty = buf->DeleteFirstSegment();
-    NS_ASSERTION(!empty, "DeleteFirstSegment failed");
-    seg = buf->AppendNewSegment();
-    NS_ASSERTION(seg, "AppendNewSegment failed");
-    seg = buf->AppendNewSegment();
-    NS_ASSERTION(seg, "AppendNewSegment failed");
-    seg = buf->AppendNewSegment();
-    NS_ASSERTION(seg, "AppendNewSegment failed");
-    empty = buf->DeleteFirstSegment();
-    NS_ASSERTION(!empty, "DeleteFirstSegment failed");
-    empty = buf->DeleteFirstSegment();
-    NS_ASSERTION(!empty, "DeleteFirstSegment failed");
-    empty = buf->DeleteFirstSegment();
-    NS_ASSERTION(!empty, "DeleteFirstSegment failed");
-    empty = buf->DeleteFirstSegment();
-    NS_ASSERTION(empty, "DeleteFirstSegment failed");
-    delete buf;
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/xpcom/io/nsSegmentedBuffer.h

@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsSegmentedBuffer_h__
-#define nsSegmentedBuffer_h__
-
-#include "nsIAllocator.h"
-#include "prclist.h"
-
-class nsSegmentedBuffer
-{
-public:
-    nsSegmentedBuffer();
-    ~nsSegmentedBuffer();
-
-    nsresult Init(PRUint32 segmentSize, PRUint32 maxSize,
-                  nsIAllocator* allocator = nsnull);
-
-    char* AppendNewSegment();   // pushes at end
-
-    // returns true if no more segments remain:
-    PRBool DeleteFirstSegment();  // pops from beginning
-
-    // returns true if no more segments remain:
-    PRBool DeleteLastSegment();  // pops from beginning
-
-    // Call Realloc() on last segment.  This is used to reduce memory
-    // consumption when data is not an exact multiple of segment size.
-    PRBool ReallocLastSegment(size_t newSize);
-
-    void Empty();               // frees all segments
-
-    PRUint32 GetSegmentCount() {
-        if (mFirstSegmentIndex <= mLastSegmentIndex)
-            return mLastSegmentIndex - mFirstSegmentIndex;
-        else 
-            return mSegmentArrayCount + mLastSegmentIndex - mFirstSegmentIndex;
-    }
-
-    PRUint32 GetSegmentSize() { return mSegmentSize; }
-
-    PRUint32 GetSize() { return GetSegmentCount() * mSegmentSize; }
-
-    char* GetSegment(PRUint32 indx) {
-        NS_ASSERTION(0 <= indx && indx < GetSegmentCount(),
-                     "index out of bounds");
-        PRInt32 i = ModSegArraySize(mFirstSegmentIndex + (PRInt32)indx);
-        return mSegmentArray[i];
-    }
-
-protected:
-    PRInt32 ModSegArraySize(PRInt32 n) {
-        PRUint32 result = n & (mSegmentArrayCount - 1);
-        NS_ASSERTION(result == n % mSegmentArrayCount,
-                     "non-power-of-2 mSegmentArrayCount");
-        return result;
-    }
-
-   PRBool IsFull() {
-        return ModSegArraySize(mLastSegmentIndex + 1) == mFirstSegmentIndex;
-    }
-
-protected:
-    PRUint32            mSegmentSize;
-    PRUint32            mMaxSize;
-    nsIAllocator*       mSegAllocator;
-    char**              mSegmentArray;
-    PRUint32            mSegmentArrayCount;
-    PRInt32             mFirstSegmentIndex;
-    PRInt32             mLastSegmentIndex;
-};
-
-// NS_SEGMENTARRAY_INITIAL_SIZE: This number needs to start out as a
-// power of 2 given how it gets used. We double the segment array
-// when we overflow it, and use that fact that it's a power of 2 
-// to compute a fast modulus operation in IsFull.
-//
-// 32 segment array entries can accommodate 128k of data if segments
-// are 4k in size. That seems like a reasonable amount that will avoid
-// needing to grow the segment array.
-#define NS_SEGMENTARRAY_INITIAL_COUNT 32
-
-#endif // nsSegmentedBuffer_h__

mozilla/xpcom/io/nsStorageStream.cpp

@@ -1,386 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-/*
- * The storage stream provides an internal buffer that can be filled by a
- * client using a single output stream.  One or more independent input streams
- * can be created to read the data out non-destructively.  The implementation
- * uses a segmented buffer internally to avoid realloc'ing of large buffers,
- * with the attendant performance loss and heap fragmentation.
- */
-
-#include "nsStorageStream.h"
-#include "nsSegmentedBuffer.h"
-#include "nsCOMPtr.h"
-#include "prbit.h"
-
-nsStorageStream::nsStorageStream()
-    : mSegmentedBuffer(0), mSegmentSize(0), mWriteInProgress(false),
-      mWriteCursor(0), mSegmentEnd(0), mLogicalLength(0), mLastSegmentNum(-1)
-{
-    NS_INIT_REFCNT();
-}
-
-nsStorageStream::~nsStorageStream()
-{
-	if (mSegmentedBuffer)
-	    delete mSegmentedBuffer;
-}
-
-NS_IMPL_ADDREF(nsStorageStream)
-NS_IMPL_RELEASE(nsStorageStream)
-
-// Multiple inheritance requires customized QI
-NS_IMETHODIMP
-nsStorageStream::QueryInterface(const nsIID& aIID, void** aInstancePtr)
-{
-    if (aInstancePtr == nsnull)
-        return NS_ERROR_NULL_POINTER;
-    if (aIID.Equals(NS_GET_IID(nsIStorageStream)) ||
-        aIID.Equals(NS_GET_IID(nsISupports))) {
-        NS_ADDREF(this);
-        *aInstancePtr = NS_STATIC_CAST(nsIStorageStream*, this);
-        return NS_OK;
-    } else if (aIID.Equals(NS_GET_IID(nsIOutputStream))) {
-        NS_ADDREF(this);
-        *aInstancePtr = NS_STATIC_CAST(nsIOutputStream*, this);
-        return NS_OK;
-    }
-    return NS_NOINTERFACE;
-}
-
-NS_IMETHODIMP
-nsStorageStream::Init(PRUint32 segmentSize, PRUint32 maxSize,
-                      nsIAllocator *segmentAllocator)
-{
-    mSegmentedBuffer = new nsSegmentedBuffer();
-    if (!mSegmentedBuffer)
-        return NS_ERROR_OUT_OF_MEMORY;
-    
-    mSegmentSize = segmentSize;
-    mSegmentSizeLog2 = PR_FloorLog2(segmentSize);
-
-    // Segment size must be a power of two
-    if (mSegmentSize != ((PRUint32)1 << mSegmentSizeLog2))
-        return NS_ERROR_INVALID_ARG;
-
-    return mSegmentedBuffer->Init(segmentSize, maxSize, segmentAllocator);
-}
-
-NS_IMETHODIMP
-nsStorageStream::GetOutputStream(PRInt32 aStartingOffset, 
-                                 nsIOutputStream * *aOutputStream)
-{
-    NS_ENSURE_ARG(aOutputStream);
-    if (mWriteInProgress)
-        return NS_ERROR_NOT_AVAILABLE;
-
-    nsresult rv = Seek(aStartingOffset);
-    if (NS_FAILED(rv)) return rv;
-
-    // Enlarge the last segment in the buffer so that it is the same size as
-    // all the other segments in the buffer.  (It may have been realloc'ed
-    // smaller in the Close() method.)
-    if (mLastSegmentNum >= 0)
-        mSegmentedBuffer->ReallocLastSegment(mSegmentSize);
-    
-    NS_ADDREF(this);
-    *aOutputStream = NS_STATIC_CAST(nsIOutputStream*, this);
-    mWriteInProgress = true;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsStorageStream::Close()
-{
-    mWriteInProgress = false;
-    
-    PRInt32 segmentOffset = SegOffset(mLogicalLength);
-
-    // Shrink the final segment in the segmented buffer to the minimum size
-    // needed to contain the data, so as to conserve memory.
-    if (segmentOffset)
-        mSegmentedBuffer->ReallocLastSegment(segmentOffset);
-    
-    mWriteCursor = 0;
-    mSegmentEnd = 0;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsStorageStream::Flush()
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsStorageStream::Write(const char *aBuffer, PRUint32 aCount, PRUint32 *aNumWritten)
-{
-    const char* readCursor;
-    PRUint32 count, availableInSegment, remaining;
-    nsresult rv = NS_OK;
-
-    NS_ENSURE_ARG_POINTER(aNumWritten);
-    NS_ENSURE_ARG(aBuffer);
-
-    remaining = aCount;
-    readCursor = aBuffer;
-    while (remaining) {
-        availableInSegment = mSegmentEnd - mWriteCursor;
-        if (!availableInSegment) {
-            mWriteCursor = mSegmentedBuffer->AppendNewSegment();
-            mLastSegmentNum++;
-            if (!mWriteCursor) {
-                rv = NS_ERROR_OUT_OF_MEMORY;
-                goto out;
-            }
-            mSegmentEnd = mWriteCursor + mSegmentSize;
-            availableInSegment = mSegmentEnd - mWriteCursor;
-        }
-	
-        count = PR_MIN(availableInSegment, remaining);
-        memcpy(mWriteCursor, readCursor, count);
-        remaining -= count;
-        readCursor += count;
-        mWriteCursor += count;
-    };
-
- out:
-    *aNumWritten = aCount - remaining;
-    mLogicalLength += *aNumWritten;
-
-    return rv;
-}
-
-NS_IMETHODIMP
-nsStorageStream::GetLength(PRUint32 *aLength)
-{
-    NS_ENSURE_ARG(aLength);
-    *aLength = mLogicalLength;
-    return NS_OK;
-}
-
-// Truncate the buffer by deleting the end segments
-NS_IMETHODIMP
-nsStorageStream::SetLength(PRUint32 aLength)
-{
-    if (mWriteInProgress)
-        return NS_ERROR_NOT_AVAILABLE;
-
-    if (aLength > mLogicalLength)
-        return NS_ERROR_INVALID_ARG;
-
-    PRInt32 newLastSegmentNum = SegNum(aLength);
-    PRInt32 segmentOffset = SegOffset(aLength);
-    if (segmentOffset == 0)
-        newLastSegmentNum--;
-
-    while (newLastSegmentNum < mLastSegmentNum) {
-        mSegmentedBuffer->DeleteLastSegment();
-        mLastSegmentNum--;
-    }
-
-    mLogicalLength = aLength;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsStorageStream::GetWriteInProgress(PRBool *aWriteInProgress)
-{
-    NS_ENSURE_ARG(aWriteInProgress);
-
-    *aWriteInProgress = mWriteInProgress;
-    return NS_OK;
-}
-
-NS_METHOD
-nsStorageStream::Seek(PRInt32 aPosition)
-{
-    // An argument of -1 means "seek to end of stream"
-    if (aPosition == -1)
-        aPosition = mLogicalLength;
-
-    // Seeking beyond the buffer end is illegal
-    if ((PRUint32)aPosition > mLogicalLength)
-        return NS_ERROR_INVALID_ARG;
-
-    // Seeking backwards in the write stream results in truncation
-    SetLength(aPosition);
-
-    // Special handling for seek to start-of-buffer
-    if (aPosition == 0) {
-        mWriteCursor = 0;
-        mSegmentEnd = 0;
-        return NS_OK;
-    }
-
-    mWriteCursor = mSegmentedBuffer->GetSegment(mLastSegmentNum);
-    mSegmentEnd = mWriteCursor + mSegmentSize;
-    PRInt32 segmentOffset = SegOffset(aPosition);
-    mWriteCursor += segmentOffset;
-    
-    return NS_OK;
-}
-
-// There can be many nsStorageInputStreams for a single nsStorageStream
-class nsStorageInputStream : public nsIInputStream
-{
-public:
-    nsStorageInputStream(nsStorageStream *aStorageStream, PRUint32 aSegmentSize)
-        : mStorageStream(aStorageStream), mReadCursor(0),
-          mSegmentEnd(0), mLogicalCursor(0), mSegmentNum(0),
-          mSegmentSize(aSegmentSize)
-	{
-        NS_ADDREF(mStorageStream);
-	    NS_INIT_REFCNT();
-	}
-
-    virtual ~nsStorageInputStream()
-    {
-        NS_IF_RELEASE(mStorageStream);
-    }
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIBASESTREAM
-    NS_DECL_NSIINPUTSTREAM
-
-protected:
-    
-    NS_METHOD Seek(PRUint32 aPosition);
-
-    friend class nsStorageStream;
-
-private:
-    const char*      mReadCursor;    // Next memory location to read byte, or NULL
-    const char*      mSegmentEnd;    // One byte past end of current buffer segment
-    PRUint32         mSegmentNum;    // Segment number containing read cursor
-    PRUint32         mSegmentSize;   // All segments, except the last, are of this size
-    PRUint32         mLogicalCursor; // Logical offset into stream
-    nsStorageStream* mStorageStream;
-
-    PRUint32 SegNum(PRUint32 aPosition)    {return aPosition >> mStorageStream->mSegmentSizeLog2;}
-    PRUint32 SegOffset(PRUint32 aPosition) {return aPosition & (mSegmentSize - 1);}
-};
-
-static NS_DEFINE_IID(kIInputStream, NS_IINPUTSTREAM_IID);
-NS_IMPL_ISUPPORTS(nsStorageInputStream, kIInputStream)
-
-NS_IMETHODIMP
-nsStorageStream::NewInputStream(PRInt32 aStartingOffset, nsIInputStream* *aInputStream)
-{
-    nsStorageInputStream *inputStream = new nsStorageInputStream(this, mSegmentSize);
-    if (!inputStream)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(inputStream);
-
-    if (aStartingOffset) {
-        nsresult rv = inputStream->Seek(aStartingOffset);
-        if (NS_FAILED(rv)) {
-            NS_RELEASE(inputStream);
-            return rv;
-        }
-    }
-
-    *aInputStream = inputStream;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsStorageInputStream::Close()
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsStorageInputStream::Available(PRUint32 *aAvailable)
-{
-    *aAvailable = mStorageStream->mLogicalLength - mLogicalCursor;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsStorageInputStream::Read(char* aBuffer, PRUint32 aCount, PRUint32 *aNumRead)
-{
-    char* writeCursor;
-    PRUint32 count, availableInSegment, remainingCapacity;
-
-    remainingCapacity = aCount;
-    writeCursor = aBuffer;
-    while (remainingCapacity) {
-	availableInSegment = mSegmentEnd - mReadCursor;
-	if (!availableInSegment) {
-	    PRUint32 available = mStorageStream->mLogicalLength - mLogicalCursor;
-	    if (!available)
-            goto out;
-	    
-	    mReadCursor = mStorageStream->mSegmentedBuffer->GetSegment(mSegmentNum++);
-	    mSegmentEnd = mReadCursor + PR_MIN(mSegmentSize, available);
-	}
-	
-	count = PR_MIN(availableInSegment, remainingCapacity);
-	memcpy(writeCursor, mReadCursor, count);
-	remainingCapacity -= count;
-	mReadCursor += count;
-	writeCursor += count;
-	mLogicalCursor += count;
-    };
-
- out:
-    *aNumRead = aCount - remainingCapacity;
-
-    if (*aNumRead == 0)
-	return NS_BASE_STREAM_WOULD_BLOCK;
-    else
-	return NS_OK;
-}
-
-NS_METHOD
-nsStorageInputStream::Seek(PRUint32 aPosition)
-{
-    PRUint32 length = mStorageStream->mLogicalLength;
-    if (aPosition >= length)
-        return NS_ERROR_INVALID_ARG;
-
-    mSegmentNum = SegNum(aPosition);
-    PRUint32 segmentOffset = SegOffset(aPosition);
-    mReadCursor = mStorageStream->mSegmentedBuffer->GetSegment(mSegmentNum) +
-        segmentOffset;
-    PRUint32 available = length - aPosition;
-    mSegmentEnd = mReadCursor + PR_MIN(mSegmentSize - segmentOffset, available);
-    mLogicalCursor = aPosition;
-    return NS_OK;
-}
-
-NS_COM nsresult
-NS_NewStorageStream(PRUint32 segmentSize, PRUint32 maxSize, nsIStorageStream **result)
-{
-    NS_ENSURE_ARG(result);
-
-    nsStorageStream* storageStream = new nsStorageStream();
-    if (!storageStream) return NS_ERROR_OUT_OF_MEMORY;
-    
-    storageStream->Init(segmentSize, maxSize);
-    NS_ADDREF(storageStream);
-    *result = storageStream;
-    return NS_OK;
-}

mozilla/xpcom/io/nsStorageStream.h

@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *  
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *  
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- */
-
-/*
- * The storage stream provides an internal buffer that can be filled by a
- * client using a single output stream.  One or more independent input streams
- * can be created to read the data out non-destructively.  The implementation
- * uses a segmented buffer internally to avoid realloc'ing of large buffers,
- * with the attendant performance loss and heap fragmentation.
- */
-
-#ifndef _nsStorageStream_h_
-#define _nsStorageStream_h_
-
-#include "nsIStorageStream.h"
-#include "nsIOutputStream.h"
-
-class nsSegmentedBuffer;
-
-class NS_COM nsStorageStream : public nsIStorageStream,
-                               public nsIOutputStream
-{
-public:
-    nsStorageStream();
-    ~nsStorageStream();
-    
-    NS_METHOD Init(PRUint32 segmentSize, PRUint32 maxSize, nsIAllocator *segmentAllocator = 0);
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSISTORAGESTREAM
-    NS_DECL_NSIBASESTREAM
-    NS_DECL_NSIOUTPUTSTREAM
-
-    friend class nsStorageInputStream;
-
-private:
-    nsSegmentedBuffer* mSegmentedBuffer;
-    PRUint32           mSegmentSize;       // All segments, except possibly the last, are of this size
-                                           //   Must be power-of-2
-    PRUint32           mSegmentSizeLog2;   // log2(mSegmentSize)
-    bool               mWriteInProgress;   // true, if an un-Close'ed output stream exists
-    PRInt32            mLastSegmentNum;    // Last segment # in use, -1 initially
-    char*              mWriteCursor;       // Pointer to next byte to be written
-    char*              mSegmentEnd;        // Pointer to one byte after end of segment
-                                           //   containing the write cursor
-    PRUint32           mLogicalLength;     // Number of bytes written to stream
-
-    NS_METHOD Seek(PRInt32 aPosition);
-    PRUint32 SegNum(PRUint32 aPosition)    {return aPosition >> mSegmentSizeLog2;}
-    PRUint32 SegOffset(PRUint32 aPosition) {return aPosition & (mSegmentSize - 1);}
-};
-
-#endif //  _nsStorageStream_h_