This commit was manufactured by cvs2svn to create tag 'arelease'.

git-svn-id: svn://10.0.0.236/tags/arelease@142510 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/js/src/xpconnect/tests/idispatch/COM/StdAfx.cpp

@@ -0,0 +1,12 @@
+// stdafx.cpp : source file that includes just the standard includes
+//  stdafx.pch will be the pre-compiled header
+//  stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+#ifdef _ATL_STATIC_REGISTRY
+#include <statreg.h>
+#include <statreg.cpp>
+#endif
+
+#include <atlimpl.cpp>

mozilla/js/src/xpconnect/tests/idispatch/COM/StdAfx.h

@@ -0,0 +1,28 @@
+// stdafx.h : include file for standard system include files,
+//      or project specific include files that are used frequently,
+//      but are changed infrequently
+
+#if !defined(AFX_STDAFX_H__3B3A8A37_A147_4D96_BFA3_51B0F69B5D8D__INCLUDED_)
+#define AFX_STDAFX_H__3B3A8A37_A147_4D96_BFA3_51B0F69B5D8D__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#define STRICT
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0400
+#endif
+#define _ATL_APARTMENT_THREADED
+
+#include <atlbase.h>
+//You may derive a class from CComModule and use it if you want to override
+//something, but do not change the name of _Module
+extern CComModule _Module;
+#include <atlcom.h>
+#include <comdef.h>
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_STDAFX_H__3B3A8A37_A147_4D96_BFA3_51B0F69B5D8D__INCLUDED)

mozilla/js/src/xpconnect/tests/idispatch/COM/XPCDispUtilities.h

@@ -0,0 +1,28 @@
+#ifndef XPCDispUtilities_h
+#define XPCDispUtilities_h
+
+template <class T>
+inline
+HRESULT XPCCreateInstance(const CLSID & clsid, const IID & iid, T ** result)
+{
+    return CoCreateInstance(clsid, 0, CLSCTX_ALL, iid, reinterpret_cast<void**>(result));
+}
+
+DISPID GetIDsOfNames(IDispatch * pIDispatch , CComBSTR const & name)
+{
+    DISPID dispid;
+    OLECHAR * pName = name;
+    HRESULT hresult = pIDispatch->GetIDsOfNames(
+        IID_NULL,
+        &pName,
+        1, 
+        LOCALE_SYSTEM_DEFAULT,
+        &dispid);
+    if (!SUCCEEDED(hresult))
+    {
+        dispid = 0;
+    }
+    return dispid;
+}
+
+#endif

mozilla/js/src/xpconnect/tests/idispatch/COM/XPCIDispatchTest.cpp

@@ -0,0 +1,86 @@
+// XPCIDispatchTest.cpp : Implementation of DLL Exports.
+
+
+// Note: Proxy/Stub Information
+//      To build a separate proxy/stub DLL, 
+//      run nmake -f IDispatchTestps.mk in the project directory.
+
+#include "stdafx.h"
+#include "resource.h"
+#include <initguid.h>
+#include "XPCIDispatchTest.h"
+
+#include "XPCIDispatchTest_i.c"
+#include "nsXPCDispTestMethods.h"
+#include "nsXPCDispSimple.h"
+#include "nsXPCDispTestNoIDispatch.h"
+#include "nsXPCDispTestProperties.h"
+#include "nsXPCDispTestArrays.h"
+#include "nsXPCDispTestScriptOn.h"
+#include "nsXPCDispTestScriptOff.h"
+#include "nsXPCDispTestWrappedJS.h"
+
+CComModule _Module;
+
+BEGIN_OBJECT_MAP(ObjectMap)
+OBJECT_ENTRY(CLSID_nsXPCDispTestMethods, nsXPCDispTestMethods)
+OBJECT_ENTRY(CLSID_nsXPCDispSimple, nsXPCDispSimple)
+OBJECT_ENTRY(CLSID_nsXPCDispTestNoIDispatch, nsXPCDispTestNoIDispatch)
+OBJECT_ENTRY(CLSID_nsXPCDispTestProperties, nsXPCDispTestProperties)
+OBJECT_ENTRY(CLSID_nsXPCDispTestArrays, nsXPCDispTestArrays)
+OBJECT_ENTRY(CLSID_nsXPCDispTestScriptOn, nsXPCDispTestScriptOn)
+OBJECT_ENTRY(CLSID_nsXPCDispTestScriptOff, nsXPCDispTestScriptOff)
+OBJECT_ENTRY(CLSID_nsXPCDispTestWrappedJS, nsXPCDispTestWrappedJS)
+END_OBJECT_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// DLL Entry Point
+
+extern "C"
+BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
+{
+    if (dwReason == DLL_PROCESS_ATTACH)
+    {
+        _Module.Init(ObjectMap, hInstance, &LIBID_IDispatchTestLib);
+        DisableThreadLibraryCalls(hInstance);
+    }
+    else if (dwReason == DLL_PROCESS_DETACH)
+        _Module.Term();
+    return TRUE;    // ok
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// Used to determine whether the DLL can be unloaded by OLE
+
+STDAPI DllCanUnloadNow(void)
+{
+    return (_Module.GetLockCount()==0) ? S_OK : S_FALSE;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// Returns a class factory to create an object of the requested type
+
+STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
+{
+    return _Module.GetClassObject(rclsid, riid, ppv);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// DllRegisterServer - Adds entries to the system registry
+
+STDAPI DllRegisterServer(void)
+{
+    // registers object, typelib and all interfaces in typelib
+    return _Module.RegisterServer(TRUE);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// DllUnregisterServer - Removes entries from the system registry
+
+STDAPI DllUnregisterServer(void)
+{
+    return _Module.UnregisterServer(TRUE);
+}
+
+
+#include "nsXPCDispTestWrappedJS.h"

mozilla/js/src/xpconnect/tests/idispatch/COM/XPCIDispatchTest.def

@@ -0,0 +1,9 @@
+; XPCIDispatchTest.def : Declares the module parameters.
+
+LIBRARY      "XPCIDispatchTest.DLL"
+
+EXPORTS
+	DllCanUnloadNow     @1 PRIVATE
+	DllGetClassObject   @2 PRIVATE
+	DllRegisterServer   @3 PRIVATE
+	DllUnregisterServer	@4 PRIVATE

mozilla/js/src/xpconnect/tests/idispatch/COM/XPCIDispatchTest.dsp

@@ -0,0 +1,318 @@
+# Microsoft Developer Studio Project File - Name="XPCIDispatchTest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=XPCIDispatchTest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "XPCIDispatchTest.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "XPCIDispatchTest.mak" CFG="XPCIDispatchTest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "XPCIDispatchTest - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "XPCIDispatchTest - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "XPCIDispatchTest - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# Begin Custom Build - Performing registration
+OutDir=.\Debug
+TargetPath=.\Debug\XPCIDispatchTest.dll
+InputPath=.\Debug\XPCIDispatchTest.dll
+SOURCE="$(InputPath)"
+
+"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	regsvr32 /s /c "$(TargetPath)" 
+	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "XPCIDispatchTest - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "XPCIDispatchTest___Win32_Release"
+# PROP BASE Intermediate_Dir "XPCIDispatchTest___Win32_Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# Begin Custom Build - Performing registration
+OutDir=.\Release
+TargetPath=.\Release\XPCIDispatchTest.dll
+InputPath=.\Release\XPCIDispatchTest.dll
+SOURCE="$(InputPath)"
+
+"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	regsvr32 /s /c "$(TargetPath)" 
+	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
+	
+# End Custom Build
+
+!ENDIF 
+
+# Begin Target
+
+# Name "XPCIDispatchTest - Win32 Debug"
+# Name "XPCIDispatchTest - Win32 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\nsXPCDispSimple.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestArrays.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestMethods.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestNoIDispatch.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestProperties.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestScriptOff.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestScriptOn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestWrappedJS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\XPCIDispatchTest.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\XPCIDispatchTest.def
+# End Source File
+# Begin Source File
+
+SOURCE=.\XPCIDispatchTest.idl
+# ADD MTL /tlb ".\XPCIDispatchTest.tlb" /h "XPCIDispatchTest.h" /iid "XPCIDispatchTest_i.c" /Oicf
+# End Source File
+# Begin Source File
+
+SOURCE=.\XPCIDispatchTest.rc
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\nsXPCDispSimple.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestArrays.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestMethods.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestNoIDispatch.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestProperties.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestScriptOff.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestScriptOn.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestWrappedJS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\XPCDispUtilities.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\nsXPCDispSimple.rgs
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestArrays.rgs
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestMethods.rgs
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestNoIDispatch.rgs
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestNoScript.rgs
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestProperties.rgs
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestScriptOff.rgs
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestScriptOn.rgs
+# End Source File
+# Begin Source File
+
+SOURCE=.\nsXPCDispTestWrappedJS.rgs
+# End Source File
+# End Group
+# Begin Group "JS Files"
+
+# PROP Default_Filter "js"
+# Begin Group "WrappedCOM"
+
+# PROP Default_Filter ""
+# Begin Group "Arrays"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\Tests\WrappedCOM\Arrays\XPCIDispatchArrayTests.js
+# End Source File
+# End Group
+# Begin Group "Attributes"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\Tests\WrappedCOM\Attributes\XPCIDispatchAttributeTests.js
+# End Source File
+# End Group
+# Begin Group "General"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\Tests\WrappedCOM\General\XPCIDispatchInstantiations.js
+# End Source File
+# Begin Source File
+
+SOURCE=..\Tests\WrappedCOM\General\XPCStress.js
+# End Source File
+# End Group
+# Begin Group "Methods"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\Tests\WrappedCOM\Methods\XPCIDispatchMethodTests.js
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\Tests\WrappedCOM\shell.js
+# End Source File
+# End Group
+# Begin Group "WrappedJS"
+
+# PROP Default_Filter ""
+# Begin Group "General (WJS)"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\Tests\WrappedJS\General\XPCIDispatchTestWrappedJS.js
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\Tests\WrappedJS\shell.js
+# End Source File
+# End Group
+# End Group
+# End Target
+# End Project

mozilla/js/src/xpconnect/tests/idispatch/COM/XPCIDispatchTest.dsw

@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "XPCIDispatchTest"=.\XPCIDispatchTest.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

mozilla/js/src/xpconnect/tests/idispatch/COM/XPCIDispatchTest.idl

@@ -0,0 +1,454 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 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 the IDispatch implementation for XPConnect
+ *
+ * The Initial Developer of the Original Code is
+ * David Bradley.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// XPCIDispatchTest.idl : IDL source for XPCIDispatchTest.dll
+//
+
+// This file will be processed by the MIDL tool to
+// produce the type library (XPCIDispatchTest.tlb) and marshalling code.
+
+import "oaidl.idl";
+import "ocidl.idl";
+import "objsafe.idl";
+
+[
+    uuid(83A51226-F49D-488A-8F78-75BB2F927F4C),
+    version(1.0),
+    helpstring("XPCIDispatchTest 1.0 Type Library")
+]
+library IDispatchTestLib
+{
+    importlib("stdole32.tlb");
+    importlib("stdole2.tlb");
+
+    [
+        object,
+        uuid(0de5dbae-1d78-45cb-91a2-24516fef2837),
+        dual,
+        helpstring("nsIXPCDispSimple interface"),
+        pointer_default(unique)
+    ]
+    interface nsIXPCDispSimple : IDispatch
+    {
+        [id(1), helpstring("Simple method returning the name of the class")]
+            HRESULT ClassName([out]BSTR * name);
+        [propget, id(2), helpstring("Simple number property")]
+            HRESULT Number([out, retval]long * result);
+        [propput, id(2), helpstring("Simple number property")]
+            HRESULT Number([in]long result);
+    }
+    [
+        uuid(9F39237C-D179-4260-8EF3-4B6D4D7D5570),
+        helpstring("nsXPCDispSimple Class")
+    ]
+    coclass nsXPCDispSimple
+    {
+        [default] interface nsIXPCDispSimple;
+    };
+    [
+        object,
+        uuid(47bf6c99-a30c-4105-8af6-de76dcfdd6dd),
+        dual,
+        helpstring("nsIXPCDispTestMethods interface"),
+        pointer_default(unique)
+    ]
+    interface nsIXPCDispTestMethods : IDispatch
+    {
+        /* Return values test */
+        [id(1), helpstring("method with no parameters")]
+            HRESULT NoParameters();
+        [id(2), helpstring("method that returns a string")]
+            HRESULT ReturnBSTR([out, retval]BSTR * result);
+        [id(3), helpstring("method that returns a 32 bit signed integer")]
+            HRESULT ReturnI4([out, retval]int * result);
+        [id(4), helpstring("method that returns an 8 bit unsigned integer")]
+            HRESULT ReturnUI1([out, retval]unsigned char * result);
+        [id(5), helpstring("method that returns a 16 bit signed integer")]
+            HRESULT ReturnI2([out, retval]short * result);
+        [id(6), helpstring("method that returns a 32 bit floating point number")]
+            HRESULT ReturnR4([out, retval]float * result);
+        [id(7), helpstring("method that returns a 64 bit floating point number")]
+            HRESULT ReturnR8([out, retval]double * result);
+        [id(8), helpstring("method that returns a boolean")]
+            HRESULT ReturnBool([out, retval]VARIANT_BOOL * result);
+        [id(9), helpstring("method that returns an IDispatch pointer")]
+            HRESULT ReturnIDispatch([out, retval]IDispatch ** result);
+        [id(10), helpstring("method that returns an error")]
+            HRESULT ReturnError([out, retval]SCODE * result);
+        [id(12), helpstring("method that returns a date")]
+            HRESULT ReturnDate([out, retval]DATE * result);
+        [id(13), helpstring("method that returns an IUnknown")]
+            HRESULT ReturnIUnknown([out, retval]IUnknown ** result);
+        [id(14), helpstring("method that returns a signed 8 bit integer")]
+            HRESULT ReturnI1([out, retval]char * result);
+        [id(15), helpstring("method that returns an unsigned 16 bit integer")]
+            HRESULT ReturnUI2([out, retval]unsigned short * result);
+        [id(16), helpstring("method that returns an unsigned 32 bit integer")]
+            HRESULT ReturnUI4([out, retval]unsigned long * result);
+        [id(17), helpstring("method that returns an integer")]
+            HRESULT ReturnInt([out, retval]int * result);
+        [id(18), helpstring("method that returns an unsigned integer")]
+            HRESULT ReturnUInt([out, retval]unsigned int * result);
+
+        /* Single input parameter tests */
+        [id(19), helpstring("method that takes a string")]
+            HRESULT TakesBSTR([in]BSTR result);
+        [id(20), helpstring("method that takes a 32 bit signed integer")]
+            HRESULT TakesI4([in]int result);
+        [id(21), helpstring("method that takes an 8 bit unsigned integer")]
+            HRESULT TakesUI1([in]unsigned char result);
+        [id(22), helpstring("method that takes a 16 bit signed integer")]
+            HRESULT TakesI2([in]short result);
+        [id(23), helpstring("method that takes a 32 bit floating point number")]
+            HRESULT TakesR4([in]float result);
+        [id(24), helpstring("method that takes a 64 bit floating point number")]
+            HRESULT TakesR8([in]double result);
+        [id(25), helpstring("method that takes a boolean")]
+            HRESULT TakesBool([in]VARIANT_BOOL result);
+        [id(26), helpstring("method that takes an IDispatch pointer")]
+            HRESULT TakesIDispatch([in]IDispatch * result);
+        [id(27), helpstring("method that takes an error")]
+            HRESULT TakesError([in]SCODE result);
+        [id(29), helpstring("method that takes a date")]
+            HRESULT TakesDate([in]DATE result);
+        [id(30), helpstring("method that takes an IUnknown")]
+            HRESULT TakesIUnknown([in]IUnknown * result);
+        [id(31), helpstring("method that takes a signed 8 bit integer")]
+            HRESULT TakesI1([in]char result);
+        [id(32), helpstring("method that takes an unsigned 16 bit integer")]
+            HRESULT TakesUI2([in]unsigned short result);
+        [id(33), helpstring("method that takes an unsigned 32 bit integer")]
+            HRESULT TakesUI4([in]unsigned long result);
+        [id(34), helpstring("method that takes an integer")]
+            HRESULT TakesInt([in]int result);
+        [id(35), helpstring("method that takes an unsigned integer")]
+            HRESULT TakesUInt([in]unsigned int result);
+
+        /* output parameter tests */
+        [id(36), helpstring("method that outputs a string")]
+            HRESULT OutputsBSTR([out]BSTR * result);
+        [id(37), helpstring("method that outputs a 32 bit signed integer")]
+            HRESULT OutputsI4([out]long * result);
+        [id(38), helpstring("method that outputs an 8 bit unsigned integer")]
+            HRESULT OutputsUI1([out]unsigned char * result);
+        [id(39), helpstring("method that outputs a 16 bit signed integer")]
+            HRESULT OutputsI2([out]short * result);
+        [id(40), helpstring("method that outputs a 32 bit floating point number")]
+            HRESULT OutputsR4([out]float * result);
+        [id(41), helpstring("method that outputs a 64 bit floating point number")]
+            HRESULT OutputsR8([out]double * result);
+        [id(42), helpstring("method that outputs a boolean")]
+            HRESULT OutputsBool([out]VARIANT_BOOL * result);
+        [id(43), helpstring("method that outputs an IDispatch pointer")]
+            HRESULT OutputsIDispatch([out]IDispatch ** result);
+        [id(44), helpstring("method that outputs an error")]
+            HRESULT OutputsError([out]SCODE * result);
+        [id(46), helpstring("method that outputs a date")]
+            HRESULT OutputsDate([out]DATE * result);
+        [id(47), helpstring("method that outputs an IUnknown")]
+            HRESULT OutputsIUnknown([out]IUnknown ** result);
+        [id(48), helpstring("method that outputs a signed 8 bit integer")]
+            HRESULT OutputsI1([out]char * result);
+        [id(49), helpstring("method that outputs an unsigned 16 bit integer")]
+            HRESULT OutputsUI2([out]unsigned short * result);
+        [id(50), helpstring("method that outputs an unsigned 32 bit integer")]
+            HRESULT OutputsUI4([out]unsigned long * result);
+    
+        /* in/outparameter tests */
+        [id(53), helpstring("method that in/outs a string")]
+            HRESULT InOutsBSTR([in, out]BSTR * result);
+        [id(54), helpstring("method that in/outs a 32 bit signed integer")]
+            HRESULT InOutsI4([in, out]long * result);
+        [id(55), helpstring("method that in/outs an 8 bit unsigned integer")]
+            HRESULT InOutsUI1([in, out]unsigned char * result);
+        [id(56), helpstring("method that in/outs a 16 bit signed integer")]
+            HRESULT InOutsI2([in, out]short * result);
+        [id(57), helpstring("method that in/outs a 32 bit floating point number")]
+            HRESULT InOutsR4([in, out]float * result);
+        [id(58), helpstring("method that in/outs a 64 bit floating point number")]
+            HRESULT InOutsR8([in, out]double * result);
+        [id(59), helpstring("method that in/outs a boolean")]
+            HRESULT InOutsBool([in, out]VARIANT_BOOL * result);
+        [id(60), helpstring("method that in/outs an IDispatch pointer")]
+            HRESULT InOutsIDispatch([in, out]IDispatch ** result);
+        [id(61), helpstring("method that in/outs an error")]
+            HRESULT InOutsError([in, out]SCODE * result);
+        [id(63), helpstring("method that in/outs a date")]
+            HRESULT InOutsDate([in, out]DATE * result);
+        [id(64), helpstring("method that in/outs an IUnknown")]
+            HRESULT InOutsIUnknown([in, out]IUnknown ** result);
+        [id(65), helpstring("method that in/outs a signed 8 bit integer")]
+            HRESULT InOutsI1([in, out]char * result);
+        [id(66), helpstring("method that in/outs an unsigned 16 bit integer")]
+            HRESULT InOutsUI2([in, out]unsigned short * result);
+        [id(67), helpstring("method that in/outs an unsigned 32 bit integer")]
+            HRESULT InOutsUI4([in, out]unsigned long * result);
+
+        /* input and return tests*/
+        [id(70), helpstring("method that takes an long and returns it")]
+            HRESULT OneParameterWithReturn([in]long input, [out,retval]long* result);
+        [id(71), helpstring("method that takes a string and returns it")]
+            HRESULT StringInputAndReturn([in]BSTR str, [out, retval]BSTR* result);
+        [id(72), helpstring("method that takes an IDispatch and returns it")]
+            HRESULT IDispatchInputAndReturn([in]IDispatch* input, [out,retval]IDispatch** result);
+    
+        /* Multiple parameters */
+        [id(73), helpstring("method that takes two parameters")]
+            HRESULT TwoParameters([in]long one, [in]long two);
+        [id(74), helpstring("method that takes 12 input parameters")]
+            HRESULT TwelveInParameters([in]long one, [in]long two, [in]long three, 
+                                       [in]long four, [in]long five, [in]long six,
+                                       [in]long seven, [in]long eight, 
+                                       [in]long nine, [in]long ten,
+                                       [in]long eleven, [in]long twelve);
+        [id(75), helpstring("method that takes 12 out parameters")]
+            HRESULT TwelveOutParameters([out]long *one, [out]long *two,
+                                        [out]long *three, [out]long *four,
+                                        [out]long *five, [out]long *six,
+                                        [out]long *seven, [out]long *eight,
+                                        [out]long *nine, [out]long *ten,
+                                        [out]long *eleven, [out]long *twelve);
+        [id(76), helpstring("method that takes 12 input string parameters")]
+            HRESULT TwelveStrings([in]BSTR one, [in]BSTR two, [in]BSTR three,
+                                 [in]BSTR four, [in]BSTR five, [in]BSTR six,
+                                 [in]BSTR seven, [in]BSTR eight, [in]BSTR nine,
+                                 [in]BSTR ten, [in]BSTR eleven, [in]BSTR twelve);
+        [id(77), helpstring("method that takes 12 input string parameters")]
+            HRESULT TwelveOutStrings([out]BSTR* one, [out]BSTR* two,
+                                     [out]BSTR* three, [out]BSTR* four,
+                                     [out]BSTR* five, [out]BSTR* six,
+                                     [out]BSTR* seven, [out]BSTR* eight,
+                                     [out]BSTR* nine, [out]BSTR* ten,
+                                     [out]BSTR* eleven, [out]BSTR* twelve);
+        [id(78), helpstring("method that takes 12 input string parameters")]
+            HRESULT TwelveIDispatch([in]IDispatch* one, [in]IDispatch* two,
+                                    [in]IDispatch* three, [in]IDispatch* four,
+                                    [in]IDispatch* five, [in]IDispatch* six,
+                                    [in]IDispatch* seven, [in]IDispatch* eight,
+                                    [in]IDispatch* nine, [in]IDispatch* ten,
+                                    [in]IDispatch* eleven,
+                                    [in]IDispatch* twelve);
+        [id(79), helpstring("method that takes 12 input string parameters")]
+            HRESULT TwelveOutIDispatch([out]IDispatch** one,
+                                       [out]IDispatch** two,
+                                       [out]IDispatch** three,
+                                       [out]IDispatch** four,
+                                       [out]IDispatch** five,
+                                       [out]IDispatch** six,
+                                       [out]IDispatch** seven,
+                                       [out]IDispatch** eight,
+                                       [out]IDispatch** nine,
+                                       [out]IDispatch** ten,
+                                       [out]IDispatch** eleven,
+                                       [out]IDispatch** twelve);
+        [id(80), helpstring("method that generates an error")]
+            HRESULT CreateError();
+    }
+    [
+        uuid(745D1149-9F46-418C-B176-71EAA98974BA),
+        helpstring("nsXPCDispTestMethods Class")
+    ]
+    coclass nsXPCDispTestMethods
+    {
+        [default] interface nsIXPCDispTestMethods;
+    };
+    [
+        object,
+        uuid(f876c083-ae00-4b78-93b8-8305980f0864),
+        dual,
+        helpstring("nsIXPCDispTestArrays interface"),
+        pointer_default(unique)
+    ]
+    interface nsIXPCDispTestArrays : IDispatch
+    {
+        [id(1), helpstring("returns a SAFEARRAY")]
+            HRESULT ReturnSafeArray([out, retval]SAFEARRAY(VARIANT)* result);
+        [id(2), helpstring("returns a SAFEARRAY")]
+            HRESULT ReturnSafeArrayBSTR([out, retval]SAFEARRAY(VARIANT)* result);
+        [id(3), helpstring("returns a SAFEARRAY")]
+            HRESULT ReturnSafeArrayIDispatch([out, retval]SAFEARRAY(VARIANT)* result);
+        [id(4), helpstring("method that takes a SAFEARRAY")]
+            HRESULT TakesSafeArray([in]SAFEARRAY(VARIANT) array);
+        [id(5), helpstring("method that takes a SAFEARRAY")]
+            HRESULT TakesSafeArrayBSTR([in]SAFEARRAY(VARIANT) array);
+        [id(6), helpstring("method that takes a SAFEARRAY")]
+            HRESULT TakesSafeArrayIDispatch([in]SAFEARRAY(VARIANT) array);
+        [id(7), helpstring("method that takes a SAFEARRAY")]
+            HRESULT InOutSafeArray([in, out]SAFEARRAY(VARIANT) * array);
+        [id(8), helpstring("method that takes a SAFEARRAY")]
+            HRESULT InOutSafeArrayBSTR([in, out]SAFEARRAY(VARIANT) * array);
+        [id(9), helpstring("method that takes a SAFEARRAY")]
+            HRESULT InOutSafeArrayIDispatch([in, out]SAFEARRAY(VARIANT) * array);
+    }
+    [
+        uuid(AB085C43-C619-48C8-B68C-C495BDE12DFB),
+        helpstring("nsXPCDispTestArrays Class")
+    ]
+    coclass nsXPCDispTestArrays
+    {
+        [default] interface nsIXPCDispTestArrays;
+    };
+    [
+        object,
+        uuid(9782107f-14cc-40b2-b0cd-988d81a46e9e),
+        dual,
+        helpstring("nsIXPCDispTestNoIDispatch interface"),
+        pointer_default(unique)
+    ]
+    interface nsIXPCDispTestNoIDispatch : IUnknown
+    {
+    }
+    [
+        uuid(7414404F-A4CC-4E3C-9B32-BB20CB22F541),
+        helpstring("nsXPCDispTestNoIDispatch Class")
+    ]
+    coclass nsXPCDispTestNoIDispatch
+    {
+        [default] interface nsIXPCDispTestNoIDispatch;
+    };
+    [
+        object,
+        uuid(7830CACE-5019-489D-8B69-029E70CF39B7),
+        dual,
+        helpstring("nsIXPCDispTestProperties Interface"),
+        pointer_default(unique)
+    ]
+    interface nsIXPCDispTestProperties : IDispatch
+    {
+        [propget, id(1), helpstring("property Short")] HRESULT Short([out, retval] short *pVal);
+        [propput, id(1), helpstring("property Short")] HRESULT Short([in] short newVal);
+        [propget, id(2), helpstring("property Long")] HRESULT Long([out, retval] long *pVal);
+        [propput, id(2), helpstring("property Long")] HRESULT Long([in] long newVal);
+        [propget, id(3), helpstring("property Float")] HRESULT Float([out, retval] float *pVal);
+        [propput, id(3), helpstring("property Float")] HRESULT Float([in] float newVal);
+        [propget, id(4), helpstring("property Double")] HRESULT Double([out, retval] double *pVal);
+        [propput, id(4), helpstring("property Double")] HRESULT Double([in] double newVal);
+        [propget, id(5), helpstring("property Currency")] HRESULT Currency([out, retval] CURRENCY *pVal);
+        [propput, id(5), helpstring("property Currency")] HRESULT Currency([in] CURRENCY newVal);
+        [propget, id(6), helpstring("property Date")] HRESULT Date([out, retval] DATE *pVal);
+        [propput, id(6), helpstring("property Date")] HRESULT Date([in] DATE newVal);
+        [propget, id(7), helpstring("property String")] HRESULT String([out, retval] BSTR *pVal);
+        [propput, id(7), helpstring("property String")] HRESULT String([in] BSTR newVal);
+        [propget, id(8), helpstring("property DispatchPtr")] HRESULT DispatchPtr([out, retval] IDispatch* *pVal);
+        [propput, id(8), helpstring("property DispatchPtr")] HRESULT DispatchPtr([in] IDispatch* newVal);
+        [propget, id(9), helpstring("property SCode")] HRESULT SCode([out, retval] SCODE *pVal);
+        [propput, id(9), helpstring("property SCode")] HRESULT SCode([in] SCODE newVal);
+        [propget, id(10), helpstring("property Boolean")] HRESULT Boolean([out, retval] BOOL *pVal);
+        [propput, id(10), helpstring("property Boolean")] HRESULT Boolean([in] BOOL newVal);
+        [propget, id(11), helpstring("property Variant")] HRESULT Variant([out, retval] VARIANT *pVal);
+        [propput, id(11), helpstring("property Variant")] HRESULT Variant([in] VARIANT newVal);
+        [propget, id(12), helpstring("property COMPtr")] HRESULT COMPtr([out, retval] IUnknown* *pVal);
+        [propput, id(12), helpstring("property COMPtr")] HRESULT COMPtr([in] IUnknown* newVal);
+        [propget, id(13), helpstring("property Char")] HRESULT Char([out, retval] unsigned char *pVal);
+        [propput, id(13), helpstring("property Char")] HRESULT Char([in] unsigned char newVal);
+		[propget, id(14), helpstring("property ParameterizedProperty")] HRESULT ParameterizedProperty([in]long aIndex, [out, retval] long *pVal);
+		[propput, id(14), helpstring("property ParameterizedProperty")] HRESULT ParameterizedProperty([in]long aIndex, [in] long newVal);
+		[propget, id(15), helpstring("property ParameterizedPropertyCount")] HRESULT ParameterizedPropertyCount([out, retval] long *pVal);
+    };
+    
+    [
+        object,
+        uuid(0797788A-CB08-4995-BD45-7BF8C468DE21),
+        dual,
+        helpstring("nsIXPCDispTestScriptOn Interface"),
+        pointer_default(unique)
+    ]
+    interface nsIXPCDispTestScriptOn : IDispatch
+    {
+    };
+    
+    [
+        uuid(2A06373F-3E61-4882-A3D7-A104F70B09ED),
+        helpstring("nsXPCDispTestScriptOn Class")
+    ]
+    coclass nsXPCDispTestScriptOn
+    {
+        [default] interface nsIXPCDispTestScriptOn;
+    };
+
+    [
+        object,
+        uuid(EE6F9DB5-890F-422D-B9DC-9C5AB5A1D654),
+        dual,
+        helpstring("nsIXPCDispTestScriptOff Interface"),
+        pointer_default(unique)
+    ]
+    interface nsIXPCDispTestScriptOff : IDispatch
+    {
+    };
+	
+	[
+		object,
+		uuid(D84352CA-1A01-4E72-9072-77AFA669B3AD),
+		dual,
+		helpstring("nsIXPCDispTestWrappedJS Interface"),
+		pointer_default(unique)
+	]
+	interface nsIXPCDispTestWrappedJS : IDispatch
+	{
+		[id(1), helpstring("method TestParamTypes")] HRESULT TestParamTypes([in] IDispatch * obj, [out, retval]BSTR * errMsg);
+	};
+    
+	[
+		uuid(EAEE6BB2-C005-4B91-BCA7-6613236F6F69),
+		helpstring("nsXPCDispTestWrappedJS Class")
+	]
+	coclass nsXPCDispTestWrappedJS
+	{
+		[default] interface nsIXPCDispTestWrappedJS;
+	};
+
+    [
+        uuid(959CD122-9826-4757-BA09-DE327D55F9E7),
+        helpstring("nsXPCDispTestScriptOff Class")
+    ]
+    coclass nsXPCDispTestScriptOff
+    {
+        [default] interface nsIXPCDispTestScriptOff;
+    };
+
+    [
+        uuid(D8B4265B-1768-4CA9-A285-7CCAEEB51C74),
+        helpstring("nsXPCDispTestProperties Class")
+    ]
+    coclass nsXPCDispTestProperties
+    {
+        [default] interface nsIXPCDispTestProperties;
+    };
+
+    
+};

mozilla/js/src/xpconnect/tests/idispatch/COM/XPCIDispatchTest.rc

@@ -0,0 +1,145 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "1 TYPELIB ""XPCIDispatchTest.tlb""\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "CompanyName", "\0"
+            VALUE "FileDescription", "XPCIDispatchTest Module\0"
+            VALUE "FileVersion", "1, 0, 0, 1\0"
+            VALUE "InternalName", "XPCIDispatchTest\0"
+            VALUE "LegalCopyright", "Copyright 2002\0"
+            VALUE "OriginalFilename", "XPCIDispatchTest.DLL\0"
+            VALUE "ProductName", "XPCIDispatchTest Module\0"
+            VALUE "ProductVersion", "1, 0, 0, 1\0"
+            VALUE "OLESelfRegister", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// REGISTRY
+//
+
+IDR_nsXPCDispTestMethods REGISTRY DISCARDABLE    "nsXPCDispTestMethods.rgs"
+IDR_nsXPCDispSimple     REGISTRY DISCARDABLE    "nsXPCDispSimple.rgs"
+IDR_nsXPCDispTestNoIDispatch REGISTRY DISCARDABLE    "nsXPCDispTestNoIDispatch.rgs"
+IDR_nsXPCDispTestProperties REGISTRY DISCARDABLE    "nsXPCDispTestProperties.rgs"
+IDR_nsXPCDispTestArrays REGISTRY DISCARDABLE    "nsXPCDispTestArrays.rgs"
+IDR_nsXPCDispTestScriptOn REGISTRY DISCARDABLE    "nsXPCDispTestScriptOn.rgs"
+IDR_nsXPCDispTestScriptOff REGISTRY DISCARDABLE    "nsXPCDispTestScriptOff.rgs"
+IDR_nsXPCDispTestWrappedJS REGISTRY DISCARDABLE    "nsXPCDispTestWrappedJS.rgs"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_PROJNAME            "XPCIDispatchTest"
+    IDS_NSXPCDISPTTESTMETHODS_DESC "nsXPCDisptTestMethods Class"
+    IDS_NSXPCDISPTESTMETHODS_DESC "nsXPCDispTestMethods Class"
+    IDS_NSXPCDISPSIMPLE_DESC "nsXPCDispSimple Class"
+    IDS_NSXPCDISPTESTNOIDISPATCH_DESC "nsXPCDispTestNoIDispatch Class"
+    IDS_NSXPCDISPTESTNOSCRIPT_DESC "nsXPCDispTestNoScript Class"
+    IDS_NSXPCDISPTESTPROPERTIES_DESC "nsXPCDispTestProperties Class"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_NSXPCDISPTESTARRAYS_DESC "nsXPCDispTestArrays Class"
+    IDS_NSXPCDISPTESTSCRIPTON_DESC "nsXPCDispTestScriptOn Class"
+    IDS_NSXPCDISPTESTSCRIPTOFF_DESC "nsXPCDispTestScriptOff Class"
+    IDS_NSXPCDISPTESTWRAPPEDJS_DESC "nsXPCDispTestWrappedJS Class"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+1 TYPELIB "XPCIDispatchTest.tlb"
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispSimple.cpp

@@ -0,0 +1,44 @@
+// nsXPCDispSimple.cpp : Implementation of CXPCIDispatchTestApp and DLL registration.
+
+#include "stdafx.h"
+#include "XPCIDispatchTest.h"
+#include "nsXPCDispSimple.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+
+STDMETHODIMP nsXPCDispSimple::InterfaceSupportsErrorInfo(REFIID riid)
+{
+    static const IID* arr[] = 
+    {
+        &IID_nsIXPCDispSimple,
+    };
+
+    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    {
+        if (InlineIsEqualGUID(*arr[i],riid))
+            return S_OK;
+    }
+    return S_FALSE;
+}
+
+STDMETHODIMP nsXPCDispSimple::ClassName(BSTR * name)
+{
+    if (name == NULL)
+        return E_POINTER;
+    CComBSTR x("nsXPCDispSimple");
+    *name = x.Detach();
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispSimple::get_Number(LONG * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = mNumber;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispSimple::put_Number(LONG result)
+{
+    mNumber = result;
+    return S_OK;
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispSimple.h

@@ -0,0 +1,56 @@
+// nsXPCDispSimple.h: Definition of the nsXPCDispSimple class
+//
+//////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_NSXPCDISPSIMPLE_H__5502A675_46D9_4762_A7F9_1A023A052152__INCLUDED_)
+#define AFX_NSXPCDISPSIMPLE_H__5502A675_46D9_4762_A7F9_1A023A052152__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "resource.h"       // main symbols
+
+/////////////////////////////////////////////////////////////////////////////
+// nsXPCDispSimple
+
+class nsXPCDispSimple : 
+    public ISupportErrorInfo,
+    public CComObjectRoot,
+    public CComCoClass<nsXPCDispSimple,&CLSID_nsXPCDispSimple>,
+    public IDispatchImpl<nsIXPCDispSimple, &IID_nsIXPCDispSimple, &LIBID_IDispatchTestLib>
+{
+public:
+    nsXPCDispSimple() : mNumber(5) {}
+BEGIN_CATEGORY_MAP(nsXPCDispSimple)
+    IMPLEMENTED_CATEGORY(CATID_SafeForScripting)
+END_CATEGORY_MAP()
+BEGIN_COM_MAP(nsXPCDispSimple)
+    COM_INTERFACE_ENTRY(IDispatch)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
+    COM_INTERFACE_ENTRY(nsIXPCDispSimple)
+END_COM_MAP()
+DECLARE_NOT_AGGREGATABLE(nsXPCDispSimple) 
+
+DECLARE_REGISTRY_RESOURCEID(IDR_nsXPCDispSimple)
+// ISupportsErrorInfo
+    STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
+
+// nsIXPCDispSimple
+public:
+// nsIXPCDispSimple
+    STDMETHOD(ClassName)(BSTR * name);
+    STDMETHOD(get_Number)(LONG * result);
+    STDMETHOD(put_Number)(LONG result);
+    template <class T>
+    static HRESULT CreateInstance(T ** result)
+    {
+        return CoCreateInstance(CLSID_nsXPCDispSimple, 0, CLSCTX_ALL,
+                                __uuidof(T),
+                                reinterpret_cast<void**>(result));
+    }
+private:
+    long mNumber;
+};
+
+#endif // !defined(AFX_NSXPCDISPSIMPLE_H__5502A675_46D9_4762_A7F9_1A023A052152__INCLUDED_)

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispSimple.rgs

@@ -0,0 +1,23 @@
+HKCR
+{
+	XPCIDispatchTest.nsXPCDispSimple.1 = s 'nsXPCDispSimple Class'
+	{
+		CLSID = s '{9F39237C-D179-4260-8EF3-4B6D4D7D5570}'
+	}
+	XPCIDispatchTest.nsXPCDispSimple = s 'nsXPCDispSimple Class'
+	{
+		CLSID = s '{9F39237C-D179-4260-8EF3-4B6D4D7D5570}'
+	}
+	NoRemove CLSID
+	{
+		ForceRemove {9F39237C-D179-4260-8EF3-4B6D4D7D5570} = s 'nsXPCDispSimple Class'
+		{
+			ProgID = s 'XPCIDispatchTest.nsXPCDispSimple.1'
+			VersionIndependentProgID = s 'XPCIDispatchTest.nsXPCDispSimple'
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'both'
+			}
+		}
+	}
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestArrays.cpp

@@ -0,0 +1,221 @@
+// nsXPCDispTestArrays.cpp : Implementation of CXPCIDispatchTestApp and DLL registration.
+
+#include "stdafx.h"
+#include "XPCIDispatchTest.h"
+#include "nsXPCDispTestArrays.h"
+
+unsigned int zero = 0;
+
+/////////////////////////////////////////////////////////////////////////////
+//
+
+STDMETHODIMP nsXPCDispTestArrays::InterfaceSupportsErrorInfo(REFIID riid)
+{
+    static const IID* arr[] = 
+    {
+        &IID_nsIXPCDispTestArrays,
+    };
+
+    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    {
+        if (InlineIsEqualGUID(*arr[i],riid))
+            return S_OK;
+    }
+    return S_FALSE;
+}
+
+STDMETHODIMP nsXPCDispTestArrays::ReturnSafeArray(LPSAFEARRAY * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+
+	*result = SafeArrayCreateVector(VT_I4, 0, 3);
+    for (long index = 0; index < 3; ++index)
+    {
+        SafeArrayPutElement(*result, &index, &index);
+    }
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestArrays::ReturnSafeArrayBSTR(LPSAFEARRAY * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+
+	*result = SafeArrayCreateVector(VT_BSTR, 0, 3);
+    for (long index = 0; index < 3; ++index)
+    {
+        _variant_t var(index);
+        HRESULT hr = VariantChangeType(&var, &var, VARIANT_ALPHABOOL, VT_BSTR);
+
+        if (FAILED(hr))
+            return hr;
+        SafeArrayPutElement(*result, &index, var.bstrVal);
+    }
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestArrays::ReturnSafeArrayIDispatch(LPSAFEARRAY * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+
+	*result = SafeArrayCreateVector(VT_DISPATCH, 0, 3);
+    for (long index = 0; index < 3; ++index)
+    {
+        CComPtr<nsIXPCDispSimple> ptr;
+        ptr.CoCreateInstance(CLSID_nsXPCDispSimple);
+        SafeArrayPutElement(*result, &index, ptr.p);
+    }
+    return S_OK;
+}
+
+#define RETURN_IF_FAIL(x) hr = x; if (FAILED(hr)) return hr;
+
+STDMETHODIMP nsXPCDispTestArrays::TakesSafeArray(LPSAFEARRAY array)
+{
+    long lbound;
+    long ubound;
+    HRESULT hr;
+
+    RETURN_IF_FAIL(SafeArrayGetLBound(array, 1, &lbound));
+    if (lbound != 0)
+        return E_FAIL;
+    RETURN_IF_FAIL(SafeArrayGetUBound(array, 1, &ubound));
+    if (ubound != 3)
+        return E_FAIL;
+    for (long index = lbound; index <= ubound; ++index)
+    {
+        _variant_t value;
+        RETURN_IF_FAIL(SafeArrayGetElement(array, &index, &value));
+        if (value != _variant_t(index))
+            return E_FAIL;
+    }
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestArrays::TakesSafeArrayBSTR(LPSAFEARRAY array)
+{
+    long lbound;
+    long ubound;
+    HRESULT hr;
+
+    RETURN_IF_FAIL(SafeArrayGetLBound(array, 1, &lbound));
+    if (lbound != 0)
+        return E_FAIL;
+    RETURN_IF_FAIL(SafeArrayGetUBound(array, 1, &ubound));
+    if (ubound != 3)
+        return E_FAIL;
+    for (long index = lbound; index <= ubound; ++index)
+    {
+        _variant_t value;
+        RETURN_IF_FAIL(SafeArrayGetElement(array, &index, &value));
+        _variant_t test(index);
+        if (_bstr_t(value) != _bstr_t(test))
+            return E_FAIL;
+    }
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestArrays::TakesSafeArrayIDispatch(LPSAFEARRAY array)
+{
+    long lbound;
+    long ubound;
+    HRESULT hr;
+
+    RETURN_IF_FAIL(SafeArrayGetLBound(array, 0, &lbound));
+    if (lbound != 0)
+        return E_FAIL;
+    RETURN_IF_FAIL(SafeArrayGetUBound(array, 0, &ubound));
+    if (ubound != 3)
+        return E_FAIL;
+    for (long index = lbound; index <= ubound; ++index)
+    {
+        _variant_t value;
+        RETURN_IF_FAIL(SafeArrayGetElement(array, &index, &value));
+        // We need to do more here, but this is good enough for now
+        if (!value.pdispVal)
+            return E_FAIL;
+    }
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestArrays::InOutSafeArray(LPSAFEARRAY * array)
+{
+    if (array == NULL)
+        return E_POINTER;
+    long lbound;
+    long ubound;
+    HRESULT hr;
+
+    RETURN_IF_FAIL(SafeArrayGetLBound(*array, 0, &lbound));
+    if (lbound != 0)
+        return E_FAIL;
+    RETURN_IF_FAIL(SafeArrayGetUBound(*array, 0, &ubound));
+    if (ubound != 3)
+        return E_FAIL;
+	LPSAFEARRAY newArray = SafeArrayCreateVector(VT_I4, lbound, ubound);
+    for (long index = lbound; index <= ubound; ++index)
+    {
+        long value;
+        RETURN_IF_FAIL(SafeArrayGetElement(*array, &index, &value));
+        if (value != index)
+            return E_FAIL;
+        value += 42;
+        RETURN_IF_FAIL(SafeArrayPutElement(newArray, &index, &value));
+    }
+    SafeArrayDestroy(*array);
+    *array = newArray;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestArrays::InOutSafeArrayBSTR(LPSAFEARRAY * array)
+{
+    if (array == NULL)
+        return E_POINTER;
+        
+    long lbound;
+    long ubound;
+    HRESULT hr;
+
+    RETURN_IF_FAIL(SafeArrayGetLBound(*array, 0, &lbound));
+    if (lbound != 0)
+        return E_FAIL;
+    RETURN_IF_FAIL(SafeArrayGetUBound(*array, 0, &ubound));
+    if (ubound != 3)
+        return E_FAIL;
+	LPSAFEARRAY newArray = SafeArrayCreateVector(VT_BSTR, lbound, ubound);
+    for (long index = lbound; index <= ubound; ++index)
+    {
+        BSTR value;
+        RETURN_IF_FAIL(SafeArrayGetElement(*array, &index, &value));
+        _bstr_t newValue(value, TRUE);
+        newValue += L"Appended";
+        RETURN_IF_FAIL(SafeArrayPutElement(newArray, &index, newValue.copy()));
+    }
+    SafeArrayDestroy(*array);
+    *array = newArray;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestArrays::InOutSafeArrayIDispatch(LPSAFEARRAY * array)
+{
+    if (array == NULL)
+        return E_POINTER;
+        
+    long lbound;
+    long ubound;
+    HRESULT hr;
+
+    RETURN_IF_FAIL(SafeArrayGetLBound(*array, 0, &lbound));
+    if (lbound != 0)
+        return E_FAIL;
+    RETURN_IF_FAIL(SafeArrayGetUBound(*array, 0, &ubound));
+    if (ubound != 3)
+        return E_FAIL;
+	LPSAFEARRAY newArray = SafeArrayCreateVector(VT_DISPATCH, lbound, ubound);
+    for (long index = lbound; index <= ubound; ++index)
+    {
+        IDispatch* value;
+        RETURN_IF_FAIL(SafeArrayGetElement(*array, &index, &value));
+        RETURN_IF_FAIL(SafeArrayPutElement(newArray, &index, &value));
+    }
+    SafeArrayDestroy(*array);
+    *array = newArray;
+    return S_OK;
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestArrays.h

@@ -0,0 +1,53 @@
+// nsXPCDispTestArrays.h: Definition of the nsXPCDispTestArrays class
+//
+//////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_NSXPCDISPTESTARRAYS_H__5F59BD4C_16A4_4BD6_8281_796DE6A2889C__INCLUDED_)
+#define AFX_NSXPCDISPTESTARRAYS_H__5F59BD4C_16A4_4BD6_8281_796DE6A2889C__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "resource.h"       // main symbols
+
+/////////////////////////////////////////////////////////////////////////////
+// nsXPCDispTestArrays
+
+class nsXPCDispTestArrays : 
+    public IDispatchImpl<nsIXPCDispTestArrays, &IID_nsIXPCDispTestArrays, &LIBID_IDispatchTestLib>,
+    public ISupportErrorInfo,
+    public CComObjectRoot,
+    public CComCoClass<nsXPCDispTestArrays,&CLSID_nsXPCDispTestArrays>
+{
+public:
+    nsXPCDispTestArrays() {}
+BEGIN_CATEGORY_MAP(nsXPCDispTestArrays)
+    IMPLEMENTED_CATEGORY(CATID_SafeForScripting)
+END_CATEGORY_MAP()
+BEGIN_COM_MAP(nsXPCDispTestArrays)
+    COM_INTERFACE_ENTRY(IDispatch)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
+    COM_INTERFACE_ENTRY(nsIXPCDispTestArrays)
+END_COM_MAP()
+DECLARE_NOT_AGGREGATABLE(nsXPCDispTestArrays) 
+
+DECLARE_REGISTRY_RESOURCEID(IDR_nsXPCDispTestArrays)
+// ISupportsErrorInfo
+    STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
+
+// nsIXPCDispTestArrays
+public:
+// nsIXPCDispTestArrays
+    STDMETHOD(ReturnSafeArray)(LPSAFEARRAY * result);
+    STDMETHOD(ReturnSafeArrayBSTR)(LPSAFEARRAY * result);
+    STDMETHOD(ReturnSafeArrayIDispatch)(LPSAFEARRAY * result);
+    STDMETHOD(TakesSafeArray)(LPSAFEARRAY array);
+    STDMETHOD(TakesSafeArrayBSTR)(LPSAFEARRAY array);
+    STDMETHOD(TakesSafeArrayIDispatch)(LPSAFEARRAY array);
+    STDMETHOD(InOutSafeArray)(LPSAFEARRAY * array);
+    STDMETHOD(InOutSafeArrayBSTR)(LPSAFEARRAY * array);
+    STDMETHOD(InOutSafeArrayIDispatch)(LPSAFEARRAY * array);
+};
+
+#endif // !defined(AFX_NSXPCDISPTESTARRAYS_H__5F59BD4C_16A4_4BD6_8281_796DE6A2889C__INCLUDED_)

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestArrays.rgs

@@ -0,0 +1,23 @@
+HKCR
+{
+	XPCIDispatchTest.nsXPCDispTestArrays.1 = s 'nsXPCDispTestArrays Class'
+	{
+		CLSID = s '{AB085C43-C619-48C8-B68C-C495BDE12DFB}'
+	}
+	XPCIDispatchTest.nsXPCDispTestArrays = s 'nsXPCDispTestArrays Class'
+	{
+		CLSID = s '{AB085C43-C619-48C8-B68C-C495BDE12DFB}'
+	}
+	NoRemove CLSID
+	{
+		ForceRemove {AB085C43-C619-48C8-B68C-C495BDE12DFB} = s 'nsXPCDispTestArrays Class'
+		{
+			ProgID = s 'XPCIDispatchTest.nsXPCDispTestArrays.1'
+			VersionIndependentProgID = s 'XPCIDispatchTest.nsXPCDispTestArrays'
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'both'
+			}
+		}
+	}
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestMethods.cpp

@@ -0,0 +1,699 @@
+// nsXPCDispTestMethods.cpp : Implementation of CIDispatchTestApp and DLL registration.
+
+#include "stdafx.h"
+#include "XPCIDispatchTest.h"
+#include "nsXPCDispTestMethods.h"
+#include "XPCDispUtilities.h"
+#include "nsXPCDispSimple.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+
+STDMETHODIMP nsXPCDispTestMethods::InterfaceSupportsErrorInfo(REFIID riid)
+{
+    static const IID* arr[] = 
+    {
+        &IID_nsIXPCDispTestMethods,
+    };
+
+    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    {
+        if (InlineIsEqualGUID(*arr[i],riid))
+            return S_OK;
+    }
+    return S_FALSE;
+}
+
+STDMETHODIMP nsXPCDispTestMethods::NoParameters()
+{
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnBSTR(BSTR * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+        
+    CComBSTR x("Boo");
+    *result = x.Detach();
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnI4(INT * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 99999;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnUI1(BYTE * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 99;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnI2(SHORT * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 9999;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnR4(FLOAT * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 99999.1f;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnR8(DOUBLE * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 99999999999.99;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnBool(VARIANT_BOOL * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = VARIANT_TRUE;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnIDispatch(IDispatch * * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    return nsXPCDispSimple::CreateInstance(result);
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnError(SCODE * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = E_FAIL;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnDate(DATE * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    CComBSTR dateStr(L"5/2/02");
+    return VarDateFromStr(dateStr, LOCALE_SYSTEM_DEFAULT,
+                          LOCALE_NOUSEROVERRIDE, result);
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnIUnknown(IUnknown * * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+        
+    return XPCCreateInstance<IUnknown>(CLSID_nsXPCDispTestNoIDispatch, IID_IUnknown, result);
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnI1(unsigned char * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+        
+    *result = 120;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnUI2(USHORT * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 9999;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnUI4(ULONG * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 3000000000;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnInt(INT * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = -999999;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::ReturnUInt(UINT * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+        
+    *result = 3000000000;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesBSTR(BSTR result)
+{
+    CComBSTR str(result);
+    static CComBSTR test(L"TakesBSTR");
+    return str == test ? S_OK: E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesI4(INT result)
+{
+    return result == 999999 ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesUI1(BYTE result)
+{
+    return result == 42 ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesI2(SHORT result)
+{
+    return result == 32000 ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesR4(FLOAT result)
+{
+    // Hopefully we won't run into any precision/rounding issues
+    return result == 99999.99f ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesR8(DOUBLE result)
+{
+    // Hopefully we won't run into any precision/rounding issues
+    return result == 999999999.99 ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesBool(VARIANT_BOOL result)
+{
+    return result ? S_OK : E_FAIL;
+}
+
+inline
+HRESULT GetProperty(IDispatch *pDisp, const CComBSTR & name, CComVariant& output)
+{
+    DISPID dispid = GetIDsOfNames(pDisp, name);
+    DISPPARAMS dispParams;
+    dispParams.cArgs = 0;
+    dispParams.cNamedArgs = 0;
+    dispParams.rgdispidNamedArgs = 0;
+    dispParams.rgvarg = 0;
+    return pDisp->Invoke(dispid, IID_NULL, LOCALE_SYSTEM_DEFAULT,DISPATCH_PROPERTYGET, &dispParams, &output, 0, 0);
+}
+    
+inline
+HRESULT PutProperty(IDispatch *pDisp, const CComBSTR & name, const CComVariant& input)
+{
+    DISPPARAMS dispParams;
+    DISPID did = DISPID_PROPERTYPUT;
+    dispParams.cArgs = 1;
+    CComVariant var(input);
+    dispParams.rgvarg = &var;
+    dispParams.cNamedArgs = 1;
+    dispParams.rgdispidNamedArgs = &did;
+    CComVariant result;
+    DISPID dispID = GetIDsOfNames(pDisp, name);
+    return pDisp->Invoke(dispID, IID_NULL, LOCALE_SYSTEM_DEFAULT,
+                               DISPATCH_PROPERTYPUT, &dispParams, &result,
+                               0, 0);
+}
+
+HRESULT VerifynsXPCDispSimple(IDispatch * result)
+{
+    CComVariant property;
+    HRESULT hResult = GetProperty(result, L"Number", property);
+    CComVariant test((long)5);
+    if (FAILED(hResult))
+        return hResult;
+    if (property != test)
+        return E_FAIL;
+    return PutProperty(result, L"Number", 76);
+}
+
+STDMETHODIMP nsXPCDispTestMethods::TakesIDispatch(IDispatch * result)
+{
+    return VerifynsXPCDispSimple(result);
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesError(SCODE result)
+{
+    return result == E_FAIL ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesDate(DATE result)
+{
+    CComBSTR dateStr(L"5/2/02");
+    DATE myDate;
+    HRESULT hResult = VarDateFromStr(dateStr, LOCALE_SYSTEM_DEFAULT,
+                                    LOCALE_NOUSEROVERRIDE, &myDate);
+    if (SUCCEEDED(hResult))
+        return myDate == result ? S_OK : E_FAIL;
+    else
+        return hResult;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesIUnknown(IUnknown * result)
+{
+    CComPtr<IUnknown> ptr(result);
+    ULONG before = result->AddRef();
+    ULONG after = result->Release();
+    CComQIPtr<nsIXPCDispTestNoIDispatch> noIDispatch(ptr);
+    return before - 1 == after ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesI1(unsigned char result)
+{
+    return result == 42 ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesUI2(USHORT result)
+{
+    return result == 50000 ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesUI4(ULONG result)
+{
+    return result == 0xF0000000 ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesInt(INT result)
+{
+    return result == -10000000 ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TakesUInt(UINT result)
+{
+    return result == 0xE0000000 ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsBSTR(BSTR * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+        
+    CComBSTR x("Boo");
+    *result = x.Detach();
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsI4(LONG * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 99999;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsUI1(BYTE * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 99;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsI2(SHORT * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 9999;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsR4(FLOAT * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 999999.1f;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsR8(DOUBLE * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 99999999999.99;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsBool(VARIANT_BOOL * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = VARIANT_TRUE;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsIDispatch(IDispatch * * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    return nsXPCDispSimple::CreateInstance(result);
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsError(SCODE * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = E_FAIL;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsDate(DATE * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    CComBSTR dateStr(L"5/2/02");
+    return VarDateFromStr(dateStr, LOCALE_SYSTEM_DEFAULT,
+                          LOCALE_NOUSEROVERRIDE, result);
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsIUnknown(IUnknown * * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+        
+    return XPCCreateInstance<IUnknown>(CLSID_nsXPCDispTestNoIDispatch, IID_IUnknown, result);
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsI1(unsigned char * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+        
+    *result = L'x';
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsUI2(USHORT * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 9999;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::OutputsUI4(ULONG * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = 3000000000;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsBSTR(BSTR * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    CComBSTR str(*result);
+    str += L"Appended";
+    SysFreeString(*result);
+    *result = str.Detach();
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsI4(LONG * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result -= 4000000;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsUI1(BYTE * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result -= 42;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsI2(SHORT * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result += 10000;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsR4(FLOAT * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result += 5.05f;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsR8(DOUBLE * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result += 50000000.00000005;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsBool(VARIANT_BOOL * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = !*result;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsIDispatch(IDispatch * * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    CComPtr<nsIXPCDispSimple> ptr;
+    ptr.CoCreateInstance(CLSID_nsXPCDispSimple);
+    CComPtr<IDispatch> incoming(*result);
+    CComVariant value;
+    HRESULT hResult = GetProperty(incoming, L"Number", value);
+    if (FAILED(hResult))
+        return hResult;
+    if (value.lVal != 10)
+        return E_FAIL;
+    hResult = ptr->put_Number(value.lVal + 5);
+    if (FAILED(hResult))
+        return hResult;
+
+    *result = ptr.Detach();
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsError(SCODE * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result += 1;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsDate(DATE * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    ULONG days;
+    HRESULT hResult = VarUI4FromDate(*result, &days);
+    if (FAILED(hResult))
+        return hResult;
+
+    return VarDateFromUI4(days + 1, result);
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsIUnknown(IUnknown * * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+        
+    CComPtr<IUnknown> ptr(*result);
+    ULONG before = (*result)->AddRef();
+    ULONG after = (*result)->Release();
+    if (before - 1 != after)
+        return E_FAIL;
+    return nsXPCDispSimple::CreateInstance(result);
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsI1(unsigned char * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    ++*result;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsUI2(USHORT * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result += 42;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::InOutsUI4(ULONG * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result -= 42;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::OneParameterWithReturn(LONG input, 
+                                                          LONG * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    *result = input + 42;
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::StringInputAndReturn(BSTR str, 
+                                                        BSTR * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    CComBSTR input(str);
+    input += L"Appended";
+    *result = input.Detach();
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::IDispatchInputAndReturn(IDispatch * input, IDispatch * * result)
+{
+    if (result == NULL)
+        return E_POINTER;
+    HRESULT hResult = VerifynsXPCDispSimple(input);
+
+    hResult = XPCCreateInstance<IDispatch>(CLSID_nsXPCDispSimple, IID_IDispatch, result);
+    if (FAILED(hResult))
+        return hResult;
+    CComVariant variant;
+    hResult = GetProperty(input, L"Number", variant);
+    if (FAILED(hResult))
+        return hResult;
+    return PutProperty(*result, L"Number", variant.lVal + 5);
+}
+STDMETHODIMP nsXPCDispTestMethods::TwoParameters(LONG one, LONG two)
+{
+    return one + 1 == two ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TwelveInParameters(LONG one, LONG two,
+                                                      LONG three, LONG four,
+                                                      LONG five, LONG six,
+                                                      LONG seven, LONG eight,
+                                                      LONG nine, LONG ten,
+                                                      LONG eleven, LONG twelve)
+{
+    return one + two + three + four + five + six + seven + eight + nine + 
+        ten + eleven + twelve == 78 ? S_OK : E_FAIL;
+}
+STDMETHODIMP nsXPCDispTestMethods::TwelveOutParameters(LONG * one, LONG * two,
+                                                       LONG * three,
+                                                       LONG * four,
+                                                       LONG * five, LONG * six,
+                                                       LONG * seven,
+                                                       LONG * eight,
+                                                       LONG * nine, LONG * ten,
+                                                       LONG * eleven,
+                                                       LONG * twelve)
+{
+    if (one == 0 || two == 0 || three == 0 || four == 0 || 
+        five == 0 || six == 0 || seven == 0 || eight == 0 ||
+        nine == 0 || ten == 0 || eleven == 0 || twelve == 0)
+        return E_POINTER;
+    
+    *one = 1;
+    *two = 2;
+    *three = 3;
+    *four = 4;
+    *five = 5;
+    *six = 6;
+    *seven = 7;
+    *eight = 8;
+    *nine = 9;
+    *ten = 10;
+    *eleven = 11;
+    *twelve = 12;
+    return S_OK;
+}
+
+inline
+boolean Equals(BSTR left, const char * str)
+{
+    return CComBSTR(left) == str;
+}
+#define TESTPARAM(val) Equals(val, #val)
+
+STDMETHODIMP nsXPCDispTestMethods::TwelveStrings(BSTR one, BSTR two, BSTR three, BSTR four, BSTR five, BSTR six, BSTR seven, BSTR eight, BSTR nine, BSTR ten, BSTR eleven, BSTR twelve)
+{
+    return TESTPARAM(one) && TESTPARAM(two) && TESTPARAM(three) && 
+        TESTPARAM(four) && TESTPARAM(five) && TESTPARAM(six) && 
+        TESTPARAM(seven) && TESTPARAM(eight) && TESTPARAM(nine) && 
+        TESTPARAM(ten) && TESTPARAM(eleven) && TESTPARAM(twelve) ? 
+            S_OK : E_FAIL;
+}
+
+#define ASSIGNPARAM(val) \
+    if (val == 0) \
+        return E_POINTER; \
+    *val = CComBSTR(#val).Detach()
+STDMETHODIMP nsXPCDispTestMethods::TwelveOutStrings(BSTR * one, BSTR * two, BSTR * three, BSTR * four, BSTR * five, BSTR * six, BSTR * seven, BSTR * eight, BSTR * nine, BSTR * ten, BSTR * eleven, BSTR * twelve)
+{
+    ASSIGNPARAM(one);
+    ASSIGNPARAM(two);
+    ASSIGNPARAM(three);
+    ASSIGNPARAM(four);
+    ASSIGNPARAM(five);
+    ASSIGNPARAM(six);
+    ASSIGNPARAM(seven);
+    ASSIGNPARAM(eight);
+    ASSIGNPARAM(nine);
+    ASSIGNPARAM(ten);
+    ASSIGNPARAM(eleven);
+    ASSIGNPARAM(twelve);
+    return S_OK;
+}
+#define VERIFYSIMPLE(param) \
+    hResult = VerifynsXPCDispSimple(param); \
+    if (FAILED(hResult)) \
+        return hResult
+STDMETHODIMP nsXPCDispTestMethods::TwelveIDispatch(IDispatch * one,
+                                                   IDispatch * two,
+                                                   IDispatch * three,
+                                                   IDispatch * four,
+                                                   IDispatch * five,
+                                                   IDispatch * six,
+                                                   IDispatch * seven,
+                                                   IDispatch * eight,
+                                                   IDispatch * nine,
+                                                   IDispatch * ten,
+                                                   IDispatch * eleven,
+                                                   IDispatch * twelve)
+{
+    HRESULT hResult;
+    VERIFYSIMPLE(one);
+    VERIFYSIMPLE(two);
+    VERIFYSIMPLE(three);
+    VERIFYSIMPLE(four);
+    VERIFYSIMPLE(five);
+    VERIFYSIMPLE(six);
+    VERIFYSIMPLE(seven);
+    VERIFYSIMPLE(eight);
+    VERIFYSIMPLE(nine);
+    VERIFYSIMPLE(ten);
+    VERIFYSIMPLE(eleven);
+    VERIFYSIMPLE(twelve);
+    return S_OK;
+}
+
+#define ASSIGNSIMPLE(param) \
+    if (param == 0) \
+        return E_POINTER; \
+    hResult = nsXPCDispSimple::CreateInstance(param); \
+    if (FAILED(hResult)) \
+        return hResult;  \
+    
+STDMETHODIMP nsXPCDispTestMethods::TwelveOutIDispatch(IDispatch * * one,
+                                                      IDispatch * * two,
+                                                      IDispatch * * three,
+                                                      IDispatch * * four,
+                                                      IDispatch * * five,
+                                                      IDispatch * * six,
+                                                      IDispatch * * seven,
+                                                      IDispatch * * eight,
+                                                      IDispatch * * nine,
+                                                      IDispatch * * ten,
+                                                      IDispatch * * eleven,
+                                                      IDispatch * * twelve){
+    HRESULT hResult;
+    ASSIGNSIMPLE(one);
+    ASSIGNSIMPLE(two);
+    ASSIGNSIMPLE(three);
+    ASSIGNSIMPLE(four);
+    ASSIGNSIMPLE(five);
+    ASSIGNSIMPLE(six);
+    ASSIGNSIMPLE(seven);
+    ASSIGNSIMPLE(eight);
+    ASSIGNSIMPLE(nine);
+    ASSIGNSIMPLE(ten);
+    ASSIGNSIMPLE(eleven);
+    ASSIGNSIMPLE(twelve);
+    return S_OK;
+}
+STDMETHODIMP nsXPCDispTestMethods::CreateError()
+{
+    CComBSTR someText(L"CreateError Test");
+    ICreateErrorInfo * pCreateError;
+    IErrorInfo * pError;
+    HRESULT result = CreateErrorInfo(&pCreateError);
+    if (FAILED(result))
+        return E_NOTIMPL;
+    result = pCreateError->QueryInterface(&pError);
+    if (FAILED(result))
+        return E_NOTIMPL;
+    result = pCreateError->SetDescription(someText);
+    if (FAILED(result))
+        return E_NOTIMPL;
+    result = pCreateError->SetGUID(IID_nsIXPCDispTestMethods);
+    if (FAILED(result))
+        return E_NOTIMPL;
+    CComBSTR source(L"XPCIDispatchTest.nsXPCDispTestMethods.1");
+    result = pCreateError->SetSource(source);
+    if (FAILED(result))
+        return E_NOTIMPL;
+    result = SetErrorInfo(0, pError);
+    if (FAILED(result))
+        return E_NOTIMPL;
+    pError->Release();
+    pCreateError->Release();
+    return E_FAIL;
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestMethods.h

@@ -0,0 +1,138 @@
+// nsXPCDispTestMethods.h: Definition of the nsXPCDispTestMethods class
+//
+//////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_NSXPCDISPTESTMETHODS_H__A516B1D7_1971_419C_AE35_EDFAC27D1227__INCLUDED_)
+#define AFX_NSXPCDISPTESTMETHODS_H__A516B1D7_1971_419C_AE35_EDFAC27D1227__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "resource.h"       // main symbols
+#include "XPCIDispatchTest.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// nsXPCDispTestMethods
+
+class nsXPCDispTestMethods : 
+    public ISupportErrorInfo,
+    public CComObjectRoot,
+    public CComCoClass<nsXPCDispTestMethods,&CLSID_nsXPCDispTestMethods>,
+    public IDispatchImpl<nsIXPCDispTestMethods, &IID_nsIXPCDispTestMethods, &LIBID_IDispatchTestLib>
+{
+public:
+    nsXPCDispTestMethods() {}
+BEGIN_CATEGORY_MAP(nsXPCDispTestMethods)
+    IMPLEMENTED_CATEGORY(CATID_SafeForScripting)
+END_CATEGORY_MAP()
+BEGIN_COM_MAP(nsXPCDispTestMethods)
+    COM_INTERFACE_ENTRY(IDispatch)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
+    COM_INTERFACE_ENTRY(nsIXPCDispTestMethods)
+END_COM_MAP()
+DECLARE_NOT_AGGREGATABLE(nsXPCDispTestMethods) 
+
+DECLARE_REGISTRY_RESOURCEID(IDR_nsXPCDispTestMethods)
+// ISupportsErrorInfo
+    STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
+
+// nsIXPCDispTestMethods
+public:
+// nsIXPCDispTestMethod
+    STDMETHOD(NoParameters)();
+    STDMETHOD(ReturnBSTR)(BSTR * result);
+    STDMETHOD(ReturnI4)(INT * result);
+    STDMETHOD(ReturnUI1)(BYTE * result);
+    STDMETHOD(ReturnI2)(SHORT * result);
+    STDMETHOD(ReturnR4)(FLOAT * result);
+    STDMETHOD(ReturnR8)(DOUBLE * result);
+    STDMETHOD(ReturnBool)(VARIANT_BOOL * result);
+    STDMETHOD(ReturnIDispatch)(IDispatch * * result);
+    STDMETHOD(ReturnError)(SCODE * result);
+    STDMETHOD(ReturnDate)(DATE * result);
+    STDMETHOD(ReturnIUnknown)(IUnknown * * result);
+    STDMETHOD(ReturnI1)(unsigned char * result);
+    STDMETHOD(ReturnUI2)(USHORT * result);
+    STDMETHOD(ReturnUI4)(ULONG * result);
+    STDMETHOD(ReturnInt)(INT * result);
+    STDMETHOD(ReturnUInt)(UINT * result);
+    STDMETHOD(TakesBSTR)(BSTR result);
+    STDMETHOD(TakesI4)(INT result);
+    STDMETHOD(TakesUI1)(BYTE result);
+    STDMETHOD(TakesI2)(SHORT result);
+    STDMETHOD(TakesR4)(FLOAT result);
+    STDMETHOD(TakesR8)(DOUBLE result);
+    STDMETHOD(TakesBool)(VARIANT_BOOL result);
+    STDMETHOD(TakesIDispatch)(IDispatch * result);
+    STDMETHOD(TakesError)(SCODE result);
+    STDMETHOD(TakesDate)(DATE result);
+    STDMETHOD(TakesIUnknown)(IUnknown * result);
+    STDMETHOD(TakesI1)(unsigned char result);
+    STDMETHOD(TakesUI2)(USHORT result);
+    STDMETHOD(TakesUI4)(ULONG result);
+    STDMETHOD(TakesInt)(INT result);
+    STDMETHOD(TakesUInt)(UINT result);
+    STDMETHOD(OutputsBSTR)(BSTR * result);
+    STDMETHOD(OutputsI4)(LONG * result);
+    STDMETHOD(OutputsUI1)(BYTE * result);
+    STDMETHOD(OutputsI2)(SHORT * result);
+    STDMETHOD(OutputsR4)(FLOAT * result);
+    STDMETHOD(OutputsR8)(DOUBLE * result);
+    STDMETHOD(OutputsBool)(VARIANT_BOOL * result);
+    STDMETHOD(OutputsIDispatch)(IDispatch * * result);
+    STDMETHOD(OutputsError)(SCODE * result);
+    STDMETHOD(OutputsDate)(DATE * result);
+    STDMETHOD(OutputsIUnknown)(IUnknown * * result);
+    STDMETHOD(OutputsI1)(unsigned char * result);
+    STDMETHOD(OutputsUI2)(USHORT * result);
+    STDMETHOD(OutputsUI4)(ULONG * result);
+    STDMETHOD(InOutsBSTR)(BSTR * result);
+    STDMETHOD(InOutsI4)(LONG * result);
+    STDMETHOD(InOutsUI1)(BYTE * result);
+    STDMETHOD(InOutsI2)(SHORT * result);
+    STDMETHOD(InOutsR4)(FLOAT * result);
+    STDMETHOD(InOutsR8)(DOUBLE * result);
+    STDMETHOD(InOutsBool)(VARIANT_BOOL * result);
+    STDMETHOD(InOutsIDispatch)(IDispatch * * result);
+    STDMETHOD(InOutsError)(SCODE * result);
+    STDMETHOD(InOutsDate)(DATE * result);
+    STDMETHOD(InOutsIUnknown)(IUnknown * * result);
+    STDMETHOD(InOutsI1)(unsigned char * result);
+    STDMETHOD(InOutsUI2)(USHORT * result);
+    STDMETHOD(InOutsUI4)(ULONG * result);
+    STDMETHOD(OneParameterWithReturn)(LONG input, LONG * result);
+    STDMETHOD(StringInputAndReturn)(BSTR str, BSTR * result);
+    STDMETHOD(IDispatchInputAndReturn)(IDispatch * input, IDispatch** result);
+    STDMETHOD(TwoParameters)(LONG one, LONG two);
+    STDMETHOD(TwelveInParameters)(LONG one, LONG two, LONG three, LONG four,
+                                  LONG five, LONG six, LONG seven, LONG eight,
+                                  LONG nine, LONG ten, LONG eleven,
+                                  LONG twelve);
+    STDMETHOD(TwelveOutParameters)(LONG * one, LONG * two, LONG * three, 
+                                   LONG * four, LONG * five, LONG * six,
+                                   LONG * seven, LONG * eight, LONG * nine,
+                                   LONG * ten, LONG * eleven, LONG * twelve);
+    STDMETHOD(TwelveStrings)(BSTR one, BSTR two, BSTR three, BSTR four,
+                             BSTR five, BSTR six, BSTR seven, BSTR eight,
+                             BSTR nine, BSTR ten, BSTR eleven, BSTR twelve);
+    STDMETHOD(TwelveOutStrings)(BSTR * one, BSTR * two, BSTR * three,
+                                BSTR * four, BSTR * five, BSTR * six,
+                                BSTR * seven, BSTR * eight, BSTR * nine,
+                                BSTR * ten, BSTR * eleven, BSTR * twelve);
+    STDMETHOD(TwelveIDispatch)(IDispatch * one, IDispatch * two,
+                               IDispatch * three, IDispatch * four,
+                               IDispatch * five, IDispatch * six,
+                               IDispatch * seven, IDispatch * eight,
+                               IDispatch * nine, IDispatch * ten,
+                               IDispatch * eleven, IDispatch * twelve);
+    STDMETHOD(TwelveOutIDispatch)(IDispatch * * one, IDispatch * * two,
+                                  IDispatch * * three, IDispatch * * four,
+                                  IDispatch * * five, IDispatch * * six,
+                                  IDispatch * * seven, IDispatch * * eight,
+                                  IDispatch * * nine, IDispatch * * ten,
+                                  IDispatch * * eleven, IDispatch * * twelve);
+    STDMETHOD(CreateError)();
+};
+
+#endif // !defined(AFX_NSXPCDISPTESTMETHODS_H__A516B1D7_1971_419C_AE35_EDFAC27D1227__INCLUDED_)

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestMethods.rgs

@@ -0,0 +1,23 @@
+HKCR
+{
+	XPCIDispatchTest.nsXPCDispTestMethods.1 = s 'nsXPCDispTestMethods Class'
+	{
+		CLSID = s '{745D1149-9F46-418C-B176-71EAA98974BA}'
+	}
+	XPCIDispatchTest.nsXPCDispTestMethods = s 'nsXPCDispTestMethods Class'
+	{
+		CLSID = s '{745D1149-9F46-418C-B176-71EAA98974BA}'
+	}
+	NoRemove CLSID
+	{
+		ForceRemove {745D1149-9F46-418C-B176-71EAA98974BA} = s 'nsXPCDispTestMethods Class'
+		{
+			ProgID = s 'XPCIDispatchTest.nsXPCDispTestMethods.1'
+			VersionIndependentProgID = s 'XPCIDispatchTest.nsXPCDispTestMethods'
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'both'
+			}
+		}
+	}
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestNoIDispatch.cpp

@@ -0,0 +1,23 @@
+// nsXPCDispTestNoIDispatch.cpp : Implementation of CXPCIDispatchTestApp and DLL registration.
+
+#include "stdafx.h"
+#include "XPCIDispatchTest.h"
+#include "nsXPCDispTestNoIDispatch.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+
+STDMETHODIMP nsXPCDispTestNoIDispatch::InterfaceSupportsErrorInfo(REFIID riid)
+{
+    static const IID* arr[] = 
+    {
+        &IID_nsIXPCDispTestNoIDispatch,
+    };
+
+    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    {
+        if (InlineIsEqualGUID(*arr[i],riid))
+            return S_OK;
+    }
+    return S_FALSE;
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestNoIDispatch.h

@@ -0,0 +1,41 @@
+// nsXPCDispTestNoIDispatch.h: Definition of the nsXPCDispTestNoIDispatch class
+//
+//////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_NSXPCDISPTESTNOIDISPATCH_H__E4B74F67_BA6B_4654_8674_E60E487129F7__INCLUDED_)
+#define AFX_NSXPCDISPTESTNOIDISPATCH_H__E4B74F67_BA6B_4654_8674_E60E487129F7__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "resource.h"       // main symbols
+
+/////////////////////////////////////////////////////////////////////////////
+// nsXPCDispTestNoIDispatch
+
+class nsXPCDispTestNoIDispatch :
+    public nsIXPCDispTestNoIDispatch,
+    public ISupportErrorInfo,
+    public CComObjectRoot,
+    public CComCoClass<nsXPCDispTestNoIDispatch,&CLSID_nsXPCDispTestNoIDispatch>
+{
+public:
+    nsXPCDispTestNoIDispatch() {}
+BEGIN_COM_MAP(nsXPCDispTestNoIDispatch)
+    COM_INTERFACE_ENTRY(nsIXPCDispTestNoIDispatch)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
+END_COM_MAP()
+//DECLARE_NOT_AGGREGATABLE(nsXPCDispTestNoIDispatch) 
+// Remove the comment from the line above if you don't want your object to 
+// support aggregation. 
+
+DECLARE_REGISTRY_RESOURCEID(IDR_nsXPCDispTestNoIDispatch)
+// ISupportsErrorInfo
+    STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
+
+// nsIXPCDispTestNoIDispatch
+public:
+};
+
+#endif // !defined(AFX_NSXPCDISPTESTNOIDISPATCH_H__E4B74F67_BA6B_4654_8674_E60E487129F7__INCLUDED_)

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestNoIDispatch.rgs

@@ -0,0 +1,23 @@
+HKCR
+{
+	XPCIDispatchTest.nsXPCDispTestNoIDispatch.1 = s 'nsXPCDispTestNoIDispatch Class'
+	{
+		CLSID = s '{7414404F-A4CC-4E3C-9B32-BB20CB22F541}'
+	}
+	XPCIDispatchTest.nsXPCDispTestNoIDispatch = s 'nsXPCDispTestNoIDispatch Class'
+	{
+		CLSID = s '{7414404F-A4CC-4E3C-9B32-BB20CB22F541}'
+	}
+	NoRemove CLSID
+	{
+		ForceRemove {7414404F-A4CC-4E3C-9B32-BB20CB22F541} = s 'nsXPCDispTestNoIDispatch Class'
+		{
+			ProgID = s 'XPCIDispatchTest.nsXPCDispTestNoIDispatch.1'
+			VersionIndependentProgID = s 'XPCIDispatchTest.nsXPCDispTestNoIDispatch'
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'both'
+			}
+		}
+	}
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestProperties.cpp

@@ -0,0 +1,256 @@
+// nsXPCDispTestProperties.cpp : Implementation of CXPCIDispatchTestApp and DLL registration.
+
+#include "stdafx.h"
+#include "XPCIDispatchTest.h"
+#include "nsXPCDispTestProperties.h"
+
+const long PARAMETERIZED_PROPERTY_COUNT = 5;
+/////////////////////////////////////////////////////////////////////////////
+//
+
+STDMETHODIMP nsXPCDispTestProperties::InterfaceSupportsErrorInfo(REFIID riid)
+{
+    static const IID* arr[] = 
+    {
+        &IID_nsIXPCDispTestProperties,
+    };
+
+    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    {
+        if (InlineIsEqualGUID(*arr[i],riid))
+            return S_OK;
+    }
+    return S_FALSE;
+}
+
+nsXPCDispTestProperties::nsXPCDispTestProperties() :
+    mChar('a'),
+    mBOOL(FALSE),
+    mSCode(0),
+    mDATE(0),
+    mDouble(0.0),
+    mFloat(0.0f),
+    mLong(0),
+    mShort(0),
+    mParameterizedProperty(new long[PARAMETERIZED_PROPERTY_COUNT])
+{
+    mCURRENCY.int64 = 0;
+    CComBSTR string("Initial value");
+    mBSTR = string.Detach();
+    for (long index = 0; index < PARAMETERIZED_PROPERTY_COUNT; ++index)
+        mParameterizedProperty[index] = index + 1;
+}
+
+nsXPCDispTestProperties::~nsXPCDispTestProperties()
+{
+    delete [] mParameterizedProperty;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_Short(short *pVal)
+{
+    *pVal = mShort;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_Short(short newVal)
+{
+    mShort = newVal;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_Long(long *pVal)
+{
+    *pVal = mLong;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_Long(long newVal)
+{
+    mLong = newVal;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_Float(float *pVal)
+{
+    *pVal = mFloat;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_Float(float newVal)
+{
+    mFloat = newVal;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_Double(double *pVal)
+{
+    *pVal = mDouble;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_Double(double newVal)
+{
+    mDouble = newVal;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_Currency(CURRENCY *pVal)
+{
+    *pVal = mCURRENCY;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_Currency(CURRENCY newVal)
+{
+    mCURRENCY = newVal;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_Date(DATE *pVal)
+{
+    *pVal = mDATE;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_Date(DATE newVal)
+{
+    mDATE = newVal;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_String(BSTR *pVal)
+{
+    *pVal = mBSTR.Copy();
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_String(BSTR newVal)
+{
+    mBSTR = newVal;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_DispatchPtr(IDispatch **pVal)
+{
+    mIDispatch.CopyTo(pVal);
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_DispatchPtr(IDispatch *newVal)
+{
+    mIDispatch = newVal;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_SCode(SCODE *pVal)
+{
+    *pVal = mSCode;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_SCode(SCODE newVal)
+{
+    mSCode = newVal;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_Boolean(BOOL *pVal)
+{
+    *pVal = mBOOL;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_Boolean(BOOL newVal)
+{
+    mBOOL = newVal;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_Variant(VARIANT *pVal)
+{
+    ::VariantCopy(pVal, &mVariant);
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_Variant(VARIANT newVal)
+{
+    mVariant = newVal;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_COMPtr(IUnknown **pVal)
+{
+    mIUnknown.CopyTo(pVal);
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_COMPtr(IUnknown *newVal)
+{
+    mIUnknown = newVal;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_Char(unsigned char *pVal)
+{
+    *pVal = mChar;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_Char(unsigned char newVal)
+{
+    mChar = newVal;
+
+    return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_ParameterizedProperty(long aIndex, long *pVal)
+{
+    if (aIndex < 0 || aIndex >= PARAMETERIZED_PROPERTY_COUNT)
+        return E_FAIL;
+
+	*pVal = mParameterizedProperty[aIndex];
+
+	return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::put_ParameterizedProperty(long aIndex, long newVal)
+{
+    if (aIndex < 0 || aIndex >= PARAMETERIZED_PROPERTY_COUNT)
+        return E_FAIL;
+
+	mParameterizedProperty[aIndex] = newVal;
+
+	return S_OK;
+}
+
+STDMETHODIMP nsXPCDispTestProperties::get_ParameterizedPropertyCount(long *pVal)
+{
+	*pVal = PARAMETERIZED_PROPERTY_COUNT;
+
+	return S_OK;
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestProperties.h

@@ -0,0 +1,88 @@
+// nsXPCDispTestProperties.h: Definition of the nsXPCDispTestProperties class
+//
+//////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_NSXPCDISPTESTPROPERTIES_H__9E10C7AC_36AF_4A3A_91C7_2CFB9EB166A5__INCLUDED_)
+#define AFX_NSXPCDISPTESTPROPERTIES_H__9E10C7AC_36AF_4A3A_91C7_2CFB9EB166A5__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "resource.h"       // main symbols
+
+/////////////////////////////////////////////////////////////////////////////
+// nsXPCDispTestProperties
+
+class nsXPCDispTestProperties : 
+    public IDispatchImpl<nsIXPCDispTestProperties, &IID_nsIXPCDispTestProperties, &LIBID_IDispatchTestLib>, 
+    public ISupportErrorInfo,
+    public CComObjectRoot,
+    public CComCoClass<nsXPCDispTestProperties,&CLSID_nsXPCDispTestProperties>
+{
+public:
+    nsXPCDispTestProperties();
+    virtual ~nsXPCDispTestProperties();
+BEGIN_CATEGORY_MAP(nsXPCDispTestProperties)
+    IMPLEMENTED_CATEGORY(CATID_SafeForScripting)
+END_CATEGORY_MAP()
+BEGIN_COM_MAP(nsXPCDispTestProperties)
+    COM_INTERFACE_ENTRY(IDispatch)
+    COM_INTERFACE_ENTRY(nsIXPCDispTestProperties)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
+END_COM_MAP()
+DECLARE_NOT_AGGREGATABLE(nsXPCDispTestProperties) 
+
+DECLARE_REGISTRY_RESOURCEID(IDR_nsXPCDispTestProperties)
+// ISupportsErrorInfo
+    STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
+
+// nsIXPCDispTestProperties
+public:
+	STDMETHOD(get_ParameterizedPropertyCount)(/*[out, retval]*/ long *pVal);
+	STDMETHOD(get_ParameterizedProperty)(/*[in]*/long aIndex, /*[out, retval]*/ long *pVal);
+	STDMETHOD(put_ParameterizedProperty)(/*[in]*/long aIndex, /*[in]*/ long newVal);
+    STDMETHOD(get_Char)(/*[out, retval]*/ unsigned char *pVal);
+    STDMETHOD(put_Char)(/*[in]*/ unsigned char newVal);
+    STDMETHOD(get_COMPtr)(/*[out, retval]*/ IUnknown* *pVal);
+    STDMETHOD(put_COMPtr)(/*[in]*/ IUnknown* newVal);
+    STDMETHOD(get_Variant)(/*[out, retval]*/ VARIANT *pVal);
+    STDMETHOD(put_Variant)(/*[in]*/ VARIANT newVal);
+    STDMETHOD(get_Boolean)(/*[out, retval]*/ BOOL *pVal);
+    STDMETHOD(put_Boolean)(/*[in]*/ BOOL newVal);
+    STDMETHOD(get_SCode)(/*[out, retval]*/ SCODE *pVal);
+    STDMETHOD(put_SCode)(/*[in]*/ SCODE newVal);
+    STDMETHOD(get_DispatchPtr)(/*[out, retval]*/ IDispatch* *pVal);
+    STDMETHOD(put_DispatchPtr)(/*[in]*/ IDispatch* newVal);
+    STDMETHOD(get_String)(/*[out, retval]*/ BSTR *pVal);
+    STDMETHOD(put_String)(/*[in]*/ BSTR newVal);
+    STDMETHOD(get_Date)(/*[out, retval]*/ DATE *pVal);
+    STDMETHOD(put_Date)(/*[in]*/ DATE newVal);
+    STDMETHOD(get_Currency)(/*[out, retval]*/ CURRENCY *pVal);
+    STDMETHOD(put_Currency)(/*[in]*/ CURRENCY newVal);
+    STDMETHOD(get_Double)(/*[out, retval]*/ double *pVal);
+    STDMETHOD(put_Double)(/*[in]*/ double newVal);
+    STDMETHOD(get_Float)(/*[out, retval]*/ float *pVal);
+    STDMETHOD(put_Float)(/*[in]*/ float newVal);
+    STDMETHOD(get_Long)(/*[out, retval]*/ long *pVal);
+    STDMETHOD(put_Long)(/*[in]*/ long newVal);
+    STDMETHOD(get_Short)(/*[out, retval]*/ short *pVal);
+    STDMETHOD(put_Short)(/*[in]*/ short newVal);
+private:
+    unsigned char       mChar;
+    CComPtr<IUnknown>   mIUnknown;
+    CComVariant         mVariant;
+    BOOL                mBOOL;
+    SCODE               mSCode;
+    CComPtr<IDispatch>  mIDispatch;
+    CComBSTR            mBSTR;
+    DATE                mDATE;
+    CURRENCY            mCURRENCY;
+    double              mDouble;
+    float               mFloat;
+    long                mLong;
+    short               mShort;
+    long *              mParameterizedProperty;
+};
+
+#endif // !defined(AFX_NSXPCDISPTESTPROPERTIES_H__9E10C7AC_36AF_4A3A_91C7_2CFB9EB166A5__INCLUDED_)

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestProperties.rgs

@@ -0,0 +1,23 @@
+HKCR
+{
+	XPCIDispatchTest.nsXPCDispTestProperties.1 = s 'nsXPCDispTestProperties Class'
+	{
+		CLSID = s '{D8B4265B-1768-4CA9-A285-7CCAEEB51C74}'
+	}
+	XPCIDispatchTest.nsXPCDispTestProperties = s 'nsXPCDispTestProperties Class'
+	{
+		CLSID = s '{D8B4265B-1768-4CA9-A285-7CCAEEB51C74}'
+	}
+	NoRemove CLSID
+	{
+		ForceRemove {D8B4265B-1768-4CA9-A285-7CCAEEB51C74} = s 'nsXPCDispTestProperties Class'
+		{
+			ProgID = s 'XPCIDispatchTest.nsXPCDispTestProperties.1'
+			VersionIndependentProgID = s 'XPCIDispatchTest.nsXPCDispTestProperties'
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'both'
+			}
+		}
+	}
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestScriptOff.cpp

@@ -0,0 +1,23 @@
+// nsXPCDispTestScriptOff.cpp : Implementation of CXPCIDispatchTestApp and DLL registration.
+
+#include "stdafx.h"
+#include "XPCIDispatchTest.h"
+#include "nsXPCDispTestScriptOff.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+
+STDMETHODIMP nsXPCDispTestScriptOff::InterfaceSupportsErrorInfo(REFIID riid)
+{
+    static const IID* arr[] = 
+    {
+        &IID_nsIXPCDispTestScriptOff,
+    };
+
+    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    {
+        if (InlineIsEqualGUID(*arr[i],riid))
+            return S_OK;
+    }
+    return S_FALSE;
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestScriptOff.h

@@ -0,0 +1,43 @@
+// nsXPCDispTestScriptOff.h: Definition of the nsXPCDispTestScriptOff class
+//
+//////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_NSXPCDISPTESTSCRIPTOFF_H__EEC88DE0_F502_4893_9918_4E435DBC9815__INCLUDED_)
+#define AFX_NSXPCDISPTESTSCRIPTOFF_H__EEC88DE0_F502_4893_9918_4E435DBC9815__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "resource.h"       // main symbols
+#include <ATLCTL.H>
+
+/////////////////////////////////////////////////////////////////////////////
+// nsXPCDispTestScriptOff
+
+class nsXPCDispTestScriptOff : 
+    public IDispatchImpl<nsIXPCDispTestScriptOff, &IID_nsIXPCDispTestScriptOff, &LIBID_IDispatchTestLib>, 
+    public ISupportErrorInfo,
+    public CComObjectRoot,
+    public CComCoClass<nsXPCDispTestScriptOff,&CLSID_nsXPCDispTestScriptOff>,
+    public IObjectSafetyImpl<nsXPCDispTestScriptOff, 0>
+{
+public:
+    nsXPCDispTestScriptOff() {}
+BEGIN_COM_MAP(nsXPCDispTestScriptOff)
+    COM_INTERFACE_ENTRY(IDispatch)
+    COM_INTERFACE_ENTRY(nsIXPCDispTestScriptOff)
+    COM_INTERFACE_ENTRY(IObjectSafety)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
+END_COM_MAP()
+DECLARE_NOT_AGGREGATABLE(nsXPCDispTestScriptOff) 
+
+DECLARE_REGISTRY_RESOURCEID(IDR_nsXPCDispTestScriptOff)
+// ISupportsErrorInfo
+    STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
+
+// nsIXPCDispTestScriptOff
+public:
+};
+
+#endif // !defined(AFX_NSXPCDISPTESTSCRIPTOFF_H__EEC88DE0_F502_4893_9918_4E435DBC9815__INCLUDED_)

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestScriptOff.rgs

@@ -0,0 +1,23 @@
+HKCR
+{
+	XPCIDispatchTest.nsXPCDispTestScriptOff.1 = s 'nsXPCDispTestScriptOff Class'
+	{
+		CLSID = s '{959CD122-9826-4757-BA09-DE327D55F9E7}'
+	}
+	XPCIDispatchTest.nsXPCDispTestScriptOff = s 'nsXPCDispTestScriptOff Class'
+	{
+		CLSID = s '{959CD122-9826-4757-BA09-DE327D55F9E7}'
+	}
+	NoRemove CLSID
+	{
+		ForceRemove {959CD122-9826-4757-BA09-DE327D55F9E7} = s 'nsXPCDispTestScriptOff Class'
+		{
+			ProgID = s 'XPCIDispatchTest.nsXPCDispTestScriptOff.1'
+			VersionIndependentProgID = s 'XPCIDispatchTest.nsXPCDispTestScriptOff'
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'both'
+			}
+		}
+	}
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestScriptOn.cpp

@@ -0,0 +1,29 @@
+// nsXPCDispTestScriptOn.cpp : Implementation of CXPCIDispatchTestApp and DLL registration.
+
+#include "stdafx.h"
+#include "XPCIDispatchTest.h"
+#include "nsXPCDispTestScriptOn.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+
+STDMETHODIMP nsXPCDispTestScriptOn::InterfaceSupportsErrorInfo(REFIID riid)
+{
+    static const IID* arr[] = 
+    {
+        &IID_nsIXPCDispTestScriptOn,
+    };
+
+    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    {
+        if (InlineIsEqualGUID(*arr[i],riid))
+            return S_OK;
+    }
+    return S_FALSE;
+}
+
+nsXPCDispTestScriptOn::nsXPCDispTestScriptOn()
+{
+    m_dwCurrentSafety = INTERFACESAFE_FOR_UNTRUSTED_CALLER |
+        INTERFACESAFE_FOR_UNTRUSTED_DATA;
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestScriptOn.h

@@ -0,0 +1,45 @@
+// nsXPCDispTestScriptOn.h: Definition of the nsXPCDispTestScriptOn class
+//
+//////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_NSXPCDISPTESTSCRIPTON_H__C037D462_C403_48FF_A02F_6C36544F0833__INCLUDED_)
+#define AFX_NSXPCDISPTESTSCRIPTON_H__C037D462_C403_48FF_A02F_6C36544F0833__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "resource.h"       // main symbols
+#include <ATLCTL.H>
+
+/////////////////////////////////////////////////////////////////////////////
+// nsXPCDispTestScriptOn
+
+class nsXPCDispTestScriptOn : 
+    public IDispatchImpl<nsIXPCDispTestScriptOn, &IID_nsIXPCDispTestScriptOn, &LIBID_IDispatchTestLib>, 
+    public ISupportErrorInfo,
+    public CComObjectRoot,
+    public CComCoClass<nsXPCDispTestScriptOn,&CLSID_nsXPCDispTestScriptOn>,
+    public IObjectSafetyImpl<nsXPCDispTestScriptOn,
+                             INTERFACESAFE_FOR_UNTRUSTED_CALLER | 
+                                 INTERFACESAFE_FOR_UNTRUSTED_DATA>
+{
+public:
+    nsXPCDispTestScriptOn();
+BEGIN_COM_MAP(nsXPCDispTestScriptOn)
+    COM_INTERFACE_ENTRY(IDispatch)
+    COM_INTERFACE_ENTRY(nsIXPCDispTestScriptOn)
+    COM_INTERFACE_ENTRY(IObjectSafety)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
+END_COM_MAP()
+DECLARE_NOT_AGGREGATABLE(nsXPCDispTestScriptOn) 
+
+DECLARE_REGISTRY_RESOURCEID(IDR_nsXPCDispTestScriptOn)
+// ISupportsErrorInfo
+    STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
+
+// nsIXPCDispTestScriptOn
+public:
+};
+
+#endif // !defined(AFX_NSXPCDISPTESTSCRIPTON_H__C037D462_C403_48FF_A02F_6C36544F0833__INCLUDED_)

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestScriptOn.rgs

@@ -0,0 +1,23 @@
+HKCR
+{
+	XPCIDispatchTest.nsXPCDispTestScriptOn.1 = s 'nsXPCDispTestScriptOn Class'
+	{
+		CLSID = s '{2A06373F-3E61-4882-A3D7-A104F70B09ED}'
+	}
+	XPCIDispatchTest.nsXPCDispTestScriptOn = s 'nsXPCDispTestScriptOn Class'
+	{
+		CLSID = s '{2A06373F-3E61-4882-A3D7-A104F70B09ED}'
+	}
+	NoRemove CLSID
+	{
+		ForceRemove {2A06373F-3E61-4882-A3D7-A104F70B09ED} = s 'nsXPCDispTestScriptOn Class'
+		{
+			ProgID = s 'XPCIDispatchTest.nsXPCDispTestScriptOn.1'
+			VersionIndependentProgID = s 'XPCIDispatchTest.nsXPCDispTestScriptOn'
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'both'
+			}
+		}
+	}
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestWrappedJS.cpp

@@ -0,0 +1,177 @@
+// nsXPCDispTestWrappedJS.cpp : Implementation of CXPCIDispatchTestApp and DLL registration.
+
+#include "stdafx.h"
+#include "XPCIDispatchTest.h"
+#include "nsXPCDispTestWrappedJS.h"
+#include <string>
+#include <sstream>
+
+/////////////////////////////////////////////////////////////////////////////
+//
+
+STDMETHODIMP nsXPCDispTestWrappedJS::InterfaceSupportsErrorInfo(REFIID riid)
+{
+	static const IID* arr[] = 
+	{
+		&IID_nsIXPCDispTestWrappedJS,
+	};
+
+	for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+	{
+		if (InlineIsEqualGUID(*arr[i],riid))
+			return S_OK;
+	}
+	return S_FALSE;
+}
+
+struct TestData
+{
+    typedef bool (*CompFunc)(const _variant_t & left, const _variant_t & right);
+    TestData(const char * name, const _variant_t & value, CompFunc cf) : 
+        mName(name), mValue(value), mCompFunc(cf) {}
+    const char * mName;
+    _variant_t mValue;
+    CompFunc mCompFunc;
+    
+};
+
+bool CompareVariant(const _variant_t & left, const _variant_t & right)
+{
+    return left == right;
+}
+
+// These should be a template but VC++6 is brain dead in this area
+#define CompareFunction(type)                                               \
+bool CompareVariant##type(const _variant_t & left, const _variant_t & right)     \
+{                                                                           \
+    return static_cast<type>(left) == static_cast<type>(right);   \
+}
+
+CompareFunction(long);
+CompareFunction(float);
+CompareFunction(double);
+CompareFunction(_bstr_t);
+
+DISPID GetIDsOfNames(IDispatch * pIDispatch , char const * i_Method)
+{
+    DISPID dispid;
+    CComBSTR method(i_Method);
+    OLECHAR * pMethod = method;
+    HRESULT hresult = pIDispatch->GetIDsOfNames(
+        IID_NULL,
+        &pMethod,
+        1, 
+        LOCALE_SYSTEM_DEFAULT,
+        &dispid);
+    if (!SUCCEEDED(hresult))
+    {
+        dispid = 0;
+    }
+    return dispid;
+}
+
+namespace
+{
+
+inline
+_bstr_t ConvertVariantFromBSTR(_variant_t & variant)
+{
+    VARIANT temp = variant;
+    if (SUCCEEDED(VariantChangeType(&temp, &temp, 0, VT_BSTR)))
+    {
+        variant.Attach(temp);
+        return static_cast<_bstr_t>(variant);
+    }
+    return "**Type Conversion failed";
+}
+
+std::string DispInvoke(IDispatch * obj, const TestData & testData)
+{
+    // Perform a put on the property
+    ITypeInfo * pTypeInfo;
+    obj->GetTypeInfo(0, LOCALE_SYSTEM_DEFAULT, &pTypeInfo);
+    DISPID dispID = ::GetIDsOfNames(obj, testData.mName);
+    DISPPARAMS dispParams;
+    dispParams.cArgs = 1;
+    dispParams.rgvarg = const_cast<VARIANT*>(&reinterpret_cast<const VARIANT&>(testData.mValue));
+    dispParams.cNamedArgs = 1;
+    DISPID propPut = DISPID_PROPERTYPUT;
+    dispParams.rgdispidNamedArgs = &propPut;
+    _variant_t result1;
+    HRESULT hResult = obj->Invoke(dispID, IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dispParams, &result1, 0, 0);
+    if (FAILED(hResult))
+    {
+        std::ostringstream msg;
+        msg << "IDispatch::Invoke on " << testData.mName << " failed to set property with result " << hResult;
+        return msg.str();
+    }
+    dispParams.cArgs = 1;
+    dispParams.rgvarg = const_cast<VARIANT*>(&reinterpret_cast<const VARIANT&>(testData.mValue));
+    dispParams.cNamedArgs = 0;
+    dispParams.rgdispidNamedArgs = 0;
+    _variant_t result2;
+    hResult = obj->Invoke(dispID, IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, &dispParams, &result2, 0, 0);
+    if (FAILED(hResult))
+    {
+        std::ostringstream msg;
+        msg << "IDispatch::Invoke on " << testData.mName << " failed to retrieve property with result " << hResult;
+        return msg.str();
+    }
+    if (!testData.mCompFunc(result2,testData.mValue))
+    {
+        std::ostringstream msg;
+        VARIANT temp = testData.mValue;
+        char const * const desired = SUCCEEDED(VariantChangeType(&temp, &temp, 0, VT_BSTR)) ? 0 : "**Conversion Failed";
+        char const * const actual = SUCCEEDED(VariantChangeType(&result2, &result2, 0, VT_BSTR)) ? 0 : "**Conversion Failed";
+
+        msg << testData.mName << " ["
+            << (desired ? desired : static_cast<char const *>(static_cast<_bstr_t>(testData.mValue))) << "] [" 
+            << (actual ? actual : static_cast<char const *>(static_cast<_bstr_t>(result2))) << "]";
+        return msg.str();
+    }
+    return std::string();
+}
+
+}
+
+STDMETHODIMP nsXPCDispTestWrappedJS::TestParamTypes(IDispatch *obj, BSTR *errMsg)
+{
+    CComPtr<IDispatch> ptr;
+    CComBSTR progID("XPCIDispatchTest.nsXPCDispSimple.1");
+    ptr.CoCreateInstance(progID);
+    _variant_t dispatchPtr;
+    dispatchPtr = static_cast<IDispatch*>(ptr);
+    CURRENCY currency;
+    currency.int64 = 55555;
+    _variant_t date(3000.0, VT_DATE);
+    _variant_t nullVariant;
+    nullVariant.ChangeType(VT_NULL);
+    const TestData tests[] =
+    {
+        TestData("Boolean", _variant_t(true), CompareVariant),
+        TestData("Short", _variant_t(short(4200)), reinterpret_cast<TestData::CompFunc>(CompareVariantlong)),
+        TestData("Long", _variant_t(long(-42000000)), CompareVariantlong),
+        TestData("Float", _variant_t(float(4.5)), CompareVariantfloat),
+        TestData("Double", _variant_t(-11111.11), CompareVariant),
+//        TestData("Currency", _variant_t(currency), CompareVariantdouble),
+        TestData("Date", date, CompareVariant_bstr_t),
+        TestData("String", _variant_t("A String"), CompareVariant),
+        TestData("DispatchPtr", dispatchPtr, CompareVariant),
+//        TestData("SCode", _variant_t(long(5), VT_ERROR), CompareVariant_bstr_t),
+        TestData("Variant", nullVariant, CompareVariant),
+        TestData("Char", _variant_t(BYTE('x')), CompareVariant_bstr_t)
+    };
+    std::string errors;
+    for (size_t index = 0; index < sizeof(tests) / sizeof(TestData); ++index)
+    {
+        std::string msg = DispInvoke(obj, tests[index]);
+        if (!msg.empty())
+        {
+            errors += msg;
+            errors += "\r\n";
+        }
+    }
+    CComBSTR errorMsg(errors.c_str());
+    *errMsg = errorMsg.Detach();
+    return S_OK;
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestWrappedJS.h

@@ -0,0 +1,50 @@
+// nsXPCDispTestWrappedJS.h: Definition of the nsXPCDispTestWrappedJS class
+//
+//////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_NSXPCDISPTESTWRAPPEDJS_H__DAAB3C99_1894_40C2_B12B_A360739F8977__INCLUDED_)
+#define AFX_NSXPCDISPTESTWRAPPEDJS_H__DAAB3C99_1894_40C2_B12B_A360739F8977__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "resource.h"       // main symbols
+
+/////////////////////////////////////////////////////////////////////////////
+// nsXPCDispTestWrappedJS
+
+class nsXPCDispTestWrappedJS : 
+	public IDispatchImpl<nsIXPCDispTestWrappedJS, &IID_nsIXPCDispTestWrappedJS, &LIBID_IDispatchTestLib>, 
+	public ISupportErrorInfo,
+	public CComObjectRoot,
+	public CComCoClass<nsXPCDispTestWrappedJS,&CLSID_nsXPCDispTestWrappedJS>
+{
+public:
+	nsXPCDispTestWrappedJS() {}
+BEGIN_CATEGORY_MAP(nsXPCDispTestWrappedJS)
+    IMPLEMENTED_CATEGORY(CATID_SafeForScripting)
+END_CATEGORY_MAP()
+BEGIN_COM_MAP(nsXPCDispTestWrappedJS)
+	COM_INTERFACE_ENTRY(IDispatch)
+	COM_INTERFACE_ENTRY(nsIXPCDispTestWrappedJS)
+	COM_INTERFACE_ENTRY(ISupportErrorInfo)
+END_COM_MAP()
+DECLARE_NOT_AGGREGATABLE(nsXPCDispTestWrappedJS) 
+
+DECLARE_REGISTRY_RESOURCEID(IDR_nsXPCDispTestWrappedJS)
+// ISupportsErrorInfo
+	STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
+
+// nsIXPCDispTestWrappedJS
+public:
+    /**
+     * This tests interacting with JS Objects via IDispatch
+     * @param obj the object being tested
+     * @param errMsg string receiving any error message, blank if no error
+     */
+	STDMETHOD(TestParamTypes)(/*[in]*/ IDispatch * obj, 
+                              /*[out]*/BSTR * errMsg);
+};
+
+#endif // !defined(AFX_NSXPCDISPTESTWRAPPEDJS_H__DAAB3C99_1894_40C2_B12B_A360739F8977__INCLUDED_)

mozilla/js/src/xpconnect/tests/idispatch/COM/nsXPCDispTestWrappedJS.rgs

@@ -0,0 +1,23 @@
+HKCR
+{
+	XPCIDispatchTest.nsXPCDispTestWrappedJS.1 = s 'nsXPCDispTestWrappedJS Class'
+	{
+		CLSID = s '{EAEE6BB2-C005-4B91-BCA7-6613236F6F69}'
+	}
+	XPCIDispatchTest.nsXPCDispTestWrappedJS = s 'nsXPCDispTestWrappedJS Class'
+	{
+		CLSID = s '{EAEE6BB2-C005-4B91-BCA7-6613236F6F69}'
+	}
+	NoRemove CLSID
+	{
+		ForceRemove {EAEE6BB2-C005-4B91-BCA7-6613236F6F69} = s 'nsXPCDispTestWrappedJS Class'
+		{
+			ProgID = s 'XPCIDispatchTest.nsXPCDispTestWrappedJS.1'
+			VersionIndependentProgID = s 'XPCIDispatchTest.nsXPCDispTestWrappedJS'
+			InprocServer32 = s '%MODULE%'
+			{
+				val ThreadingModel = s 'both'
+			}
+		}
+	}
+}

mozilla/js/src/xpconnect/tests/idispatch/COM/resource.h

@@ -0,0 +1,36 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by XPCIDispatchTest.rc
+//
+#define IDS_PROJNAME                    100
+#define IDS_NSXPCDISPTTESTMETHODS_DESC  101
+#define IDR_nsXPCDisptTestMethods       102
+#define IDS_NSXPCDISPTESTMETHODS_DESC   103
+#define IDR_nsXPCDispTestMethods        104
+#define IDS_NSXPCDISPSIMPLE_DESC        105
+#define IDR_nsXPCDispSimple             106
+#define IDS_NSXPCDISPTESTNOIDISPATCH_DESC 107
+#define IDR_nsXPCDispTestNoIDispatch    108
+#define IDS_NSXPCDISPTESTNOSCRIPT_DESC  109
+#define IDR_nsXPCDispTestNoScript       110
+#define IDS_NSXPCDISPTESTPROPERTIES_DESC 111
+#define IDR_nsXPCDispTestProperties     112
+#define IDS_NSXPCDISPTESTARRAYS_DESC    113
+#define IDR_nsXPCDispTestArrays         114
+#define IDS_NSXPCDISPTESTSCRIPTON_DESC  115
+#define IDR_nsXPCDispTestScriptOn       116
+#define IDS_NSXPCDISPTESTSCRIPTOFF_DESC 117
+#define IDR_nsXPCDispTestScriptOff      118
+#define IDS_NSXPCDISPTESTWRAPPEDJS_DESC 119
+#define IDR_nsXPCDispTestWrappedJS      120
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        204
+#define _APS_NEXT_COMMAND_VALUE         32768
+#define _APS_NEXT_CONTROL_VALUE         201
+#define _APS_NEXT_SYMED_VALUE           121
+#endif
+#endif

mozilla/js/src/xpconnect/tests/idispatch/Tests/WrappedCOM/Arrays/XPCIDispatchArrayTests.js

@@ -0,0 +1,54 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 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 the IDispatch implementation for XPConnect
+ *
+ * The Initial Developer of the Original Code is
+ * David Bradley.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Verify that we can access but not overwrite the values of read-only 
+ * attributes.
+ */
+
+test();
+
+function test()
+{
+    printStatus("Testing arrays");  
+    var obj = COMObject(CLSID_nsXPCDispTestArrays);
+    var anArray = [ 0, 1, 2, 3];
+    obj.TakesSafeArray(anArray);
+    var strArray = [ "0", "1", "2", "3"];
+    obj.TakesSafeArrayBSTR(strArray);
+	return 0;
+}

mozilla/js/src/xpconnect/tests/idispatch/Tests/WrappedCOM/Attributes/XPCIDispatchAttributeTests.js

@@ -0,0 +1,150 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 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 the IDispatch implementation for XPConnect
+ *
+ * The Initial Developer of the Original Code is
+ * David Bradley.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * \file XPCIDispatchAttributeTests.js
+ * Test IDispatch properties and also type conversion
+ */
+
+try
+{
+	// Test object used to test IDispatch property.
+    testObject = { one : 1, two : 2, three : 'three' };
+    test();
+}
+catch (e)
+{
+    reportFailure("Unhandled exception encountered: " + e.toString());
+}
+
+/**
+ * Main function to perform test
+ */
+function test()
+{
+    printStatus("Read-Write Attributes");
+
+    /*
+    * These values come from xpctest_attributes.idl and xpctest_attributes.cpp
+    */
+
+    o = COMObject(CLSID_nsXPCDispTestProperties);
+
+    // Check the class an interface to make sure they're ok
+    reportCompare(
+        "object",
+        typeof o,
+        "typeof COMObject(CLSID_nsXPCDispTestProperties)");
+    // Make sure we can read the values
+    testProperty("o.Boolean", ["true", "1","testObject", "'T'", "'F'", "'true'","'false'"], false);
+    testProperty("o.Char", ["32"], true);
+    testProperty("o.COMPtr", ["0"], true);
+    testProperty("o.Currency", ["0", "0.5", "10000.00"], true);
+    testProperty("o.Date", ["'04/01/03'"], false);
+    testProperty("o.DispatchPtr", ["testObject"], false);
+    testProperty("o.Double", ["5.555555555555555555555", "5.555555555555555555555", "5", "-5"], true);
+    testProperty("o.Float", ["-5.55555555", "5.5555555", "5", "-5"], true);
+    testProperty("o.Long", ["-5", "1073741823", "-1073741824", "1073741824", "-1073741825", "5.5"], true);
+    testProperty("o.SCode", ["5"], true);
+    testProperty("o.Short", ["5", "-5", "32767", "-32768"], true);
+    testProperty("o.String", ["'A String'", "'c'", "5", "true"], false);
+    testProperty("o.Variant", ["'A Variant String'", "testObject", "10", "5.5"], false);
+    
+    // Parameterized property tests
+    for (index = 0; index < o.ParameterizedPropertyCount; ++index)
+        compareExpression(
+            "o.ParameterizedProperty(index)",
+            index + 1,
+            "Reading initial value from parameterized property " + index);
+    for (index = 0; index < o.ParameterizedPropertyCount; ++index)
+        compareExpression(
+            "o.ParameterizedProperty(index) = index + 5",
+            index + 5,
+            "Assigning parameterized property " + index);
+
+    for (index = 0; index < o.ParameterizedPropertyCount; ++index)
+        compareExpression(
+            "o.ParameterizedProperty(index)",
+            index + 5,
+            "Reading new value from parameterized property " + index);
+}
+
+/**
+ * Tests retrieving a value from a property and setting multiple values on
+ * the property
+ */
+function testProperty(propertyExpression, values, tryString)
+{
+    print(propertyExpression);
+    try
+    {
+        reportCompare(
+            eval(propertyExpression),
+            eval(propertyExpression),
+            propertyExpression);
+    }
+    catch (e)
+    {
+        reportFailure("Testing initial value of " + propertyExpression + " Exception: " + e.toString());
+    }
+    for (i = 0; i < values.length; ++i)
+    {
+        var value = values[i];
+        var expression = propertyExpression + "=" + value;
+        print(expression);
+        try
+        {
+            reportCompare(
+                eval(expression),
+                eval(value),
+                expression);
+            if (tryString)
+            {
+                expression = propertyExpression + "='" + value + "'";
+                print(expression);
+                reportCompare(
+                    eval(expression),
+                    eval("'" + value + "'"),
+                    expression);
+            }
+        }
+        catch (e)
+        {
+            reportFailure("Testing assignment: " + expression + " Exception: " + e.toString());
+        }
+    }
+}

mozilla/js/src/xpconnect/tests/idispatch/Tests/WrappedCOM/General/XPCIDispatchInstantiations.js

@@ -0,0 +1,122 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 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 the IDispatch implementation for XPConnect
+ *
+ * The Initial Developer of the Original Code is
+ * David Bradley.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Verify that we can access but not overwrite the values of read-only 
+ * attributes.
+ */
+
+test();
+
+function testInstantiate(name, id, scriptable, methods)
+{
+    var IDISPATCH_TEXT = "[xpconnect wrapped IDispatch";
+    var obj = COMObject(id);
+    var value = obj.toString().substr(0, IDISPATCH_TEXT.length);
+    reportCompare(
+        IDISPATCH_TEXT,
+        value,
+        "var obj = COMObject(" + id + ");");
+    try
+    {
+        obj = COMObject(id);
+    }
+    catch (e)
+    {
+        if (scriptable)
+        {
+            reportFailure("COMObject('" + id + "') generated an exception");
+        }
+        return;
+    }
+    value = obj.toString().substr(0, IDISPATCH_TEXT.length);
+    reportCompare(
+        scriptable ? IDISPATCH_TEXT : undefined,
+        scriptable ? value : obj,
+        "var obj = COMObject(" + id + ");");
+}
+
+function testEnumeration(compInfo)
+{
+    var obj = COMObject(compInfo.cid);
+    compareObject(obj, compInfo, "Enumeration Test");
+}
+
+function test()
+{
+    try
+    {
+
+        printStatus("Instantiation Tests - " + objectsDesc.length + " objects to test");
+        for (index = 0; index < objectsDesc.length; ++index)
+        {
+            compInfo = objectsDesc[index];
+            printStatus("Testing " + compInfo.name);
+            testInstantiate(compInfo.name, compInfo.cid, compInfo.scriptable);
+            testInstantiate(compInfo.name, compInfo.progid, compInfo.scriptable);
+        }
+        // Test a non-existant COM object
+        var obj;
+        try
+        {
+            obj = COMObject("dwbnonexistantobject");
+            printFailure("var obj = COMObject('dwbnonexistantobject'); did not throw an exception");
+        }
+        catch (e)
+        {
+        }
+        try
+        {
+            obj = COMObject("dwbnonexistantobject");
+            printFailure("obj = COMObject('dwbnonexistantobject'); did not throw an exception");
+        }
+        catch (e)
+        {
+        }
+        printStatus("Enumeration Tests - testing " + objectsDesc.length + " objects");
+        for (var index = 0; index < objectsDesc.length; ++index)
+        {
+            printStatus("Enumerating " + objectsDesc[index].name);
+            testEnumeration(objectsDesc[index]);
+        }
+
+    } 
+    catch (e)
+    {
+        reportFailure("Unhandled exception occured:" + e.toString());
+    }
+}

mozilla/js/src/xpconnect/tests/idispatch/Tests/WrappedCOM/General/XPCStress.js

@@ -0,0 +1,58 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 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 the IDispatch implementation for XPConnect
+ *
+ * The Initial Developer of the Original Code is
+ * David Bradley.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Make repeated calls so GC kicks in and we can check for memory leaks.
+ */
+
+test();
+
+function test()
+{
+	printStatus("Stress testing");	
+	for (index = 0; index < 10000; ++index)
+	{
+		for (x = 0; x < objectsDesc.length; ++x)
+		{
+			var obj = COMObject(objectsDesc[x].cid);
+			for (prop in obj)
+			{
+				print(index + ":" +objectsDesc[x].name + ":" + prop);
+			}
+		}
+	}
+}

mozilla/js/src/xpconnect/tests/idispatch/Tests/WrappedCOM/Methods/XPCIDispatchMethodTests.js

@@ -0,0 +1,376 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 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 the IDispatch implementation for XPConnect
+ *
+ * The Initial Developer of the Original Code is
+ * David Bradley.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Verify that we can access but not overwrite the values of read-only 
+ * attributes.
+ */
+
+test();
+
+function TestOutMethod(obj, method, value)
+{
+    printDebug("TestOutMethod - " + method);
+    var x = new Object();
+    try
+    {
+        obj[method](x);
+        reportCompare(value, x.value, "Testing output parameter: " + method);
+    }
+    catch (e)
+    {
+        reportFailure("Testing output parameter failed: " + method + ": " + e.toString());
+    }
+}
+
+function TestReturnMethod(obj, method, value)
+{
+    printDebug("TestReturnMethod - " + method);
+    try
+    {
+        reportCompare(value, obj[method](), "Testing output parameter: " + method);
+    }
+    catch (e)
+    {
+        reportFailure("Testing return value failed: " + method + ": " + e.toString());
+    }
+}
+
+function TestInputMethod(obj, method, value)
+{
+    printDebug("TestInputMethod - " + method);
+    try
+    {
+        obj[method.toLowerCase()](value);
+    }
+    catch (e)
+    {
+        reportFailure("Testing input parameter failed: " + method + ": " + e.toString());
+    }
+}
+
+function TestInOutMethod(obj, method, inValue, outValue)
+{
+    printDebug("TestInOutMethod - " + method);
+    try
+    {
+        var param = { value : inValue };
+        obj[method](param);
+        reportCompare(outValue, param.value, "Testing in/out parameter: " + method);
+    }
+    catch (e)
+    {
+        reportFailure("Testing in/out parameter failed: " + method + ": " + e.toString());
+    }
+}
+
+function test()
+{
+    printStatus("Testing methods"); 
+    var obj = COMObject(CLSID_nsXPCDispTestMethods);    
+    try
+    {
+        obj.NoParameters();
+    }
+    catch (e)
+    {
+        reportFailure("NoParameters failed: " + e.toString());
+    }
+    printStatus("Test method - Return values"); 
+    TestReturnMethod(obj, "ReturnBSTR", "Boo");
+    TestReturnMethod(obj, "ReturnI4",99999);
+    TestReturnMethod(obj, "ReturnUI1", 99);
+    TestReturnMethod(obj, "ReturnI2",9999);
+    TestReturnMethod(obj, "ReturnR4",99999.1);
+    TestReturnMethod(obj, "ReturnR8", 99999999999.99);
+    TestReturnMethod(obj, "ReturnBool", true);
+
+    printStatus("TestReturnMethod - ReturnIDispatch");
+    compareObject(obj.ReturnIDispatch(), nsXPCDispSimpleDesc, "Test method - Return IDispatch"); 
+    var E_FAIL= -2147467259;
+    TestReturnMethod(obj, "ReturnError", E_FAIL);
+    TestReturnMethod(obj, "ReturnDate", "5/2/2002");
+    // TestReturnMethod(obj, ReturnIUnknown(IUnknown * * result)
+    TestReturnMethod(obj, "ReturnI1", 120);
+    TestReturnMethod(obj, "ReturnUI2", 9999);
+    TestReturnMethod(obj, "ReturnUI4", 3000000000);
+    TestReturnMethod(obj, "ReturnInt", -999999);
+    TestReturnMethod(obj, "ReturnUInt", 3000000000);
+
+    printStatus("Test method - Input params");
+    TestInputMethod(obj, "TakesBSTR", "TakesBSTR");
+    TestInputMethod(obj, "TakesI4", 999999);
+    TestInputMethod(obj, "TakesUI1", 42);
+    TestInputMethod(obj, "TakesI2", 32000);
+    TestInputMethod(obj, "TakesR4", 99999.99);
+    TestInputMethod(obj, "TakesR8", 999999999.99);
+    TestInputMethod(obj, "TakesBool", true);
+    var x = { Number : 5, ClassName : "nsXPCDispSimple" };
+    TestInputMethod(obj, "TakesIDispatch", x);
+    // This would always fail, type mismatch (no way to indicate this is going
+    // to an error, and there's no automatic conversion from integers to error
+    // codes
+    // TestInputMethod(obj, "TakesError", E_FAIL);
+    TestInputMethod(obj, "TakesDate", "5/2/2002");
+    // TestInputMethod(obj, TakesIUnknown, );
+    TestInputMethod(obj, "TakesI1", 42);
+    TestInputMethod(obj, "TakesUI2", 50000);
+    TestInputMethod(obj, "TakesUI4", 4026531840);
+    TestInputMethod(obj, "TakesInt", -10000000);
+    TestInputMethod(obj, "TakesUInt", 3758096384);
+
+    printStatus("Test method - Output params");
+    TestOutMethod(obj, "OutputsBSTR", "Boo");
+    TestOutMethod(obj, "OutputsI4",99999);
+    TestOutMethod(obj, "OutputsUI1", 99);
+    TestOutMethod(obj, "OutputsI2",9999);
+    TestOutMethod(obj, "OutputsR4",999999.1);
+    TestOutMethod(obj, "OutputsR8", 99999999999.99);
+    TestOutMethod(obj, "OutputsBool", true);
+
+    var outParam = new Object();
+    obj.OutputsIDispatch(outParam);
+    compareObject(outParam.value, nsXPCDispSimpleDesc, "Test method - Output params"); 
+    TestOutMethod(obj, "OutputsError", E_FAIL);
+    TestOutMethod(obj, "OutputsDate", "5/2/2002");
+    // TestOutMethod(obj, OutputsIUnknown(IUnknown * * result)
+    TestOutMethod(obj, "OutputsI1", 120);
+    TestOutMethod(obj, "OutputsUI2", 9999);
+    TestOutMethod(obj, "OutputsUI4", 3000000000);
+
+    printStatus("Test method - In/out params");
+    TestInOutMethod(obj, "InOutsBSTR", "String", "StringAppended");
+    TestInOutMethod(obj, "InOutsI4", 2000000, -2000000);
+    TestInOutMethod(obj, "InOutsUI1", 50, 8);
+    TestInOutMethod(obj, "InOutsI2", -1000, 9000);
+    TestInOutMethod(obj, "InOutsR4", -2.05, 3.0);
+    TestInOutMethod(obj, "InOutsR8", -5.5, 49999994.50000005);
+    TestInOutMethod(obj, "InOutsBool", true, false);
+    TestInOutMethod(obj, "InOutsBool", false, true);
+    var inoutParam = { value : {ClassName : "InOutTest", Number : 10 } };
+    try
+    {
+        obj.InOutsIDispatch(inoutParam);
+        if (inoutParam.value.Number != 15)
+            reportFailure("Testing in/out parameter failed: IDispatch");
+    }
+    catch (e)
+    {
+        reportFailure("Testing in/out parameter failed: IDispatch - " + e.toString());
+    }
+    // See the TakesError case
+    //TestInOutMethod(obj, "InOutsError", E_FAIL, E_FAIL + 1);
+    TestInOutMethod(obj, "InOutsDate", "5/23/2001", "5/24/2001");
+    //TestInOutMethod(obj, InOutsIUnknown(IUnknown * * result)
+    TestInOutMethod(obj, "InOutsI1", -42, -41);
+    TestInOutMethod(obj, "InOutsUI2", 43, 85);
+    TestInOutMethod(obj, "InOutsUI4", 88, 46);
+
+    try
+    {
+        reportCompare(obj.OneParameterWithReturn(-20), 22, "Testing OneParameterWithReturn");
+    }
+    catch (e)
+    {
+        reportFailure("Testing OneParameterWithReturn: " + e.toString());
+    }
+
+    try
+    {
+        reportCompare(obj.StringInputAndReturn("A String "), "A String Appended", "Testing StringInputAndReturn");
+    }
+    catch (e)
+    {
+        reportFailure("Testing StringInputAndReturn: " + e.toString());
+    }
+    try
+    {
+        var inoutIDispatch = {  className : "inouttest", Number : 5 };
+        var result = obj.IDispatchInputAndReturn(inoutIDispatch);
+        reportCompare(81, result.Number, "IDispatchInputAndReturn");
+    }
+    catch (e)
+    {
+        reportFailure("Testing IDispatchInputAndReturn: " + e.toString());
+    }
+    try
+    {
+        obj.TwoParameters(1, 2);
+    }
+    catch (e)
+    {
+        reportFailure("Testing TwoParameters: " + e.toString());
+    }
+
+    try
+    {
+        obj.TwelveInParameters(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
+    }
+    catch (e)
+    {
+        reportFailure("Testing TwelveInParameters: " + e.toString());
+    }
+
+    try
+    {
+        var out1 = new Object();
+        var out2 = new Object();
+        var out3 = new Object();
+        var out4 = new Object();
+        var out5 = new Object();
+        var out6 = new Object();
+        var out7 = new Object();
+        var out8 = new Object();
+        var out9 = new Object();
+        var out10 = new Object();
+        var out11 = new Object();
+        var out12 = new Object();
+        obj.TwelveOutParameters(out1, out2, out3, out4, out5, out6, out7, out8, out9, out10, out11, out12);
+        reportCompare(78, out1.value + out2.value + out3.value + out4.value + out5.value + out6.value + out7.value + out8.value + out9.value + out10.value + out11.value + out12.value, "Testing TwelveOutParameters");
+    }
+    catch (e)
+    {
+        reportFailure("Testing TwelveOutParameters: " + e.toString());
+    }
+
+    try
+    {
+        obj.TwelveStrings("one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", "eleven", "twelve");
+    }
+    catch (e)
+    {
+        reportFailure("Testing TwelveStrings: " + e.toString());
+    }
+
+    try
+    {
+        var out1 = new Object();
+        var out2 = new Object();
+        var out3 = new Object();
+        var out4 = new Object();
+        var out5 = new Object();
+        var out6 = new Object();
+        var out7 = new Object();
+        var out8 = new Object();
+        var out9 = new Object();
+        var out10 = new Object();
+        var out11 = new Object();
+        var out12 = new Object();
+        obj.TwelveOutStrings(out1, out2, out3, out4, out5, out6, out7, out8, out9, out10, out11, out12);
+        reportCompare(true, out1.value == "one" && out2.value == "two" &&
+                            out3.value == "three" && out4.value == "four" &&
+                            out5.value == "five" && out6.value == "six" &&
+                            out7.value == "seven" && out8.value == "eight" &&
+                            out9.value == "nine" && out10.value == "ten" &&
+                            out11.value == "eleven" && out12.value == "twelve",
+                      "Testing TwelveOutString");
+    }
+    catch (e)
+    {
+        reportFailure("Testing TwelveOutParameters: " + e.toString());
+    }
+    try
+    {
+        var out1 = { className : "out1", Number : 5 };
+        var out2 = { className : "out2", Number : 5 };
+        var out3 = { className : "out3", Number : 5 };
+        var out4 = { className : "out4", Number : 5 };
+        var out5 = { className : "out5", Number : 5 };
+        var out6 = { className : "out6", Number : 5 };
+        var out7 = { className : "out7", Number : 5 };
+        var out8 = { className : "out8", Number : 5 };
+        var out9 = { className : "out9", Number : 5 };
+        var out10 = { className : "out10", Number : 5 };
+        var out11 = { className : "out11", Number : 5 };
+        var out12 = { className : "out12", Number : 5 };
+        obj.TwelveIDispatch(out1, out2, out3, out4, out5, out6, out7, out8, out9, out10, out11, out12);
+    }
+    catch (e)
+    {
+        reportFailure("Testing TwelveIDispatch: " + e.toString());
+    }
+    try
+    {
+        var out1 = new Object();
+        var out2 = new Object();
+        var out3 = new Object();
+        var out4 = new Object();
+        var out5 = new Object();
+        var out6 = new Object();
+        var out7 = new Object();
+        var out8 = new Object();
+        var out9 = new Object();
+        var out10 = new Object();
+        var out11 = new Object();
+        var out12 = new Object();
+        obj.TwelveOutIDispatch(out1, out2, out3, out4, out5, out6, out7, out8, out9, out10, out11, out12);
+        print("out1.value" + out1.value.Number);
+        reportCompare(true, out1.value.Number == 5 && out2.value.Number == 5 &&
+                            out3.value.Number == 5 && out4.value.Number == 5 &&
+                            out5.value.Number == 5 && out6.value.Number == 5 &&
+                            out7.value.Number == 5 && out8.value.Number == 5 &&
+                            out9.value.Number == 5 && out10.value.Number == 5 &&
+                            out11.value.Number == 5 && out12.value.Number == 5,
+                      "Testing TwelveOutIDispatch");
+        compareObject(out1.value, nsXPCDispSimpleDesc, "Testing TwelveOutParameters - out1");
+        compareObject(out2.value, nsXPCDispSimpleDesc, "Testing TwelveOutParameters - out2");
+        compareObject(out3.value, nsXPCDispSimpleDesc, "Testing TwelveOutParameters - out3");
+        compareObject(out4.value, nsXPCDispSimpleDesc, "Testing TwelveOutParameters - out4");
+        compareObject(out5.value, nsXPCDispSimpleDesc, "Testing TwelveOutParameters - out5");
+        compareObject(out6.value, nsXPCDispSimpleDesc, "Testing TwelveOutParameters - out6");
+        compareObject(out7.value, nsXPCDispSimpleDesc, "Testing TwelveOutParameters - out7");
+        compareObject(out8.value, nsXPCDispSimpleDesc, "Testing TwelveOutParameters - out8");
+        compareObject(out9.value, nsXPCDispSimpleDesc, "Testing TwelveOutParameters - out9");
+        compareObject(out10.value, nsXPCDispSimpleDesc, "Testing TwelveOutParameters - out10");
+        compareObject(out11.value, nsXPCDispSimpleDesc, "Testing TwelveOutParameters - out11");
+        compareObject(out12.value, nsXPCDispSimpleDesc, "Testing TwelveOutParameters - out12");
+    }
+    catch (e)
+    {
+        reportFailure("Testing TwelveOutIDispatch: " + e.toString());
+    }
+
+    try
+    {
+        obj.CreateError();
+        reportFailure("Testing CreateError: Didn't generate a catchable exception");
+    }
+    catch (e)
+    {
+        reportCompare(true, e.toString().search("CreateError Test") != -1, "Testing CreateError");
+    }
+}

mozilla/js/src/xpconnect/tests/idispatch/Tests/WrappedCOM/shell.js

@@ -0,0 +1,361 @@
+/* -*- 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 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 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ * Rob Ginda rginda@netscape.com
+ */
+
+FAILED = "FAILED!: ";
+STATUS = "STATUS: ";
+BUGNUMBER = "BUGNUMBER: ";
+DEBUGLINE = "DEBUG: ";
+
+DEBUG = false;
+VERBOSE = false;
+
+var CLSID_nsXPCDispSimple = "{9F39237C-D179-4260-8EF3-4B6D4D7D5570}";
+var ProgID_nsXPCDispSimple = "XPCIDispatchTest.nsXPCDispSimple.1";
+var nsXPCDispSimpleDesc =
+{
+    name : "nsXPCDispSimple", 
+    cid : CLSID_nsXPCDispSimple, 
+    progid : ProgID_nsXPCDispSimple, 
+    scriptable : true,
+    methods :
+    [
+        "ClassName",
+        "Number"
+    ]
+};
+
+var CLSID_nsXPCDispTestMethods = "{745D1149-9F46-418C-B176-71EAA98974BA}";
+var ProgID_nsXPCDispTestMethods = "XPCIDispatchTest.nsXPCDispTestMethods.1";
+var nsXPCDispTestMethodsDesc = 
+{
+    name : "nsXPCDispTestMethods", 
+    cid : CLSID_nsXPCDispTestMethods, 
+    progid : ProgID_nsXPCDispTestMethods, 
+    scriptable : true,
+    methods : 
+    [
+        "NoParameters", "ReturnBSTR", "ReturnI4",
+        "ReturnUI1", "ReturnI2", "ReturnR4", "ReturnR8", "ReturnBool",
+        "ReturnIDispatch", "ReturnError", "ReturnDate", 
+        "ReturnIUnknown", "ReturnI1", "ReturnUI2", "ReturnUI4",
+        "ReturnInt", "ReturnUInt", "TakesBSTR", "TakesI4", "TakesUI1",
+        "TakesI2", "TakesR4", "TakesR8", "TakesBool",
+        "TakesIDispatch", "TakesError", "TakesDate", "TakesIUnknown",
+        "TakesI1", "TakesUI2", "TakesUI4", "TakesInt", "TakesUInt",
+        "OutputsBSTR", "OutputsI4", "OutputsUI1", "OutputsI2",
+        "OutputsR4", "OutputsR8", "OutputsBool", "OutputsIDispatch",
+        "OutputsError", "OutputsDate", "OutputsIUnknown", "OutputsI1",
+        "OutputsUI2", "OutputsUI4", "InOutsBSTR", "InOutsI4", 
+        "InOutsUI1", "InOutsI2", "InOutsR4", "InOutsR8", "InOutsBool",
+        "InOutsIDispatch", "InOutsError", "InOutsDate",
+        "InOutsIUnknown", "InOutsI1", "InOutsUI2", "InOutsUI4",
+        "InOutsInt", "InOutsUInt", "OneParameterWithReturn",
+        "StringInputAndReturn", "IDispatchInputAndReturn",
+        "TwoParameters", "TwelveInParameters", "TwelveOutParameters",
+        "TwelveStrings", "TwelveOutStrings", "TwelveIDispatch",
+        "TwelveOutIDispatch", "CreateError"
+     ]
+};
+
+var CLSID_nsXPCDispTestArrays = "{AB085C43-C619-48C8-B68C-C495BDE12DFB}";
+var ProgID_nsXPCDispTestArrays = "XPCIDispatchTest.nsXPCDispTestArrays.1";
+var nsXPCDispTestArraysDesc =
+{
+    name : "nsXPCDispTestArrays", 
+    cid : CLSID_nsXPCDispTestArrays, 
+    progid : ProgID_nsXPCDispTestArrays, 
+    scriptable : true,
+    methods : 
+    [
+        "ReturnSafeArray", "ReturnSafeArrayBSTR", "ReturnSafeArrayIDispatch",
+        "TakesSafeArray", "TakesSafeArrayBSTR", "TakesSafeArrayIDispatch",
+        "InOutSafeArray", "InOutSafeArrayBSTR", "InOutSafeArrayIDispatch"
+    ]
+};
+
+
+var CLSID_nsXPCDispTestNoIDispatch = "{7414404F-A4CC-4E3C-9B32-BB20CB22F541}";
+var ProgID_nsXPCDispTestNoIDispatch = "XPCIDispatchTest.nsXPCDispTestNoIDispatch.1";
+
+var CLSID_nsXPCDispTestNoScript = "{F8D54F00-4FC4-4731-B467-10F1CB8DB0AD}";
+var ProgID_nsXPCDispTestNoScript = "XPCIDispatchTest.nsXPCDispTestNoScript.1";
+
+var CLSID_nsXPCDispTestProperties = "{D8B4265B-1768-4CA9-A285-7CCAEEB51C74}";
+var ProgID_nsXPCDispTestProperties = "XPCIDispatchTest.nsXPCDispTestProperties.1";
+var nsXPCDispTestPropertiesDesc = 
+{
+    name : "nsXPCDispTestProperties", 
+    cid : CLSID_nsXPCDispTestProperties, 
+    progid : ProgID_nsXPCDispTestProperties, 
+    scriptable : true,
+    methods : 
+    [
+        "Short", "Long", "Float", "Double", "Currency",
+        "Date", "String", "DispatchPtr", "SCode", "Boolean", "Variant",
+        "COMPtr", "Char"
+    ]
+};
+
+var CLSID_nsXPCDispTestScriptOn = "{2A06373F-3E61-4882-A3D7-A104F70B09ED}";
+var ProgID_nsXPCDispTestScriptOn = "XPCIDispatchTest.nsXPCDispTestScriptOn.1";
+var nsXPCDispTestScriptOnDesc =
+{
+    name : "nsXPCDispTestScriptOn",
+    cid : CLSID_nsXPCDispTestScriptOn,
+    progid : ProgID_nsXPCDispTestScriptOn,
+    scriptable : true,
+    methods : [ ]
+};
+
+var CLSID_nsXPCDispTestScriptOff = "{959CD122-9826-4757-BA09-DE327D55F9E7}";
+var ProgID_nsXPCDispTestScriptOff = "XPCIDispatchTest.nsXPCDispTestScriptOff.1";
+var nsXPCDispTestScriptOffDesc =
+{
+    name : "nsXPCDispTestScriptOff",
+    cid : CLSID_nsXPCDispTestScriptOff,
+    progid : ProgID_nsXPCDispTestScriptOff,
+    scriptable : false,
+    methods : [ ]
+};
+
+var CLSID_nsXPCDispTestWrappedJS = "{EAEE6BB2-C005-4B91-BCA7-6613236F6F69}";
+var ProgID_nsXPCDispTestWrappedJS = "XPCIDispatchTest.nsXPCDispTestWrappedJS.1";
+var nsXPCDispTestWrappedJSDesc =
+{
+    name : "nsXPCDispTestWrappedJS",
+    cid : CLSID_nsXPCDispTestWrappedJS,
+    progid : ProgID_nsXPCDispTestWrappedJS,
+    scriptable : true,
+    methods :
+    [
+        "TestParamTypes"
+    ]
+};
+
+// create list of COM components
+var objectsDesc =
+[
+    nsXPCDispSimpleDesc,
+    nsXPCDispTestMethodsDesc,
+    nsXPCDispTestArraysDesc,
+    nsXPCDispTestPropertiesDesc,
+    nsXPCDispTestScriptOnDesc,
+    nsXPCDispTestScriptOffDesc,
+    nsXPCDispTestWrappedJSDesc
+];
+
+function findProp(prop, array, marked)
+{
+    len = array.length;
+    for (index = 0; index < len; ++index)
+    {
+        if (prop == array[index])
+        {
+            marked[index] = true;
+            return true;
+        }
+    }
+    return false;
+}
+
+function compareObject(obj, objDesc, testName)
+{
+	if (obj == undefined)
+	{
+		reportFailure("compareObject passed an invalid object");
+		return;
+	}	
+    var marked = new Array();
+    for (prop in obj)
+    {
+        printDebug("Found " + prop);
+        reportCompare(
+            true,
+            findProp(prop, objDesc.methods, marked),
+            testName + ": " + prop + " exists on " + objDesc.name + ", but was not expected");
+    }
+    len = objDesc.methods.length;
+    for (var index = 0; index < len; ++index)
+    {
+        reportCompare(
+            true,
+            marked[index],
+            testName + ": " + objDesc.methods[index] + " does not exist on " + objDesc.name);
+    }
+}
+
+function compareExpression(expression, expectedResult, testName)
+{
+    if (VERBOSE && (typeof testName != "undefined"))
+        printStatus(testName + " - evaluating:" + expression);
+
+    try
+    {
+        reportCompare(
+            expectedResult,
+            eval(expression),
+            testName);
+    }
+    catch (e)
+    {
+        reportFailure(expression + " generated the following exception:" + e.toString());
+    }
+}
+            
+var callStack = new Array();
+
+/*
+ * Report a failure in the 'accepted' manner
+ */
+function reportFailure (msg)
+{
+    var lines = msg.split ("\n");
+    var l;
+    var funcName = currentFunc();
+    var prefix = (funcName) ? "[reported from " + funcName + "] ": "";
+    
+    for (var i=0; i<lines.length; i++)
+        print (FAILED + prefix + lines[i]);
+
+}
+
+/*
+ * Print a non-failure message.
+ */
+function printDebug (msg)
+{
+    if (DEBUG)
+    {
+        var lines = msg.split ("\n");
+        var l;
+
+        for (var i=0; i<lines.length; i++)
+            print (DEBUGLINE + lines[i]);
+    }
+
+}
+/*
+ * Print a non-failure message.
+ */
+function printStatus (msg)
+{
+    var lines = msg.split ("\n");
+    var l;
+
+    for (var i=0; i<lines.length; i++)
+        print (STATUS + lines[i]);
+
+}
+
+/*
+ * Print a bugnumber message.
+ */
+function printBugNumber (num)
+{
+
+    print (BUGNUMBER + num);
+
+}
+
+/*
+ * Compare expected result to actual result, if they differ (in value and/or
+ * type) report a failure.  If description is provided, include it in the 
+ * failure report.
+ */
+function reportCompare (expected, actual, description)
+{
+    var expected_t = typeof expected;
+    var actual_t = typeof actual;
+    var output = "";
+    
+    if ((VERBOSE) && (typeof description != "undefined"))
+        printStatus ("Comparing '" + description + "'");
+
+    if (expected_t != actual_t)
+        output += "Type mismatch, expected type " + expected_t + 
+            ", actual type " + actual_t + "\n";
+    else if (VERBOSE)
+        printStatus ("Expected type '" + actual_t + "' matched actual " +
+                     "type '" + expected_t + "'");
+
+    if (expected != actual)
+        output += "Expected value '" + expected + "', Actual value '" + actual +
+            "'\n";
+    else if (VERBOSE)
+        printStatus ("Expected value '" + actual + "' matched actual " +
+                     "value '" + expected + "'");
+
+    if (output != "")
+    {
+        if (typeof description != "undefined")
+            reportFailure (description);
+        reportFailure (output);   
+    }
+
+}
+
+/*
+ * Puts funcName at the top of the call stack.  This stack is used to show
+ * a function-reported-from field when reporting failures.
+ */
+function enterFunc (funcName)
+{
+
+    if (!funcName.match(/\(\)$/))
+        funcName += "()";
+
+    callStack.push(funcName);
+
+}
+
+/*
+ * Pops the top funcName off the call stack.  funcName is optional, and can be
+ * used to check push-pop balance.
+ */
+function exitFunc (funcName)
+{
+    var lastFunc = callStack.pop();
+    
+    if (funcName)
+    {
+        if (!funcName.match(/\(\)$/))
+            funcName += "()";
+
+        if (lastFunc != funcName)
+            reportFailure ("Test driver failure, expected to exit function '" +
+                           funcName + "' but '" + lastFunc + "' came off " +
+                           "the stack");
+    }
+    
+}
+
+/*
+ * Peeks at the top of the call stack.
+ */
+function currentFunc()
+{
+    
+    return callStack[callStack.length - 1];
+    
+}

mozilla/js/src/xpconnect/tests/idispatch/Tests/WrappedJS/General/XPCIDispatchTestWrappedJS.js

@@ -0,0 +1,76 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 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 the IDispatch implementation for XPConnect
+ *
+ * The Initial Developer of the Original Code is
+ * David Bradley.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * \file
+ * This file contains the tests for making sure that JS Objects access via the IDispatch interface
+ * work properly
+ */
+
+test();
+
+function test()
+{
+	try
+	{
+		var variantObj = Components.classes["@mozilla.org/variant;1"].createInstance(Components.interfaces.nsIVariant);
+		var jsobj = 
+		{
+			Boolean : false,
+			Short : 0,
+			Long : 0,
+			Float : 0.0,
+			Double : 0.0,
+			Currency : 0.0,
+			Date : new Date(),
+			String : "",
+			DispatchPtr : {},
+			SCode : 0,
+			Variant : variantObj,
+			Char : 'a'
+		};
+		var obj = COMObject(CLSID_nsXPCDispTestWrappedJS);
+		reportCompare(
+			obj.TestParamTypes(jsobj),
+			"",
+			"Testing IDispatch wrapped JS objects");
+	}
+	catch (e)
+	{
+		reportFailure(e.toString());
+	}
+}

mozilla/js/src/xpconnect/tests/idispatch/Tests/WrappedJS/shell.js

@@ -0,0 +1,361 @@
+/* -*- 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 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 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ * Rob Ginda rginda@netscape.com
+ */
+
+FAILED = "FAILED!: ";
+STATUS = "STATUS: ";
+BUGNUMBER = "BUGNUMBER: ";
+DEBUGLINE = "DEBUG: ";
+
+DEBUG = false;
+VERBOSE = false;
+
+var CLSID_nsXPCDispSimple = "{9F39237C-D179-4260-8EF3-4B6D4D7D5570}";
+var ProgID_nsXPCDispSimple = "XPCIDispatchTest.nsXPCDispSimple.1";
+var nsXPCDispSimpleDesc =
+{
+    name : "nsXPCDispSimple", 
+    cid : CLSID_nsXPCDispSimple, 
+    progid : ProgID_nsXPCDispSimple, 
+    scriptable : true,
+    methods :
+    [
+        "ClassName",
+        "Number"
+    ]
+};
+
+var CLSID_nsXPCDispTestMethods = "{745D1149-9F46-418C-B176-71EAA98974BA}";
+var ProgID_nsXPCDispTestMethods = "XPCIDispatchTest.nsXPCDispTestMethods.1";
+var nsXPCDispTestMethodsDesc = 
+{
+    name : "nsXPCDispTestMethods", 
+    cid : CLSID_nsXPCDispTestMethods, 
+    progid : ProgID_nsXPCDispTestMethods, 
+    scriptable : true,
+    methods : 
+    [
+        "NoParameters", "ReturnBSTR", "ReturnI4",
+        "ReturnUI1", "ReturnI2", "ReturnR4", "ReturnR8", "ReturnBool",
+        "ReturnIDispatch", "ReturnError", "ReturnDate", 
+        "ReturnIUnknown", "ReturnI1", "ReturnUI2", "ReturnUI4",
+        "ReturnInt", "ReturnUInt", "TakesBSTR", "TakesI4", "TakesUI1",
+        "TakesI2", "TakesR4", "TakesR8", "TakesBool",
+        "TakesIDispatch", "TakesError", "TakesDate", "TakesIUnknown",
+        "TakesI1", "TakesUI2", "TakesUI4", "TakesInt", "TakesUInt",
+        "OutputsBSTR", "OutputsI4", "OutputsUI1", "OutputsI2",
+        "OutputsR4", "OutputsR8", "OutputsBool", "OutputsIDispatch",
+        "OutputsError", "OutputsDate", "OutputsIUnknown", "OutputsI1",
+        "OutputsUI2", "OutputsUI4", "InOutsBSTR", "InOutsI4", 
+        "InOutsUI1", "InOutsI2", "InOutsR4", "InOutsR8", "InOutsBool",
+        "InOutsIDispatch", "InOutsError", "InOutsDate",
+        "InOutsIUnknown", "InOutsI1", "InOutsUI2", "InOutsUI4",
+        "InOutsInt", "InOutsUInt", "OneParameterWithReturn",
+        "StringInputAndReturn", "IDispatchInputAndReturn",
+        "TwoParameters", "TwelveInParameters", "TwelveOutParameters",
+        "TwelveStrings", "TwelveOutStrings", "TwelveIDispatch",
+        "TwelveOutIDispatch", "CreateError"
+     ]
+};
+
+var CLSID_nsXPCDispTestArrays = "{AB085C43-C619-48C8-B68C-C495BDE12DFB}";
+var ProgID_nsXPCDispTestArrays = "XPCIDispatchTest.nsXPCDispTestArrays.1";
+var nsXPCDispTestArraysDesc =
+{
+    name : "nsXPCDispTestArrays", 
+    cid : CLSID_nsXPCDispTestArrays, 
+    progid : ProgID_nsXPCDispTestArrays, 
+    scriptable : true,
+    methods : 
+    [
+        "ReturnSafeArray", "ReturnSafeArrayBSTR", "ReturnSafeArrayIDispatch",
+        "TakesSafeArray", "TakesSafeArrayBSTR", "TakesSafeArrayIDispatch",
+        "InOutSafeArray", "InOutSafeArrayBSTR", "InOutSafeArrayIDispatch"
+    ]
+};
+
+
+var CLSID_nsXPCDispTestNoIDispatch = "{7414404F-A4CC-4E3C-9B32-BB20CB22F541}";
+var ProgID_nsXPCDispTestNoIDispatch = "XPCIDispatchTest.nsXPCDispTestNoIDispatch.1";
+
+var CLSID_nsXPCDispTestNoScript = "{F8D54F00-4FC4-4731-B467-10F1CB8DB0AD}";
+var ProgID_nsXPCDispTestNoScript = "XPCIDispatchTest.nsXPCDispTestNoScript.1";
+
+var CLSID_nsXPCDispTestProperties = "{D8B4265B-1768-4CA9-A285-7CCAEEB51C74}";
+var ProgID_nsXPCDispTestProperties = "XPCIDispatchTest.nsXPCDispTestProperties.1";
+var nsXPCDispTestPropertiesDesc = 
+{
+    name : "nsXPCDispTestProperties", 
+    cid : CLSID_nsXPCDispTestProperties, 
+    progid : ProgID_nsXPCDispTestProperties, 
+    scriptable : true,
+    methods : 
+    [
+        "Short", "Long", "Float", "Double", "Currency",
+        "Date", "String", "DispatchPtr", "SCode", "Boolean", "Variant",
+        "COMPtr", "Char"
+    ]
+};
+
+var CLSID_nsXPCDispTestScriptOn = "{2A06373F-3E61-4882-A3D7-A104F70B09ED}";
+var ProgID_nsXPCDispTestScriptOn = "XPCIDispatchTest.nsXPCDispTestScriptOn.1";
+var nsXPCDispTestScriptOnDesc =
+{
+    name : "nsXPCDispTestScriptOn",
+    cid : CLSID_nsXPCDispTestScriptOn,
+    progid : ProgID_nsXPCDispTestScriptOn,
+    scriptable : true,
+    methods : [ ]
+};
+
+var CLSID_nsXPCDispTestScriptOff = "{959CD122-9826-4757-BA09-DE327D55F9E7}";
+var ProgID_nsXPCDispTestScriptOff = "XPCIDispatchTest.nsXPCDispTestScriptOff.1";
+var nsXPCDispTestScriptOffDesc =
+{
+    name : "nsXPCDispTestScriptOff",
+    cid : CLSID_nsXPCDispTestScriptOff,
+    progid : ProgID_nsXPCDispTestScriptOff,
+    scriptable : false,
+    methods : [ ]
+};
+
+var CLSID_nsXPCDispTestWrappedJS = "{EAEE6BB2-C005-4B91-BCA7-6613236F6F69}";
+var ProgID_nsXPCDispTestWrappedJS = "XPCIDispatchTest.nsXPCDispTestWrappedJS.1";
+var nsXPCDispTestWrappedJSDesc =
+{
+    name : "nsXPCDispTestWrappedJS",
+    cid : CLSID_nsXPCDispTestWrappedJS,
+    progid : ProgID_nsXPCDispTestWrappedJS,
+    scriptable : true,
+    methods :
+    [
+        "TestParamTypes"
+    ]
+};
+
+// create list of COM components
+var objectsDesc =
+[
+    nsXPCDispSimpleDesc,
+    nsXPCDispTestMethodsDesc,
+    nsXPCDispTestArraysDesc,
+    nsXPCDispTestPropertiesDesc,
+    nsXPCDispTestScriptOnDesc,
+    nsXPCDispTestScriptOffDesc,
+    nsXPCDispTestWrappedJSDesc
+];
+
+function findProp(prop, array, marked)
+{
+    len = array.length;
+    for (index = 0; index < len; ++index)
+    {
+        if (prop == array[index])
+        {
+            marked[index] = true;
+            return true;
+        }
+    }
+    return false;
+}
+
+function compareObject(obj, objDesc, testName)
+{
+	if (obj == undefined)
+	{
+		reportFailure("compareObject passed an invalid object");
+		return;
+	}	
+    var marked = new Array();
+    for (prop in obj)
+    {
+        printDebug("Found " + prop);
+        reportCompare(
+            true,
+            findProp(prop, objDesc.methods, marked),
+            testName + ": " + prop + " exists on " + objDesc.name + ", but was not expected");
+    }
+    len = objDesc.methods.length;
+    for (var index = 0; index < len; ++index)
+    {
+        reportCompare(
+            true,
+            marked[index],
+            testName + ": " + objDesc.methods[index] + " does not exist on " + objDesc.name);
+    }
+}
+
+function compareExpression(expression, expectedResult, testName)
+{
+    if (VERBOSE && (typeof testName != "undefined"))
+        printStatus(testName + " - evaluating:" + expression);
+
+    try
+    {
+        reportCompare(
+            expectedResult,
+            eval(expression),
+            testName);
+    }
+    catch (e)
+    {
+        reportFailure(expression + " generated the following exception:" + e.toString());
+    }
+}
+            
+var callStack = new Array();
+
+/*
+ * Report a failure in the 'accepted' manner
+ */
+function reportFailure (msg)
+{
+    var lines = msg.split ("\n");
+    var l;
+    var funcName = currentFunc();
+    var prefix = (funcName) ? "[reported from " + funcName + "] ": "";
+    
+    for (var i=0; i<lines.length; i++)
+        print (FAILED + prefix + lines[i]);
+
+}
+
+/*
+ * Print a non-failure message.
+ */
+function printDebug (msg)
+{
+    if (DEBUG)
+    {
+        var lines = msg.split ("\n");
+        var l;
+
+        for (var i=0; i<lines.length; i++)
+            print (DEBUGLINE + lines[i]);
+    }
+
+}
+/*
+ * Print a non-failure message.
+ */
+function printStatus (msg)
+{
+    var lines = msg.split ("\n");
+    var l;
+
+    for (var i=0; i<lines.length; i++)
+        print (STATUS + lines[i]);
+
+}
+
+/*
+ * Print a bugnumber message.
+ */
+function printBugNumber (num)
+{
+
+    print (BUGNUMBER + num);
+
+}
+
+/*
+ * Compare expected result to actual result, if they differ (in value and/or
+ * type) report a failure.  If description is provided, include it in the 
+ * failure report.
+ */
+function reportCompare (expected, actual, description)
+{
+    var expected_t = typeof expected;
+    var actual_t = typeof actual;
+    var output = "";
+    
+    if ((VERBOSE) && (typeof description != "undefined"))
+        printStatus ("Comparing '" + description + "'");
+
+    if (expected_t != actual_t)
+        output += "Type mismatch, expected type " + expected_t + 
+            ", actual type " + actual_t + "\n";
+    else if (VERBOSE)
+        printStatus ("Expected type '" + actual_t + "' matched actual " +
+                     "type '" + expected_t + "'");
+
+    if (expected != actual)
+        output += "Expected value '" + expected + "', Actual value '" + actual +
+            "'\n";
+    else if (VERBOSE)
+        printStatus ("Expected value '" + actual + "' matched actual " +
+                     "value '" + expected + "'");
+
+    if (output != "")
+    {
+        if (typeof description != "undefined")
+            reportFailure (description);
+        reportFailure (output);   
+    }
+
+}
+
+/*
+ * Puts funcName at the top of the call stack.  This stack is used to show
+ * a function-reported-from field when reporting failures.
+ */
+function enterFunc (funcName)
+{
+
+    if (!funcName.match(/\(\)$/))
+        funcName += "()";
+
+    callStack.push(funcName);
+
+}
+
+/*
+ * Pops the top funcName off the call stack.  funcName is optional, and can be
+ * used to check push-pop balance.
+ */
+function exitFunc (funcName)
+{
+    var lastFunc = callStack.pop();
+    
+    if (funcName)
+    {
+        if (!funcName.match(/\(\)$/))
+            funcName += "()";
+
+        if (lastFunc != funcName)
+            reportFailure ("Test driver failure, expected to exit function '" +
+                           funcName + "' but '" + lastFunc + "' came off " +
+                           "the stack");
+    }
+    
+}
+
+/*
+ * Peeks at the top of the call stack.
+ */
+function currentFunc()
+{
+    
+    return callStack[callStack.length - 1];
+    
+}

mozilla/js/src/xpconnect/tests/idispatch/Tests/exectests.cmd

@@ -0,0 +1 @@
+perl jsDriver.pl -e xpcshell %1 %2 %3 %4 %5 %6 %7 %8 %9

mozilla/mstone/Building

@@ -1,46 +0,0 @@
-Mstone building instructions
-
-For Unix, just "gmake" one of these
-	release		The usual optimized build
-	debug		Debug build includes some asserts
-
-	rpackage	Build the release and package it
-	dpackage	Build the debug version and package it
-
-	all_OPT		Build a multi-platform package
-	all_DBG		Build a multi-platform debug package
-
-For NT, run autobuild.bat.  This will build and package both the debug
-and optimized versions.  Perl must already be built and installed in
-\.  The NT build may be behind the Unix stuff.  Pull the build/package/*
-subdirectories into the main build/package before doing a 'make all_???'.
-
-You can build multiple OSes in the same tree.  Debug and optimized
-builds are kept separately.  The all_??? targets will combine whatever
-OSes are present into a multi-architecture package (including NT).
-Note that you have ot build and package each OS before doing the all_
-step.
-
-
-Helper components
-
-Linux usually comes with workable versions of gnuplot and perl.  Most
-other OSes don't.  Mstone can build and package perl, gnuplot, and gd
-with the right settings.  These will be automatically built and
-packaged if they are present.
-
-Unpack gd1.3 or later in the mstone directory.  You can probably find
-gd from here: http://www.boutell.com/gd/.  The directory should look
-like gd?.*.  Right now we need the (obsolete) version 1.3 to generate
-GIF files (without patented run-length coding).  The scripts need to
-be updated to be able to handle PNG or GIF files.
-
-Unpack gnuplot 3.7 or later in the mstone directory.  You can probably
-find gnuplot from http://www.cs.dartmouth.edu/gnuplot_info.html.  The
-directory should look like gnuplot-?.* (the exact version should not
-matter).  Gnuplot requres gd to generate GIFs (which is what we need).
-
-Unpack perl 5.005 or later in the mstone directory.  You can probably
-find perl from http://www.perl.com/pub/language/info/software.html.
-The directory should look like perl5.* (the exact version should
-not matter).

mozilla/mstone/ChangeLog

@@ -1,73 +0,0 @@
-2005-02-19  Dan Christian  <robodan@idiom.com>
-
-	* Merge big Sendmail patch see ChangeLog-Sendmail for details
-
-	* src/bench.h (VERSION): Start working toward version 5.0 (now 4.9)
-
-2004-09-07  Dan Christian  <robodan@idiom.com>
-
-	* data/*.msg: Updated with more realistic messages
-
-	* bin/args.pl: Really fix doc link to be relative
-
-	* src/smtp.c (sendSMTPLoop): Handle file lists (random selection)
-	(sendFile): New, send file with option offset and head/tail
-	(SmtpFilePrep): Split a glob pattern to a list
-	(SmtpFileInit): New, split out initial file scan
-
-	* src/bench.c (rangeNext): Get to last value in a random range
-
-2004-06-14  Dan Christian  <robodan@idiom.com>
-
-	* Makefile (VERSION): Bump version to 4.3
-
-	* Make build work on recent versions of Linux and Solaris
-
-	* Make ssh the default way to get a remote shell
-
-	* Support SVG graph output (not supported by all browsers)
-
-	* Use rfc822 style from addresses
-
-	* Fix documentation link on index page to be local
-
-2000-04-28  Dan Christian  <dac@x.cx>
-
-	* http and wmap now use common routines from http-util
-
-	* http is now separated from the pish command structure.
-
-2000-04-27  Dan Christian  <dac@x.cx>
-
-	* bin/genplot.pl: Support gnuplot generating images other than gif
-
-	* src/smtp.c (sendSMTPStart): Send domain name with HELO
-
-2000-04-05  Dan Christian <robodan@netscape.com>
-	* Fix bug in WMAP where the login field was reporting banner data.
-
-	* Add a reconnect concept to WMAP.  This separates out the
-	reconnect activity from the initial connections.  There is still a
-	bug/feature that the reconnect increments an error which can
-	eventually hit the maxErrors limit.  You have to record the error
-	or else you could not get the "connections" graph right.
-	
-2000-03-31  Dan Christian <robodan@netscape.com>
-	
-	* Merged setup and mstone into one script to reduce command
-	namespace polution.  "mstone setup" is the the same as "setup".
-
-	* Made setup try to be more tolerant of OSes that were not
-	include in the distribution.  SunOS 5.7 will fall back to 5.6.
-
-	* Now package conf/general.wld.in and only copy to general.wld if
-	there isn't one already in place.  This means that you can unpack
-	new bits over old bits without blowing away your configuration.
-	
-	* Added <includeOnce file> command to workloads.  This allows
-	tests to be used either as a stand alone or as part of another
-	test (e.g. smtp).
-
-	* Converted ChangeLog to more common formating
-
-	* Spilt off old ChangeLog entries to ChangeLog.1 and ChangeLog.2

mozilla/mstone/ChangeLog-Sendmail

@@ -1,86 +0,0 @@
-2005-02-03  Thom O'Connor <thom@sendmail.com>
-
-        * Merge Mozilla mstone HEAD with Sendmail,Inc. modifications. In
-          particular, this included some hand-waving around the bitwise
-          operators "leaveMailOnServer" in the Mozilla branch and the
-          dinst_t struct pish->leaveMailOnServerDist.
-
-2005-01-25  Thom O'Connor <thom@sendmail.com>
-
-        * Fix comments, properly attribute Sean O'Rourke's contributions.
-
-2004-09-21  Thom O'Connor <thom@sendmail.com>
-
-	* Modified config/config.mk to build SSL version of mailclient.
-
-2004-06-07  Thom O'Connor <thom@sendmail.com>
-
-	* Remove _thread_sys_poll defininition for poll in FreeBSD builds
-	(bench.h).
-
-2001-04-27  Sean O'Rourke  <sean@sendmail.com>
-
-	* distributions can now be truncated.  This is used to prevent
-	0-recipient messages, and could be used to prevent enormous
-	messages.
-
-	* throttling: Preload workloads use some additional mstone magic
-	to throttle delivery rate based on server responsiveness.  This is
-	still in the experimental phase, and may change.
-
-	* fix for parsing bug exposed by distribution truncation notation.
-	
-2001-03-10    Sean O'Rourke <sean@sendmail.com>
-
-	* clients: Fixed up code for specifying client counts on a
-	per-host or per-group basis.  This eliminates the need to force
-	the mozilla distribution code to do one's bidding.
-
-	* smtpsink.pl: Very basic threaded perl SMTP sink.  This may go
-	away to be replaced by the sink from smtpslam.  Needs much better
-	statistics.
-
-2001-02-24    Sean O'Rourke <sean@sendmail.com>
-
-	* checksums added.  See {checksum,md5}.{c,h}.  Auto-generated
-	messages can currently have checksums computed over the body, and
-	pop and multipop retrieval will verify the sum.
-
-2001-02-21    Sean O'Rourke <sean@sendmail.com>
-
-	* MIME generation changed to generate deep messages rather than
-	  several parts.  This should be a better test of MIME parsers,
-	  forcing them to save more state.
-
-2001-02-18    Sean O'Rourke <sean@sendmail.com>
-
-	* mstone_changes.html: update SSL documentation.
-
-	* wld, defaults.pm: divide the ever-expanding "config" section
-	  into more descriptive subparts: clients, server, sink, mstone.
-
-	* report: now in bin directory, where it should be.
-
-2001-02-17    Sean O'Rourke <sean@sendmail.com>
-
-	* client.c, main.c, parse.c: removed old throttling code, as it
-	  wasn't being used.
-	
-	* ALL: General code cleanup.
-	
-	* sysdep.c: simplified rlimit-bumping code, added increase for
-	  RLIM_NPROC, as threads are procs on some systems.
-
-	* imap4.c: removed silliness of malloc()ing a buffer the size of
-	  the entire message every time we retrieve a message.
-
-	* xalloc.c, xalloc.h: consolidated memory allocation so everyone
-	  handles OOM the same way (for now, dump core).
-
-	* constants.h: various assumptions and limits, were in bench.h.
-
-	* events: added event-queue model to reduce thread requirements.
-	  Eventually, it would be nice for a consultant to be able to run
-	  this off a laptop to test a small- to medium-sized box.  For
-	  now, at least, configuration remains the same.  This doesn't
-	  work on NT.  Oh, well.

mozilla/mstone/ChangeLog.1

@@ -1,129 +0,0 @@
-MailStone 4.1: Changes to since version 4.0
-	
-	* threads are used on all platforms reduces memory requirements by
-	10x for large numbers of clients must run as root for maximum
-	connections per process
-	
-	* massive internal code and script cleanup / rewrite performance
-	improvements for socket handling (blocking) and caching files and
-	name lookups
-	
-	* filename and path conventions restructuring '/mailstone'
-	hardwired path no longer required mailstone/results/index.html
-	(index of test runs) mailstone/results/<datestamp>/stderr (look
-	here for errors) mailstone/results/<datestamp>/results.html
-	mailstone/results/<datestamp>/results.txt
-	mailstone/results/<datestamp>/work.wld (workload config used)
-	mailstone/results/<datestamp>/testbed.tbd (testbed used)
-	mailstone/results/<datestamp>/summary.csv (per client summary)
-	mailstone/results/<datestamp>/*.gif (graphs)
-	mailstone/tmp/<datestamp>/*.out (raw results from each client)
-	mailstone/conf/*.wld (workload file) mailstone/conf/*.html
-	(machine descriptions for reports) mailstone/data/*.msg (sample
-	test messages)
-	
-	* periodic statistics reporting allows for trend analysis of many
-	variables per protocol.  sampling rate is automatically determined
-	by mailmaster Can now generate on-the-fly reports for above by
-	running "process"
-	
-	* The accountFormat directive is now obsolete.  Use loginFormat
-	and addressFormat instead.
-	
-	* The numAccounts and beginAccounts directives are now obsolete.
-	Use numLogins, firstLogin, numAddresses, and firstAddress instead.
-	
-	* The sequentialLogins directive disables random account number
-	selection.  This insures a predictable account sequence.
-	
-	* The checkMailInterval directive for IMAP is now obsolete.  Use
-	loopDelay instead.
-	
-	* The directives idleTime, loopDelay, and numLoops now apply to
-	all protocols.  See the manual for how loopDelay and numLoops are
-	used by each protocol.
-	
-	* a command directive such as <SMTP> without HOSTS=xxx will now
-	apply to all clients in the testbed
-	
-	* <include> directive for workload and testbed files (e.g. for
-	user profile)
-	
-	* workloads are now passed to 'mailclient' through stdin no test
-	specific files need to be copied to client machines more
-	synchonized test startup
-	
-	* 'setup' script will copy mailclient and test messages
-	(data/*.msg) to each testbed machine in /var/tmp
-	
-	* 'cleanup' form of setup will remove mailclient and test messages
-	from each testbed machine in /var/tmp
-	
-	* 'checktime' form of setup will (nearly) simultaneously retrieve
-	time from each client.  This lets you easily check for clock
-	problems.
-	
-	* 'timesync' form of setup will (nearly) simultaneously set time
-	on each client.  This only works on OSs that support setting
-	seconds through the "date" command.  rdate or ntpdate should be
-	used if available.  You must be the root user and be able to rsh
-	as root for timesync to work.
-	
-	* Improved reports in text and html (formatting and content)
-	
-	* The text version of the report is now only displayed
-	automatically if "-v" is given.
-	
-	* Graphs with more than one protocol will also display a "Total"
-	graph
-	
-	* The graphs can now be customized for each test (see sample.wld
-	for the default)
-	
-	* You can now add graphs (in addition to the default or configured
-	ones) by using "process timestamp -a conf/moregraph.wld".
-	
-	* An informative index of test runs is now generated in
-	results/index.html
-	
-	* The index is updated while the run is in progress to make
-	checking for errors easier.
-	
-	* The error log now displays times relative to test start.
-	
-	* Memory use while processing results has been greatly reduced.
-	
-	* A summary of the data from each process is now saved in a
-	Comma-separated-value (CSV) file.  results/timestamp/clients.csv
-	
-	* A summary of the data over time is now saved in a
-	Comma-separated-value (CSV) file.
-	results/timestamp/protocol-time.csv
-	
-	* new gnuplot binary included, can output directly to gif format
-	
-	* read and write performance numbers now reported separately
-	
-	* new runtime banners and copyrights (ooh boy)
-	
-	* idleTime option for IMAP fixed, plus now applies to all commands
-	
-	* blockTime now sets a delay between command blocks
-	
-	* Process model is as follows
-	  User runs the top-level 'mstone' script
-	  This calls 'conf/testname.pl' with command line arguments
-	  This calls 'mailmaster.pl' with config and command line arguments
-	  mailmaster uses 'rsh' or equivalent to launch mailclients
-          mailclient runs on each testbed and forks numprocs
-	  each proc spawns numthreads (one per client)
-
-          <run tests> (note: results are being sent continuously)
-
-          threads send results back through sockets to top mailclient
-	  mailclient forwards results back over stdout via rsh pipe
-          (for future work - do some data reduction/combining here)
-	  mailmaster directs output to each client-<hostname> file
-	  mailmaster launches report generator
-	
-	* sample LDIF fragment for a postmaster entry included

mozilla/mstone/ChangeLog.2

@@ -1,77 +0,0 @@
-MailStone 4.15: Changes to Mailstone since version 4.1
-	
-	* Setup now checks license acceptance and configures a basic
-	setup.  By default, it will also create a user LDIF file with a
-	'allusers' account.
-	
-	* All parameters and and testbed information may now be specified
-	in the workload files (*.wld).  New sections: CONFIG, CLIENT,
-	MONITOR, PRETEST, and POSTTEST.  Command line parameters still
-	override the files.  A complete copy of the configuration is saved
-	in results/<TIMESTAMP>/all.wld.
-	
-	* The '*.pl', '*.tbd', and 'config*' files in ./conf/ are
-	depreciated.  These should still work, but the new sections are
-	simpler and more flexible.
-	
-	* Any CONFIG parameter can now be specified on the command line
-	using the form: 'PARAMETER=value'.  Note that PARAMETER is case
-	insensitive.  No whitespace is allowed before or after the '='.
-	
-	* The new switch '-l' or CONFIG parameter 'ClientCount' can now
-	specify the total number of clients.  The 'MaxClients' and
-	'MaxThreads' parameters in each CLIENT section control load
-	balancing.  If the 'processes' and 'threads' parameters are set,
-	then the load for that CLIENT section will not be adjusted, but
-	will be taken into account when calculating other CLIENT sections.
-	If just 'processes' is set, then only the thread count will be
-	adjusted.  All hosts in a CLIENT section will run the same number
-	of processes and threads.
-	
-	* bin/makeusers.pl now creates users, broadcast account, etc.
-	Numbered passwords are now suppored.  The new user/password format
-	now replaces '%ld' with the user number to match the rest of
-	mailstone.  The ldif/ directory is obsolete.  Run "perl/bin/perl
-	bin/makeusers.pl -h" for usage.
-	
-	* NT client machines may now be used from a Unix test master.  See
-	conf/sample.wld for configuration details.
-	
-	* Commands can now be run for a specified block count, error
-	count, or time (whichever comes first).  Set 'maxBlocks' and/or
-	'maxErrors'.
-	
-	* Telemetry logging to /var/tmp/mstone-log.pn.tn is now performed
-	when "telemetry 1" is specified.
-	
-	* The name used in the "CLIENT" section is now used to match
-	"HOSTS=..." qualifier.  Compatibility with "hostname" is no longer
-	needed.
-	
-	* Config values can now use quoted characters such as \n, \r, \t
-	
-	* Config values can be continued using \ (backslash)
-	
-	* System configuration information (SYSCONFIG) can now be
-	specified entirely within a workload file by quoting the newlines.
-	
-	* Config values get enclosing double-quotes stripped
-	
-	* Preliminary support for HTTP and WMAP (WebMail) testing.
-	
-	* New table formats are easier to interpret and allow more protocols.
-	
-	* The new text format report is easier to machine processes.
-	
-	* The following command line switches are now obsolete: -f, -g,
-	-e, -p, and -l.  The same functionality can be obtained by
-	FREQUENCY=<interval>, GNUPLOT=<path>, RSH=<path>, RCP=<path>, and
-	TEMPDIR=<directory> respectively.
-	
-	* File backups are now created.  When ./process is run multiple
-	times, the old files are moved to the ./tmp/<TIMESTAMP>/
-	directory.
-	
-	* perl has been updated to include full perl5.005_03 install
-	package.  Perl support for each architecture is now under the
-	perl/ directory.

mozilla/mstone/INSTALL

@@ -1,222 +0,0 @@
-
-		Mstone 4.15 Quick Installation
-
-This version of Mstone runs on many current UNIX platforms and NT.
-Only a web browser and text editor are needed to view the results and
-configure tests.
-
-
-QUICK INSTALL
--------------
-
-IMPORTANT: If you have an existing mstone, save a copy of the
-mstone/conf directory to preserve any configuration files you may want
-to keep.
-
-Unpack distribution:
-
-	tar xzf /tmp/mstone_OPT.tar.gz
-or
-	gunzip -c /tmp/mstone_OPT.tar.gz | tar xf -
-or
-	unzip /tmp/mstone_OPT.zip
-
-	cd mstone
-
-Both the tar.gz file and the zip file are identical.  Use whichever is
-more convenient for you.
-
-This will create a sub-directory named "mstone" with files and
-directories under that.  
-
-cd mstone
-
-NOTE: all scripts must be run from the mstone directory.
-
-
-Do initial configuration:
-
-Run "mstone config".  It will ask you about your system configuration.
-Fill in the appropriate values and create the optional user accounts
-and broadcast account.  When it asks about client machines, enter them
-seperated by commas, with no spaces (e.g. host1,host2,host3).  If you
-need to re-configure, run "mstone config".
-
-The machine starting the test may also be a client.  For accurate
-results, clients should not be run on the test mailserver machine (or
-its directory server).  If all the client machines are not running
-the same operating system version, see "Configuring Client Machines"
-below to configure for different OSes.
-
-When the test master is on NT, only the local machine may be a client
-and only one process is allowed.  You will not be asked about client
-machines.
-
-Setup only configures the most important parameters.  If you have more
-advanced needs, edit conf/general.wld appropriately.
-
-Run "mstone setup".  It will now push the necessary files to each
-client machine.  If there are problems (i.e. with rsh permissions),
-fix them and re-run "mstone setup" until everything works.
-
-
-Install test accounts:
-
-Setup will create a file called conf/MAILHOST.ldif (where MAILHOST is the
-name of your mail server).  If you are not using Netscape Messaging
-and Directory Servers, then you may have to edit the ldif file or use
-alternate means to create the user accounts.
-
-To import these users into Netscape Messaging Server, use "add
-entries" from the directory console or use the ldapmodify command line
-utility.
-
-Note: imports will go faster if access logging is disabled.  For large
-user counts (more than 10,000 users), it may be much faster to export
-the current database, merge the files together manually, and then
-import the new database.
-
-Here is how the ldapmodify supplied with Netscape Messaging Server
-would be used.
-
-setenv LD_LIBRARY_PATH /usr/netscape/messaging/lib
-cd /usr/netscape/messaging
-shared/bin/ldapmodify -h mailhost -a -D 'cn=directory manager' -w d_m_password < conf/MAILHOST.ldif
-
-
-Check time consistency:
-
-IMPORTANT: The system time on each client machine must be synchronized
-within one second of each other for accurate results graphs.
-
-Run "checktime" to see the time on each client.  There should not be
-more than two seconds difference among the displayed time.
-
-The best way to synchronize clients is use NTP (Network Time Protocol)
-or similar protocols (like rdate or timeslave) that have sub second
-accuracy.
-
-A simple utility called "timesync" is provide to push the local
-system time to all clients.  You must be root and have root rsh
-permissions to use timesync.  Timesync only works on OSs that support
-setting seconds using "date MMDDhhmmCCYY.ss".  Timesync is only
-accurate to a second (at best) and should only be used if better
-protocols aren't available.
-
-When running the test master on NT, "checktime" and "timesync" are
-never needed (because there is only one client machine).  Timesync
-will be ignored for NT clients, another method must be used
-(e.g. timeserv or Dimension4).
-
-
-Run tests:
-
-Try it out.  Use small process and thread counts until everything is
-working.
-
-mstone pop -t 30s
-
-The script will tell you how many processes and threads it is running
-on each system and where errors are logged.  At the end of the test,
-it will print out a URL for the test results and an indication of the
-size of the errorlog file (stderr).
-
-The results of the mstone run will display statistics for each
-protocol that was tested.  The results are presented in both a HTML
-web page and a text file.  The text file is simple and uniform, while
-the web page is more user readable.  The web page has links to the
-test configuration files, error log, and the text version.
-
-For long tests run (e.g. 8 hours), the results can be updated while
-the test is running by using the "process" utility.  Don't run
-"process" near the very end of the test.
-
-If a test has to be aborted, then use "process" to generate a report
-using the available data.
-
-
-Customize tests:
-
-Copy and edit the scripts (e.g. "conf/pop.wld") to define new tests.
-The CONFIG section specifies all the attributes used in the test.
-Other sections specify the protocols to be tested and the parameters
-for them.
-
-All switches can be overridden on the command line to facilitate
-easier testing.  The exact configuration (include command line
-overrides) is stored with the results from each test.
-
-
-Maintenance:
-
-You can run "mstone setup" at any time (except during a test :-) to
-update the files on the client machines.
-
-Use "mstone cleanup" to remove the files created by "mstone setup".
-
-After the test is finished, the directories under "tmp/" can be
-compressed or deleted to save space.  All the information about a test
-run is stored in the "results/" directories.
-
-
-Configuring client machines:
-
-Edit conf/general.wld to include CLIENT sections for each machines to
-use.
-
-You can also specify the OS type for each client machine.  Set the
-"Arch" parameter in each CLIENT section as appropriate (e.g. SunOS5.6,
-Linux2.2_x86, AIX4.2, HP-UXB.11.00, IRIX6.5, OSF1V4.0, WINNT4.0). The
-directories under "bin" specify the available OS types.
-
-For NT4.0 clients with a UNIX test master, you will need to configure
-"command" and "tempDir" for proper operation.  See the "HOSTS=winnt01"
-example in conf/sample.wld.
-
-The total number of processes and threads that can be supported on a
-client is dependent on the number of commands in the test, the OS, and
-available memory.  Check the stderr log for messages about not being
-able to create processes or threads.  Check on the client machines
-during the test and make sure they aren't running out of CPU.  The
-UNIX programs "top" and "vmstat" are good for this.  If the client CPU
-is more than 75% busy, use more machines.
-
-Also watch out for network saturation.  You may have to use machines
-with separate networks to the server to reach full server load.
-
-
-Know problems:
-
-There can be extraneous errors or connections after the specified end
-of the test.  These are most likely do to stopping the test and should
-be ignored.
-
-At the end of the test, all current connections will logout without
-any delays.  This can cause very high peak loads.
-
-If one process exits early (due to misconfiguration or resource
-exhaustion) and the monitoring command did not specify a count (%c),
-then the monitoring tasks will be terminated early as well.
-
-Monitoring commands that specify a count (%c), may take longer than
-predicted and delay the processing of test results.  This is because
-vmstat actually delays the requested time plus the time needed to
-generate the statistics summary.
-
-If you are doing tests with large thread counts, you may have to run
-as root to allow mailclient to raise its resource limits.
-
-The telemetry logging for SMTP, POP3, and IMAP4 is incomplete.  Most
-commands are captured, but banners and message contents may be missing.
-
-The MaxBlocks parameter gets divided by the total number of processes
-before starting each client.  This doesn't account for clients that
-don't have commands to run.
-
-The HTTP protocol used by WMAP allows connections to be dropped and
-re-connected as needed.  WMAP logs this as an error and an additional
-connect.  The error log must be consulted to distinguish another types
-of connection errors (timeout or connection refused) from an automatic
-re-connect.
-
-The HTTP protocol test is experimental and subject to change.

mozilla/mstone/LICENSE

@@ -1,19 +0,0 @@
-The contents of this software package are subject to the Netscape
-Public License Version 1.1 (the "License"); you may not use this
-software 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.
-
-Alternatively, the this software package may be used under the terms
-of the GNU Public License (the "GPL"), in which case the provisions of
-the GPL are applicable instead of those above.  If you wish to allow
-use of your version of this file only under the terms of the GPL and
-not to allow others to use your version of this file under the NPL,
-indicate your decision by deleting the provisions above and replace
-them with the notice and other provisions required by the GPL.  If you
-do not delete the provisions above, a recipient may use your version
-of this file under either the NPL or the GPL.

mozilla/mstone/LICENSE.npl

@@ -1,535 +0,0 @@
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-     EXHIBIT A-Netscape Public License.
-
-          "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 the Netscape Mailstone code, released
-          March 17, 2000.
-
-          The Initial Developer of the Original Code is Netscape
-          Communications Corporation. Portions created by Netscape are
-          Copyright (C) 1999-2000 Netscape Communications Corporation. All
-          Rights Reserved.
-
-          Contributor(s): Dan Christian <robodan@netscape.com>
-			  Marcel DePaolis <marcel@netscape.com>
-			  Jim Salter <jsalter@netscape.com>
-			  Mike Blakely, David Shak, Brain Williams
-
-          Alternatively, the contents of this file may be used under the
-          terms of the GNU General Public license Version 2 or later
-	  (the "GPL"), in which case the provisions of GPL are
-	  applicable instead of those above.  If you wish to allow use
- 	  of your version of this file only under the terms of the GPL
-	  and not to allow others to use your version of this file
-	  under the NPL, indicate your decision by deleting the
-	  provisions above and replace them with the notice and other
-	  provisions required by the GPL.  If you do not delete the
-	  provisions above, a recipient may use your version of this
-	  file under either the NPL or the GPL License."
-
-     ----------------------------------------------------------------------
-
-     AMENDMENTS
-
-     The Netscape Public License Version 1.1 ("NPL") consists of the
-     Mozilla Public License Version 1.1 with the following Amendments,
-     including Exhibit A-Netscape Public License.  Files identified with
-     "Exhibit A-Netscape Public License" are governed by the Netscape
-     Public License Version 1.1.
-
-     Additional Terms applicable to the Netscape Public License.
-          I. Effect.
-          These additional terms described in this Netscape Public
-          License -- Amendments shall apply to the Mozilla Communicator
-          client code and to all Covered Code under this License.
-
-          II. "Netscape's Branded Code" means Covered Code that Netscape
-          distributes and/or permits others to distribute under one or more
-          trademark(s) which are controlled by Netscape but which are not
-          licensed for use under this License.
-
-          III. Netscape and logo.
-          This License does not grant any rights to use the trademarks
-          "Netscape", the "Netscape N and horizon" logo or the "Netscape
-          lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript",
-          "Smart Browsing" even if such marks are included in the Original
-          Code or Modifications.
-
-          IV. Inability to Comply Due to Contractual Obligation.
-          Prior to licensing the Original Code under this License, Netscape
-          has licensed third party code for use in Netscape's Branded Code.
-          To the extent that Netscape is limited contractually from making
-          such third party code available under this License, Netscape may
-          choose to reintegrate such code into Covered Code without being
-          required to distribute such code in Source Code form, even if
-          such code would otherwise be considered "Modifications" under
-          this License.
-
-          V. Use of Modifications and Covered Code by Initial Developer.
-               V.1. In General.
-               The obligations of Section 3 apply to Netscape, except to
-               the extent specified in this Amendment, Section V.2 and V.3.
-
-               V.2. Other Products.
-               Netscape may include Covered Code in products other than the
-               Netscape's Branded Code which are released by Netscape
-               during the two (2) years following the release date of the
-               Original Code, without such additional products becoming
-               subject to the terms of this License, and may license such
-               additional products on different terms from those contained
-               in this License.
-
-               V.3. Alternative Licensing.
-               Netscape may license the Source Code of Netscape's Branded
-               Code, including Modifications incorporated therein, without
-               such Netscape Branded Code becoming subject to the terms of
-               this License, and may license such Netscape Branded Code on
-               different terms from those contained in this License.
-
-          VI. Litigation.
-          Notwithstanding the limitations of Section 11 above, the
-          provisions regarding litigation in Section 11(a), (b) and (c) of
-          the License shall apply to all disputes relating to this License.
-

mozilla/mstone/Makefile

@@ -1,246 +0,0 @@
-# Makefile for mstone
-# use gmake
-# Builds each of the components and then packages everything
-
-topsrcdir	= .
-
-CP := cp -p
-
-ifndef INCLUDED_CONFIG_MK
-include $(topsrcdir)/config/config.mk
-endif
-
-
-# dynamically find the optional directories names
-LIBGD_DIR	= $(wildcard gd?.*)
-GNUPLOT_DIR	= $(wildcard gnuplot-?.*)
-PERL_DIR	= $(wildcard perl5.*)
-
-# file that we package
-GDFILES		= gd.txt gd.html libgd.* gd.h demoin.gif gddemo giftogd webgif
-GNUPLOTFILES	= gnuplot Copyright gnuplot_x11 gnuplot.1 gnuplot.gih 
-
-VERSION		= 4.3
-TARBALL		= mstone-$(VERSION)-$(NSARCH)$(OBJDIR_TAG).tar.gz
-ZIPFILE		= mstone-$(VERSION)-$(NSARCH)$(OBJDIR_TAG).zip
-TARBALL_ALL	= mstone-$(VERSION)-all$(OBJDIR_TAG).tar.gz
-ZIPFILE_ALL	= mstone-$(VERSION)-all$(OBJDIR_TAG).zip
-
-NTFILES		= mstone.bat process.bat setup.bat
-
-all:: usage
-
-usage::
-	@$(ECHO) "gmake [ release | rpackage | debug | dpackage ]"
-	@$(ECHO) "      [ DIST=/m/dist/mailstone/1999xxxx dist ]"
-	@$(ECHO) "      [ all_DBG | all_OPT ]"
-	@$(ECHO) "perl is" $(PERL_DIR) ". gd is" $(LIBGD_DIR) ". gnuplot is" $(GNUPLOT_DIR) "."
-
-targets::	$(OBJDIR) mailclient
-
-ifneq (,$(LIBGD_DIR))
-targets::	libgd
-endif
-
-ifneq (,$(GNUPLOT_DIR))
-targets::	gnuplot
-endif
-
-ifneq (,$(PERL_DIR))
-targets::	perl
-endif
-
-$(OBJDIR):
-	-mkdir -p $(OBJDIR)
-
-mailclient::
-	@$(ECHO) "\n===== [`date`] making OS_CONFIG=$(NSARCH) BUILD_VARIANT=$(BUILD_VARIANT)\n"
-	cd src; $(MAKE) BUILD_VARIANT=$(BUILD_VARIANT) OBJDIR=../$(OBJDIR) PKGDIR=../$(PKGDIR) all
-
-# Use our top level makefiles to drive the component builds
-libgd $(OBJDIR)/gd/libgd.a::
-	$(MAKE) -f gd.mk LIBGD_DIR=$(LIBGD_DIR) libgd
-
-gnuplot $(OBJDIR)/gnuplot/gnuplot::
-	$(MAKE) -f gnuplot.mk LIBGD_DIR=$(LIBGD_DIR) GNUPLOT_DIR=$(GNUPLOT_DIR) gnuplot
-
-perl $(OBJDIR)/perl/perl::
-	$(MAKE) -f perl.mk PERL_DIR=$(PERL_DIR) perl
-
-# Create packaging binary directories
-# Note: dont make gd or gnuplot here.  For multi-OS, they are links
-mkpkgdirs::	$(PKGDIR)/bin $(PKGDIR)/conf $(PKGDIR)/data $(PKGDIR)/doc
-
-$(PKGDIR)/bin:
-	mkdir -p $(PKGDIR)/bin
-
-$(PKGDIR)/conf:
-	mkdir -p $(PKGDIR)/conf
-
-$(PKGDIR)/data:
-	mkdir -p $(PKGDIR)/data
-
-$(PKGDIR)/doc:
-	mkdir -p $(PKGDIR)/doc
-
-$(PKGDIR)/gd:
-	mkdir -p $(PKGDIR)/gd
-
-$(PKGDIR)/gnuplot:
-	mkdir -p $(PKGDIR)/gnuplot
-
-$(PKGDIR)/perl:
-	mkdir -p $(PKGDIR)/perl
-
-
-# operating system independent share-files (at least for Unix)
-pkg-share-files:: mkpkgdirs
-	@$(ECHO) "\n===== [`date`] making package share-files...\n"
-	$(CP) mstone process $(PKGDIR)
-	(cd $(PKGDIR); [ ! -f setup ] || rm -f setup; ln -s mstone setup)
-	(cd $(PKGDIR); [ ! -f cleanup ] || rm -f cleanup; ln -s mstone cleanup)
-	(cd $(PKGDIR); [ ! -f checktime ] || rm -f checktime; ln -s mstone checktime)
-	(cd $(PKGDIR); [ ! -f timesync ] || rm -f timesync; ln -s mstone timesync)
-	-$(CP) nsarch bin/*.pl $(PKGDIR)/bin
-	-$(CP) conf/*.wld conf/*.wld.in conf/*.html $(PKGDIR)/conf
-	-$(CP) data/*.msg $(PKGDIR)/data
-	-$(CP) doc/*.html doc/*.gif $(PKGDIR)/doc
-	-$(CP) INSTALL $(PKGDIR)
-	-$(CP) README $(PKGDIR)
-	-$(CP) ChangeLog $(PKGDIR)
-	-$(CP) LICENSE $(PKGDIR)
-
-# split out OS specific file so that combined packaging possible (set PKGDIR)
-pkg-arch-files-gd::	 $(PKGDIR)/gd $(OBJDIR)/gd/libgd.a
-	$(CP) $(addprefix $(OBJDIR)/gd/, $(GDFILES)) $(PKGDIR)/gd
-	-$(STRIP) $(PKGDIR)/gd/webgif $(PKGDIR)/gd/giftogd $(PKGDIR)/gd/gddemo
-
-pkg-arch-files-gnuplot::	$(PKGDIR)/gnuplot $(OBJDIR)/gnuplot/gnuplot
-	$(CP) $(addprefix $(OBJDIR)/gnuplot/, $(GNUPLOTFILES)) $(PKGDIR)/gnuplot
-	-$(STRIP) $(PKGDIR)/gnuplot/gnuplot $(PKGDIR)/gnuplot/gnuplot_x11
-
-ifneq (,$(LIBGD_DIR))
-pkg-arch-files::	pkg-arch-files-gd
-endif
-
-ifneq (,$(GNUPLOT_DIR))
-pkg-arch-files::	pkg-arch-files-gnuplot
-endif
-
-pkg-arch-files::	$(PKGDIR)/bin $(OBJDIR)/mailclient
-	@$(ECHO) "\n===== [`date`] making package arch-files...\n"
-	$(CP) $(OBJDIR)/mailclient $(PKGDIR)/bin
-	-$(STRIP) $(PKGDIR)/bin/mailclient
-
-pkg-perl-files:: $(PKGDIR)/bin $(OBJDIR)/perl/perl
-	@$(ECHO) "\n===== [`date`] making package perl-files...\n"
-	$(MAKE) -f perl.mk PERL_DIR=$(PERL_DIR) \
-		BUILD_VARIANT=$(BUILD_VARIANT) \
-		OBJDIR=$(OBJDIR) PKGDIR=$(PKGDIR) package-perl
-	find $(PKGDIR)/perl/lib -name .packlist -exec rm {} \; -print
-	-$(STRIP) $(PKGDIR)/perl/bin/perl
-	-$(STRIP) $(PKGDIR)/perl/bin/a2p
-
-# for combined packaging, this should not be part of pkg-arch-files
-# perl is handled seperately do to its size
-ifneq (,$(PERL_DIR))
-pkg::	pkg-perl-files
-endif
-
-pkg::	targets pkg-share-files pkg-arch-files
-
-tarball:	build/$(TARBALL)
-
-build/$(TARBALL):
-	@$(ECHO) "\n===== [`date`] making os tar file...\n"
-	-rm -f build/$(TARBALL)
-	cd $(dir $(PKGDIR)) && tar cf - . | gzip > ../../$(TARBALL)
-
-zipfile:	build/$(ZIPFILE)
-
-build/$(ZIPFILE):
-	@$(ECHO) "\n===== [`date`] making os zip file...\n"
-	-rm -f build/$(ZIPFILE)
-	cd $(dir $(PKGDIR)) && zip -r -q ../../$(ZIPFILE) .
-
-
-########################################################################
-# Generate a combined build for every Unix OS that is already packaged
-# NT has to be done seperately because it has different file names
-# We have to nuke some old parts, because permissions wont allow overwrites
-# Finally, dont ship perl development headers and libraries
-all_DBG all_OPT::
-	@$(ECHO) "===== [`date`] unified packaging for $@..."
-	$(MAKE) NSARCH=$@ OBJDIR_TAG='' \
-		PKGDIR=$(topsrcdir)/build/package/$@.OBJ/mstone pkg-share-files
-	./ospkg.sh $@.OBJ \
-	    $(notdir $(shell ls -d build/package/[A-Z]*$(subst all,,$@.OBJ)))
-	[ -d $(topsrcdir)/build/package/$@.OBJ/mstone/bin/WINNT4.0 ] \
-		&& cp -p $(NTFILES) $(topsrcdir)/build/package/$@.OBJ/mstone; :
-	-rm -f ./build/mstone-$(VERSION)-$@.tar.gz
-	cd ./build/package/$@.OBJ \
-		&& tar cf - . | gzip > ../../mstone-$(VERSION)-$@.tar.gz
-	-rm -f ./build/mstone-$(VERSION)-$@.zip
-	cd ./build/package/$@.OBJ \
-		&& zip -r -q ../../mstone-$(VERSION)-$@.zip .
-
-
-########################################################################
-# Copy all the packaged trees to the distribution site
-# Copy in the unified tarball and zip file
-# Link mstone to mailstone for Netscape back compatibility
-# Re-map short Linux name to standard Netscape convention
-dist::
-	@[ "$(DIST)" != "" ] || ($(MAKE) usage && /bin/false)
-	@[ ! -d "$(DIST)" ] || ($(ECHO) "Error: $(DIST) already exists" && \
-		$(MAKE) usage && /bin/false)
-	mkdir -p $(DIST)
-	cp -p build/mstone-$(VERSION)-all_*.*[a-z] $(DIST)/
-	(cd build/package; tar cf - *.OBJ) | (cd $(DIST); tar xf - )
-	for l in $(DIST)/*_???.OBJ ; do \
-		(cd $$l; ln -s mstone mailstone); done
-	cd $(DIST); for l in Linux*_???.OBJ ; do \
-		nn=`echo $$l | sed -e 's/_OPT/_glibc_PTH_OPT/' | sed -e 's/_DBG/_glibc_PTH_DBG/'`; \
-		ln -s $$l $$nn; done
-
-# since the default is release mode, this can just work off a dependency
-release::	targets
-#release::
-#	@$(ECHO) "\n===== [`date`] making release build..."
-#	$(MAKE) BUILD_VARIANT=release OBJDIR_TAG=_OPT targets
-	@$(ECHO) "\n===== [`date`] making release build done."
-
-rpackage:: release pkg #tarball zipfile
-#rpackage:: release
-#	@$(ECHO) "\n===== [`date`] making release package..."
-#	$(MAKE) BUILD_VARIANT=release OBJDIR_TAG=_OPT pkg tarball zipfile
-	@$(ECHO) "\n===== [`date`] making release package done."
-
-# since the default is release mode, start a make with the right mode
-debug::	
-	@$(ECHO) "\n===== [`date`] making debug build..."
-	$(MAKE) BUILD_VARIANT=debug OBJDIR_TAG=_DBG targets
-	@$(ECHO) "\n===== [`date`] making debug build done."
-
-# We dont usually bother to tar up a debug build
-dpackage:: debug
-	@$(ECHO) "\n===== [`date`] making debug package..."
-	$(MAKE) BUILD_VARIANT=debug OBJDIR_TAG=_DBG pkg
-	@$(ECHO) "\n===== [`date`] making debug package done."
-
-# These are old and may be broken
-cleanvariant::
-	(cd src; $(MAKE) OBJDIR=../$(OBJDIR) clean)
-	rm -rf $(PKGDIR)
-
-clean::
-	$(MAKE) BUILD_VARIANT=release OBJDIR_TAG=_OPT cleanvariant
-	$(MAKE) BUILD_VARIANT=debug OBJDIR_TAG=_DBG cleanvariant
-
-distcleanvariant::
-	(cd src; $(MAKE) OBJDIR=../$(OBJDIR) distclean)
-	rm -rf $(OBJDIR) $(PKGDIR)
-
-distclean:: clean
-	$(MAKE) BUILD_VARIANT=release OBJDIR_TAG=_OPT distcleanvariant
-	$(MAKE) BUILD_VARIANT=debug OBJDIR_TAG=_DBG distcleanvariant

mozilla/mstone/README

@@ -1,75 +0,0 @@
-
-                    MSTONE 4.2
-
-Mstone is a mail server performance testing tool designed to simulate
-the different types and volume of mail traffic a mail server would
-experience during a peak activity period.  Mstone was formerly known
-as Mailstone.
-
-A quick installation guide is available in INSTALL.
-
-The full Mailstone 4.15 user manual is available at
-http://lxr.mozilla.org/mozilla/source/mstone/doc/MailStone.html
-
-Testing strategy
-----------------
-
-Mstone is capable of opening SMTP, POP3, IMAP4, and other protocol
-connections to mail servers.  The number and type of connections made
-to the mail server is based on a weighted command list which provides
-the ability to test mail server implementation requirements.
-
-A series of perl script allow you to setup client machines, run tests,
-and then cleanup client machine files.  Each client machine has a copy
-of the mailclient program and SMTP message files.  When the test is
-run, the mailclient is started with the proper command line and work load.
-
-After experimenting with mstone loads, you will notice that there
-are a few factors that can distort server the byte and message
-throughput.  You will find that the server byte throughput is related
-to the average SMTP message (file) size.  Also, server throughput, in
-bytes and messages, is affected by larger than normal POP3/IMAP4
-mailboxes.  So it is important to approach the mstone command
-configuration with data collected from existing mail server
-implementations, for example, a customer might say "during our peak
-activity in the morning, we handle up to two thousand employees
-sending an average of 5 messages of 20K average size and receiving 25
-messages of same size". With input like this, you can begin tuning
-mstone to generate relevant data.
-
-There are two important things to consider when reviewing the results of
-mstone performance analysis:  Was the test run on target for
-simulating the type and volume of mail traffic; and did the server, both
-software and machine, handle the load within an acceptable margin?
-
-With this information, it can be determined: whether enough SMTP
-connections were made to the server during the run, and how many
-messages were downloaded over how many POP3/IMAP4 connections.  If the
-number of SMTP connections is not in the acceptable range, then
-consider adding more client processes/machines or checking the server
-performance during the run.  The message/connection ratio for
-POP3/IMAP4 should be checked for soundness, and adjustments should be
-made to the mailboxes before running the next test.
-
-Monitoring the server performance during test runs is crucial in
-understanding the results.  If the number of client connections is not
-being achieved and the server cpu usage and process run queue is not
-settling down after the initial spike, then modifications to the server
-architecture could be in order.
-
-The analysis of mstone results is an iterative process of client
-(mstone client) and server tuning.  The bottom line is to determine
-whether the messaging solution can handle the type of load expected in
-an acceptable manner.
-
-
-Server Log Tuning
------------------
-The Messaging and Directory server ship with access logging enabled by
-default.  This gives the most information about what is going on in
-the system, but can reduce performance.  You should test the way the
-system will be run.  
-
-Noticeable performance increases are often obtained by disabling access
-logging on the directory server and by reducing the logging level of
-the messaging servers from "Notice" to "Warning".

mozilla/mstone/README.Sendmail-contributions

@@ -1,16 +0,0 @@
-Under the terms of the Mozilla Public License, Version 1.1, granted
-by Mozilla, Sendmail Inc. is contributing the following Source Code
-changes to the Mozilla mstone source repository.
-
-Sendmail, Inc. is making available these source code modifications
-according to the Distribution Obligations as listed in section 3
-of the Mozilla Public License, Version 1.1
-
-The changes provided herein are described in the included files:
-
-  README.Sendmail-mstone_changes.html
-  ChangeLog-Sendmail
-
-All modifications are derived, directly or indirectly, from the original
-code as provided by Mozilla.
-

mozilla/mstone/README.Sendmail-mstone_changes.html

@@ -1,419 +0,0 @@
-<html>
-<head><title>Sendmail, Inc. Mstone changes</title></head>
-<body>
-
-<h3>Mstone modifications</h3>
-
-<ol>
-<li><h4>Random Variable Parameters</h4>
-
-In addition to taking on constant values, some parameters can now be
-sampled from probability distributions.  These variables are:
-<ul>
-<li><code>startDelay</code>
-<li><code>idleTime</code>
-<li><code>blockTime</code>
-<li><code>loopDelay</code>
-<li><code>numRecips</code>
-<li><code>size</code>
-<li><code>headers</code>
-<li><code>mime</code>
-<li><code>leaveMailOnServer</code>
-<li><code>bandwidth</code>
-<li><code>latency</code>
-</ul>
-
-<p>
-The following distributions are currently implemented:
-<ul>
-<li>Uniform (~unif(a, b))
-<li>Normal (~normal(a, b))
-<li>Log-Normal (~lognormal(a, b))
-<li>Weibull (~weib(a, b, c))
-<li>Exponential (~exp(a))
-<li>Constant (~const(a))
-<li>Binomial (~binomial(a))
-</ul>
-
-<p>
-Sampled values may also be constrained by a minimum and maximum value.
-This is particularly useful for e.g. the normal and lognormal
-distributions, though over-tight constraints will create a "lump" at
-the end of the generated distribution, and any constraints may change
-the distribution's characteristics (e.g. mean).  To specify
-constraints, do the following:
-
-<h5>getdist</h5>
-
-<p>
-There is also a helper tool called "getdist" in the Sendmail mstone
-distribution. Building getdist:
-
-<pre>
-  file: mstone/src/idle.c
-  # gcc -DTEST_PROB -Dxalloc=malloc -Dxfree=free -lm idle.c
-</pre>
-
-<p>
-Rename the resulting binary to "getdist"
-
-<p>
-<b>Using getdist</b>
-
-<p>
-To run it interactively:
-
-<ol>
-<li>Start up getdist</li>
-<li>Enter the distribution you want to see a sample and mean (ignore warning about 'gets()')</li>
-</ol>
-
-<p>
-Example:
-
-<pre>
-% getdist
-warning: this program uses gets(), which is unsafe.
-~lognormal(3,4.5)
-Samples:
-6.846493
-0.109578
-31.402784
-0.467486
-21.905714
-7.113645
-0.225102
-29.372181
-4.252427
-1.444493
-mean: 29.128932
-</pre>
-
-<p>
-It will only OUTPUT 10 samples as examples but the mean
-is calculated based on 2000 samples by default.  You can specify
-the mean sample size on the command line by giving it a -n option:
-
-<pre>
-% getdist -n 1000000
-</pre>
-
-<p>
-This will calculate the mean based on a sample of 1000000 entries.
-
-<p>
-The above data was calculated with 2M samples.
-
-<p>
-<i>Known Problems</i><BR>
-It appears (anecdotally) that the first set of samples returned by
-getdist are inaccurate. After starting the getdist program interactively,
-it may appear necessary to ignore the first set of output, but that entering
-the distribution again will return a more accurate result.<BR>
-
-<p>
-For example:
-
-<pre>
-# getdist
-~lognormal(10,2)
-Samples:
-670043.575395
-48.842052
-54.039792
-0.460849
-2.152179
-32.534664
-6.163511
-42.827706
-27.806642
-4.966444
-mean:   364.747532
-var:    224352671.855287
-stddev: 14978.406853
-~lognormal(10,2)
-Samples:
-1.842800
-39.760727
-4.798239
-10.722216
-27.052030
-28.923926
-61.504273
-20.743583
-5.373420
-42.195531
-mean:   25.510130
-var:    2674.124997
-stddev: 51.711942
-</pre>
-
-
-<dl>
-  <dt><code>~dist(...) : [min,]</code>
-  <dd>force all sampled values to be >= <code>min</code>
-  <dt><code>~dist(...) : [min,max]</code>
-  <dd>force all sampled values X to be <code>min</code> <= X <= <code>max</code>.
-  <dt><code>~dist(...) : [,max]</code>
-  <dd>force values to be <= <code>max</code>
-</dl>
-
-<li><h4>Parsing Changes</h4>
-
-All of the time-valued test parameters except <code>rampTime</code>
-and <code>time</code> now have millisecond values.  In particular,
-this means that a value of "17" parses to 17
-<strong>milliseconds</strong>, not 17 seconds.  Use "17s" instead.
-<p>
-
-    Size-valued parameters can have units of "k" or "m" to indicate
-kilobytes or megabytes, respectively.
-<p>
-
-    For parameters supporting random-variable values, a value starting
-with "~" will be interpreted as a random variable specification of the
-form "~NAME([ARGS ...])".  Unit suffixes (e.g. "s", and "m") apply to
-random variable parameters as well as constant values.  This implies
-that for unitless parameters, the suffixes corresponding to the random
-variable's units will still be recognized (i.e. the values will be
-multiplied by the appropriate factors).  This is probably best
-considered as a "bug" rather than excercised as a "feature."
-<p>
-
-    <code>blockTime</code>, <code>loopDelay</code>, and
-<code>idleTime</code> now refer to the total amount of time a command
-block, loop, and initialization phase should take, respectively, not
-the amount of time the simulation should stall after completing each
-phase.  For example, if a block takes 2 seconds to complete, and the
-block time is 4 seconds, the client thread will sleep for 2 seconds
-after finishing instead of the full 4.<p>
-
-<code>rampTime</code> is now solely for the benefit of the client
-machines, to control the rate at which threads are started.  The rate
-at which commands from a given protocol are started is now controlled
-by the <code>startDelay</code> variable, which is
-distribution-valued.  Thus the actual command loop now looks like
-this:
-
-<pre>
-wait for startDelay
-start counting idleTime
-start counting blockTime
-execute start function
-wait for remainder of idleTime
-for (1 ... numLoops)
-       	start counting loopDelay
-       	execute loop function
-       	wait for remainder of loopDelay
-execute	end function
-wait for remainder of blockTime
-</pre>
-
-<li><h4>Automatic Message Generation</h4>
-
-Both MIME and text/plain messages can now be generated automatically.
-To enable automatic message generation, set the <code>file</code>
-attribute of an SMTP block to "auto".  The messages will then have at
-least as many headers as the value of the <code>headers</code>
-attribute, have bodies <code>size</code> bytes long, and have
-<code>mime</code> MIME parts.  To generate text/plain messages, set
-<code>mime</code> to zero.
-
-<table border=1 cellpadding=2>
-<tr><th>Attribute</th><th>Description</th></tr>
-
-<tr>
-  <td><code>headers <i>N</i></code></td>
-  <td>(optional; default=5) Each automatically generated message will
-      have <code>min(<i>N</i>, min_hdrs)</code> headers, where
-      <code>min_hdrs</code> is 5 for text/plain, and about 7 for MIME
-      messages.  Additional headers are named
-      "X-generated-header-%d". </td>
-</tr>
-
-<tr>
-  <td><code>size <i>N</i></code></td>
-  <td>(required) Each generated message will have a body be <i>N</i>
-      bytes long.</td>
-</tr>
-
-<tr>
-  <td><code>mime <i>N</i></code></td>
-  <td>Each generated message will have <code>N</code> MIME parts.  If
-      the value of <code>size</code> does not allow <code>N</code> parts,
-      one part is generated.  If <code>N</code> is zero, the message is
-      text/plain.</td>
-</tr>
-
-<tr>
-  <td><code>checksum <i>{yes|no|save}</i></code></td>
-  <td>For SMTP: each generated message will have the MD5 sum of the
-  message body appended to the message unless the value is <i>no</i>.
-  For retrieval protocols, checksums will be verified.  (NOT
-  IMPLEMENTED: if <code>checksum</code> is <i>save</i>, messages with
-  incorrect checksums will be saved to temporary files for later
-  examination.) </td>
-</tr>
-
-</table>
-
-<li><h4>Linespeed Emulation</h4>
-
-SMTP, POP, and IMAP all support a form of linespeed emulation,
-controlled via the <code>latency</code> and <code>bandwidth</code>
-parameters.
-
-<table border=1 cellpadding=2>
-<tr><th>Attribute</th><th>Description</th></tr>
-
-<tr><td><code>latency <i>N</i></code></td>
-<td>Set the network latency to <code>N</code> milliseconds.</td></tr>
-
-<tr><td><code>bandwidth <i>N</i></code></td>
-
-<td>Transfer at most <code>N</code> bytes per second.</td></tr>
-
-</table>
-
-<li><h4>TLS support</h4>
-
-If you have openssl, mstone now supports STARTTLS for SMTP and IMAP,
-and STLS for POP (both old-style and MULTIPOP), as well as SSL
-tunneling.  This support is <strong>not</strong> well-tested, and TLS
-can be a bit tricky to set up, so use at your own risk.  TLS
-introduces several new attributes to the protocol blocks:
-
-<table border=1 cellpadding=2>
-<tr><th>Attribute</th><th>Description</th></tr>
-
-<tr><td><code>sslcert <i>filename</i></code></td>
-<td>Read the client's cert from <i>filename</i>, which should be in
-PEM format. </td></tr>
-
-<tr><td><code>sslkey <i>filename</i></code></td>
-
-<td>Read the client's private key from <i>filename</i>, which should
-be in PEM format.</td></tr>
-
-<tr><td><code>usetls {0|1}</code></td>
-
-<td>Turn STARTTLS/STLS on or off (default: off).  <b>Note</b>:
-<code>starttls</code> and <code>ssltunnel</code> are mutually
-exlcusive.</td></tr>
-
-<tr><td><code>ssltunnel {0|1}</code></td>
-
-<td>Turn SSL tunneling on or off (default: off).</td></tr>
-
-</table>
-
-<li><h4>"Multi-POP" protocol</h4>
-
-<b>Note</b>: multipop, always a band-aid, is hopefully obsoleted by
-the new event-queue execution model.  Though it has not been tested,
-it should be easier, more efficient, and more accurate to use the
-normal POP protocol with events to simulate a large number of users
-with a reasonable number of threads.  Once this has been tested,
-automatically-generated workloads should revert to using POP.
-
-<p>To simulate a large number of concurrently active POP users with
-Mstone's extravagant use of threads, and to simulate a period of
-activity comprised of several POP sessions one can use the MULTIPOP
-protocol to multiplex active users onto a single thread.  The protocol
-has all the same parameters as POP, plus the following:
-
-<table border=1 cellpadding=2>
-<tr><th>Attribute</th><th>Description</th></tr>
-
-<tr><td><code>userSpacing</code></td>
-
-    <td>Total time for each user's session.</td>
-</tr>
-<tr><td><code>usersPerModem</code></td>
-
-    <td>The maximum number of concurrently connected users is limited
-	to <code>users / usersPerModem</code></td>
-</tr>
-</table>
-
-<p>
-
-The protocol functions are substantially different.  Instead of
-simulating a single login-check-logout sequence, a protocol block
-simulates an entire active period for a set of users.  Each user
-checks mail once in the initialization function, once each time the
-loop body is executed, and once more in the protocol conclusion
-function.  
-<p>
-
-<li><h4>"Event-queue" implementation</h4>
-
-<p>
-Unless the "noevents" parameter in the "&lt;config&gt;" section is set to 1,
-or mailclient is not given the "-e" flag, mstone will run in
-"event-queue" mode.  Instead of creating one thread per client, it
-will multiplex clients over a much smaller number of threads.  This is
-intended to increase the tool's scalability.
-
-<p>
-Note that I/O is still synchronous with this model, so the number of
-threads required will approximately equal the maximum number of
-concurrent operations.  Also note that this change does not reduce the
-number of required file descriptors.
-
-<p>
-
-<li><h4>Other Minor Additions</h4>
-
-<ul>
-
-<li>IMAP now has a ramp-down time, enabled by defining
-<code>IMAP_RAMPDOWN</code>.  IMAP threads now exit uniformly between
-the time the test is supposed to be over and the time Mstone starts
-killing them.
-
-<li>Mstone used to always time out connections after 60 seconds.  The
-timeout value can now be configured on a per-block basis via the
-<code>timeout</code> parameter. The value of the timeout parameter must
-be defined in milliseconds, so the following value would mean a timeout
-of one (1) hour:<BR>
-
-&nbsp;&nbsp;&nbsp;timeout 3600000
-
-<li>Simplified client allocation.  It is now possible to specify the
-number of clients in each group by specifying a value for
-<code>clients</code> in each <code>&lt;CLIENT&gt;</code> section and
-<em>not</em> specifying a global <code>clientCount</code> in the
-<code>&lt;CONFIG&gt;</code> section.
-
-</ul>
-
-<li><h4>Bug Fixes</h4>
-
-<ul>
-
-<li>SMTP now ignores debugging output appearing over the connection.
-Before, Mstone would generate an error when talking to
-e.g. <code>sendmail -d64.5</code>.
-
-<li>(now it works...)  The old sequence of IMAP commands used by
-Mstone was incorrect.  Instead of only downloading unread messages, it
-would download all messages received since the start of the session
-each time a new messages was received.  Depending on what you were
-doing, this could have a serious effect on your results.
-
-</ul>
-
-<li><h4>Wish List</h4>
-
-<ul>
-  <li>Scriptable user behavior for POP and IMAP protocols.  While we should
-      probably not go overboard, adding more configuration options to Mstone
-      is probably not the answer.  There is already some support for more
-      complex behaviors in the IMAP code -- we may or may not want to make
-      use of it.  More to the point, wider coverage of the IMAP
-      protocol is vital to QA's use of the tool.
-</ul>
-
-</ol>
-</body></html>

mozilla/mstone/ToDo

@@ -1,189 +0,0 @@
-Mstone TODO List
-
-Updated:
-	3-20-2000	Dan Christian
-
-======================================================================
-Minor improvements
-
-Data reduction at each testbed client
-
-Test message generator (plain and MIME styles)
-
-More graphs for multiple runs
-
-Option to drop a fraction of connections
-
-IMAP delete without reading
-	Just get the message list and delete everything.  This could
-be the fastest way to drain out the store.
-
-
-Display MIN/MAX or standard deviation on graphs
-	Gnuplot can do data points with error bars.  You could either
-use MIN/MAX or the standard deviation for the error bars.  There are
-issues with calculating the standard deviation numbers throughout the
-graph that need to be addressed.
-
-
-Statistics reset
-	At least the MIN and MAX statistics could be easily reset
-during the test (after ramp up).  This keeps the transients during
-startup and shutdown from dominating these numbers.  The standard
-deviation statistics are much trickier to reset during the run.  It
-may be better to isolate sections in post processing.
-
-
-Perl web server
-	Sometimes it would be nice to include our own web server to
-provide the results (instead of using file: URLs).  This would also be
-a gateway to form based test configuration editing and allow results
-to be interactively updated during tests.  Perl with a socket library
-could handle this without too much trouble.
-
-
-Dynamic test loading
-	Finalize an API for dynamically loading tests.  This would
-allow tests to be added or updated separately from the core
-functionality.  This may be needed for some types of security testing.
-
-
-Link graphs to the results tables
-	There are already tags by each graph.  You should be able to
-link the appropriate results table entry to each graph.  This sort of
-tricky since graphs often combine multiple entries.
-
-
-Show statistics for every block
-	Statistics are actually kept for every block in every thread.
-There should be a way to view information at this detail.
-
-
-Man pages
-	The online docs are nice, but good 'ol man pages would be
-great in a different way.
-
-
-Reduce namespace polution
-	Scripts names like setup and cleanup are too general.  They
-
-should be part of the main 'mstone' script (e.g. mstone setup).
-
-Examples of script series
-	Include example scripts to run entire series of tests in a
-sane way.
-
-
-Fix FORMAT clash
-	At the start of a test, each client process outputs the
-information needed to report all its protocols.  When there are
-multiple processes on one client, these FORMAT lines can intermix and
-cause parsing errors.
-
-
-Set connection drop rate
-	Drop some percentage of the connections without a proper
-shutdown.  This tests how well a server can detect and recover from
-hard disconnects.
-
-
-Improve randomness
-	The way that we generate random numbers in a range may be not
-generate the proper randomness.  We are using lrand48()%range we
-should use (lrand48/RAND_RANGE)*range.  There are some end conditions
-that need to be thought about.  All of this is in the sequence code;
-one change should fix (or break :) everything.
-
-	Also, we may be generating numbers that are never used.  This
-may be costly, and can create holes in the proper sequence.
-
-
-Improve printing
-	The color graphs are great on screen, but tend to print
-poorly.  Either we need a better way to generate a printable version
-(maybe through a CGI button), or the seperate protocols need to be
-printed individually.  Also, Communicator does a lousy job of keeping
-title with tables or graphs.  Hopefully, Mozilla will do better.
-
-
-======================================================================
-Whole new protocol tests:
-
-ICQ
-	Test high volume instant messaging.  Very useful for the
-bridges and gateways that people are considering using.
-
-
-WAP
-	WAP is the emerging standard for mobile phones.
-
-
-WCAP
-	Web based calendar services
-
-
-LDAP
-	Use the LDAP SDK to do basic LDAP testing.  The SDK probably
-isn't fast enough to call this a real performance test, but you can at
-least test performance degredation due to load from a real application
-(like a mail server).
-
-
-DNS
-	Mail servers use DNS a lot.  You should at least be able to
-see if performance is degrading due to load.
-
-
-Disk/filesystem
-	Test read, write, sync, link, un-link, and append performance under
-multiple threads.
-
-
-Cert servers
-	Test certificate authenticity checking performance
-
-
-======================================================================
-Possible dummy servers:
-
-SMTP
-	Receive mail via SMTP and ignore it.  Usefull for SMTP relay
-testing.
-
-
-DNS
-	Simulate slow DNS server lookups.  Usefull for SMTP relay testing.
-
-
-======================================================================
-Major changes
-
-Throttling
-	Monitor and control transaction rates so that specific load
-levels can be easily specified.  The rates should be able to vary to
-simulate peek hour usage and disconnect-restore.
-
-
-NSPR threading
-	Use NSPR for threading and sockets.  This may allow other OSes
-to be used as clients.  This might be easy, since mstone does not need
-any locking, just simple thread creation and harvesting.  NSPR
-argument parsing and hashes may also be useful.
-
-
-SSL
-	Support SSL on the protocols that allow it.  May require NSPR.
-
-
-Line speed emulation
-	Simulate the variable delays and limited throughput of dial up
-connections.
-
-
-Scripting
-	Allow more detailed control of protocol tests.  It looks
-difficult to make this scalable and fast.
-
-
-Combined tests
-	Deliver mail over SMTP and then see when it arrives using IMAP.

mozilla/mstone/allbuild

@@ -1,462 +0,0 @@
-#!/bin/ksh
-########################################################################
-# buildall - automated multi-platform build tool
-#
-# 10/09/97 - marcel - created
-# 10/13/97 - marcel - support shared build tree
-#  2/11/98 - marcel - updated for 4.0 Beta builds (need -update)
-#  2/26/98 - marcel - added -r, -t and host specifiers
-#  7/01/99 - robodan - added VAR=value ability
-#  8/01/99 - robodan - explicitly know about building on localhost
-#  10/15/99 - robodan - remove older OSes from build list
-#  2000/4/7 - robodan - Created mstone version
-########################################################################
-#
-# This script is intended to do a set of UNIX builds for a
-# given CVS module.  It is designed to use 'rsh' between a
-# set of trusting hosts and use shared NFS storage with common
-# mount points (e.g. /u/username/...)
-#
-# To check if you have rights to rsh to a particular host, try:
-#   rsh hostname "echo $PATH"
-# You may have to edit your .rhosts or /etc/hosts.equiv
-#
-# A target directory will be created based on the current date.
-#
-# A set of global build logs plus a log per platform are kept
-# in a log directory under the target
-#
-# It will checkout a copy of the source, duplicate it for
-# each platform and perform a set of remote builds in parallel.
-# The script will exit when all the work has been completed.
-#
-# Example usage:
-#  cd ~/src; buildall msg
-# Result:
-#  ~/src/19980210_40.1/
-#  ~/src/19980210_40.1/logs/...
-#  ~/src/19980210_40.1/src/...
-#  ...
-#
-
-# Buildhosts
-DEFAULT_BUILDHOSTS="kimo nugget vsync shave purgatory trex0"
-
-usage() {
-  echo ""
-  echo "usage: buildall [ make assigns... ] < -t | target > [ -r ] [ buildhosts... ]"
-  echo "   [ -t | --test]:	just test rsh and report OS versions."
-  echo "  [-r | --respin]:	rebuild in place using existing source."
-  echo "  [-p | --postbuild]:	Execute post build command too."
-  echo "  [make assigns]:	e.g. VARIANT=release"
-  echo "         <target>:	one of: mstone42"
-  echo "  [buildhosts...]:	default [$DEFAULT_BUILDHOSTS]"
-  echo ""
-  exit 1
-}
-
-########################################################################
-# Set these defaults and options for your desired build
-########################################################################
-
-# Target base destination directory
-DESTBASE=`pwd`
-
-# Can we do multiple ARCH builds in same source tree
-SHARESRC=yes
-
-DESCRIPTION=""
-BUILDHOSTS=""
-RESPIN="no"
-POSTBUILD="no"
-JUST_TEST="no"
-DESTTYPE=""
-CO_CMD="cvs -d $CVSROOT -q checkout"
-CHECKOUT=""
-CHECKOUT2=""
-#MOZCVSROOT=':pserver:anonymous@cvs.mozilla.org:/cvsroot'
-MOZCVSROOT=':pserver:robodan%netscape.com@cvs.mozilla.org:/cvsroot'
-
-MAKE="gmake"
-MK_ARG=""
-
-ARGS="$@"
-
-for ARG in "$@"; do
-
-# If this is a make assignment (FOO=whatever), add it to make command
-# Arguments with quotes in them dont go all the way through.
-# Make args trick: 'FOO=nop -j 2'
-# The pre-post arg stuff uses hostnames as a switch, ugly calling syntax.
-if [[ -n "`echo z$ARG | egrep '^z[A-Z0-9_]+=[^ 	]'`" ]] ; then
-  if [[ -n "$DESCRIPTION" ]] ; then
-	echo "Arg after target is ignored! ($ARG)"
-	continue
-  fi
-  if [[ -z "$BUILDHOSTS" ]] ; then	# pre  args
-    MAKE="$MAKE $ARG"
-  else					# post args
-    MK_ARG="$MK_ARG $ARG"
-  fi
-  continue
-fi
-
-# should we just rebuild todays latest source...
-if [[ "$ARG" = "-r" || "$ARG" = "--respin" || "$ARG" = "respin" ]]; then
-  RESPIN="yes"
-  continue
-fi
-
-# should we just run post build command...
-if [[ "$ARG" = "-p" || "$ARG" = "--postbuild" || "$ARG" = "postbuild" ]]; then
-  POSTBUILD="yes"
-  continue
-fi
-
-# should we just test remote connectivity and execute permissions...
-if [[ "$ARG" = "-t" || "$ARG" = "--test" ]]; then
-  JUST_TEST="yes"
-  RESPIN="yes"
-  continue
-fi
-
-# We will pull source using: "$CHECKOUT"
-# And build on each machine: "cd $BUILDDIR && $BUILDCMD"
-
-
-# expand targets (but dont confuse hosts for targets (msg7))
-
-# These will build just mstone
-# expand targets (but dont confuse hosts for targets (msg7))
-if [[ "$BUILDCMD" = "" && "$ARG" = mailstone* ]]; then
-  case ${ARG#mstone} in
-	"")
-	"42")
-		DESTTYPE=_MSTONE42
-		MS_BRANCH=""
-		#BUILDCMD="$MAKE $MK_ARG debug release"
-		#POSTCMD="$MAKE $MK_ARG all_DBG.OBJ all_OPT.OBJ"
-		BUILDCMD="$MAKE $MK_ARG rpackage"
-		POSTCMD="$MAKE $MK_ARG all_OPT"
-		;;
-	*)
-		echo "Unknown mstone version in $ARG"
-		echo "Try mstone42"
-		exit 1;;
-  esac
-
-  DESCRIPTION="Mstone $MS_BRANCH"
-  BUILDDIR=./mozilla/mstone
-  CVSROOT=$MOZCVSROOT
-  CHECKOUT="$CO_CMD $MS_BRANCH mozilla/mstone"
-  # BUG No way to unpack perl, gd, and gnuplot before building
-  continue
-fi
-
-#########################
-# Other...
-#########################
-
-# These will print some tools info
-if [[ "$ARG" = "tools" ]]; then
-  CHECKOUT="$CO_CMD modules"
-  BUILDDIR=.
-  BUILDCMD="which gcc && ls -l /tools/ns/bin/gcc && which gcc-2.7.2.1 && ls -l /tools/ns/bin/gcc-2.7.2.1"
-  continue
-fi
-
-#########################
-# Everything else is assumed to be a hostname
-#########################
-
-BUILDHOSTS="$ARG $BUILDHOSTS"
-
-done # for ARG in $*; do
-
-if [[ "$BUILDHOSTS" = "" ]]; then
-  BUILDHOSTS=$DEFAULT_BUILDHOSTS
-fi
-
-if [[ "$BUILDCMD" = "" && "$JUST_TEST" = "no" ]]; then
-  usage
-fi
-
-########################################################################
-# You shouldn't have to modify stuff below here too much
-########################################################################
-
-# Who and Where are we
-PROG=buildall
-RSH=rsh
-SYS=`uname -s`
-echo SYS=$SYS
-if [[ "$SYS" = "HP-UX" ]]; then
-  RSH=remsh
-fi
-
-########################################################################
-# Simple log output function
-########################################################################
-
-log() {
-#  echo "[`date +\"%Y/%m/%d %H:%M:%S\"`] $PROG: $*"
-  echo "`date +\"%H:%M:%S\"` $PROG: $*"
-}
-
-########################################################################
-# Error
-########################################################################
-
-quit() {
-  log "$* (exiting)..."
-  exit 1
-}
-
-# Where should the work be done
-REV=1
-WORKDIR=$DESTBASE/`date +"%Y%m%d"`$DESTTYPE.$REV
-LASTWORKDIR=$WORKDIR
-LASTREV=$REV
-
-while [[ -d $WORKDIR ]]; do
-  LASTREV=$REV
-  let "REV= REV + 1"
-  LASTWORKDIR=$WORKDIR
-  WORKDIR=$DESTBASE/`date +"%Y%m%d"`$DESTTYPE.$REV
-done
-
-if [[ "$RESPIN" = "yes" ]]; then
-  WORKDIR=$LASTWORKDIR
-  REV=$LASTREV
-fi
-BUILDREV=$REV
-
-if [[ ! -d $WORKDIR && "$RESPIN" = "yes" ]]; then
-  quit "missing expected respin workdir ($WORKDIR)"
-fi
-
-mkdir -p $WORKDIR
-
-# Where to send logs
-LOGDIR=$WORKDIR/logs
-[[ -d $LOGDIR ]] || mkdir $LOGDIR
-
-# What tool to use for compressed tar
-if [[ -x /tools/ns/bin/tar ]] ; then	# ROBDAN 9-15-98 for Linux
-  TAR=/tools/ns/bin/tar
-else
-  TAR=tar
-fi
-
-SRCDIR=$WORKDIR/src
-SRCTAR=$WORKDIR/src.tar.gz
-
-########################################################################
-# The function which extracts the source and prepares for copies
-########################################################################
-
-prepare_source() {
-  log "Preparing source code..."
-  mkdir $SRCDIR
-  (cd $SRCDIR;
-   log "Extracting source in $SRCDIR...";
-   log "$CHECKOUT > $LOGDIR/cvs-co.txt";
-   $CHECKOUT > $LOGDIR/cvs-co.txt;
-   RET=$?
-   if [[ $RET -ne 0 ]]; then quit "### Failed($RET): $CHECKOUT"; fi
-   if [[ "$CHECKOUT2" != "" ]]; then
-      log "$CHECKOUT2 >> $LOGDIR/cvs-co.txt";
-      $CHECKOUT2 >> $LOGDIR/cvs-co.txt;
-      RET=$?
-      if [[ $RET -ne 0 ]]; then quit "### Failed($RET): $CHECKOUT2"; fi
-   fi
-   log "Listing source...";
-   ls -Rl > $LOGDIR/src-ls-Rl.txt
-   log "Archiving source..."
-   $TAR czf $SRCTAR .
-  )
-  RET=$?
-  if [[ $RET -ne 0 ]]; then
-    quit "### Failed($RET): cannot prepare source";
-  else
-    log "Source extraction complete";
-  fi
-}
-
-########################################################################
-# The function which does a build
-########################################################################
-
-do_rbuild() {
-  OSDEST=$1
-
-  if [ "$SHARESRC" = "yes" ]; then
-    RSRCDIR=$SRCDIR
-  else
-    RSRCDIR=$WORKDIR/$OSDEST
-  fi
-
-  [[ -d $RSRCDIR ]] || mkdir -p $RSRCDIR
-
-  cd $RSRCDIR;
-
-  # do any late variable expansions
-  RAWCMD=$BUILDCMD
-  BUILDCMD=$(eval echo $RAWCMD)
-  
-  if [[ $RHOST = localhost ]] ; then
-    log "Build locally for $OSDEST ($BUILDCMD)...";
-    cd $BUILDDIR && pwd && $BUILDCMD && echo $PROG: Success
-    RET=$?
-    if [[ $RET -ne 0 ]]; then quit "### Failed($RET): $OSDEST build"; fi
-
-    log "Completed local build..."
-    return
-  fi
-
-  if [[ "$SHARESRC" != "yes" ]]; then
-     log "Extracting source for $OSDEST...";
-     $RSH $RHOST -n "cd $RSRCDIR && pwd && $TAR xzf $SRCTAR";
-     RET=$?
-     if [[ $RET -ne 0 ]]; then quit "### Failed($RET): $OSDEST source extraction"; fi
-  else
-     log "Using common source in $RSRCDIR";
-  fi
-  
-  log "Building for $OSDEST ($BUILDCMD)...";
-  $RSH $RHOST -n "cd $RSRCDIR/$BUILDDIR && pwd && $BUILDCMD && echo $PROG: Success"
-  RET=$?
-  if [[ $RET -ne 0 ]]; then quit "### Failed($RET): $OSDEST build"; fi
-
-  log "Completed $OSDEST...";
-}
-
-buildhost() {
-  RHOST=$1
-
-  log "Query $RHOST configuration...";
-
-  if [[ $RHOST = localhost ]] ; then
-     uname -s > /tmp/$$.$RHOST 2>&1
-  else
-    $RSH $RHOST -n "uname -s" > /tmp/$$.$RHOST 2>&1
-    RET=$?
-    if [[ $RET -ne 0 ]]; then
-      quit "..[$RHOST] ### Failed($RET): $RSH $RHOST -n \"uname -s\"";
-    fi
-  fi
-  ROSTYPE=`tail -1 /tmp/$$.$RHOST`
-
-  if [[ "$ROSTYPE" = "AIX" ]]; then
-    $RSH $RHOST -n "uname -v" > /tmp/$$.$RHOST 2>&1
-    ROSTYPE=${ROSTYPE}`tail -1 /tmp/$$.$RHOST`
-  fi
-
-  if [[ $RHOST = localhost ]] ; then
-     uname -r > /tmp/$$.$RHOST 2>&1
-  else
-    $RSH $RHOST -n "uname -r" > /tmp/$$.$RHOST 2>&1
-  fi
-  ROSREV=`tail -1 /tmp/$$.$RHOST`
-  rm /tmp/$$.$RHOST
-
-  if [[ $RHOST = localhost ]] ; then
-    OSDEST=`hostname | cut -f1 -d.`-${ROSTYPE}${ROSREV}
-  else
-    OSDEST=${RHOST}-${ROSTYPE}${ROSREV}
-  fi
-  log "..Building on [$OSDEST]..."
-
-  REV=1				# find unique logfile name
-  OSLOG=$LOGDIR/$OSDEST.$REV
-  while [[ -f $OSLOG ]]; do
-    let "REV = REV + 1"
-    OSLOG=$LOGDIR/$OSDEST.$REV
-  done
-
-  if [[ "$JUST_TEST" = "yes" ]]; then
-    echo "$PROG: Success" > $OSLOG
-  else
-    ( do_rbuild $OSDEST ) > $OSLOG 2>&1
-  fi
-
-  grep "$PROG: Success" $OSLOG > /dev/null
-  RET=$?
-  if [[ $RET -eq 0 ]]; then
-    RESULT="SUCCESS";
-  else
-    RESULT="FAILURE($RET)";
-  fi
-  log "..Completed [$OSDEST] <$RESULT>.";
-}
-
-########################################################################
-# The function which initiates all the builds
-########################################################################
-
-do_builds() {
-  log "Launching builds..."
-
-  for HOST in $BUILDHOSTS; do
-    buildhost $HOST &
-  done
-}
-
-########################################################################
-# main
-########################################################################
-
-main() {
-  if [[ "$JUST_TEST" = "yes" ]]; then
-    log "Automated test starting..."
-  else
-    log "Automated build of [$DESCRIPTION] starting..."
-  fi
-  log ""
-  log "       ARGS = $ARGS"
-  log " BUILDHOSTS = $BUILDHOSTS"
-  log "    WORKDIR = $WORKDIR"
-  log "     SRCDIR = $SRCDIR"
-  log "     LOGDIR = $LOGDIR"
-  log "   CHECKOUT = $CHECKOUT"
-  log "   BUILDDIR = $BUILDDIR"
-  log "   BUILDCMD = $BUILDCMD"
-  log "     RESPIN = $RESPIN"
-  log ""
-
-  [[ "$RESPIN" = "no" ]] && prepare_source
-  do_builds
-  log "Waiting for all builds to complete..."
-  wait
-  log "All builds completed."
-
-  if [[ -n "$POSTCMD" && "$POSTBUILD" = "yes" ]] ; then
-	log "Running post build command."
-
-	REV=1				# find unique logfile name
-	POSTLOG=$LOGDIR/postbuild.$REV
-  	while [[ -f $POSTLOG ]]; do
- 	  let "REV = REV + 1"
- 	  POSTLOG=$LOGDIR/postbuild.$REV
-	done
-
-	echo "Dir $SRCDIR/$BUILDDIR" > $POSTLOG
-	echo "Cmd $POSTCMD" >> $POSTLOG
-	(cd $SRCDIR/$BUILDDIR && $POSTCMD && echo $PROG: Success) >> $POSTLOG 2>&1
-
-        log "Post build command completed."
-  elif [[ -n "$POSTCMD" ]] ; then
-	echo "Skipping post build command: $POSTCMD"
-  fi
-}
-
-REV=1
-PROGLOG=$LOGDIR/$PROG.$REV
-
-while [[ -f $PROGLOG ]]; do
-  REV=`expr $REV + 1`
-  PROGLOG=$LOGDIR/$PROG.$REV
-done
-
-main | tee $PROGLOG 2>&1
-exit 0

mozilla/mstone/autobuild.bat

@@ -1,164 +0,0 @@
-@if not "%echo%" == "on" echo off
-
-REM ************ simple autobuild for mailstone
-
-setlocal
-
-set BOTH=0
-
-if not "%1" == "" goto GetTag
-
-set BOTH=1
-set TAG=_OPT
-goto SetConfig
-
-:GetTag
-
-if %1 == dbg set TAG=_DBG
-if %1 == DBG set TAG=_DBG
-if %1 == Debug set TAG=_DBG
-if %1 == debug set TAG=_DBG
-if %1 == Release set TAG=_OPT
-if %1 == release set TAG=_OPT
-if %1 == opt set TAG=_OPT
-if %1 == OPT set TAG=_OPT
-if %1 == optimize set TAG=_OPT
-if %1 == Optimize set TAG=_OPT
-if %1 == optimized set TAG=_OPT
-if %1 == Optimized set TAG=_OPT
-if %1 == clean goto CleanBoth
-
-:SetConfig
-
-if %TAG% == _DBG set Config=Debug
-if %TAG% == _OPT set Config=Release
-
-set ARCH=WINNT4.0%TAG%.OBJ
-
-set FINAL_PATH=built\package\%ARCH%\mailstone
-
-if not "%2" == "clean" if not exist %FINAL_PATH%\nul mkdir %FINAL_PATH%
-
-
-REM ************ first, clean the binary release
-nmake /f mailstone.mak CFG="mailstone - Win32 %Config%" /nologo NO_EXTERNAL_DEPS=1 CLEAN
-
-if not "%2" == "clean" goto BuildMailstone
-
-if exist src\%Config%\nul echo y | rd /s src\%Config% > nul
-if exist src\gnuplot-3.7\%Config%\nul echo y | rd /s src\gnuplot-3.7\%Config% > nul
-if exist src\gd1.3\%Config%\nul echo y | rd /s src\gd1.3\%Config% > nul
-if exist built\%ARCH%\nul echo y | rd /s built\%ARCH% > nul
-if exist %FINAL_PATH%\nul echo y | rd /s %FINAL_PATH% > nul
-
-goto done
-
-:BuildMailstone
-
-REM **************** next, build it
-nmake /f mailstone.mak CFG="mailstone - Win32 %Config%" /nologo NO_EXTERNAL_DEPS=1
-if errorlevel 1 goto BadBuild
-
-REM ************ next, copy the top-level files
-copy mstone.bat %FINAL_PATH%
-copy setup.bat %FINAL_PATH%
-copy CHANGELOG %FINAL_PATH%
-copy INSTALL %FINAL_PATH%
-copy README %FINAL_PATH%
-copy LICENSE %FINAL_PATH%
-
-REM ************ now, copy the files for running mailstone into bin
-if not exist %FINAL_PATH%\bin\nul mkdir %FINAL_PATH%\bin
-copy built\%ARCH%\mailclient.exe %FINAL_PATH%\bin
-if exist built\package\%ARCH%\mailclient.exe copy built\package\%ARCH%\mailclient.exe %FINAL_PATH%\bin
-if exist built\package\%ARCH%\mailclient.exe del /f /q built\package\%ARCH%\mailclient.exe
-copy bin\*.pl %FINAL_PATH%\bin
-
-REM ************ now, copy the configuration files into conf
-if not exist %FINAL_PATH%\conf\nul mkdir %FINAL_PATH%\conf
-copy conf\*.* %FINAL_PATH%\conf
-
-REM ************ now, copy the data files into data
-if not exist %FINAL_PATH%\data\nul mkdir %FINAL_PATH%\data
-copy data\*.msg %FINAL_PATH%\data
-
-REM ************ now, copy the gd files into gd
-if not exist %FINAL_PATH%\gd\nul mkdir %FINAL_PATH%\gd
-copy src\gd1.3\index.html %FINAL_PATH%\gd\gd.html
-
-REM ************ now, copy the gnuplot files into gnuplot
-if not exist %FINAL_PATH%\gnuplot\nul mkdir %FINAL_PATH%\gnuplot
-copy built\%ARCH%\gnuplot\gnuplot.exe %FINAL_PATH%\gnuplot
-copy src\gnuplot-3.7\Copyright %FINAL_PATH%\gnuplot
-copy src\gnuplot-3.7\docs\gnuplot.1 %FINAL_PATH%\gnuplot
-
-REM ************ now, copy the perl files into perl
-if not exist %FINAL_PATH%\perl\nul mkdir %FINAL_PATH%\perl
-if not exist %FINAL_PATH%\perl\bin\nul mkdir %FINAL_PATH%\perl\bin
-if not exist %FINAL_PATH%\perl\lib\nul mkdir %FINAL_PATH%\perl\lib
-if not exist %FINAL_PATH%\perl\lib\5.00503\nul mkdir %FINAL_PATH%\perl\lib\5.00503
-if not exist %FINAL_PATH%\perl\lib\5.00503\MSWin32-x86\nul mkdir %FINAL_PATH%\perl\lib\5.00503\MSWin32-x86
-#copy built\%ARCH%\perl\perl.exe %FINAL_PATH%\perl\bin
-#rcp -b sandpit:/share/builds/components/perl5/WINNT-perl5/perl.exe %FINAL_PATH%\perl\bin\perl.exe
-#if errorlevel 1 goto BadRcp
-#if not exist %FINAL_PATH%\perl\perl.exe goto BadRcp
-#rcp -b sandpit:/share/builds/components/perl5/WINNT-perl5/perl300.dll %FINAL_PATH%\perl\bin\perl300.dll
-#if errorlevel 1 goto BadRcp
-#if not exist %FINAL_PATH%\perl\perl300.dll goto BadRcp
-
-copy src\perl5.005_03\Artistic %FINAL_PATH%\perl
-copy c:\perl\5.00503\bin\MSWin32-x86\perl.exe %FINAL_PATH%\perl\bin
-copy c:\perl\5.00503\bin\MSWin32-x86\perl.dll %FINAL_PATH%\perl\bin
-copy c:\perl\5.00503\lib\*.pm %FINAL_PATH%\perl\lib\5.00503
-copy c:\perl\5.00503\lib\*.pl %FINAL_PATH%\perl\lib\5.00503
-copy c:\perl\5.00503\lib\MSWin32-x86\*.pm %FINAL_PATH%\perl\lib\5.00503\MSWin32-x86
-
-
-goto end
-
-:CleanBoth
-
-echo.
-echo NOTICE: CLEANING debug build
-call autobuild.bat debug clean
-
-echo NOTICE: CLEANING optimized build
-call autobuild.bat release clean
-
-echo NOTICE: Removing generated dependency files
-del /s *.dep
-
-if exist built\nul echo y | rd /s built > nul
-
-goto done
-
-:BadRcp
-
-echo.
-echo ERROR: Failed to rcp perl files over to mailstone packaging
-echo ERROR: Two common causes of this are .rhosts permissions or a broken rcp.exe
-echo ERROR: Make sure you are not using rcp.exe from NT4.0 SP4
-echo ERROR: The SP5 version is available in \\cobra\engineering\bin\rcp_sp5.exe
-echo ERROR: Use this version to replace ...\system32\rcp.exe
-goto done
-
-:BadBuild
-
-echo.
-echo ERROR: Failed to build mailstone
-goto done
-
-:end
-
-echo.
-
-if %BOTH% == 0 goto done
-if %TAG% == _DBG goto done
-
-set TAG=_DBG
-goto SetConfig
-
-:done
-
-endlocal
-

mozilla/mstone/bin/args.pl

@@ -1,64 +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 the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# This file does argument processing, file IO, and other utility routines
-
-# Where the online docs live
-#$mailstoneURL =
-#    "http://home.netscape.com/eng/server/messaging/4.1/mailston/stone.htm";
-#$mailstoneURL =
-#    "http://lxr.mozilla.org/mozilla/source/mstone/doc/MailStone.html";
-#$mailstoneURL =
-#    "http://docs.iplanet.com/docs/manuals/messaging/nms415/mailstone/stone.htm"
-$mailstoneURL = "doc/MailStone.html";
-
-# Subdirs for results (each under a timestamp dir).  Should just hardwire.
-$tmpbase = "tmp";
-$resultbase = "results";
-
-# This holds everything about the test and system configuration
-@workload = ();
-# Setup the special CONFIG section
-$params{"sectionTitle"} = "CONFIG";
-$params{"sectionParams"} = "";
-$params{"lineList"} = ();
-push @workload, \%params;
-
-# Get the lists discribing the data we process
-do 'protoconf.pl' || die "$@\n";
-
-%includedFiles = ();		# array of included files
-
-do 'util.pl' || die "$@\n";
-
-return 1;

mozilla/mstone/bin/genplot.pl

@@ -1,310 +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 the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-#			Sean O'Rourke <sean@sendmail.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# This file deals with the graphs data only
-# Interfaces to gnuplot to generate gifs for HTML inclusion.
-
-do 'util.pl';
-sub warn_system;
-sub die_system;
-
-# Type of images to hold plots (e.g. png, gif, jpeg, svg, tiff, pbm, etc)
-unless ($params{IMAGETYPE}) {
-    # Should probe gnuplot and see if it can generate one of:
-    #	png, gif, jpeg, svg, tiff, or pbm.
-    # Not all the programs that use args.pl need this (or have gnuplot, yet)
-    my $outfile = "$tmpbase/termtypes.out";
-    my %types = ();		# hash of interesting types that we spot
-
-    unless (open(NEW, "<$outfile")) { # re-use old file if present
-	($params{DEBUG}) &&
-	    print "Asking gnuplot what output types it supports\n";
-
-	# SEAN: this appears to do what they want:
-	warn_system "echo 'set term' | $params{GNUPLOT} > $outfile";
-
-	open(NEW, "<$outfile") ||
-	    warn ": Could not open gnuplot output for parsing ($outfile): $!";
-    }
-
-    # now check through the output for terminal types we can use.
-    # I havent verified the jpeg or tiff types.  e-mail me success or failure
-    while (<NEW>) {
-	(/\spng\s/) && ++$types{"png"} && next;
-	(/\sgif\s/) && ++$types{"gif"} && next;
-	(/\sjpeg\s/) && ++$types{"jpeg"} && next;
-	(/\ssvg\s/) && ++$types{"svg"} && next;
-	(/\stiff\s/) && ++$types{"tiff"} && next;
-	(/\spbm\s/) && ++$types{"pbm"} && next;
-    }
-    close (NEW);
-
-    ($params{DEBUG}) &&
-	print "Found these gnuplot types: " . (join " ", (keys %types)) . "\n";
-
-    # The ordering here determines our preferences
-    # This list is by likely browser compatibility and image compactness
-    # png is about 10x smaller than gif
-    # svg is smooth and scalable but usually requires a plug-in
-    # jpeg will probably look bad, but will be directly supported
-    if ($types{"png"}) { $params{IMAGETYPE}="png"; }
-    elsif ($types{"gif"}) { $params{IMAGETYPE}="gif"; }
-    elsif ($types{"jpeg"}) { $params{IMAGETYPE}="jpeg"; }
-    elsif ($types{"svg"}) { $params{IMAGETYPE}="svg"; }
-    elsif ($types{"tiff"}) { $params{IMAGETYPE}="tiff"; }
-    elsif ($types{"pbm"}) { $params{IMAGETYPE}="pbm"; }
-    else {
-	warn "Gnuplot doesn't support any good image types.  Check $outfile.\n";
-	$params{IMAGETYPE} = undef;
-    }
-    # leave the output file around to speed up repeat runs
-}
-
-# sub function to write data files, fire off gnuscript, and clean up
-# Uses global startTime and endTime figured above
-# genPlot counterName title label \@protocols \@variables
-sub genPlot {
-    my $name = shift;
-    my $title = shift;
-    my $label = shift;
-    my $protos = shift || die "genPlot: '$name' missing protocols";
-    my $f = shift;
-    my $vars = shift || die "genPlot: '$name' missing vars";
-
-    my $runlist = "";
-    my $totPoints = 0;
-    my $totProtos = 0;
-    my @realProtos;
-    my @goodProtos;
-
-    # user fewer data points than pixels to look good.
-    #   on 640x480 gif, the graph is about 579x408
-    my $maxData = int (($params{CHARTWIDTH}-60) * 0.9);
-    my $averageCnt = int (($endTime - $startTime + ($maxData - 1))/$maxData);
-    if ($averageCnt < 1) { $averageCnt = 1; } # must be a positive int
-
-    ($params{DEBUG}) && print "$name: averageCnt=$averageCnt vars = @$vars \n";
-
-    foreach $p (@$protos) { # First see if there is anything to graph
-	($p =~ /^Total$/o) && next; # derived if needed
-	my $pPoints = 0;
-	my $gp = $graphs{$p};
-	ALLVAR: foreach $vm (@$vars) {
-	    my $vp =  ($f) ? $gp->{$vm}->{$f} : $gp->{$vm};
-
-	    unless (($vp) && (scalar %$vp)) {
-		#print "genplot Checking: $p $vm $f => NO\n";
-		next;
-	    }
-	    #print "genplot Checking: $p $vm $f => ";
-	    foreach $time (keys %$vp) {
-		next unless ($vp->{$time} != 0);
-		$totPoints++;
-		$pPoints++;
-		#print "VALUES\n";
-		last ALLVAR;
-	    }
-	    #print "nothing\n"
-	}
-	if ($pPoints > 0) {	# count how many protocols have non 0
-	    $totProtos++;
-	    push @goodProtos, $p;
-	}
-    }
-    ($params{DEBUG}) && print "\tprotocols: @goodProtos\n";
-
-    if ($totPoints == 0) {	# nothing in any protocol
-	print "No data for graph '$name', variables '@$vars'\n";
-	return 0;
-    }
-
-    foreach $p (@$protos) {
-	unlink ("$tmpdir/$name.$p"); # remove any previous runs
-
-	(($p =~ /^Total$/o) && ($totProtos <= 1))
-	    && next;		# skip Totally if only 1 protocol plus total
-
-	($p !~ /^Total$/o) && push @realProtos, $p; # everything but Total
-
-#  	if ($p =~ /^Total$/o) {	# move from last to first
-#  	    $runlist = "\'$name.$p\' with lines, " . $runlist;
-#  	    next;
-#  	}
-
-	$runlist .= ", " if ($runlist); # later ones
-
-	$runlist .= "\'$name.$p\' with lines";
-    }
-
-    $totPoints = 0;
-    foreach $p (@realProtos) {	# create the plot data files
-	open(DATA, ">$tmpdir/$name.$p") || 
-	    die "Can't open $tmpdir/$name.$p:$!";
-	my $gp = $graphs{$p};
-	my $n = 0;
-	my $s = 0.0;
-	my $sTime = 0.0;
-	my $vp = ($f) ? $gp->{$vars->[0]}->{$f} : $gp->{$vars->[0]};
-
-#	foreach $time (sort numeric keys %$vp) {
-	for (my $tm = $startTime; $tm <= $endTime; $tm++) {
-	    my $v = 0.0;
-	    foreach $vm (@$vars) {
-		$vp = ($f) ? $gp->{$vm}->{$f} : $gp->{$vm};
-
-		$totPoints++;
-
-		# due to optimization in updateDelta, 
-		#    0 entries are undefined (also avoids warning)
-		$v += ($vp->{$tm}) ? $vp->{$tm} : 0;
-
-		# if ($vp->{$tm} < 0) {
-		# print $name, ": proto=", $p, " var=", $vm,
-		# " value=", $vp->{$tm}, "\n";
-		# }
-	    }
-	    $s += $v;
-	    $n += 1;
-	    if ($n == 1) {	# NOTE: shifts left in sliding window
-		$sTime = $tm-$startTime;
-	    }
-	    if ($n >= $averageCnt) {
-		printf (DATA "%d %f\n", $sTime * $timeStep, $s/$n);
-		$n = 0;
-		$s = 0.0;
-	    }
-	}
-	if ($n > 0) {		# handle end case
-	    printf (DATA "%d %f\n", $sTime * $timeStep, $s/$n);
-	}
-	close(DATA);
-    }
-    #($params{DEBUG}) && print "\tpoints: $totPoints\n";
-
-    # need to handle "Total" case
-    # read the other files and write out the sum
-    # FIX: total my be mis-aligned with data
-    if (($#$protos > $#realProtos) && ($totProtos > 1)) { 
-	unlink ("$tmpdir/$name.Total");
-	open(DATA, ">$tmpdir/$name.Total") || 
-	    die "Can't open $tmpdir/$name.Total:$!";
-
-	foreach $r (@goodProtos) { # get file handles
-	    open($r, "$tmpdir/$name.$r")
-		|| die "Couldn't open $tmpdir/$name.$r: $!";
-	}
-				# ASSUMES files are identical in order
-	my $first = shift @goodProtos;
-	# print "First protocol: $first  Rest: @realProtos\n";
-	while (<$first>) {
-	    my ($t, $s) = split ' ', $_;
-	    foreach $r (@goodProtos) { # get file handles
-		$l = <$r>;
-		if ($l) {
-		    my ($tt, $v) = split ' ', $l;
-		    $t = $tt unless ($t); # in case first proto missing time
-		    $s += $v;
-		}
-	    }
-	    printf (DATA "%d %f\n", $t, $s);
-	}
-
-	foreach $r (@goodProtos) { close($r); }
-	close (DATA);
-    }
-
-    # SEAN: don't even try if we aren't generating images:
-    return 0 unless $params{IMAGETYPE};
-
-    # Create a script to feed to gnuplot, which creates a .gif graph.
-    $runTime = ($endTime - $startTime + 1) * $timeStep;
-    unlink("$tmpdir/$name.gpt");
-    open(SCRIPT, ">$tmpdir/$name.gpt")
-	|| die "Can't open $tmpdir/$name.gpt:$!";
-    
-    $gnuplot = $params{GNUPLOT};
-    return 1 unless $gnuplot;
-    if ($gnuplot !~ /^\//) {	# if not absolute, adjust for cd $tmpbase
-	$gnuplot = "../../$gnuplot"; # ASSUME $tmpbase is single dir
-    }
-    #print "gnuplot is $gnuplot $params{GNUPLOT}\n";
-
-    my $varstring = "";		# create display version of names
-    foreach $t (@$vars) {
-	$varstring .= ", " if ($varstring);
-	$varstring .= ($timerNames{$t}) ? $timerNames{$t} : $t;
-    }
-
-    # Setup output "terminal type"
-    if ($params{IMAGETYPE} eq "gif") { # gif type has different arguments
-	print SCRIPT "set terminal $params{IMAGETYPE} small size $params{CHARTWIDTH},$params{CHARTHEIGHT}\n";
-    } elsif ($params{IMAGETYPE} eq "svg") { # svg type has different args too
-	print SCRIPT "set terminal $params{IMAGETYPE} size $params{CHARTWIDTH} $params{CHARTHEIGHT}\n";
-    } else {			# most types work like this
-	print SCRIPT "set terminal $params{IMAGETYPE} small color\n";
-	if (($params{CHARTWIDTH} != 640) || ($params{CHARTHEIGHT} != 480)) {
-	    my $xscale = $params{CHARTWIDTH} / 640;
-	    my $yscale = $params{CHARTHEIGHT} / 480;
-	    print SCRIPT "set size $xscale,$yscale\n";
-	}
-    }
-    print SCRIPT<<"!GROK!THIS!";
-set output "../../$resultdir/$name.$params{IMAGETYPE}" # ASSUME $tmpbase is single dir
-set autoscale
-set xlabel "Test time (seconds)"
-set ylabel "$label"
-set title "$title ($varstring) -- $params{TSTAMP}"
-plot [0:$runTime] $runlist
-!GROK!THIS!
-    close(SCRIPT);
-
-    # run script from tmpbase to clean up line labeling
-#    my $olddir=getcwd();
-    chdir $tmpdir;
-    warn_system (split (/\s/, $gnuplot), "$name.gpt");
-    chdir "../..";
-#    chdir $olddir;
-
-    unless ($params{DEBUG}) {
-	# cleanup the plot data (or leave around for debugging)
-	foreach $p (@$protos) {
-	    unlink("$tmpdir/$name.$p");
-	}
-	unlink("$tmpdir/$name.gpt");
-    }
-    return 1;
-}
-
-
-return 1;

mozilla/mstone/bin/mailmaster.pl

@@ -1,629 +0,0 @@
-#!/usr/bin/env perl
-# 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 the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-#			Mike Blakely
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-#  see setup.pl for full usage
-#	mailmaster [-d] [-c <config file>] ...
-
-# This script reads in the client configuration files and will
-# fork children to rsh the mailclient process on network clients,
-# each child will write test results to /mailstone directory before
-# dying.  The parent will the read and combine the results.
-#
-# Make sure the user running this script has rsh privilege across
-# all client machines
-
-print "Netscape Mailstone version 4.2\n";
-print "Copyright (c) Netscape Communications Corp. 1997-2000\n";
-
-# this parses the command line and config file
-do 'args.pl'|| die "$@\n";
-sub die_system;
-sub warn_system;
-
-parseArgs();			# parse command line
-
-{				# get unique date string
-    my ($sec, $min, $hour, $mday, $mon, $year) = localtime;
-    my $tstamp = sprintf ("%04d%02d%02d.%02d%02d",
-		       1900+$year, 1+$mon, $mday, $hour, $min);
-
-    if ( -d "$resultbase/$tstamp") { # check for runs within a minute
-	my $tail = 'a';
-	while ( -d "$resultbase/$tstamp$tail" ) { $tail++; }
-	$tstamp .= $tail;
-    }
-    $params{TSTAMP} = $tstamp;
-}
-
-$resultdir = "$resultbase/$params{TSTAMP}";
-$tmpdir = "$tmpbase/$params{TSTAMP}";
-$resultstxt = "$resultdir/results.txt";
-$resultshtml = "$resultdir/results.html";
-mkdir ("$resultbase", 0775);
-mkdir ("$tmpbase", 0775);
-mkdir ("$resultdir", 0775);
-mkdir ("$tmpdir", 0775);
-
-# Make sure we have everything
-die "Must specify the test time" unless $params{TIME};
-die "Must specify a workload file" unless $params{WORKLOAD};
-
-if ($params{TESTBED}) {		# BACK COMPATIBILITY
-    readTestbedFile ($params{TESTBED}) || die "Error reading testbed: $@\n";
-}
-
-$testsecs = figureTimeSeconds ($params{TIME}, "seconds");
-
-# figure out the processes and thread, given the desired number
-# takes into account all the constraints.  todo can be a float.
-sub figurePT {
-    my $sec = shift;
-    my $todo = shift;
-    my $p = 1;			# first guess
-    my $t = 1;
-    my $start = 1;		# initial process guess
-    my $end = 250;		# highest process guess
-
-    if ($todo < 1) {		# mark this client as inactive
-	$sec->{PROCESSES} = 0;
-	$sec->{THREADS} = 0;
-	return 0;
-    }
-
-    if (($section->{MAXCLIENTS}) && ($todo > $section->{MAXCLIENTS})) {
-	$todo = $section->{MAXCLIENTS};	# trim to max client per host
-    }
-    if ($section->{PROCESSES}) { # they set this part already
-	$start = int ($section->{PROCESSES});
-	$end = $start;
-	$p = $start;
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	print "Using specified $p processes for clients $slist\n";
-    }
-
-    $end = int ($section->{MAXPROCESSES})
-	if ($section->{MAXPROCESSES}); # they set a max
-    
-    if (($params{NT}) || ($section->{ARCH} eq "NT4.0")) {
-	$end = 1;		#  # NT is currently limited to 1 process
-	$start = 1;
-	$p = 1;
-    }
-
-    # step through some process counts
-    # it should first reduce errors due to MAXTHREADS,
-    # the it will reduce errors due to integer math.
-    # not optimal, just good enough
-    my $misses = 0;
-    for (my $n = $start; $n <= $end; $n++) { # try some process counts
-	my $tryt = int ($todo / $n);
-	if (($sec->{MAXTHREADS}) && ($tryt > $sec->{MAXTHREADS})) {
-	    $tryt = $sec->{MAXTHREADS};
-	}
-	# see if this is a better match than the last one
-	if (abs ($todo - ($n * $tryt)) < abs ($todo - ($p * $t))) {
-	    $p = $n;
-	    $t = $tryt;
-	    $misses = 0;
-	} else {
-	    $misses++;
-	    last if ($misses > 1); # getting worse
-	}
-    }
-    $sec->{PROCESSES} = $p;
-    $sec->{THREADS} = $t;
-    return $p * $t;
-}
-
-# Allocate CLIENTCOUNT to the client machines
-# try NOT to turn this into a massive linear programming project
-# works best to put bigger machines last
-if ($params{CLIENTCOUNT}) {
-    my $todo = $params{CLIENTCOUNT};
-    my $softcli = 0;		# how many can we play with
-
-    foreach $section (@workload) { # see which are already fixed
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	unless (($section->{PROCESSES}) && ($section->{THREADS})) {
-	    $softcli++;
-	    next;
-	}
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my @hlist = split /[\s,]/, $slist;
-	my $hcnt = (1 + $#hlist);
-
-	# subtract fixed entries
-	my $tcount = ($section->{THREADS}) ? $section->{THREADS} : 1;
-	$todo -= $tcount * $section->{PROCESSES} * $hcnt;
-	$clientProcCount += $section->{PROCESSES} * $hcnt; # total processes
-	$params{DEBUG} &&
-	    print "Fixed load group with $hcnt hosts: $section->{PROCESSES} x $tcount\n";
-    }
-
-    $params{DEBUG} &&
-	    print "Allocating $todo clients over $softcli groups\n";
-    if ($softcli) {
-	foreach $section (@workload) {
-	    next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	    next if (($section->{PROCESSES}) && ($section->{THREADS}));
-	    my $slist = $section->{sectionParams};
-	    $slist =~ s/HOSTS=\s*//; # strip off initial bit
-	    my @hlist = split /[\s,]/, $slist;
-	    my $hcnt = (1 + $#hlist);
-
-	    #print "todo=$todo softcli=$softcli hcnt=$hcnt\n";
-	    $todo -= $hcnt * figurePT ($section, $todo / ($softcli * $hcnt));
-	    $clientProcCount += $hcnt * $section->{PROCESSES}; # total procs
-
-	    $softcli--;
-	    last if ($softcli <= 0); # should not happen
-	}
-    }
-    if ($todo) {
-	print "Warning: Could not allocate $todo of $params{CLIENTCOUNT} clients.\n";
-	$params{CLIENTCOUNT} -= $todo;
-    }
-	    
-   
-} else {			# figure out the client count
-    my $cnt = 0;
-    foreach $section (@workload) { # see which are already fixed
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-#  	next unless ($section->{PROCESSES});
-	next unless $section->{CLIENTS};
-
-	my $clients = $section->{CLIENTS};
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my @hlist = split /[\s,]/, $slist;
-	my $hcnt = scalar @hlist;
-	
-	$clients /= $hcnt;
-	my $maxp = ($section->{MAXPROCESSES} || 10000);
-	my $maxt = ($section->{MAXTHREADS} || 10000);
-	if ($maxp * $maxt < $clients) {
-	    die <<EOS;
-Too many clients for hosts $section->{sectionParams}:
-clients 	= $section->{CLIENTS}
-maxThreads 	= $section->{MAXTHREADS}
-maxProcesses 	= $section->{MAXPROCESSES}
-EOS
-	}
-	my ($nt, $np);
-	if ($maxt >= $clients) {
-	    $nt = $clients;
-	    $np = 1;
-	} else {
-	    $np = int (($clients / $maxt) + (($clients % $maxt) ? 1 : 0));
-	    $nt = int ($clients / $np);
-	}
-
-	$section->{THREADS} = $nt;
-	$section->{PROCESSES} = $np;
-#  	$section->{CLIENTS} = $np * $nt * $hcnt;
-	$cnt += $nt * $np * $hcnt;
-	$clientProcCount += $np * $hcnt; # total processes
-    }
-    $params{CLIENTCOUNT} = $cnt;
-    die "No clients configured!\n" unless ($cnt > 0);
-}
-
-# This has to be written into save workload file for later processing
-unless ($params{FREQUENCY}) {	# unless frequency set on command line
-    my $chartp = ($params{CHARTPOINTS}) ? $params{CHARTPOINTS} : 464;
-
-    # approximate data points for good graphs (up to 2 times this)
-    $params{FREQUENCY} = int ($testsecs / $chartp);
-    if ($params{FREQUENCY} < 2) { # fastest is every 2 seconds
-	$params{FREQUENCY} = 2;
-    } elsif ($params{FREQUENCY} > 60) {	# slowest is every minute
-	$params{FREQUENCY} = 60;
-    }
-}
-
-{ # set a unique block id on every section
-    my $id = 0;
-    my $configSeen = 0;
-    my $defaultSeen = 0;
-    foreach $section (@workload) {
-	if ($section->{"sectionTitle"} =~ /^CONFIG$/) {
-	    next if $configSeen;
-	    $configSeen++;
-	}
-	if ($section->{"sectionTitle"} =~ /^DEFAULT$/) {
-	    next if $defaultSeen;
-	    $defaultSeen++;
-	}
-	$id++;			# number 1, 2, ...
-	if ($section->{"sectionTitle"} =~ /^(CONFIG|CLIENT)$/) {
-	    $section->{BLOCKID} = $id;
-	} else {
-	    push @{$section->{"lineList"}}, "blockID\t$id\n";
-	}
-    }
-}
-
-# Write the version we pass to mailclient
-writeWorkloadFile ("$resultdir/work.wld", \@workload,
-		   \@scriptWorkloadSections);
-
-# Write the complete inclusive version
-writeWorkloadFile ("$resultdir/all.wld", \@workload);
-
-# SEAN: copy the wld.in file to the result directory for later
-# statistics gathering.
-my $wld = $params{WORKLOAD};
-if (-f "$wld.in") {
-    die_system "cp $wld.in $resultdir/wld.in";
-} else {
-    unless ($wld !~ /\.preload_(new|old|touch)$/) {
-	warn "Can't find wld.in file for `$wld'\n" unless -f "$wld.in";
-    }
-}
-
-setConfigDefaults();		# pick up any missing defaults
-
-unless ($#protocolsAll > 0) {
-    die "No protocols found.  Test Failed!\n";
-}
-
-print "Starting: ", scalar(localtime), "\n";
-
-# redirect STDERR
-open SAVEERR, ">&STDERR";
-open(STDERR, ">$resultdir/stderr") || warn "Can't redirect STDERR:$!\n";
-
-$totalProcs = 0;		# number of clients started
-
-# iterate over every client in the testbed, complete the cmd and rsh
-if ($params{NT}) {		# single client on local host 
-    pathprint ("Starting clients (errors logged to $resultdir/stderr)\n");
-
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	my $tcount = ($section->{THREADS}) ? $section->{THREADS} : 1;
-
-
-	# Build the initial Mailclient command line
-	my $preCmd = ($section->{COMMAND})
-	    ? $section->{COMMAND} : $params{CLIENTCOMMAND};
-	$preCmd .= " -s -t $params{TIME} -f $params{FREQUENCY}";
-	$preCmd .= " -d" if ($params{DEBUG});
-	$preCmd .= " -r" if ($params{TELEMETRY});
-	$preCmd .= " -R $params{RAMPTIME}" if ($params{RAMPTIME});
-	$preCmd .= " -m $params{MAXERRORS}" if ($params{MAXERRORS});
-	$preCmd .= " -M $params{MAXBLOCKS}" if ($params{MAXBLOCKS});
-	$preCmd .= " -n 1 -N $tcount";
-	$preCmd .= ($params{USEGROUPS} && $section->{GROUP})
-	    ? " -H $section->{GROUP}" : " -H $cli";
-
-	my $stdout = "$tmpdir/localhost.out";
-
-	$totalProcs += $tcount;
-	do 'makeindex.pl' || warn "$@\n";	# html index
-
-	printf "\nTest duration: %d %s.  Rampup time: %d %s.  Number of clients: %d\n",
-	figureTimeNumber ($params{TIME}),
-	figureTimeUnits ($params{TIME}, "seconds"),
-	figureTimeNumber ($params{RAMPTIME}),
-	figureTimeUnits ($params{RAMPTIME}, "seconds"),
-	$totalProcs;
-
-	print STDERR  "localhost: cd $params{TEMPDIR}; $preCmd\n";
-
-	# Redirect STDIN, and STDOUT
-	#open SAVEIN, "<STDIN";
-	open STDIN, "<$resultdir/work.wld"
-	    || die "Coundn't open $resultdir/work.wld for input\n";
-	open SAVEOUT, ">&STDOUT";
-	open STDOUT, ">$stdout"
-	    || die "Couldnt open $stdout for output\n";
-
-	chdir $params{TEMPDIR} || die "Could not cd $params{TEMPDIR}: $!\n";
-	warn_system $preCmd;
-	close STDOUT;
-	open STDOUT, ">&SAVEOUT";
-	printf "Test done.\n";
-
-	chdir $cwd || die "Could not cd $cwd: $!\n";
-	last;			# only do the first one
-    }
-} else {			# not NT (forking works)
-
-    foreach $section (@workload) {	# do pre run commands
-	next unless ($section->{sectionTitle} =~ /PRETEST/i);
-	unless ($section->{COMMAND}) {
-	    print "PreTest with no Command for $section->{sectionParams}\n";
-	    next;
-	}
-
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my $myCmd = $section->{COMMAND};
-	$myCmd =~ s/%f/$params{FREQUENCY}/; # fill in frequency variable
-	if ($myCmd =~ m/%c/o) { # dont force down if count is used
-	    $count = $testsecs / $params{FREQUENCY};
-	    $myCmd =~ s/%c/$count/; # fill in count variable
-	}
-	my $rsh = ($section->{RSH}) ? $section->{RSH} : $params{RSH};
-
-	foreach $cli (split /[\s,]/, $slist) {
-	    print "Running pre test command on $cli\n";
-	    open PRE, ">>$resultdir/$cli-pre.log";
-	    print PRE "========\n";
-	    print PRE "$myCmd\n";
-	    print PRE "========\n";
-	    close PRE;
-	    print STDERR "$cli: $myCmd\n"; # log the actual command
-	    forkproc ($rsh, $cli, $myCmd,
-		      "/dev/null", "$resultdir/$cli-pre.log");
-	}
-	foreach $cli (split /[\s,]/, $slist) {
-	    wait();		# run multiple PRETEST section sequentially
-	}
-    }
-
-    foreach $section (@workload) { # start monitors
-	next unless ($section->{sectionTitle} =~ /MONITOR/i);
-
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my $myCmd = ($section->{COMMAND})
-	    ? $section->{COMMAND} : $params{MONITORCOMMAND};
-	my $forceDown = 0;
-	$myCmd =~ s/,/ /g;	# turn commas into spaces BACK COMPATIBIILITY
-	$myCmd =~ s/%f/$params{FREQUENCY}/; # fill in frequency variable
-
-	if ($myCmd =~ m/%c/o) { # dont force down if count is used
-	    $count = $testsecs / $params{FREQUENCY};
-	    $myCmd =~ s/%c/$count/; # fill in count variable
-	} else {
-	    $forceDown = 1;
-	}
-	my $rsh = ($section->{RSH}) ? $section->{RSH} : $params{RSH};
-
-	foreach $cli (split /[\s,]/, $slist) {
-	    printf "Monitoring on $cli\n";
-	    open PRE, ">>$resultdir/$cli-run.log";
-	    print PRE "========\n";
-	    print PRE "$myCmd\n";
-	    print PRE "========\n";
-	    close PRE;
-	    print STDERR "$cli: $myCmd\n"; # log the actual command
-	    $pid = forkproc ($rsh, $cli, $myCmd,
-			     "/dev/null", "$resultdir/$cli-run.log");
-	    push @forceDownPids, $pid if ($forceDown); # save PID for shutdown
-	}
-    }
-
-    print "Starting clients (errors logged to $resultdir/stderr)\n";
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	next unless ($section->{PROCESSES}); # unused client
-
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my $rsh = ($section->{RSH}) ? $section->{RSH} : $params{RSH};
-	my $pcount = $section->{PROCESSES};
-	my $tcount = ($section->{THREADS}) ? $section->{THREADS} : 0;
-	my $tempdir;
-	if ($section->{TEMPDIR}) {
-	    $tempdir = $section->{TEMPDIR};
-	} elsif ($params{TEMPDIR}) {
-	    $tempdir = $params{TEMPDIR};
-	}
-	my $preCmd = "./" . (($section->{COMMAND})
-			     ? $section->{COMMAND} : $params{CLIENTCOMMAND});
-	$preCmd .= " -e" unless ($params{NOEVENTS});
-	$preCmd .= " -s -t $params{TIME} -f $params{FREQUENCY}";
-	$preCmd .= " -d" if ($params{DEBUG});
-	$preCmd .= " -r" if ($params{TELEMETRY});
-	$preCmd .= " -R $params{RAMPTIME}" if ($params{RAMPTIME});
-	if ($params{MAXERRORS}) {
-	    # distribute error count over processes, rounding up
-	    my $n = int (($params{MAXERRORS} + $clientProcCount - 1)
-			 / $clientProcCount);
-	    $n = 1 if ($n < 1);
-	    $preCmd .= " -m $n";
-	}
-	if ($params{MAXBLOCKS}) {
-	    # distribute block count over processes, rounding up
-	    my $n = int (($params{MAXBLOCKS} + $clientProcCount - 1)
-			 / $clientProcCount);
-	    $n = 1 if ($n < 1);
-	    $preCmd .= " -M $n";
-	}
-	$preCmd = "cd $tempdir; " . $preCmd if ($tempdir);
-	$preCmd =~ s!/!\\!g if ($section->{ARCH} eq "NT4.0");
-	$preCmd =~ s/;/&&/g if ($section->{ARCH} eq "NT4.0");
-
-        my $total_clients = $section->{CLIENTS};
-	my $residue = $total_clients - ($tcount * $pcount);
-	foreach $cli (split /[\s,]/, $slist) {
-	    my $stdout = getClientFilename ($cli, $section);
-	    my $myCmd = $preCmd;
- 	    $myCmd .= ($params{USEGROUPS} && $section->{GROUP})
-		? " -H $section->{GROUP}" : " -H $cli";
-	    my $foo = ($params{USEGROUPS} && $section->{GROUP})
-		? $section->{GROUP} : undef;
-
-	    if ($tcount) {
-		my $nt = $tcount;
-		if ($residue > 0) {
-		    ++$nt;
-		    $residue -= $pcount;
-		}
-		$myCmd .= " -n $pcount -N $nt";
-		printf "Starting $pcount x $nt on $cli%s\n", 
-		    $foo?" (group = $foo)":'';
-		$totalProcs += $pcount * $nt;
-	    } else {
-		my $np = $pcount;
-		if ($residue > 0) {
-		    ++$np;
-		    --$residue;
-		}
-		$myCmd .= " -n $np";
-		printf "Starting $np processes on $foo\n";
-		$totalProcs += $np;
-	    }
-
-	    print STDERR "$cli: $myCmd\n"; # log the actual command
-	    $pid = forkproc ($rsh, $cli, $myCmd,
-			     "$resultdir/work.wld", $stdout);
-	    push @localPids, $pid if ($cli =~ /^localhost$/i);
-	}
-    }
-
-    if (@localPids) {
-	# print "Trapping extraneous local signals\n";
-	# This doesnt trap quite right.  We dont die, but shell returns...
-	$SIG{ALRM} = 'IGNORE';	# in case we get an ALRM from the mailclient
-    }
-
-    printf "\nTest duration: %d %s.  Rampup time: %d %s.  Number of clients: %d\n",
-    figureTimeNumber ($params{TIME}),
-    figureTimeUnits ($params{TIME}, "seconds"),
-    figureTimeNumber ($params{RAMPTIME}),
-    figureTimeUnits ($params{RAMPTIME}, "seconds"),
-    $totalProcs;
-
-    do 'makeindex.pl' || warn "$@\n";	# html index
-
-    print "Waiting for test to finish.\n";
-    print "Waiting: ", scalar(localtime), "\n";
-    # wait for children to finish
-    $pid = wait();
-    if (@forceDownPids) {		# shut down after the first return.
-	print "Shutting down @forceDownPids\n";
-	kill 1 => @forceDownPids;	# sigHUP
-	# kill 9 => @forceDownPids;	# sigTERM
-    }
-    while ($pid != -1) {	# wait for all children
-	$pid = wait();
-    }
-
-    foreach $section (@workload) {	# do post test commands
-	next unless ($section->{sectionTitle} =~ /POSTTEST/i);
-	unless ($section->{COMMAND}) {
-	    print "PostTest with no command for $section->{sectionParams}\n";
-	    next;
-	}
-
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my $myCmd = $section->{COMMAND};
-	$myCmd =~ s/%f/$params{FREQUENCY}/; # fill in frequency variable
-	if ($myCmd =~ m/%c/o) { # dont force down if count is used
-	    $count = $testsecs / $params{FREQUENCY};
-	    $myCmd =~ s/%c/$count/; # fill in count variable
-	}
-	my $rsh = ($section->{RSH}) ? $section->{RSH} : $params{RSH};
-
-	foreach $cli (split /[\s,]/, $slist) {
-	    printf "Running post test command on $cli\n";
-	    open PRE, ">>$resultdir/$cli-post.log";
-	    print PRE "========\n";
-	    print PRE "$myCmd\n";
-	    print PRE "========\n";
-	    close PRE;
-	    print STDERR "$cli: $myCmd\n"; # log the actual command
-	    forkproc ($rsh, $cli, $myCmd,
-		      "/dev/null", "$resultdir/$cli-post.log");
-	}
-	foreach $cli (split /[\s,]/, $slist) {
-	    wait();		# run multiple POSTTEST section sequentially
-	}
-    }
-
-}
-
-print STDERR "\nDone.\n";
-close(STDERR);
-open STDERR, ">&SAVEERR";
-
-print "\nClients done: ", scalar(localtime), "\n";
-print "Collecting results\n";
-
-do 'reduce.pl' || die "$@\n";	# generate graphs and sums
-
-print "Generating results pages\n";
-
-do 'report.pl' || die "$@\n";
-
-# Now display that data to console
-if ($params{VERBOSE}) {
-    fileShow ($resultstxt);
-    print "\n";
-}
-print "Processing done: ", scalar (localtime), "\n";
-
-pathprint ("\nResults (text):\t$resultstxt\n");
-pathprint (  "Results (HTML):\t$resultshtml\n");
-print        "Index of runs: \tfile://$cwd/$resultbase/index.html\n";
-
-
-# Now check for major problems in the stderr file
-if (open(RESULTSTXT, "$resultdir/stderr")) {
-    $ERRCNT=0;
-    while (<RESULTSTXT>) { $ERRCNT++; }
-    close(RESULTSTXT);
-    pathprint ("Error log ($ERRCNT lines):\t$resultdir/stderr\n");
-}
-
-{				# list user requested logging
-    my @logfiles = <$resultdir/*-pre.log>;
-    if (@logfiles) {
-	foreach $f (@logfiles) {
-	    print "Pre test log:   \t$f\n";
-	}
-    }
-    @logfiles = <$resultdir/*-run.log>;
-    if (@logfiles) {
-	foreach $f (@logfiles) {
-	    print "Monitoring log: \t$f\n";
-	}
-    }
-    @logfiles = <$resultdir/*-post.log>;
-    if (@logfiles) {
-	foreach $f (@logfiles) {
-	    print "Post test log:  \t$f\n";
-	}
-    }
-}
-
-print "Mailmaster done: ", scalar(localtime), "\n"; exit 0;

mozilla/mstone/bin/makeindex.pl

@@ -1,115 +0,0 @@
-#!/usr/bin/env perl
-# 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 the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# usage: perl -Ibin makeindex.pl
-# Look at all the results files and create a top level index
-
-unless ($resultbase) {		# pick up systematic defaults, if needed
-    do 'args.pl'|| die $@;
-    parseArgs();		# parse command line
-}
-
-($testname = $params{WORKLOAD}) =~ s:conf/::;
-$testname =~ s:.wld::;
-
-my $entry = "";
-
-$entry .= "<TR><TD><BR><A HREF=\"$params{TSTAMP}/results.html\">$params{TSTAMP}</A></TD>";
-$entry .= "<TD>$testname</TD>\n";
-$entry .= "<TD>$params{TITLE}</TD>\n";
-$entry .= "<TD>$params{TIME}</TD>\n";
-$entry .= "<TD>$params{CLIENTCOUNT}</TD>\n";
-$entry .= "<TD><A HREF=\"$params{TSTAMP}/all.wld\">workload</A></TD>\n";
-$entry .= "<TD><A HREF=\"$params{TSTAMP}/stderr\">stderr</A></TD></TR>\n";
-
-if (-r "$resultbase/index.html") {
-    fileInsertAfter ("$resultbase/index.html",
-		     "^<!-- INSERT TAGS HERE",
-		     $entry);
-} else {			# create index from scratch
-    system ("cd $resultbase; ln -s ../doc .");
-    open(INDEXNEW, ">$resultbase/index.new") || 
-	die "Couldn't open $resultbase/index.new: $!";
-
-    print INDEXNEW <<END;
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<TITLE>
-MailStone Results
-</TITLE>
-<HEAD>
-</HEAD>
-<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000FF" VLINK="#FF0000" ALINK="#000088">
-<A HREF=$mailstoneURL>Mailstone documentation</A><BR>
-<TABLE BORDER=2>
-<CAPTION> Mozilla MailStone Results Index </CAPTION>
-<TR>
-<TH>Run</TH> <TH>Testname</TH> <TH> Title </TH>
-    <TH>Duration</TH> <TH>Clients</TH> <TH>Details</TH> <TH>Error log</TH> 
-</TR>
-<!-- INSERT TAGS HERE - DO NOT DELETE THIS LINE -->
-END
-
-    print INDEXNEW $entry;	# put in this entry
-
-    # Add in any existing entries
-    # get a list of all the results files
-    @resall = <$resultbase/*/results.html>;
-    # Write out all the links
-    # This could be rather slow, but we only do it when index.html is missing
-    foreach $filefull (reverse @resall) {
-	my $file = $filefull;
-	$file =~ s:$resultbase/::;
-	if ($file eq $params{TSTAMP}) { next; } # written above
-	my $dir = $file;
-	$dir =~ s:/results.html::;
-	# dont read in old workloads, it will override the current one
-	print INDEXNEW "<TR><TD><BR><A HREF=\"$file\">$dir</A></TD>\n";
-	print INDEXNEW "<TD>&nbsp;</TD><TD>&nbsp;</TD><TD>&nbsp;</TD><TD>&nbsp;</TD>\n";
-	print INDEXNEW "<TD><A HREF=\"$dir/all.wld\">workload</A></TD>\n";
-	print INDEXNEW "<TD><A HREF=\"$dir/stderr\">stderr</A></TD></TR>\n";
-    }
-
-    print INDEXNEW <<END;
-</TABLE>
-</BODY>
-</HTML>
-END
-    close (INDEXNEW);
-    fileBackup ("$resultbase/index.html");
-    rename ("$resultbase/index.new", "$resultbase/index.html");
-    print "Created $resultbase/index.html\n";
-}
-
-return 1;

mozilla/mstone/bin/makeusers.pl

@@ -1,414 +0,0 @@
-#!/usr/bin/perl
-# 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 the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# script to create test user accounts for Netscape Messaging Server 3, 4
-#
-# Given a set of parameters, this script will create an LDIF file
-# for a number of email users of the form:
-#	test1, test2, test3, ...	
-#
-# usage: perl create_accounts_ldif [users] [broadcast] [postmaster] [ options ]
-#   [ -a allUsersAlias ]
-#   [ -b basedn ]
-#   [ -d maildomain ]
-#   [ -f firstaccount ]
-#   [ -k ]
-#   [ -m mailhost ]
-#   [ -n numaccounts ]
-#   [ -o outputfile ]
-#   [ -p password ]
-#   [ -s storebase ]
-#   [ -u username ]
-#   [ -v ]
-#   [ -w workload ]
-#   [ -x maxstores ]
-#   [ -3 ]
-#
-#perl -Ibin -- bin/makeusers.pl -d mailhost.example.com -m mailhost.example.com -b 'o=example.com' -u mailhost-test -n 100 -4 -o mailhost100.ldif
-
-# Create the ldif for the user accounts and/or broadcast, postmaster account.
-#
-# The ldif then must be added to 
-# the directory by hand (ldapadd, or through the dir admin server's
-# Database Mgmt->Add entries from an ldif file).  
-
-# A faster way
-# is to export the existing directory, append the results of
-# this script, and re-import the combined file.  This can be
-# done using the following Netscape Directory Server commands:
-#   stop-slapd
-#   db2ldif outputfile
-#   [ merge files ]
-#   ldif2db inputfile  # for DS4 you would typically use -noconfig
-#   start-sladp
-#
-
-print "Netscape Mailstone.\nCopyright (c) 1998,1999 Netscape Communications Corp.\n";
-
-# server to be used in the internet mail address of the users
-$domain = "newdomain.example.net";
-
-# machine that will act as the user's mailhost
-$mailhost = "mailhost.example.net";
-
-# base dn for the user entries, e.g. o=Ace Industry,c=US 
-$basedn = "o=Benchmark Lab, c=US";
-
-# name of broadcast account
-$bcastacct = "allusers";
-
-# name of broadcast account
-$postmasteraddr = "root\@localhost";
-
-# base name to build user names, will construct test0, test1, ...
-$username = "test%ld";
-
-# user passwds, in SHA format, the passwd below is 'netscape'
-#$userpassword =  "{SHA}aluWfd0LYY9ImsJb3h4afrI4AXk=";
-# these can also be imported as cleartext
-$userpassword = "netscape";
-
-# 0: no numbered passwords, 1: number with userID
-$maxpass = 0;
-
-# first account to use
-$firstaccount = 0;
-
-# number of user accounts to create ($first - $first+$num-1)
-$numaccounts = 1_000;
-
-# For larger systems, spreading the users over multiple partitions
-# is usually a good idea.  This example assumes you have
-# created partitions named p0, p1, etc.
-
-# store partition base name
-$storebase = "p%ld";
-
-# max store number (0 - maxstores-1), skip if 0
-$maxstores = 0;
-
-#default to msg 4 schemas
-$usemsg4schema = 1;
-
-#default to writing to stdout
-$outfile = STDOUT;
-
-# Initial UID for genpasswd
-$firstuid = 1000;
-
-sub usage {
-    print "Usage: perl -Ibin -- makeusers [users] [broadcast] [postmaster]\n";
-    print "\t[ -w workload ] [ -o outputFile ]\n";
-    print "\t[ -d mailDomain ] [ -m mailHost ] [ -b baseDN ]\n";
-    print "\t[ -u username ] [ -f firstAccount ] [ -n numAccounts ]\n";
-    print "\t[ -p password ] [ -k ]\n";
-    print "\t[ -s storeBase ] [ -x numStores ]\n";
-    print "\t[ -a allUsersAlias ] [ -t postmasterAddress ]\n";
-    print "\t[ -3 ]|[ -4 ]\n";
-}
-
-sub readWorkConfig {		# read the workload in, parse our params
-    my $workloadfile = shift || die "Workload file name expected\n";
-
-    do 'args.pl'|| die $@;
-    readWorkloadFile ($workloadfile, \@workload)
-	|| die "Error reading workload: $@\n";
-				# assign all the parameters from the config
-    $mailhost = $defaultSection->{SERVER}
-	if ($defaultSection->{SERVER});
-    if ($defaultSection->{ADDRESSFORMAT}) {
-	my $addr = $defaultSection->{ADDRESSFORMAT};
-	$addr =~ s/^.*@//;
-	$domain = $addr;
-    }
-    if ($defaultSection->{LOGINFORMAT}) {
-	my $user = $defaultSection->{LOGINFORMAT};
-	#$user =~ s/%ld$//;
-	$username = $user;
-    }
-    $numaccounts = $defaultSection->{NUMLOGINS}
-        if ($defaultSection->{NUMLOGINS});
-    $firstaccount = $defaultSection->{FIRSTLOGINS}
-        if ($defaultSection->{FIRSTLOGINS});
-
-    $userpassword = $defaultSection->{PASSWDFORMAT}
-    if ($defaultSection->{SERVER});
-
-    if ($userpassword =~ m/%ld/) { # see if numbered passwords
-	$maxpass++;
-	#$userpassword =~ s/%ld//g;
-    }
-
-    # what isnt set: basedn, storebase, maxstores, usemsg4schema
-}
-
-while (@ARGV) {
-    $arg = shift(@ARGV);
-
-    if ($arg =~ /^-a$/i) {	# allusers (broadcast) user name
-	$bcastacct = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-b$/i) {	# LDAP base DN
-	$basedn = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-d$/i) {	# mail domain
-	$domain = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-f$/i) {	# initial account
-	$firstaccount = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-k$/i) {	# use numbered passwords
-	$maxpass++;
-	next;
-    }
-    if ($arg =~ /^-h$/i) {	# help
-	usage();
-	exit 0;
-    }
-    if ($arg =~ /^-m$/i) {	# mail server name
-	$mailhost = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-n$/i) {	# number of accounts
-	$numaccounts = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-o$/i) {	# name output file
-	my $fname = shift || die "File name expected\n";
-	open OUTFILE, ">$fname" || die "Error opening file $@\n";
-	$outfile = OUTFILE;
-	next;			# use msg4 user admin schema
-    }
-    if ($arg =~ /^-p$/i) {	# password
-	$userpassword = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-s$/i) {	# base name for above
-	$storebase = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-t$/i) {	# postmaster address
-	$postmasteraddress = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-u$/i) {	# user name base
-	$username = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-v$/i) {	# be verbose
-	$verbose++;
-	next;
-    }
-    # do this when read, so that later switches can override
-    if ($arg =~ /^-w$/i) {	# get a workload file
-	readWorkConfig (shift(@ARGV));
-	next;
-    }
-    if ($arg =~ /^-x$/i) {	# number of partitions (0 to skip)
-	$maxstores = shift(@ARGV);
-	next;
-    }
-    if ($arg =~ /^-3$/) {	# no msg4 schema
-	$usemsg4schema = 0;
-	next;
-    }
-    if ($arg =~ /^-4$/) {	# use msg4 user admin schema
-	$usemsg4schema = 1;
-	next;
-    }
-    if ($arg =~ /^users$/i) {
-	$genusers++;
-	next;
-    }
-    if ($arg =~ /^broadcast$/i) {
-	$genbroadcast++;
-	next;
-    }
-    if ($arg =~ /^passwd$/i) {
-	$genpasswd++;
-	next;
-    }
-    if ($arg =~ /^postmaster$/i) {
-	$genpostmaster++;
-	next;
-    }
-
-    print STDERR "Unknown argument $arg.  Use -h for help.\n";
-    exit 1;
-}
-
-unless (($genusers) || ($genbroadcast) || ($genpasswd) || ($genpostmaster)) {
-    print STDERR "Must specify mode [users] [broadcast] [postmaster] ...\n";
-    usage();
-    exit 0;
-}
-
-# specify number fields, if needed
-unless ($username =~ /%ld/) {
-    $username .= '%ld';
-}
-if (($maxpass) && !($userpassword =~ /%ld/)) {
-    $userpassword .= '%ld';
-}
-if (($maxstores) && !($storename =~ /%ld/)) {
-    $storename .= '%ld';
-}
-
-if ($verbose) {
-    print STDERR "Here is the configuration:\n";
-    print STDERR "baseDN='$basedn' \t";
-    print STDERR (($usemsg4schema) ? "-4\n" : "-3\n");
-    print STDERR "mailHost='$mailhost' \tdomain='$domain'\n";
-    print STDERR "userName='$username' \tnumAccounts=$numaccounts \tfirstAccount=$firstaccount\n";
-    print STDERR "userPassword='$userpassword'\n";
-    print STDERR "allUsersAccount='$bcastacct'\n" if ($genbroadcast);
-    print STDERR "postmasterAddress='$postmasterAddress'\n" if ($genpostmaster);
-}
-
-
-if ($genusers) {		# Create the user accounts
-    $storenum=0;
-    for ($i = $firstaccount; $i < $firstaccount+$numaccounts; $i++) {
-	# build user account name
-	my $acctname = $username;
-	$acctname =~ s/%ld/$i/;	# insert user number
-	my $password = $userpassword;
-	$password =~ s/%ld/$i/;	# insert user number
-
-
-
-	# MAKE SURE THERE ARE NO TRAILING SPACES IN THE LDIF
-	my $extradata = "";
-
-	if ($maxstores > 0) {	# assign them to a store
-	    my $storename = $storebase;
-	    $storename =~ s/%ld/$storenum/;
-	    $extradata .= "mailmessagestore: $storename\n";
-	    $storenum++;
-	    $storenum=0 if ($storenum >= $maxstores);
-	}
-
-	$extradata .= "objectclass: nsMessagingServerUser\n"
-	    if ($usemsg4schema);
-
-print $outfile <<END;
-dn: uid=$acctname, $basedn
-userpassword: $password
-givenname: $acctname
-sn: $acctname
-cn: $acctname
-uid: $acctname
-mail: $acctname\@$domain
-mailhost: $mailhost
-maildeliveryoption: mailbox
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: mailRecipient
-$extradata
-END
-    }
-}
-
-if ($genbroadcast) {		# Create the broadcast account
-    # MAKE SURE THERE ARE NO TRAILING SPACES IN THE LDIF
-    my $password = $userpassword;
-    $password =~ s/%ld//;	# strip user number
-    # initial part
-    print $outfile <<END;
-dn: uid=$bcastacct, $basedn
-userpassword: $password
-givenname: $bcastacct
-sn: $bcastacct
-cn: $bcastacct
-uid: $bcastacct
-mail: $bcastacct\@$domain
-mailhost: $mailhost
-maildeliveryoption: forward
-END
-
-    # now put in each address
-    for ($i = $firstaccount; $i < $firstaccount+$numaccounts; $i++) {
-	# build user account name
-	my $acctname = $username;
-	$acctname =~ s/%ld/$i/;	# insert user number
-
-	print $outfile "mailforwardingaddress: $acctname\@$domain\n";
-    }
-
-    # final part
-    print $outfile <<END;
-objectclass: top
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-objectclass: mailRecipient
-
-END
-}
-
-if ($genpostmaster) {		# Create the postmaster account
-    # MAKE SURE THERE ARE NO TRAILING SPACES IN THE LDIF
-    print $outfile <<END;
-dn: cn=postmaster, $basedn
-cn: postmaster
-mail: postmaster\@$domain
-mailalternateaddress: postmaster\@$mailhost
-mgrprfc822mailmember: $postmasterAddress
-objectclass: top
-objectclass: mailGroup
-objectclass: groupOfUniqueNames
-
-END
-}
-
-# mixing passwd output with the ldif output above would be quite silly
-if ($genpasswd) {		# Create passwd entries for makeusers
-    for ($i = $firstaccount; $i < $firstaccount+$numaccounts; $i++) {
-	# build user account name
-	my $acctname = $username;
-	$acctname =~ s/%ld/$i/;	# insert user number
-	my $password = $userpassword;
-	$password =~ s/%ld/$i/;	# insert user number
-	my $uid = $firstuid + $i;
-	print $outfile "$acctname:$password:$uid:$uid:Mail user $acctname:/home/$acctname:/bin/sh\n";
-    }
-}
-
-exit 0;

mozilla/mstone/bin/nsarch

@@ -1,147 +0,0 @@
-#!/bin/sh
-# 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 the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1999-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# Figure out standard system names
-
-UNAME_REPORTS=`uname`
-UNAME_OS_ARCH=`uname -s`
-UNAME_OS_RELEASE=`uname -r`
-
-OS_ARCH=$UNAME_OS_ARCH
-OS_RELEASE=$UNAME_OS_RELEASE
-OS_CONFIG=${OS_ARCH}${OS_RELEASE}
-
-if [ "$UNAME_OS_ARCH" = "SunOS" ]; then
-  PROCESSOR=`uname -p`
-  if [ "$PROCESSOR" = "i386" ]; then
-    BUILD_ARCH=x86
-  else
-    BUILD_ARCH=SPARC
-  fi
-  BUILD_OS=SOLARIS
-  if [ "$UNAME_OS_RELEASE" = "5.5" ]; then
-    BUILD_VER=2.5
-  elif [ "$UNAME_OS_RELEASE" = "5.5.1" ]; then
-    BUILD_VER=2.5
-  elif [ "$UNAME_OS_RELEASE" = "5.6" ]; then
-    BUILD_VER=2.6
-  elif [ "$UNAME_OS_RELEASE" = "5.7" ]; then
-    BUILD_VER=7
-  elif [ "$UNAME_OS_RELEASE" = "5.8" ]; then
-    BUILD_VER=8
-  fi
-
-elif [ "$UNAME_OS_ARCH" = "HP-UX" ]; then
-  BUILD_ARCH=HPPA
-  BUILD_OS=$UNAME_OS_ARCH
-  BUILD_VER=$OS_RELEASE
-
-elif [ "$UNAME_OS_ARCH" = "AIX" ]; then
-  BUILD_ARCH=POWER
-  BUILD_OS=$UNAME_OS_ARCH
-  BUILD_VER=`uname -v`.`uname -r`
-  OS_CONFIG=${BUILD_OS}${BUILD_VER}
-
-elif [ "$UNAME_OS_ARCH" = "OSF1" ]; then
-  BUILD_ARCH=ALPHA
-  BUILD_OS=$UNAME_OS_ARCH
-  BUILD_VER=$OS_RELEASE
-
-elif [ "$UNAME_OS_ARCH" = "IRIX64" -o "$UNAME_OS_ARCH" = "IRIX" ]; then
-  BUILD_ARCH=MIPS
-  BUILD_OS=IRIX
-  BUILD_VER=$OS_RELEASE
-  OS_CONFIG=${BUILD_OS}${OS_RELEASE}
-
-elif [ "$UNAME_OS_ARCH" = "BSD/386" ]; then
-  BUILD_ARCH=x86
-  BUILD_OS=BSDI
-  BUILD_VER=$OS_RELEASE
-
-elif [ "$UNAME_OS_ARCH" = "FreeBSD" ]; then
-  BUILD_ARCH=`uname -p`
-  BUILD_OS=$UNAME_OS_ARCH
-  BUILD_VER=$UNAME_OS_RELEASE
-  if [ "$BUILD_ARCH" = "i386" ]; then
-    BUILD_ARCH=x86
-  fi
-  OS_CONFIG=${BUILD_OS}${BUILD_VER}_${BUILD_ARCH}
-
-elif [ "$UNAME_OS_ARCH" = "SCO_SV" ]; then
-  BUILD_ARCH=x86
-  BUILD_OS=SCO
-  BUILD_VER=$OS_RELEASE
-
-elif [ "$UNAME_OS_ARCH" = "UNIX_SV" ]; then
-  # Check for braindamage
-  grep NCR /etc/bcheckrc > /dev/null 2>&1
-  BUILD_ARCH=x86
-  if [ $? = 0  ]; then
-      BUILD_OS=NCR
-  else
-      BUILD_OS=UNIXWARE
-  fi
-  BUILD_VER=$OS_RELEASE
-
-elif [ "$UNAME_OS_ARCH" = "NEWS-OS" ]; then
-  BUILD_ARCH=`uname -p`
-  BUILD_OS=SONY
-  BUILD_VER=$OS_RELEASE
-
-elif [ "$UNAME_OS_ARCH" = "UNIX_System_V" ]; then
-  BUILD_ARCH=`uname -p`
-  BUILD_OS=NEC
-  BUILD_VER=$OS_RELEASE
-
-elif [ $UNAME_OS_ARCH = Linux ]; then
-  BUILD_ARCH=`uname -m`
-  if [ -n "`echo $BUILD_ARCH | grep -e '86$'`" ] ; then
-	  BUILD_ARCH=x86
-  fi
-  BUILD_OS=$UNAME_OS_ARCH
-  BUILD_VER=`echo $OS_RELEASE | cut -f1,2 -d.`
-  OS_CONFIG=${BUILD_OS}${BUILD_VER}_${BUILD_ARCH}
-fi
-
-case "$UNAME_OS_ARCH" in
-SINIX*|ReliantUNIX*)
-  BUILD_ARCH=`uname -p`
-  BUILD_OS="ReliantUNIX"
-  BUILD_VER=$OS_RELEASE
-  ;;
-esac
-
-#PLATFORM=${BUILD_ARCH}_${BUILD_OS}_${BUILD_VER}
-#echo $PLATFORM
-echo $OS_CONFIG

mozilla/mstone/bin/process

@@ -1,70 +0,0 @@
-#!/bin/sh
-# The conZtents 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 the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1999-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# re-process a data run
-# by default, use the most recent one
-# Usage: process
-# or
-# Usage: process TIMESTAMP [args...]
-# or
-# Usage: process results/TIMESTAMP [args...]
-
-if [ ! -x perl/bin/perl -o ! -f .license ] ; then # see if setup was ever run
-   echo "Critical files are missing.  Run setup."
-   exit 2;
-fi
-
-if [ $# -lt 1 ] ; then		# do most recent run
-	# since the directories are time stamps with fixed fields,
-	#  alphabetical order is also time order
-	dir=`ls -d results/[0-9]*.[0-9]* | tail -1`
-else				# use specified run
-	if  [ -d results/$1 ] ; then	#  timestamp
- 	    dir=results/$1
-	    shift
-	elif  [ -d $1 ] ; then	# results/timestamp
- 	    dir=$1
-	    shift
-	fi
-fi
-
-if [ -n "$dir" ] ; then
-	if  [ -f $dir/all.wld ] ; then	# unified workload file
-		perl/bin/perl -Ibin -- bin/process.pl -w $dir/all.wld "$@"
-	else			# BACK COMPATIBILITY form
-		perl/bin/perl -Ibin -- bin/process.pl -c $dir/config.cfg "$@"
-	fi
-else				# pass in whatever they gave us
-	perl/bin/perl -Ibin -- bin/process.pl "$@"
-fi

mozilla/mstone/bin/process.pl

@@ -1,371 +0,0 @@
-#!/usr/bin/env perl
-# 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 the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# Generate reports independently of mailmaster
-# Can be used during a run or after mailmaster has finished
-
-print "Netscape Mailstone\n";
-print "Copyright (c) 1997-2000 Netscape Communications Corp.\n";
-
-# this parses the command line and config file
-do 'args.pl'|| die $@;
-parseArgs();			# parse command line
-setConfigDefaults();		# pick up any missing defaults
-
-$resultdir = "$resultbase/$params{TSTAMP}";
-$tmpdir = "$tmpbase/$params{TSTAMP}";
-$resultstxt = "$resultdir/results.txt";
-$resultshtml = "$resultdir/results.html";
-
-if ($params{TESTBED}) {		# BACK COMPATIBILITY
-    $params{TESTBED} = "$resultdir/testbed.tbd"; # use saved testbed
-    # open the saved testbed conf file
-    readTestbedFile($params{TESTBED}) || die "$@\n";
-}
-
-# Convert old style to new.  Write the complete inclusive workload
-writeWorkloadFile ("$resultdir/all.wld", \@workload)
-    unless ((-r "$resultdir/all.wld") || (-r "$resultdir/all.wld.gz"));
-
-$testsecs = figureTimeSeconds ($params{TIME}, "minutes");
-
-print "Starting data reduction\n";
-
-sub readClientCSV {
-    my $file = shift;
-    my @fields;
-    my $line;
-
-    print "Reading client summary: $file\n";
-    open(CSV, "<$file")	||	# Summary of all clients
-	open(CSV, "gunzip -c $file.gz |") || 
-	    return 0;		# failed
-
-    # Title line: Verify that arguments are in the same order
-    $line = <CSV>;
-    unless ($line) {
-	print "readClientCSV: Error reading $file. \n";
-	return 0;
-    }
-    chomp $line;		# strip newline
-    @fields = split /,/, $line; # turn into an array
-    my $cli = shift @fields;	# pull off client header
-    my $cn = shift @fields;	# pull off num header
-    my $pro = shift @fields;	# pull off protocol header
-
-    # Client array, per variable, per protocol
-    foreach $p (@protocols) {
-	# This hash will hold the timers
-	$clidata{$p} = ArrayInstance->new();
-	foreach $t (@timers) {
-	    # This hash will hold the values in the timer
-	    $clidata{$p}->{$t} = ArrayInstance->new();
-	    foreach $f (@{$timerFields{$t}}) {
-		# This hash that will hold the actual values per client
-		$clidata{$p}->{$t}->{$f} = ArrayInstance->new();
-	    }
-	}
-	foreach $t (@scalarClientFields) { # non-timer fields
-	    # This hash that will hold the actual values per client
-	    $clidata{$p}->{$t} = ArrayInstance->new();
-	}
-    }
-
-    foreach $f (@commClientFields) { # proto independent
-	my $v = shift @fields;
-	if ($v !~ m/$f/i) {
-	    print "readClientCSV: Protocol order mismatch '$v', '$f' \n";
-	    return 0;
-	}
-    }
-    foreach $t (@timers) {	# timers
-	foreach $f (@{$timerFields{$t}}) {
-	    my $v = shift @fields;
-	    if ($v !~ m/$t:$f/i) {
-		print "readClientCSV: Protocol order mismatch '$v', '$t:$f' \n";
-		return 0;
-	    }
-	}
-    }
-    foreach $t (@scalarClientFields) { # scalars
-	my $v = shift @fields;
-	if ($v !~ m/$t/i) {
-	    print "readClientCSV: Protocol order mismatch '$v', '$t' \n";
-	    return 0;
-	}
-    }
-
-    # Now read actual data
-    while (<CSV>) {
-	chomp;			# strip newline
-	@fields = split /,/;	# turn into an array
-	my $cli = shift @fields; # pull off client header
-	my $cn = shift @fields;	# pull off num header
-	my $p = shift @fields;	# pull off protocol header
-	my $cp = $clidata{$p};
-
-	# Create the needed finals arrays
-	unless ($finals{$p}) {
-	    #print "Creating finals{$p}\n"; # DEBUG
-	    $finals{$p} = ArrayInstance->new();
-	    foreach $t (@timers) {
-		$finals{$p}->{$t} = ArrayInstance->new();
-	    }
-	}
-
-	foreach $f (@commClientFields) { # proto independent
-	    $cliGen{$f}->{$cn} = shift @fields;
-	}
-	foreach $t (@timers) {	# timers
-	    foreach $f (@{$timerFields{$t}}) {
-		$cp->{$t}->{$f}->{$cn} = shift @fields;
-		$finals{$p}->{$t}->{$f} += $cp->{$t}->{$f}->{$cn};
-	    }
-	}
-	foreach $t (@scalarClientFields) { # scalars
-	    $cp->{$t}->{$cn} = shift @fields;
-	    $finals{$p}->{$t} += $cp->{$t}->{$cn};
-	}
-
-	foreach $section (@workload) { # find thread count for this client
-	    next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	    next unless ($section->{sectionParams} =~ /$cli/);
-	    #print "Process $cli has threads $section->{THREADS}\n";
-	    $reportingClients += ($section->{THREADS})
-		? $section->{THREADS} : 1;
-	    last;
-	}
-    }
-
-    close (CSV);
-    return 1;			# success
-}
-
-sub readTimeCSV {
-    my $file = shift;
-    my $p = shift;
-    my $gp = $graphs{$p};
-    my $line;
-
-    print "Reading time $p summary: $file\n";
-    open(CSV, "<$file")	||	# Summary over time
-	open(CSV, "gunzip -c $file.gz |") || 
-	    return 0;		# failed
-
-    # Verify that arguments are in the same order
-    $line = <CSV>;
-    unless ($line) {
-	print "readTimeCSV: Error reading $file. \n";
-	return 0;
-    }
-    chomp $line;		# strip newline
-    @fields = split /,/, $line;
-    my $t = shift @fields;	# pull off time header
-    foreach $t (@timers) {
-	foreach $f (@{$timerFields{$t}}) {
-	    my $v = shift @fields;
-	    if ($v !~ m/$t:$f/i) {
-		print "readTimeCSV: Protocol order mismatch '$v', '$t:$f' \n";
-		return 0;
-	    }
-	}
-    }
-    foreach $t (@scalarGraphFields) {
-	my $v = shift @fields;
-	if ($v !~ m/$t/i) {
-	    print "readTimeCSV: Protocol order mismatch '$v', '$t' \n";
-	    return 0;
-	}
-    }
-    while (<CSV>) {
-	chomp;
-	#print "LINE: $_\n";
-	@fields = split /,/;
-	my $tm = shift @fields;	# pull off time header
-	#print "t=$t ";
-	foreach $t (@timers) {
-	    foreach $f (@{$timerFields{$t}}) {
-		$gp->{$t}->{$f}->{$tm} = shift @fields;
-		#print "$v=$gp->{$v}->{$tm} ";
-	    }
-	}
-	foreach $t (@scalarGraphFields) {
-	    $gp->{$t}->{$tm} = shift @fields;
-	    #print "$v=$gp->{$v}->{$tm} ";
-	}
-	#print "\n";
-    }
-    close (CSV);
-    return 1;			# success
-}
-
-sub loadCSV {
-    my @csvs = <$resultdir/time-*.csv>;
-    @csvs = <$resultdir/time-*.csv.gz> unless (@csvs);
-    return 0 unless (@csvs);	# no time.csv files
-
-    # stuff normally done from reduce.pl (should all be in protoconf?)
-    # Basic sanity check
-    return 0 unless ($testsecs > 0);
-
-    $startTime = 0;			# these are timeInSeconds/$timeStep
-    $endTime = 0;
-
-    # keep graphs with somewhat more precision than sample rate;
-    $timeStep = int ($params{FREQUENCY} / 2);
-    if ($timeStep < 1) { $timeStep = 1; }
-
-    # global results initialization
-    $reportingClients = 0;
-    $totalProcs = 0;		# number of clients started
-
-    foreach $f (@commClientFields) { # protocol independent fields
-	$cliGen{$f} = ArrayInstance->new();
-    }
-
-    return 0 unless (readClientCSV ("$resultdir/clients.csv")); # client info
-
-    foreach $c (@csvs) { # read time info
-	$c =~ s/.gz$//;		# strip .gz extension
-	my $p = $c;		# strip down to protocol portion
-	$p =~ s/$resultdir\/time-//;
-	$p =~ s/.csv$//;
-	return 0 unless (readTimeCSV ($c, $p));
-    }
-
-    return 0 unless ($reportingClients > 0);
-
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my @hlist = split /[\s,]/, $slist;
-	my $hcnt = (1 + $#hlist);
-	my $pcount = $section->{PROCESSES};
-	my $tcount = ($section->{THREADS}) ? $section->{THREADS} : 1;
-
-	$totalProcs += $pcount * $tcount * $hcnt;
-    }
-
-    # Find time extent for a key graph
-    ($startTime, $endTime) = dataMinMax ("blocks", \@protocols,
-					 $startTime, $endTime);
-
-    $realTestSecs = ($endTime - $startTime) * $timeStep;
-    $realTestSecs = 1 unless ($realTestSecs); # in case of small MaxBlocks
-    printf "Reported test duration %d seconds with %d second resolution\n",
-    $realTestSecs, $timeStep;
-    $realTestSecs = $testsecs if ($realTestSecs > $testsecs);
-
-    my @newProtos;	# figure real protocol list
-    foreach $p (@protocols) {
-	my $gp = $graphs{$p};
-	my $numValid = 0;
-	# See if there is real data here
-	CHECKVAL: foreach $t (@timers) {
-	    foreach $f (@{$timerFields{$t}}) {
-		my $vp = $gp->{$t}->{$f};
-		next unless ($vp);	# no data
-		next unless (scalar %$vp); # redundant???
-
-		#print "Checking: $p $t $f => ENTRIES\n";
-		$numValid++;
-		last CHECKVAL;
-	    }
-	}
-	($numValid > 0) || next;
-
-	push @newProtos, $p;
-    }
-    # update protocol list to only have what was used
-    @protocols = @newProtos;
-    @protocolsAll = @newProtos;
-    push @protocolsAll, "Total";
-}
-
-
-my $doFull = 1;			# re-processing is currently broken
-
-#  if (!((-f "$resultdir/clients.csv")
-#        || (-f "$resultdir/clients.csv.gz"))) { # no processing yet
-#      $doFull = 1;
-#  } else {			# see if any source is newer than csv
-#      foreach $section (@workload) {
-#  	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-#  	my $slist = $section->{sectionParams};
-#  	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-#  	foreach $cli (split /[\s,]/, $slist) {
-#  	    my $fname = getClientFilename ($cli, $section);
-#  	    if ((-r $fname)	# raw source exists
-#  		&& ((-M "$resultdir/clients.csv")
-#  		    > (-M $fname))) { # newer
-#  		#print "$fname is newer than $resultdir/clients.csv\n";
-#  		$doFull++;
-#  		last;
-#  	    }
-#  	}
-#      }
-#  }
-
-#  unless ($doFull) {		# do CSV load
-#      # if this is a csv only run, then these may not exist yet
-#      mkdir ("$tmpbase", 0775);
-#      mkdir ("$tmpdir", 0775);
-#      unless (-r "$resultbase/index.html") {
-#  	do 'makeindex.pl' || warn "$@\n";	# html index
-#      }
-
-#      $doFull = 1 unless (loadCSV); # if CSV fails, fall back to full processing
-#  }
-
-if ($doFull) {
-    do 'reduce.pl' || die "$@\n";
-}
-
-
-print "Generating results pages:\t", scalar (localtime), "\n";
-
-do 'report.pl' || die "$@\n";
-
-# Now display that data to console
-if ($params{VERBOSE}) {
-    fileShow ($resultstxt);
-    print "\n";
-}
-
-pathprint ("\nResults (text):\t$resultstxt\n");
-pathprint (  "Results (HTML):\t$resultshtml\n");
-print        "Index of runs: \tfile://$cwd/$resultbase/index.html\n";
-
-print "Process done:\t", scalar (localtime), "\n";

mozilla/mstone/bin/protoconf.pl

@@ -1,158 +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 the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# This define the structures that hold summary, client, and graph data,
-
-# This sets the names used for display.  Can be internationalized.
-# All top level names are here (both timers and scalars).
-# Any unlisted names will map to themselves.
-%timerNames
-    = (
-       #internal name,	Printed name
-       "total",		"total",
-       "conn",		"connect",
-       "reconn",	"reconnect",
-       "banner",	"banner",
-       "login",		"login",
-       "cmd",		"command",
-       "submit",	"submit",
-       "retrieve",	"retrieve",
-       "logout",	"logout",
-       "idle",		"idle",
-       "connections",	"connections",
-       "blocks",	"blocks",
-       );
-
-# This sets the names used for display.  Can be internationalized.
-%fieldNames
-    = (
-       #internal name,	Printed name
-       "Try",		"Try",
-       "Error",		"Error",
-       "BytesR",	"BytesR",
-       "BytesW",	"BytesW",
-       "Time",		"Time",
-       "TimeMin",	"TMin",
-       "TimeMax",	"TMax",
-       "Time2",		"TStd",
-       );
-
-
-# hold time graphs for each protocol
-%graphs = ();
-
-# Totals are done during plotting, if needed
-%finals = ();			# create base finals hash
-
-# These are sections that dont get passed to mailclient (case insensitive)
-@scriptWorkloadSections
-    = (
-       "Config",		# special, references %params
-       "Client",		# testbed client(s)
-       "Graph",			# graph generation
-       "Setup",			# things to run with ./setup
-       "Startup",		# things to run before test
-       "Monitor",		# other performance monitoring
-       "PreTest",		# things to run before test
-       "PostTest",		# things to run after test
-       );
-
-# These are sections that arent protocols.  Anything else must be.
-@nonProtocolSections
-    = (@scriptWorkloadSections, ("Default"));
-
-# These are the known workload parameters (as they will print)
-# These are coerced to upper case internally (do NOT internationize)
-@workloadParameters
-    = (
-       "addressFormat",
-       "arch",
-       "blockID",
-       "blockTime",
-       "chartHeight",
-       "chartPoints",
-       "chartWidth",
-       "clientCount",
-       "command",
-       "comments",
-       "file",
-       "firstAddress",
-       "firstLogin",
-       "frequency",
-       "gnuplot",
-       "group",
-       "idleTime",
-       "leaveMailOnServer",
-       "loginFormat",
-       "loopDelay",
-       "numAddresses",
-       "numLogins",
-       "numLoops",
-       "numRecips",
-       "mailClient",
-       "maxBlocks",
-       "maxClients",
-       "maxErrors",
-       "maxThreads",
-       "maxProcesses",
-       "passwdFormat",
-       "processes",
-       "rampTime",
-       "rcp",
-       "rsh",
-       "sequentialAddresses",
-       "sequentialLogins",
-       "server",
-       "smtpMailFrom",
-       "sysConfig",
-       "threads",
-       "telemetry",
-       "tempDir",
-       "time",
-       "title",
-       "TStamp",
-       "useAuthLogin",
-       "useEHLO",
-       "weight",
-       "wmapBannerCmds",
-       "wmapClientHeader",
-       "wmapInBoxCmds",
-       "wmapLoginCmd",
-       "wmapLoginData",
-       "wmapLogoutCmds",
-       "wmapMsgReadCmds",
-       "wmapMsgWriteCmds",
-       "workload",
-       );
-       
-return 1;

mozilla/mstone/bin/report.pl

@@ -1,605 +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 the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1997-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# This file deals with the summary data only
-
-# Should be packages
-do 'genplot.pl' || die "$@\n";
-
-sub walkSetupTotals {
-    my $a = shift; my $f = shift; my $p = shift;
-    if ($p =~ /(\w+):(\w+):$/) {
-	my $tm = $2;
-	if (!($finals{Total}->{$tm}->{$f})) {
-	    $finals{Total}->{$tm}->{$f} = $a;
-	} elsif ($f =~ /Min$/) {
-	    $finals{Total}->{$tm}->{$f} = $a
-		if (($a > 0.0) && ($a < $finals{Total}->{$tm}->{$f}));
-	} elsif ($f =~ /Max$/) {
-	    $finals{Total}->{$tm}->{$f} = $a if ($a > $finals{Total}->{$tm}->{$f});
-	} else {
-	    $finals{Total}->{$tm}->{$f} += $a;}
-    }
-    elsif ($p =~ /(\w+):$/) {
-	$finals{Total}->{$f} += $a;
-    }
-}
-
-sub setupTotals {
-    # Figure out combined timers for "Total" protocol
-    # We might do a smarter merge here (look at context and try to match order)
-    # As long as the first protocol is a superset, it wont matter
-    my @tnames;
-    foreach $proto (@protocols) {
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;
-	    $t =~ s/([][{}*+?^.\/])/\\$1/g; # quote regex syntax
-	    my $found = 0;
-	    foreach $tn (@tnames) { # see if it is in the list already
-		next unless ($tn =~ /$t/);
-		$found = 1;
-		last;
-	    }
-	    #print "proto $proto: Found $n\n" if ($found > 0);
-	    next if ($found > 0);
-	    #print "proto $proto: Add $n\n";
-	    push @tnames, $n;	# add to list
-	}
-    }
-    #print "'Total' timers @tnames\n";
-    $protocolFields{"Total"} = \@tnames;
-
-    # Create "Total" hashes
-    $finals{Total} =  ArrayInstance->new();
-    foreach $n (@{$protocolFields{"Total"}}) { # all timers
-	my $t = $n;	# dont modify original list
-	if ($t =~ /^\[(\w+)\]$/) { # Timer case, strip off brackets
-	    $finals{Total}->{$1} = ArrayInstance->new();
-	    #print "Creating Total timer field $1\n";
-	} else {		# scalar
-	    $finals{Total}->{$n} = 0;
-	    #print "Creating Total scalar field $n\n";
-	}
-    }
-
-    # Total finals array
-    foreach $proto (@protocols) {
-	foreach $t (@{$protocolFields{$proto}}) {
-	    if ($t =~ /^\[(\w+)\]$/) { # Timer case, strip off brackets
-		my $tm = $1;
-		foreach $f (@timerFieldsAll) {
-		    my $a = $finals{$proto}->{$tm}->{$f};
-		    if (!($finals{Total}->{$tm}->{$f})) { # never touched
-			$finals{Total}->{$tm}->{$f} = $a;
-		    } elsif ($f =~ /Min$/) {
-			$finals{Total}->{$tm}->{$f} = $a
-			    if (($a > 0.0)
-				&& ($a < $finals{Total}->{$tm}->{$f}));
-		    } elsif ($f =~ /Max$/) {
-			$finals{Total}->{$tm}->{$f} = $a
-			    if ($a > $finals{Total}->{$tm}->{$f});
-		    } else {
-			$finals{Total}->{$tm}->{$f} += $a;
-		    }
-		}
-	    } else {
-		$finals{Total}->{$t} += $finals{$proto}->{$t};
-	    }
-	}
-    }    
-		    
-    # Convert Time2 to standard deviation
-    foreach $proto (@protocolsAll) {
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;	# dont modify original list
-	    if ($t =~ /^\[(\w+)\]$/) { $t = $1; } # strip off brackets
-	    next unless ($finals{$proto}->{$t}); # proto doesnt have timer
-	    next unless ($finals{$proto}->{$t}->{Try});
-	    next unless ($finals{$proto}->{$t}->{Time2} > 0);
-	    my $ss = $finals{$proto}->{$t}->{Time2};
-	    my $tot = $finals{$proto}->{$t}->{Time};
-	    my $n = $finals{$proto}->{$t}->{Try};
-	    next unless ($n > 0); # skip if this is 0
-
-	    my $var = ($ss - (($tot * $tot) / $n)) / $n;
-	    print "$proto->$t var < 0: Time2=$ss Time=$tot n=$n\n"
-		if ($var < 0);
-	    $finals{$proto}->{$t}->{Time2} = ($var > 0) ? sqrt ($var) : 0.0;
-	}
-    }
-
-    # Divide total times by trys to get averate time
-    foreach $proto (@protocolsAll) {
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;	# dont modify original list
-	    if ($t =~ /^\[(\w+)\]$/) { $t = $1; } # strip off brackets
-	    next unless ($finals{$proto}->{$t}); # proto doesnt have timer
-	    ($finals{$proto}->{$t}->{Try}) || next;
-	    $finals{$proto}->{$t}->{Time} /= $finals{$proto}->{$t}->{Try}
-	}
-    }
-}
-
-# The text version is designed to be machine processable
-# commify and kformat are not used
-sub genTextReport {
-    fileBackup ($resultstxt);	# if processing as we go, backup old file
-    # Open a text file to hold the results
-    open(RESULTSTXT, ">$resultstxt") || 
-	die "Couldn't open $resultstxt: $!";
-
-    # Store results as text
-    printf RESULTSTXT "---- Mozilla MailStone Results $params{TSTAMP} ----\n";
-
-    printf RESULTSTXT "\t\t%s\n", $params{TITLE};
-    printf RESULTSTXT "\t\t%s\n", $params{COMMENTS};
-    printf RESULTSTXT "\n";
-    printf RESULTSTXT "Test duration: %d %s.  Rampup: %d %s.  Reported duration %s seconds\n",
-    figureTimeNumber ($params{TIME}),
-    figureTimeUnits ($params{TIME}, "minutes"),
-    figureTimeNumber ($params{RAMPTIME}),
-    figureTimeUnits ($params{RAMPTIME}, "seconds"), $realTestSecs;
-    printf RESULTSTXT "Number of reporting clients: %s of %s\n",
-    $reportingClients, $totalProcs;
-
-    foreach $proto (@protocolsAll) {
-	# do op counters
-	printf RESULTSTXT "\n%-15s  ", $proto;
-	foreach $f (@timerFieldsAll) {
-	    #($f =~ m/^Time2$/o) && next;
-	    printf RESULTSTXT "%13s",
-	    ($fieldNames{$f}) ? $fieldNames{$f} : $f;
-	}
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;	# dont modify original list
-	    unless ($t =~ /^\[(\w+)\]$/) { # scalar case
-		#next;		# skip scalars for now
-		# do scalar counters. Column should line up with "Try"
-		printf RESULTSTXT "\n%-15s  ",
-		$proto . ":" . (($timerNames{$t}) ? $timerNames{$t} : $t);
-		printf RESULTSTXT
-		    "%13s", $finals{$proto}->{$t};
-		next;
-	    } else {		# strip off brackets
-		$t = $1;
-	    }
-	    printf RESULTSTXT "\n%-15s  ",
-	    $proto . ":" . (($timerNames{$t}) ? $timerNames{$t} : $t);
-	    foreach $f (@timerFieldsAll) {
-		#($f =~ m/^Time2$/o) && next;
-		if ($f =~ m/Time/o) {
-		    printf RESULTSTXT
-			"%13.3f", $finals{$proto}->{$t}->{$f};
-		} elsif ($f =~ m/Bytes/o) {
-		    printf RESULTSTXT
-			"%13d", $finals{$proto}->{$t}->{$f};
-		} else {
-		    printf RESULTSTXT
-			"%13s", $finals{$proto}->{$t}->{$f};
-		}
-	    }
-	}
-
-	# do ops/sec
-	printf RESULTSTXT "\n\n%-15s  ", $proto;
-	foreach $f (@timerFieldsAll) {
-	    ($f =~ m/^Time/o) && next;
-	    printf RESULTSTXT "%9s/sec", 
-	    ($fieldNames{$f}) ? $fieldNames{$f} : $f;
-	}
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;	# dont modify original list
-	    unless ($t =~ /^\[(\w+)\]$/) { # scalar case
-		#next;		# skip scalars for now
-		# do scalar counter/sec. Column should line up with "Try"
-		printf RESULTSTXT "\n%-15s  ",
-		$proto . ":" . (($timerNames{$t}) ? $timerNames{$t} : $t) . "/s";
-		printf RESULTSTXT
-		    "%13.3f", $finals{$proto}->{$t} / $realTestSecs;
-		next;
-	    } else {
-		$t = $1;
-	    }
-	    printf RESULTSTXT "\n%-15s  ",
-	    $proto . ":" . (($timerNames{$t}) ? $timerNames{$t} : $t) . "/s";
-	    foreach $f (@timerFieldsAll) {
-		($f =~ m/^Time/o) && next;
-		if ($f =~ m/Bytes/o) {
-		    printf RESULTSTXT
-			"%13d",
-			$finals{$proto}->{$t}->{$f} / $realTestSecs;
-		} else {
-		    printf RESULTSTXT
-			"%13.3f",
-			$finals{$proto}->{$t}->{$f} / $realTestSecs;
-		}
-	    }
-	}
-	printf RESULTSTXT "\n\n";
-    }
-
-    if ($params{SYSCONFIG}) {
-	print RESULTSTXT "\nSytem config details\n";
-	if (($params{SYSCONFIG} =~ m/^\S+$/o)
-	    && (open(SCFILE, "<$params{SYSCONFIG}"))) {
-	    while (<SCFILE>) {
-		(m/^<\S+>\s*$/o) && next; # skip HTML only on them
-		s/<\S+>//g;	# trim out obvious HTML commands
-		s/<!--.*-->//g;	# trim out HTML comments
-		print RESULTSTXT $_;
-	    }
-	    close(SCFILE);
-	} else {
-	    my $l = $params{SYSCONFIG};	# filter similar to above
-	    $l =~ s/<\S+>//g;	# trim out obvious HTML commands
-	    $l =~ s/<!--.*-->//g; # trim out HTML comments
-	    $l =~ s/\\\n/\n/g;	# turn quoted newline to plain newline
-	    print RESULTSTXT $l;
-	}
-    }
-
-    close(RESULTSTXT);
-}
-
-# Write the main part of the HTML page
-sub genHTMLReportStart {
-    fileBackup ($resultshtml);	# if processing as we go, backup old file
-    # Open an html file to hold the results
-    open(RESULTSHTML, ">$resultshtml") || 
-	die "Couldn't open $resultshtml: $!";
-
-    print RESULTSHTML <<END;
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<A NAME=TitleSection>
-<TITLE>
-Mozilla MailStone Results $params{TSTAMP}
-</TITLE>
-</A>
-<HEAD>
-</HEAD>
-<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000FF" VLINK="#FF0000" ALINK="#000088">
-<CENTER>
-<HR NOSHADE WIDTH="100%">
-<H1>Mozilla MailStone Results $params{TSTAMP}</H1>
-<H2>$params{TITLE}</H2>
-<I>$params{COMMENTS}</I>
-<HR WIDTH="100%">
-</CENTER>
-
-END
-    printf RESULTSHTML "<BR><B>Test duration:</B> %d %s.  ",
-    figureTimeNumber ($params{TIME}),
-    figureTimeUnits ($params{TIME}, "minutes");
-    printf RESULTSHTML "<B>Rampup:</B> %d %s.  ",
-    figureTimeNumber ($params{RAMPTIME}),
-    figureTimeUnits ($params{RAMPTIME}, "seconds");
-    printf RESULTSHTML "<B>Reported duration:</B> %s seconds\n",
-    commify ($realTestSecs);
-
-    printf RESULTSHTML "<BR><B>Reporting clients:</B> %s of %s\n",
-    commify ($reportingClients), commify ($totalProcs);
-
-    print RESULTSHTML <<END;
-<BR>
-Test <A HREF="all.wld">complete workload</a> description.  
-Filtered <A HREF="work.wld">workload</a> description.
-<BR>
-Plain <A HREF="results.txt">text version</a> of results.  
-Log of <A HREF="stderr">stderr</a> and debugging output.
-<BR>
-
-<A NAME=MonitoringSection></A>
-END
-
-    {				# list user requested logging
-	my @logfiles = <$resultdir/*-pre.log>;
-	if (@logfiles) {
-	    foreach $f (@logfiles) {
-		$f =~ s/$resultdir\///o; # strip directory out
-		$f =~ s/-pre\.log$//o; # strip extension off
-		print RESULTSHTML "Pre test log: <A HREF=\"$f-pre.log\">$f</a><BR>\n";
-	    }
-	}
-	@logfiles = <$resultdir/*-run.log>;
-	if (@logfiles) {
-	    foreach $f (@logfiles) {
-		$f =~ s/$resultdir\///o; # strip directory out
-		$f =~ s/-run\.log$//o; # strip extension off
-		print RESULTSHTML "Monitoring log: <A HREF=\"$f-run.log\">$f</a><BR>\n";
-	    }
-	}
-	@logfiles = <$resultdir/*-post.log>;
-	if (@logfiles) {
-	    foreach $f (@logfiles) {
-		$f =~ s/$resultdir\///o; # strip directory out
-		$f =~ s/-post\.log$//o; # strip extension off
-		print RESULTSHTML "Post test log: <A HREF=\"$f-post.log\">$f</a><BR>\n";
-	    }
-	}
-    }
-
-    #print RESULTSHTML
-	#"<CENTER><H2>Results per protocol</H2></CENTER>\n";
-
-    foreach $proto (@protocolsAll) {
-	printf RESULTSHTML "<A NAME=%sTable></A>\n", $proto;
-	printf RESULTSHTML
-	    "<TABLE BORDER=2 CELLSPACING=2 CELLPADDING=2 COLS=%d WIDTH=\"95%%\">",
-	    2+$#{@{$protocolFields{$proto}}};
-	print RESULTSHTML
-	    "<CAPTION>$proto Counters</CAPTION>\n";
-	# do op counters
-	print RESULTSHTML
-	    "<TR><TH>$proto</TH>\n";
-	foreach $f (@timerFieldsAll) {
-	    #($f =~ m/^Time2$/o) && next;
-	    printf RESULTSHTML "<TH>%s</TH> ",
-	    ($fieldNames{$f}) ? $fieldNames{$f} : $f;
-	}
-	print RESULTSHTML
-	    "</TR>\n";
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;	# dont modify original list
-	    unless ($t =~ /^\[(\w+)\]$/) { # scalar case
-		next;		# skip scalars for now
-		# do scalar counters. Column should line up with "Try"
-		printf RESULTSHTML "<TR ALIGN=RIGHT><TH>%s</TH>\n",
-		($timerNames{$t}) ? $timerNames{$t} : $t;
-		printf RESULTSHTML
-		    "<TD>%s</TD> ",
-		    commify ($finals{$proto}->{$t});
-		next;
-	    } else {
-		$t = $1;
-	    }
-	    printf RESULTSHTML "<TR ALIGN=RIGHT><TH>%s</TH>\n",
-	    ($timerNames{$t}) ? $timerNames{$t} : $t;
-	    foreach $f (@timerFieldsAll) {
-		#($f =~ m/^Time2$/o) && next;
-		if ($f =~ m/Time/o) {
-		    printf RESULTSHTML
-			"<TD>%s</TD> ",
-			tformat ($finals{$proto}->{$t}->{$f});
-		} elsif ($f =~ m/Bytes/o) {
-		    printf RESULTSHTML
-			"<TD>%s</TD> ",
-			kformat ($finals{$proto}->{$t}->{$f});
-		} else {
-		    printf RESULTSHTML
-			"<TD>%s</TD> ",
-			commify ($finals{$proto}->{$t}->{$f});
-		}
-	    }
-	    print RESULTSHTML "</TR>\n";
-	}
-
-	# do ops/sec
-	print RESULTSHTML
-	    "<TR><TH>$proto</TH>\n";
-	foreach $f (@timerFieldsAll) {
-	    ($f =~ m/^Time/o) && next;
-	    printf RESULTSHTML "<TH>%s/sec</TH> ",
-	    ($fieldNames{$f}) ? $fieldNames{$f} : $f;
-	}
-	print RESULTSHTML
-	    "</TR>\n";
-	foreach $n (@{$protocolFields{$proto}}) {
-	    my $t = $n;	# dont modify original list
-	    unless ($t =~ /^\[(\w+)\]$/) { # scalar case
-		next;		# skip scalars for now
-		# do scalar counters. Column should line up with "Try"
-		printf RESULTSHTML "<TR ALIGN=RIGHT><TH>%s</TH>\n",
-		($timerNames{$t}) ? $timerNames{$t} : $t;
-		printf RESULTSHTML
-		    "<TD>%.3f</TD> ",
-		    $finals{$proto}->{$t} / $realTestSecs;
-		next;
-	    } else {
-		$t = $1;
-	    }
-	    printf RESULTSHTML "<TR ALIGN=RIGHT><TH>%s</TH>\n",
-	    ($timerNames{$t}) ? $timerNames{$t} : $t;
-	    foreach $f (@timerFieldsAll) {
-		($f =~ m/^Time/o) && next;
-		if ($f =~ m/Bytes/o) {
-		    printf RESULTSHTML
-			"<TD>%s</TD> ",
-			kformat ($finals{$proto}->{$t}->{$f} / $realTestSecs);
-		} else {
-		    printf RESULTSHTML
-			"<TD>%.3f</TD> ",
-			$finals{$proto}->{$t}->{$f} / $realTestSecs;
-		}
-	    }
-	    print RESULTSHTML "</TR>\n";
-	}
-	printf RESULTSHTML "</TABLE> <BR>\n\n";
-    }
-
-    print RESULTSHTML <<END;
-
-<BR>
-
-<CENTER>
-<A NAME=GraphSection></A>
-END
-}
-
-%genplotGraphs = ();
-
-# Call genplot; and, if a graph is generated, insert the HTML reference to it
-sub genHTMLReportGraph {
-    my $name = shift;
-    my $title = shift;
-    my $label = shift;
-    my $protos = shift || die "genHTMLReportGraph: '$name' missing protocols";
-    my $field = shift;
-    my $vars = shift || die "genHTMLReportGraph: '$name' missing vars";
-
-    if ($genplotGraphs{$name}) {
-	print "Graph $name has already been generated.\n";
-	return;
-    }
-
-    $genplotGraphs{$name} = $title;
-
-    # Delineate and tag each graph
-    print RESULTSHTML "<A NAME=$name><HR SIZE=4 WIDTH=\"90%\"></A>\n";
-    if (genPlot ($name, $title, $label, $protos, $field, $vars) > 0) {
-	print RESULTSHTML <<END;
-<P><H3>$title</H3>
-<IMG SRC=$name.$params{IMAGETYPE} ALT="$label"></P>
-END
-    } else {
-	print RESULTSHTML "<BR>Graph \"$name\" contained no data (@{$vars}).<BR>\n";
-    }
-	
-}
-
-# Write the final parts of the HTML page
-sub genHTMLReportEnd {
-    print RESULTSHTML <<END;
-<!-- INSERT IMAGES HERE - DO NOT DELETE THIS LINE -->
-</CENTER>
-<A NAME=EndSection></A>
-END
-
-    if ($params{SYSCONFIG}) {
-	print RESULTSHTML "<HR WIDTH=\"100%\">";
-	print RESULTSHTML "<CENTER><H2>Details</H2></CENTER>\n";
-	if (($params{SYSCONFIG} =~ m/^\S+$/o)
-	    && (open(SCFILE, "<$params{SYSCONFIG}"))) { # see if its a file
-	    while (<SCFILE>) {
-		print RESULTSHTML $_;
-	    }
-	    close(SCFILE);
-	} else {		# output text directly
-	    my $l = $params{SYSCONFIG};
-	    $l =~ s/\\\n/\n/g;	# turn quoted newline to plain newline
-	    print RESULTSHTML $l;
-	}
-    }
-
-    print RESULTSHTML <<END;
-
-<HR NOSHADE WIDTH="100%">
-
-</BODY>
-</HTML>
-END
-    close(RESULTSHTML);
-}
-
-
-# Actually generate the standard stuff
-setupTotals();
-genTextReport();
-
-
-genHTMLReportStart();
-
-my $graphCount = 0;
-foreach $section (@workload) {
-    next unless ($section->{sectionTitle} =~ /GRAPH/i);
-    my $name = $section->{sectionParams};
-    $name =~ s/name=\s*//;	# strip off initial bit
-    my @varlist = split (/[\s,]+/, $section->{VARIABLES});
-
-    $graphCount++;
-    genHTMLReportGraph ($name, $section->{TITLE}, $section->{LABEL}, 
-			($section->{FIELD} =~ /Time/o)
-			? \@protocols : \@protocolsAll,
-			$section->{FIELD}, \@varlist);
-}
-
-if ($graphCount <= 0) {		# use built ins
-
-# generate the graphs we want
-# NOTE: the first argument (name), must be unique; sets file name
-    genHTMLReportGraph ("connects",
-			"Number of connections attempted", "Connections/sec",
-			\@protocolsAll, "Try", ["conn" ]);
-    genHTMLReportGraph ("connections",
-			"Total connections", "Connections",
-			\@protocolsAll, "", ["connections" ]);
-    genHTMLReportGraph ("errors",
-			"Number of connection errors", "Errors/sec",
-			\@protocolsAll, "Error", ["conn", "banner", "login", "logout" ]);
-    genHTMLReportGraph ("retrieves",
-			"Number of messages read", "Messages/sec",
-			\@protocolsAll, "Try", ["retrieve" ]);
-    genHTMLReportGraph ("submits",
-			"Number of messages written", "Messages/sec",
-			\@protocolsAll, "Try", ["submit" ]);
-    genHTMLReportGraph ("commands",
-			"Protocol commands", "Commands/sec",
-			\@protocolsAll, "Try", ["cmd" ]);
-    genHTMLReportGraph ("readBytes",
-			"Bytes read", "Bytes/sec",
-			\@protocolsAll, "BytesR", ["login", "banner", "cmd", "retrieve", "submit", "logout" ]);
-    genHTMLReportGraph ("writeBytes",
-			"Bytes written", "Bytes/sec",
-			\@protocolsAll, "BytesW", ["login", "banner", "cmd", "retrieve", "submit", "logout" ]);
-    genHTMLReportGraph ("msgTime",
-			"Message transfer time", "Seconds per message",
-			\@protocols, "Time", ["cmd", "submit", "retrieve" ]);
-    genHTMLReportGraph ("setupTime",
-			"Connection setup time", "Seconds per connection",
-			\@protocols, "Time", ["conn", "banner", "login" ]);
-    genHTMLReportGraph ("blocks",
-			"Number of mailstone blocks executed", "Blocks/sec",
-			\@protocolsAll, "", ["blocks" ]);
-}
-
-if ($params{ADDGRAPHS}) {	# pick up additional graphs
-    my @graphs = ();
-    readWorkloadFile ($params{ADDGRAPHS}, \@graphs);
-    foreach $section (@graphs) {
-	next unless ($section->{sectionTitle} =~ /GRAPH/i);
-	my $name = $section->{sectionParams};
-	$name =~ s/name=\s*//;	# strip off initial bit
-	my @varlist = split (/[\s,]+/, $section->{VARIABLES});
-
-	$graphCount++;
-	genHTMLReportGraph ($name, $section->{TITLE}, $section->{LABEL}, 
-			    ($section->{FIELD} =~ /Time/o)
-			    ? \@protocols : \@protocolsAll,
-			    $section->{FIELD}, \@varlist);
-    }
-}
-
-
-genHTMLReportEnd();
-
-return 1;

mozilla/mstone/bin/series_utils.ksh

@@ -1,205 +0,0 @@
-#!/bin/ksh
-
-# global configuration parameters.
-# Fill in defaults for anything that is not already set
-
-# Look for testname$test_form, first
-export test_form=${test_form:-""}
-
-# string appended to every description
-export desc_conf=${desc_conf:-""}
-
-# extra arguments common to all tests
-export extra_args=${extra_args:-""}
-
-# error limit to abort sequence
-export error_limit=${error_limit:-100}
-
-# set this to only show what it will do
-export only_show_it=${only_show_it:-0}
-
-# time to allow the server to calm down after each run
-export sleep_time=${sleep_time:-5}
-
-# This is where we store the important runs
-export save_dir=${save_dir:-"results.save"}
-
-# Basic sanity test
-if [[ ! -x /usr/bin/perl || ! -f .license ]] ; then # see if setup was ever run
-   echo "Critical files are missing.  Run setup."
-   exit 2;
-fi
-
-find_timestamp () {		# find the timestamp string from latest run
-  #OLD timestamp=`ls -d results/[0-9]*.[0-9][0-9][0-9][0-9]?(a-z) | tail -1`
-
-  # list all directories with the timestamp pattern
-  timestamp=`echo results/[0-9]*.[0-9][0-9][0-9][0-9]?([a-z])`
-  # strip all but the last one
-  timestamp=${timestamp##* }
-
-  # strip the top directory name out
-  timestamp=${timestamp#results/}
-
-  # return it
-  echo $timestamp
-  return 0
-}
-
-
-# copy last mailstone run from the current directory to good results directory
-save_run () {
-
-  [[ -d $save_dir ]] || \
-	mkdir $save_dir
-
-  [[ $only_show_it -gt 0 ]] && return 0	# dont do anything important
-
-  if [[ -n "$last_timestamp" && -d "results/$last_timestamp/" ]] ; then
-	cp -pR results/$last_timestamp $save_dir/
-	# index probably has lots of extra junk, but its better than nothing
-	cp -pf results/index.html $save_dir/
-  fi
-}
-
-# Display and run a command.  Skip if in only_show mode.
-run () {
-  if [[ $only_show_it -gt 0 ]] ; then
-	echo  "Would run:" "$@"
-	return 0
-  fi
-  echo "Running: " "$@"
-  "$@"
-}
-
-# Sleep.  Skip if in only_show mode.
-run_sleep () {
-  if [[ $only_show_it -gt 0 ]] ; then
-	echo  "Would sleep:" "$@"
-	return 0
-  fi
-  echo "Sleeping: " "$@"
-  sleep "$@"
-}
-# for readability, just use sleep
-alias sleep=run_sleep
-
-
-# This runs the actual mstone run and check for errors
-# compress tmp files
-# Usage: run_test testname description [args...]
-run_test () {
-  testname="$1"; shift;
-  desc="$1"; shift;
-
-  # see if a special version of this test exists
-  if [[ -f conf/$testname$test_form.wld ]] ; then
-	testname=$testname$test_form
-  fi
-
-  #oldtimestamp=`find_timestamp`
-
-  if [[ $only_show_it -gt 0 ]] ; then
-	echo  "Would run:" mstone $testname -b "$desc $desc_conf" $extra_args "$@"
-	if [[ ! -f conf/$testname.wld ]] ; then
-	  echo "Configuration Error: No such test $testname"
-	fi
-	return 0
-  fi
-
-  echo "\n##########################################################"
-  if [[ ! -f conf/$testname.wld ]] ; then
-    echo "CONFIGURATION ERROR: No such test $testname"
-    exit 2
-  fi
-
-  echo  "\nRunning:" mstone $testname -b "$desc $desc_conf" $extra_args "$@"
-  # We actually bypass the mstone script
-  /usr/bin/perl -Ibin -- bin/mailmaster.pl -w conf/$testname.wld  -b "$desc $desc_conf" $extra_args "$@"
-  stat=$?
-
-  # BUG if another test is running at the same time, this is wrong
-  timestamp="`find_timestamp`"
-
-  # test failed to even run
-  if [[ $stat -ne 0 ]]
-  then
-	echo "ABORT! Test failed to start"
-        [[ -n "$mail_list" ]] && \
-	    mail_series "DotCom Failed run: `date`" "$mail_list"
-	exit 2
-  fi
-
-  # compress tmp files.  get the csv files, too.
-  gzip tmp/$timestamp/* results/$timestamp/*.csv
-
-  # stick the timestamp someplace global for a save_run
-  export last_timestamp=$timestamp
-  export all_timestamps="$all_timestamps $timestamp"
-
-  # save the results
-  save_run
-
-  # see how many errors we hit
-  totline=`grep 'Total:total ' results/$timestamp/results.txt`
-
-  # strip label and first field
-  errors=${totline##+([+-z])+( )+([+-9])+( )}
-  # strip trailing fields
-  errors=${errors%% *}
-
-  echo ""			# space things out
-
-  if [[ $errors -gt $error_limit ]] ; then
-	echo "ABORT! Errors ($errors) exceed error limit ($error_limit)"
-        [[ -n "$mail_list" ]] && \
-	    mail_series "DotCom Aborted run: `date`" "$mail_list"
-	exit 1
-  fi
-  echo "Run completed OK ($errors errors).  Timestamp $timestamp"
-
-  sleep $sleep_time
-
-  return 0
-}
-
-# Usage: mail_series subject "address,address,..."
-mail_series () {
-  subject=$1; shift
-  file=/tmp/series$$.tar
-
-  if [[ $only_show_it -gt 0 ]] ; then
-	echo  "Would mail results about $subject" to "$@"
-	return 0
-  fi
-  echo "Mailing results about $subject" to "$@"
-
-  tar cf $file $save_dir/index.html
-  for f in $all_timestamps ; do
-      tar rf $file $save_dir/$f
-  done
-  gzip $file
-  echo "$all_timestamps" | uuenview -b -30000 -s "$subject" -m "$@" $file.gz
-  rm -f $file.gz
-}
-
-# parse command line arguments
-while [[ -n "$1" ]]
-do
-  case $1 in
-  # -n mode, do not execute, just show
-  -n)	only_show_it=1; shift;;
-
-  # set test form
-  -f)	shift; test_form=$1; shift;;
-
-  # set test extra description
-  -d)	shift; desc_conf=$1; shift;;
-
-  # Rest are to be passed in exactly
-  --)	shift; break;;
-
-  #default, pick up as an extra arg
-  *)	extra_args="$extra_args $1"; shift;;
-  esac
-done

mozilla/mstone/bin/setup.pl

@@ -1,464 +0,0 @@
-#!/usr/bin/env perl
-# 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 the Netscape Mailstone utility, 
-# released March 17, 2000.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1999-2000 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s):	Dan Christian <robodan@netscape.com>
-#			Marcel DePaolis <marcel@netcape.com>
-#			Jim Salter <jsalter@netscape.com>
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU Public License (the "GPL"), in which case the
-# provisions of the GPL are applicable instead of those above.
-# If you wish to allow use of your version of this file only
-# under the terms of the GPL and not to allow others to use your
-# version of this file under the NPL, indicate your decision by
-# deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL.  If you do not delete
-# the provisions above, a recipient may use your version of this
-# file under either the NPL or the GPL.
-#####################################################
-
-# usage: setup.pl setup|cleanup|checktime|timesync -m machine_file
-# message files are expected to be in ./data/ and end with ".msg"
-
-print "Netscape Mailstone.\nCopyright (c) 1997-2000 Netscape Communications Corp.\n";
-
-$mode = shift;			# mode must be first
-
-# this parses the command line for -m machinefile
-# also sets many defaults
-do 'args.pl'|| die $@;
-sub warn_system;
-sub die_system;
-
-parseArgs();			# parse command line
-
-setConfigDefaults();		# setup RSH and RCP
-
-$cpcmd = "cp";			# copy files... dir
-$rmcmd = "rm -f";		# remove files...
-
-die "Must specify workload file" unless (@workload);
-
-# Add or change client machines
-sub configClients {
-    print "\n    You can enter multiple machines like this: host1,host2\n";
-    my @d = <bin/*/bin>;
-    if (@d) {
-	my @d2;
-	foreach (@d2 = @d) { s/^bin\/// }
-	foreach (@d = @d2) { s/\/bin$// }
-	print "    These OS versions are available:\n@d\n";
-    }
-
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	my $arch = "default OS";
-	$arch = $section->{ARCH} if ($section->{ARCH});
-	print "\nWhat is the name of the client(s) for $arch [$slist]: ";
-	my $ans = <STDIN>; chomp $ans;
-	if ($ans) {
-	    $ans =~ s/\s//g;	# strip any whitespace
-	    fileReplaceText ($params{WORKLOAD}, "<CLIENT", $slist, $ans);
-	}
-    }
-    while (1) {
-	print "\nWhat additional client(s) [none]: ";
-	my $ans = <STDIN>; chomp $ans;
-	last unless ($ans);	# done
-	last if ($ans =~ /^none$/i);
-	$ans =~ s/\s//g;	# strip any whitespace
-	my $block = "\n<CLIENT HOSTS=$ans>\n";
-
-	print "What OS type [default]: ";
-	my $ans = <STDIN>; chomp $ans;
-	$block .= "  Arch\t$ans\n" if ($ans && !($ans =~ /^default$/i));
-
-	$block .= "</CLIENT>\n";
-	fileInsertAfter ($params{WORKLOAD}, "^</CLIENT>", $block);
-    }
-}
-
-# Create a user ldif file
-sub configUserLdif {
-    my $name = "conf/$defaultSection->{SERVER}.ldif";
-    print "\nWhat file to you want to create [$name]? ";
-    $ans = <STDIN>; chomp $ans;
-    $name = $ans if ($ans);
-
-    my $mode = "users";
-    print "\nDo you want to create a broadcast account [y]? ";
-    $ans = <STDIN>;
-    $mode .= " broadcast" unless ($ans =~ /^n/i);
-
-    my $basedn = $defaultSection->{SERVER};	# pick a default
-    $basedn =~ s/^.*?\.//;	# strip off before first dot
-    $basedn = "o=$basedn";
-
-    print "\nWhat is LDAP base DN [$basedn]? ";
-    $ans = <STDIN>; chomp $ans;
-    $basedn = $ans if ($ans);
-
-    my $args = $params{MAKEUSERSARGS};
-
-    print "\n    Common additional makeusers arguments:\n";
-    print "\t-s storeName -x storeCount \tMultiple store partitions\n";
-    print "\t[-3|-4]                    \tConfigure for NSMS 3.x or 4.x\n";
-    print "Any extra arguments to makeusers [$args]? ";
-    $ans = <STDIN>; chomp $ans;
-    $args = $ans if ($ans);
-
-    my $perlbin = "/usr/bin/perl";
-
-    $params{DEBUG} &&
-	print "$perlbin -Ibin -- bin/makeusers.pl $mode -w $params{WORKLOAD} -b '$basedn' -o $name $args\n";
-
-    print "\nGenerating $name (this can take a while)\n";
-    warn_system "$perlbin -Ibin -- bin/makeusers.pl $mode -w $params{WORKLOAD} -b '$basedn' -o $name $args";
-    print "LDIF generation complete.  See $name\n";
-    print "\tSee the manual or INSTALL to create users using the LDIF file.\n";
-}
-
-# This uses a match pattern plus text to text replacements.  
-# Could make all changes and then write out new workload
-# 	You would have to be carefull about sections with multi-line support.
-sub configWorkload {
-    my $ans;
-
-    print "\nWhat is the name of the mail host [$defaultSection->{SERVER}]: ";
-    $ans = <STDIN>; chomp $ans;
-    if ($ans) {
-	fileReplaceText ($params{WORKLOAD},
-			 "(SERVER|SMTPMAILFROM|ADDRESSFORMAT)", 
-			 $defaultSection->{SERVER}, $ans);
-	$defaultSection->{SERVER} = $ans; # needed for ldif generation
-    }
-    print "\nWhat is the user name pattern [$defaultSection->{LOGINFORMAT}]: ";
-    $ans = <STDIN>; chomp $ans;
-    if ($ans) {
-	fileReplaceText ($params{WORKLOAD},
-			 "(LOGINFORMAT|ADDRESSFORMAT)",
-			 $defaultSection->{LOGINFORMAT}, $ans);
-	$ans =~ s/%ld/0/;	# create smtpMailFrom user
-	my $olduser = $defaultSection->{SMTPMAILFROM};
-	$olduser =~ s/@.*$//;	# strip off after @
-	fileReplaceText ($params{WORKLOAD},
-			 "SMTPMAILFROM",
-			 $olduser, $ans);
-    }
-
-    print "\nWhat is the password pattern [$defaultSection->{PASSWDFORMAT}]: ";
-    $ans = <STDIN>; chomp $ans;
-    fileReplaceText ($params{WORKLOAD}, "PASSWDFORMAT", 
-		     $defaultSection->{PASSWDFORMAT}, $ans);
-
-    $defaultSection->{NUMLOGINS} = 100 unless ($defaultSection->{NUMLOGINS});
-    print "\nHow many users [$defaultSection->{NUMLOGINS}]: ";
-    $ans = <STDIN>; chomp $ans;
-    fileReplaceText ($params{WORKLOAD}, "(NUMADDRESSES|NUMLOGINS)",
-		     $defaultSection->{NUMLOGINS}, $ans);
-
-    $defaultSection->{FIRSTLOGIN} = 0 unless ($defaultSection->{FIRSTLOGIN});
-    print "\nWhat is the first user number [$defaultSection->{FIRSTLOGIN}]: ";
-    $ans = <STDIN>; chomp $ans;
-    fileReplaceText ($params{WORKLOAD}, "(FIRSTADDRESS|FIRSTLOGIN)",
-		     $defaultSection->{FIRSTLOGIN}, $ans);
-
-    unless ($params{NT}) {
-	configClients ();
-    }
-
-    print "\nDo you want to view the edited $params{WORKLOAD} [y]? ";
-    $ans = <STDIN>;
-    unless ($ans =~ /^n/i) {
-	print "Here is the edited $params{WORKLOAD}:\n\n";
-	fileShow ($params{WORKLOAD});
-	print "\n";
-    }
-
-    print "\nDo you want to generate a user LDIF file [y]? ";
-    $ans = <STDIN>;
-    unless ($ans =~ /^n/i) {
-	configUserLdif ();
-    }
-}
-
-# See if license file has been displayed
-if (($mode ne "cleanup") && (! -f ".license" )) {
-    fileShow ("LICENSE");
-    # SEAN: blow off annoying agreement message.
-#      print "\nDo you agree to the terms of the license? (yes/no) ";
-#      my $ans = <STDIN>;
-#      print "\n";
-#      unless ($ans =~ /^yes$/i) {
-#  	print "License not agreed to.\n";
-#  	exit 0;
-#      }
-    my ($sec, $min, $hour, $mday, $mon, $year) = localtime;
-    open (LIC, ">.license");
-    printf LIC "%04d$mon$mday$hour$min\n", $year+1900;
-    close (LIC);
-}
-
-if ($mode eq "config") {	# re-run config
-    configWorkload ();
-
-    print "\nMake any additional changes to $params{WORKLOAD} and then re-run 'setup'\n";
-    exit 0;
-} elsif ($mode ne "cleanup") {	# check if configured
-    my $unconf = 0; # see if default values are in use
-    foreach $section (@workload) {
-	($section->{SERVER})
-	    && ($section->{SERVER} =~ /example\.com$/)
-		&& $unconf++;
-	($section->{SMTPMAILFROM})
-	    && ($section->{SMTPMAILFROM} =~ /example\.com$/)
-		&& $unconf++;
-	($section->{ADDRESSFORMAT})
-	    && ($section->{ADDRESSFORMAT} =~ /example\.com$/)
-		&& $unconf++;
-	last if ($unconf > 0);
-    }
-    if ($unconf > 0) {
-	print "Server has not been configured (example.com is an invalid address).\n";
-	print "Do you want to setup a simple configuration now [y]?";
-	my $ans = <STDIN>;
-	if ($ans =~ /^n/i) {
-	    print "Re-run setup when you have edited the configuration.\n";
-	    exit 0;
-	}
-	configWorkload ();
-
-	print "\nMake any additional changes to $params{WORKLOAD} and then re-run 'setup'\n";
-	exit 0;
-    }
-}
-
-if ($mode eq "timesync") {
-    if ($params{NT}) {
-	print "Timesync has no effect on NT\n";
-	exit 0;
-    }
-    my ($sec, $min, $hour, $mday, $mon, $year) = localtime;
-    $mon += 1;			# adjust from 0 based to std
-    $systime = sprintf ("%02d%02d%02d%02d%04d.%02d",
-		     $mon, $mday, $hour, $min, 1900+$year, $sec);
-} elsif ($mode eq "checktime") {
-    if ($params{NT}) {		# if running on NT, then only single client
-	print "Checktime not needed on NT\n";
-	exit 0;
-    }
-    mkdir ("$resultbase", 0775);
-    mkdir ("$tmpbase", 0775);
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	foreach $cli (split /[\s,]/, $slist) {
-	    open MAKEIT, ">$tmpbase/$cli.tim";
-	    close MAKEIT;
-	}
-    }
-} elsif (($mode eq "setup") || ($mode eq "cleanup")) {
-    @msgs = <data/*.msg>;
-    foreach (@files = @msgs) { s/data\/// }
-    print "Found these message files:\n@files\n\n";
-    if ($params{NT}) {		# handle NT localhost here
-	exit 0 if ($mode =~ /cleanup$/);
-	my $clipath = "bin/WINNT4.0/bin/mailclient.exe";
-	print "Copying $clipath and message files to $cli\n";
-	die_system "copy $clipath $params{TEMPDIR}";
-	foreach $f (@files) {
-	    die_system "copy $f $params{TEMPDIR}";
-	}
-	exit 0;			# without perl:fork, no more to do
-    }
-}
-
-# iterate over every client in the testbed, complete the cmd and rsh
-foreach $section (@workload) {
-    next unless ($section->{sectionTitle} =~ /CLIENT/i);
-    my $slist = $section->{sectionParams};
-    $slist =~ s/HOSTS=\s*//; # strip off initial bit
-    foreach $cli (split /[\s,]/, $slist) {
-	my $rsh = ($section->{RSH}) ? $section->{RSH} : $params{RSH};
-	my $rcp = ($section->{RCP}) ? $section->{RCP} : $params{RCP};
-	my $tempdir;
-	if ($section->{TEMPDIR}) {
-	    $tempdir = $section->{TEMPDIR};
-	} elsif ($params{TEMPDIR}) {
-	    $tempdir = $params{TEMPDIR};
-	}
-
-	my $cliarch = $section->{ARCH};
-
-	# presumed architecture for bin/mailclient on localhost:
-	my $local_arch = `bin/nsarch`;
-	chomp $local_arch;
-
-	# Try to determine arch if it hasn't been explicitly set.
-	if (!$cliarch) {
-	    if ($cli =~ /localhost/) {
-		$cliarch = `bin/nsarch`;
-		chomp $cliarch;
-	    } else {
-		$cliarch = `$rsh $cli sh < bin/nsarch`;
-		chomp $cliarch;
-	    }
-	}
-
-	# most time critical first
-	if ($mode eq "timesync") {
-	    next if ($cli =~ /^localhost$/i); # dont reset our own time
-	    # run all these in parallel to minimize skew
-	    next if ($cliarch eq "NT4.0");
-	    forkproc ($rsh, $cli, "date $systime");
-	}
-
-	elsif ($mode eq "checktime") {
-	    # run all these in parallel to minimize skew
-	    forkproc ($rsh, $cli, ($cliarch eq "NT4.0")
-		      ? "time" : "date",
-		      "/dev/null", "$tmpbase/$cli.tim");
-	}
-
-	elsif ($mode eq "setup") {
-	    my ($clibin) = split /\s/, (($section->{COMMAND})
-					? $section->{COMMAND}
-					: $params{CLIENTCOMMAND});
-	    my $clipath = '';	# do nothing by default
-
-	    # Look for architecture-specific binary.
-	    if ($cliarch) {
-
-		# fallback to just os-name if we can't find an exact match.
-		my $approx = $cliarch;
-		$approx =~ s/^(\D+).*/$1/;
-		my $approx_bin = <"bin/${approx}*/bin/$clibin">;
-
-		if (-x "bin/$cliarch/bin/$clibin") {
-		    # exact match.
-		    $clipath = "bin/$cliarch/bin/$clibin";
-		} elsif (-x $approx_bin) {
-		    # approximate match
-		    $clipath = $approx_bin;
-		} elsif ($local_arch =~ /^$approx/) {
-		    # same arch as localhost
-		    $clipath = "bin/mailclient";
-		} else {
-		    print STDERR
-			"Requested OS $cliarch for $cli not found.  ",
-			"Not copying binary.\n";
-		}
-	    } else {
-		# arch not found
-		print STDERR "Cannot determine architecture for $cli.  ",
-		"Not copying binary.\n";
-	    }
-	    # See if we have anything to copy:
-	    if ("$clipath @files" !~ /\S/) {
-		print STDERR "Nothing to copy to $cli.  Skipping.\n";
-		next;
-	    }
-	    my $rdir = ($tempdir) ?  "$tempdir/" : ".";
-	    # chmod so that the remote files can be easily cleaned up
-	    my $rcmd = "chmod g+w @files $clibin; uname -a";
-	    $rcmd = "cd $tempdir; " . $rcmd if ($tempdir);
-	    $rdir =~ s!/!\\!g if ($cliarch eq "NT4.0");
-	    if ($cli =~ /^localhost$/i) {
-		die "TEMPDIR must be set for 'localhost'\n"
-		    unless ($tempdir);
-		die "Invalid local NT copy.  Should never get here.\n"
-		    if ($cliarch eq "NT4.0"); # should never happen
-		print "Copying $clipath and message files to $rdir\n";
-		die_system ("$cpcmd @msgs $clipath $rdir");
-		die_system ($rcmd);
-	    } else {
-		print "$rcp $clipath @msgs $cli:$rdir\n" if ($params{DEBUG});
-		print "Copying $clipath and message files to $cli:$rdir\n";
-		warn_system (split (/\s+/, $rcp), $clipath, @msgs, "$cli:$rdir");
-		next if ($cliarch eq "NT4.0"); # chmod not valid
-		print "rcmd='$rcmd'\n" if ($params{DEBUG});
-		die_system (split (/\s+/, $rsh), $cli, $rcmd);
-	    }
-	    print "\n";
-	}
-
-	elsif ($mode eq "cleanup") {
-	    if ($params{DEBUG}) {	# get debug files
-		print "Cleaning up debug files on $cli\n";
-		my $rcmd = ($cliarch eq "NT4.0") ? "DEL" : "$rmcmd";
-		$rmcmd .= " mstone-debug.[0-9]*";
-		$rcmd = "cd $tempdir; " . $rcmd if ($tempdir);
-		$rcmd =~ s/;/&&/g if ($cliarch eq "NT4.0");
-		if ($cli =~ /^localhost$/i) {
-		    die "TEMPDIR must be set for 'localhost'\n"
-			unless ($tempdir);
-		    warn_system ($rcmd);
-		} else {
-		    warn_system (split (/\s+/, $rsh), $cli, $rcmd);
-		}
-	    } else {
-		print "Cleaning $cli\n";
-		my $rcmd = ($cliarch eq "NT4.0") ? "DEL" : "$rmcmd";
-		$rcmd .= " $clibin @files";
-		$rcmd = "cd $tempdir; " . $rcmd if ($tempdir);
-		$rcmd =~ s/;/&&/g if ($cliarch eq "NT4.0");
-		if ($cli =~ /^localhost$/i) {
-		    die "TEMPDIR must be set for 'localhost'\n"
-			unless ($tempdir);
-		    warn_system ($rcmd);
-		} else {
-		    warn_system (split (/\s+/, $rsh), $cli, $rcmd);
-		}
-	    }
-	}
-
-	else {
-	    die "Couldn't recognize mode $mode!\n";
-	}
-    }
-}
-
-# wait for children to finish
-if (($mode eq "timesync") || ($mode eq "checktime")) {
-    $pid = wait();
-    while ($pid != -1) {
-	$pid = wait();
-    }
-}
-
-# Print the results of the time checks
-if ($mode eq "checktime") {
-    print "Time from each client:\n";
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	my $slist = $section->{sectionParams};
-	$slist =~ s/HOSTS=\s*//; # strip off initial bit
-	foreach $cli (split /[\s,]/, $slist) {
-	    open TIMEFILE, "$tmpbase/$cli.tim"
-		|| warn "Counldn't open $tmpbase/$cli.tim\n";
-	    printf "%32s: ", $cli;
-	    while (<TIMEFILE>) { print; last;} # single line (2 on NT)
-	    close(TIMEFILE);
-	    unlink "$tmpbase/$cli.tim";
-	}
-    }
-}

mozilla/mstone/bin/smtpsink.pl

@@ -1,280 +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 the Netscape Mailstone utility,
- * released March 17, 2000.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999-2000 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):     Sean O'Rourke <sean@sendmail.com>
- *                     Thom O'Connor <thom@sendmail.com>
- *                     Sendmail, Inc.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License Version 2 or later (the "GPL"), in
- * which case the provisions of the GPL are applicable instead of
- * those above.  If you wish to allow use of your version of this file
- * only under the terms of the GPL and not to allow others to use your
- * version of this file under the NPL, indicate your decision by
- * deleting the provisions above and replace them with the notice and
- * other provisions required by the GPL.  If you do not delete the
- * provisions above, a recipient may use your version of this file
- * under either the NPL or the GPL.
- */
-
-use Thread qw(async);
-use FileHandle qw(_IOLBF);
-use Socket;
-use strict;
-use Getopt::Long;
-
-# options
-my $maxconn = SOMAXCONN;
-my $t_banner = 0;
-my $t_from = 0;
-my $t_rcpt = 0;
-my $t_dot = 0;
-my $port = 25;
-my $cs = '';
-my $log = '';
-my $proto = getprotobyname('tcp');
-
-# statistics
-my ($cmds, $errs, $bytesw, $bytesr, $msgs);
-
-GetOptions('maxconn:i'		=> \$maxconn,
-	   'banner-delay:i'	=> \$t_banner,
-	   'from-delay:i'	=> \$t_from,
-	   'rcpt-delay:i'	=> \$t_rcpt,
-	   'dot-delay:i'	=> \$t_dot,
-	   'log:s'		=> \$log,
-	   'checksums:s'	=> sub { use Digest::MD5; $cs = $_[0]; })
-    || &usage;
-
-if (@ARGV == 1) {
-    ($port) = @ARGV;
-}
-
-if ($log) {
-    if (open(LOG, ">$log")) {
-	print STDERR "Logging messages to $log\n";
-    } else {
-	warn ("Cannot open logfile $log\n");
-	$log = '';
-    }
-}
-
-socket(S, PF_INET, SOCK_STREAM, $proto) || die $!;
-setsockopt(S, SOL_SOCKET, SO_REUSEADDR, pack("l", 1)) || die $!;
-
-(bind(S, sockaddr_in($port, INADDR_ANY))
- && listen(S, $maxconn))
-    || die $!;
-
-my $addr;
-my $fh = new FileHandle;
-my $cnt = 0;
-
-$SIG{INT} = sub { close(LOG); print STDERR "done\n"; exit 0; };
-
-while(my $addr = accept($fh, S)) {
-    if (++$cnt % 100 == 0) {
-	print STDERR "$cnt\r";
-    }
-    my $thr = async { do_smtp($addr, $fh); };
-    $thr->join;
-    $fh = new FileHandle;
-}
-
-sub usage
-{
-    print STDERR <<EOS;
-Usage: $0 [options] [port]
-EOS
-    exit -1;
-}
-
-sub netline
-{
-    my $fh = shift;
-    my $line = $fh->getline;
-    $line =~ s/\r\n$// if $line;
-    $line;
-}
-
-sub millisleep
-{
-    my $t = shift;
-    select(undef, undef, undef, $t) if $t > 0;
-}
-
-sub netprint($@)
-{
-    my ($fh, @stuff) = @_;
-    foreach (@_) {
-	s/([^\r])\n/$1\r\n/g;
-	$fh->print($_);
-    }
-}
-
-sub do_smtp
-{
-    my ($addr, $s) = @_;
-    my $buf;
-    my ($port, $iaddr) = sockaddr_in($addr);
-    my $name = gethostbyaddr($iaddr, AF_INET);
-    $s->setvbuf($buf, _IOLBF, 1024);
-
-    millisleep($t_banner);
-    $s->print("220 wazzup, bro?\r\n");
-    my %state = ('conn'		=> $s,
-		 'host'		=> $name);
-    my %funcs = ('helo'		=> \&do_helo,
-		 'ehlo'		=> \&do_helo,
-		 'word'		=> \&do_helo,
-
-		 'quit'		=> \&do_quit,
-		 'latr'		=> \&do_quit,
-
-		 'mail'		=> \&do_from,
-		 'rcpt'		=> \&do_rcpt,
-		 'data'		=> \&do_data,
-		 'rset'		=> \&do_ok,
-		 'vrfy'		=> \&do_ok,
-		 'noop'		=> \&do_ok,
-		);
-    while (my $line = netline($s))
-    {
-	my ($cmd, $arg) = ($line =~ /^\s*(\S+)\s*(.*)$/);
-	die "cmd = `$cmd'" unless ($cmd = lc($cmd));
-	# fail 1% of commands
-	if ($funcs{$cmd}) {
-	    &{$funcs{$cmd}}(\%state, $cmd, $arg, \%funcs);
-	} else {
-	    $s->print("500 5.0.0 no.  Just... no.\r\n");
-	}
-    }
-    return 0;
-}
-
-sub already_said_that
-{
-    my ($state, $cmd, $arg) = @_;
-    $state->{conn}->print("503 5.0.0 Dude, you already said that.\r\n");
-}
-
-sub do_helo
-{
-    my ($state, $cmd, $arg) = @_;
-    $state->{helohost} = $arg;
-    die unless $cmd;
-    if ($cmd eq 'helo') {
-	if ($arg eq $state->{host}) {
-	    $state->{conn}->print("221 hello Mr. Honest\r\n");
-	} else {
-	    $state->{conn}->print("221 We know where you live, $state->{iaddr}\r\n");
-	}
-    } elsif ($cmd eq 'ehlo') {
-	my $esmtp = <<EOS;
-250-localhost is pleased to make your acquaintance, and offers:
-250 8bitmime
-EOS
-	if ($arg) {
-	    netprint($state->{conn}, $esmtp);
-	} else {
-	    $state->{conn}->print("501 5.0.0 tell me more...\r\n");
-	    return;
-	}
-    } else {
-	$state->{conn}->print("221 2.0.0 peace brother\r\n");
-    }
-}
-
-sub do_quit
-{
-    my ($state, $cmd) = @_;
-    $state->{conn}->print( "221 2.0.0 drop in any time\r\n");
-    close ($state->{conn});
-}
-
-sub do_from
-{
-    my ($state, $cmd, $args, $funcs) = @_;
-    millisleep($t_from);
-    $state->{conn}->print( "250 2.1.0 Okay, keep talking\r\n");
-    $funcs->{rcpt} = \&do_rcpt;
-}
-
-sub do_rcpt
-{
-    my ($state, $cmd, $args, $funcs) = @_;
-    my ($rcpt) = ($args =~ /to\:\s*(.+)/i);
-    millisleep($t_rcpt);
-    $state->{conn}->print("250 2.1.5 ${rcpt}'s cool\r\n");
-    $funcs->{data} = \&do_data;
-}
-
-sub do_data
-{
-    my ($state, $cmd, $args, $funcs) = @_;
-    $state->{conn}->print( "354 up to the dot...\r\n");
-    if ($cs) {
-	my $line;
-	my $md5 = Digest::MD5->new;
-	# skip headers
-    header: while ($_ = netline($state->{conn})) {
-	    last header if /^$/;
-	    last body if /^\.$/;
-	}
-
-    body: while ($_ = $state->{conn}->getline) {
-	    if (/^=CS=MD5=(.+)\r/) {
-		my $sum = $1;
-		my $end = netline($state->{conn});
-
-		if ($end ne '.') {
-		    print STDERR "Fake checksum?: $sum\n";
-		    while (netline($state->{conn}) ne '.') { }
-		} elsif (lc($sum) eq lc($md5->hexdigest)) {
-#  		    print STDERR "MD5 sum OK.\n";
-		} else {
-		    print STDERR "MD5 sum mismatch: $sum, ",
-			$md5->hexdigest, "\n";
-		}
-		last body;
-	    } elsif (/^\.\r$/) {
-  		print STDERR "no checksum\n" if $cs =~ /^r/;
-		last body;
-	    }
-	    print LOG $_ if $log;
-	    $md5->add($_);
-	}
-	print LOG ".\r\n" if $log;
-    } else {
-	local ($/) = "\r\n.\r\n";
-	$state->{conn}->getline;
-    }
-    millisleep($t_dot);
-    if (rand() % 100 == 0) {
-	$state->{conn}->print("451 ohshit\r\n");
-    } else {
-	$state->{conn}->print("250 2.0.0 I will deliver\r\n");
-    }
-}
-
-sub do_ok
-{
-    my ($state) = @_;
-    $state->{conn}->print("220 uhhuh\r\n");
-}

mozilla/mstone/bin/util.pl

@@ -1,825 +0,0 @@
-# util.pl -- utilities which used to live in bin/args.pl
-
-sub my_system {
-    my ($file, $line);
-    $file = shift;
-    $line = shift;
-    my $ret;
-    if (($ret = system(@_)) != 0) {
-	my $msg = "$file:$line: @_\n\t";
-	my ($excode, $sig, $cored) = ($ret >> 8, $ret & 127, $ret & 128);
-	if ($sig) {
-	    $msg .= "died with signal $sig";
-	    $msg .= ' (core dumped)' if ($cored);
-	    $msg .= "\n";
-	} else {
-	    $msg .= "exited abnormally with code $excode\n";
-	}
-	return $msg;
-    }
-    undef;
-}
-
-sub warn_system {
-    my ($pack, $file, $line) = caller;
-    my $msg = my_system($file, $line, @_);
-    warn $msg if $msg;
-}
-
-sub die_system {
-    my ($pack, $file, $line) = caller;
-    my $msg = my_system($file, $line, @_);
-    die $msg if $msg;
-}
-
-# Utility functions
-# Create a unique hash array. Programming Perl, 2nd edition, p291 (p217?)
-package ArrayInstance;
-sub new {
-    my $type = shift;
-    my %params = @_;
-    my $self = {};
-    return bless $self, $type;
-}
-
-package main;
-
-# run a command in the background, return its PID
-# Uses fork: will not run on NT in perl 5.004
-# if the server is "localhost", ignore the rcmd part
-# if stdin, stdout, and/or stderr is set, redirect those for the sub process
-sub forkproc {
-    my $rcmd = shift;
-    my $server = shift;
-    my $command = shift;
-    my $stdin = shift;
-    my $stdout = shift;
-    my $stderr = shift;
-
-    if (my $pid = fork()) {
-	return $pid;		# parent
-    }
-
-    # rest of this is in the child
-    if ($stdin) {		# redirect stdin if needed
-	close (STDIN);
-	open STDIN, "<$stdin"
-	    || die "Couldn't open $stdin for input\n";
-    }
-
-    if ($stdout) {		# redirect stdout if needed
-	close (STDOUT);
-	open STDOUT, ">>$stdout"
-	    || die "Couldn't open $stdout for output\n";
-    }
-
-    if ($stderr) {		# redirect stderr if needed
-	close (STDERR);
-	open STDERR, ">>$stderr"
-	    || die "Couldn't open $stderr for output\n";
-    }
-
-    if ($server =~ /^localhost$/i) {
-	exec $command;
-	die "Coundn't exec $command:$!\n";
-    } else {
-	exec split (/\s+/, $rcmd), $server, $command;
-	die "Coundn't exec $rcmd $server $command:$!\n";
-    } 
-}
-
-# Relocate file to tmp directory (if it is in the results directory),
-#  and put a ~ on the end of it.
-# ASSUMES tmp and results are on the same partition (on NT, same drive).
-# Usage: fileBackup (filename)
-sub fileBackup {
-    my $filename = shift;
-    my $bfile = $filename;
-
-    (-f $filename) || return 0;	# file doent exist
-    $bfile =~ s/$resultbase/$tmpbase/; # move to tmp
-    $bfile .= "~";		# indicate that this is a backup
-    (-f $bfile) && unlink ($bfile);
-    #print "Backing up $filename to $bfile\n"; # DEBUG
-    rename ($filename, $bfile) || unlink ($filename);
-}
-
-# Insert text into a file after a tagline
-# fileInsertAfter (filename, tagstring, newtext)
-sub fileInsertAfter {
-    my $filename = shift || die "fileInsertAfter: missing filename";
-    my $tagline = shift || die "fileInsertAfter: missing tagline";
-    my $newtext = shift || die "fileInsertAfter: missing text";
-    my $foundit = 0;
-
-    open(OLD, "<$filename") ||
-	open(OLD, "gunzip -c $filename |") ||
-	    die "fileInsertAfter: Could not open input $filename: $!";
-    open(NEW, ">$filename+") ||
-	die "fileInsertAfter: Could not open output $filename+: $!";
-
-    while (<OLD>) {
-	print NEW $_;		# copy (including tagline)
-
-	next unless (/$tagline/); # matched tagline
-
-	print NEW $newtext;	# insert new text
-	$foundit++;
-	last;			# only change first occurance
-    }
-
-    if ($foundit) {		# copy rest of file
-	while (<OLD>) {
-	    print NEW $_;
-	}
-    }
-
-    close (OLD);
-    close (NEW);
-    if ($foundit) {
-	fileBackup ($filename);
-	rename ("$filename+", "$filename");
-	#print "Updated $filename\n"; # DEBUG
-	return $foundit;
-    } else {
-	($params{DEBUG}) && print "No change to $filename\n"; # DEBUG
-	unlink ("$filename+");
-	return 0;
-    }
-}
-
-# Do text for text replacements in a file.
-# Perl wildcards are automatically quoted.
-# fileReplace (filename, matchPat, oldtext, newtext)
-sub fileReplaceText {
-    my $filename = shift || die "fileReplaceText: missing filename";
-    my $tagline = shift || die "fileReplaceText: missing tagline ($filename)";
-    my $oldtext = shift;
-    my $newtext = shift;
-    my $foundit = 0;
-
-    return if ($newtext eq "");	# nothing to do
-    return if ($oldtext eq "");	# nothing can be done
-
-    open(OLD, "<$filename") ||
-	open(OLD, "gunzip -c $filename |") ||
-	    die "fileReplaceText: Could not open input $filename: $!";
-    open(NEW, ">$filename+") ||
-	die "fileReplaceText: Could not open output $filename+: $!";
-
-    $oldtext =~ s/([][{}*+?^.\/])/\\$1/g; # quote regex syntax
-
-    while (<OLD>) {
-	if (/$tagline/i) { # matched tagline
-	    $foundit++;
-	    s/$oldtext/$newtext/; # do the replace
-	}
-	print NEW $_;
-    }
-
-    close (OLD);
-    close (NEW);
-    if ($foundit) {
-	fileBackup ($filename);
-	rename ("$filename+", "$filename");
-	#print "Updated $filename\n"; # DEBUG
-	return $foundit;
-    } else {
-	($params{DEBUG}) && print "No change to $filename\n"; # DEBUG
-	unlink ("$filename+");
-	return 0;
-    }
-}
-
-# copy a file to a new name.  Handles possible compression.  OS independent.
-# fileCopy (filename, newname)
-sub fileCopy {
-    my $filename = shift || die "fileReplaceText: missing filename";
-    my $newname = shift || die "fileReplaceText: missing newname ($filename)";
-
-    open(OLD, "<$filename") ||
-	open(OLD, "gunzip -c $filename |") ||
-	    die "fileReplaceText: Could not open input $filename: $!";
-    open(NEW, ">$newname") ||
-	die "fileReplaceText: Could not open output $newname: $!";
-
-    while (<OLD>) {		# copy it
-	print NEW $_;
-    }
-
-    close (OLD);
-    close (NEW);
-    return 0;
-}
-
-# display a file to STDOUT.  Handles possible compression
-sub fileShow {
-    my $filename = shift || die "fileShow: missing filename";
-    open(SHOWIT, "<$filename") ||
-	open(SHOWIT, "gunzip -c $filename.gz |") ||
-	    die "fileShow: Couldn't open $filename: $!";
-    while (<SHOWIT>) { print; }
-    close(SHOWIT);
-}
-
-# sub function to figure time extents
-# (start, end) = dataMinMax counterName \@protocols oldstarttime oldendtime
-# Use 0 for uninitialized start or end
-sub dataMinMax {
-    my $name = shift;
-    my $protos = shift;
-    my $start = shift;
-    my $end = shift;
-    
-    # make global
-    # create the plot script and data files
-    # Figure out the encompassing time extent
-    foreach $p (@$protos) {	# create the plot data files
-	my @times = sort numeric keys %{ $graphs{$p}->{$name}};
-	if ($#times <= 0) {
-	    next;
-	}
-	if (($start == 0) || ($times[0] < $start)) {
-	    $start = $times[0];
-	}
-	if (($end == 0) || ($times[0] > $end)) {
-	    $end = $times[$#times];
-	}
-    }
-    #printf ("Data $name start=$start end=$end (%d points)...\n",
-	#    $end - $start);
-    return ($start, $end);
-}
-
-# simple function to formatted a number into n, n K, n M, or n G
-sub kformat {
-    my $n = shift;
-    my $r = "";
-    if ($n > (1024*1024*1024)) {
-	$r = sprintf "%.2fG", $n / (1024*1024*1024);
-    } elsif ($n > (1024*1024)) {
-	$r = sprintf "%.2fM", $n / (1024*1024);
-    } elsif ($n > 1024) {
-	$r = sprintf "%.2fK", $n / 1024;
-    } else {
-	$r = sprintf "%d ", $n;
-    }
-    return $r;
-}
-
-# simple function to formatted a time into Ns, Nms, or Nus
-# the goal is to make a table of timss uncluttered and easy to read
-# I dont convert to minutes or hours because the non-1000x multipliers
-#   are hard to back solve in your head for comparisons
-sub tformat {
-    my $n = shift;
-    my $r = "";
-    if ($n == 0.0) {
-	$r = "0.0";		# make exactly 0 explicit
-    } elsif ($n < 0.001) {
-	$r = sprintf "%.2fus", $n * 1000 * 1000;
-    } elsif ($n < 1.0) {
-	$r = sprintf "%.2fms", $n * 1000;
-    } elsif ($n >= 1000.0) {
-	$r = sprintf "%.0fs", $n;
-    } elsif ($n >= 100.0) {
-	$r = sprintf "%.1fs", $n;
-    } else {
-	$r = sprintf "%.3fs", $n;
-    }
-    return $r;
-}
-
-#Usage: commify (1234567) returns 1,234,567
-sub commify {			# perl cookbook p64-65
-    my $text = reverse $_[0];
-    $text  =~ s/(\d\d\d)(?=\d)(?!\d*\.)/$1,/g;
-    return scalar reverse $text;
-}
-
-# subroutine to enable numeric sorts.  Programming Perl p218
-# Use: sort numeric ...
-sub numeric { $a <=> $b; }
-
-# on NT, turn slash to backslash, then print.  Else print.
-sub pathprint {
-    my $str = shift;
-    $str =~ s!/!\\!g if ($params{NT});	# turn slash to back slash
-    print $str;
-}
-    
-# figureTimeNumber number
-# Given an number like: 60m, 1h, 100s, 4d, 200
-# Return 60, 1, 100, 4, 200
-sub figureTimeNumber {
-    my $arg = shift;
-
-    ($arg =~ /([0-9]+)(s|sec|second|seconds|m|min|minute|minutes|h|hr|hour|hours|d|day|days)$/i)
-	&& return $1;
-    return $arg;			# return default
-}
-
-# figureTimeUnits number, default
-# Given an number like: 60m, 1h, 100s, 4d
-# Return a string of minutes, hours, seconds, days
-# Else return the second argument
-sub figureTimeUnits {
-    my $arg = shift;
-
-    ($arg =~ /(s|sec|second|seconds)$/i)	&& return "seconds";
-    ($arg =~ /(m|min|minute|minutes)$/i)	&& return "minutes";
-    ($arg =~ /(h|hr|hour|hours)$/i)	&& return "hours";
-    ($arg =~ /(d|day|days)$/i)		&& return "days";
-
-    return shift;		# return default
-}
-
-# figureTimeSeconds number, defaultUnits
-# Given an number like: 60m, 2h, 100s, 4d
-# Return 60*60, 2*60*60, 100, 4*24*60*60
-sub figureTimeSeconds {
-    my $arg = shift;
-
-    ($arg =~ /([0-9]+)(s|sec|second|seconds)$/i)	&& return $1;
-    ($arg =~ /([0-9]+)(m|min|minute|minutes)$/i)	&& return (60*$1);
-    ($arg =~ /([0-9]+)(h|hr|hour|hours)$/i)	&& return (60*60*$1);
-    ($arg =~ /([0-9]+)(d|day|days)$/i)		&& return (24*60*60*$1);
-
-    if ($_) { 
-	my $def = shift;
-	return $arg * figureTimeSeconds ("1$def"); # return scaled by default
-    } else {
-	return $arg;		# return it
-    }
-}
-
-# BACK COMPATIBILITY (everything now in the workload file)
-# read the testbed conf file, convert to workload sections
-# machine, how many processes, how many threads/proc, arch
-# only the first 2 fields are required.  Lines starting with # are ignored.
-# You can include other files using <include conf/filename.tbd>
-# exampe:
-#	client1  5 10 SunOS5.5.1
-sub readTestbedFile {
-    my $filename = shift;
-    foreach $section (@workload) {
-	next unless ($section->{sectionTitle} =~ /CLIENT/i);
-	print "Testbed $filename skipped, clients read in workload\n";
-	return 1;			# clients already read in workload
-    }
-
-    my $level = 0;
-    if ($_) {
-	$level = 1 + shift;
-	die "Too many nested includes ($level) in $filename!"
-	    unless ($level < 100);
-    }
-    my $handle = "$filename$level";
-    open($handle, "<$filename") ||
-	open($handle, "gunzip -c $filename.gz |") ||
-	    die "Couldn't open testbed $filename: $!";
-
-    while(<$handle>) {
-	chomp;
-
-	s/#.*//;		# strip any comments from line
-
-	m/^\s*$/o &&  next; 	# continue if blank line
-
-	# handle include statement
-	if (m/^<(include|INCLUDE)\s+([^\s]+)\s*>/o) {
-	    #print "Including $2 from $filename\n";
-	    readTestbedFile ($2, $level) || die;
-	    next;
-	}
-
-	# get the server name and number of processes 
-	my @line = split(/\s+/);
-				# create CLIENT entry in workload
-	my $sparm = ArrayInstance->new();
-	if ($line[1]) {
-	    $sparm->{"sectionTitle"} = "CLIENT";
-	    $sparm->{"sectionParams"} = "HOSTS=$line[0]";
-	    $sparm->{"PROCESSES"} = $line[1];
-	    $sparm->{"THREADS"} = $line[2] if ($line[2]);
-	    $sparm->{"ARCH"} = $line[3] if ($line[3]);
-	} else {
-	    $sparm->{"sectionTitle"} = "MONITOR";
-	    $sparm->{"sectionParams"} = "HOSTS=$line[0]";
-	    $sparm->{"COMMAND"} = $line[2];
-	}
-	($params{DEBUG})
-	    && print "<$sparm->{sectionTitle} $sparm->{sectionParams}>\n";
-	push @workload, $sparm;
-    }
-    close ($handle);
-}
-
-# BACK COMPATIBILITY (everything now in the saved workload file)
-# This is now only needed to process mailstone4.1 runs
-sub readConfigFile {
-    my $filename = shift;
-    open(CONFIG, "<$filename") ||
-	open(CONFIG, "gunzip -c $filename.gz |") ||
-	    die "Couldn't open config file $filename: $!";
-
-    while(<CONFIG>) {
-	chomp;
-
-	s/#.*//;		# strip any comments from line
-
-	m/^\s*$/o && next; 	# continue if blank line
-
-	# get the property and value
-	my @line = split(/=/);
-	$params{$line[0]} = $line[1];
-    }
-    close CONFIG;
-}
-
-# read the workload file and store it as a list of hashes
-# Each hash always has the fields: sectionTitle and sectionParams
-# usage: readWorkloadFile filename, \@list
-sub readWorkloadFile {
-    my $filename = shift || die "readWorkloadFile: Missing file name";
-    my $plist = shift || die "readWorkloadFile: Missing return list";
-    my $level = 0;		# file inclusion level
-    my @handles;
-
-    my $fh = "$filename$level";
-
-    ($params{DEBUG}) && print "Reading workload from $filename.\n";
-    open($fh, "<$filename") ||
-	open($fh, "gunzip -c $filename.gz |") ||
-	    die "readWorkloadFile Couldn't open testbed $filename: $!";
-    $includedFiles{$filename} = 1; # mark file as included
-
-    my $sparm=0;
-    my $conline = "";
-    
-    while($fh) {
-	while(<$fh>) {
-	    s/#.*//;		# strip any comments from line (quoting?)
-	    s/\s*$//;		# strip trailing white space
-	    if ($conline) {	# utilize line continue
-		$_ = $conline . "\\\n" . $_;
-		$conline = "";
-	    }
-	    if (m/\\$/o) {	# check for quoted line continue
-		s/\\$//;	# 
-		$conline = $_;
-		next;
-	    }
-	    s/^\s*//;		# strip initial white space
-	    m/^$/o &&  next;	# continue if blank line
-
-	    # handle include and includeOnce statements
-	    if ((m/^<(include)\s+(\S+)\s*>/i)
-		|| (m/^<(includeonce)\s+(\S+)\s*>/i)) {
-		my $incfile = $2;
-		if (($1 =~ m/^includeonce/i) && ($includedFiles{$incfile})) {
-		    ($params{DEBUG})
-			&& print "readWorkloadFile:includeOnce $incfile already read.\n";
-		    next;
-		}
-		($params{DEBUG})
-		    && print "readWorkloadFile include $incfile from $filename.\n";
-		$includedFiles{$incfile} = 1; # mark file
-		push @handles, $fh; # push current handle on to stack
-		if ($level++ > 99) { # check recursion and make handles unique
-		    die "readWorkloadFile: include level too deep: $filename $level\n";
-		}
-		$fh = "$incfile$level";
-		open($fh, "<$incfile") ||
-		    open($fh, "gunzip -c $incfile.gz |") ||
-			die "readWorkloadFile Couldn't open testbed file $incfile: $!";
-		$filename = $incfile;	# for error messages
-		next;
-	    }
-
-	    if (m!^</(\w+)>$!o) { # end of section
-		my $end = $1;
-		unless ($sparm->{"sectionTitle"} =~ /$end/i) {
-		    die "readWorkloadFile Mismatched section $filename: $. '$sparm->{sectionTitle}' '$end'\n";
-		    return 0;
-		}
-		($params{DEBUG}) && print "</$sparm->{sectionTitle}>\n";
-		push @$plist, $sparm;
-		$sparm = 0;
-		next;
-	    }
-
-	    if (m!^<(\w+)\s*(.*)>$!o) { # start of section
-		my $sec = $1;
-		my $more = $2;
-
-		if ($sparm) {
-		    die "readWorkloadFile Missing section end $filename: $. '$sparm->{sectionTitle}'\n";
-		}
-		if ($sec =~ /CONFIG/i) { # special case, map to existing global
-		    $sparm = \%params;
-		} elsif ($sec =~ /DEFAULT/i) { # special case, only one DEFAULT
-		    if ($defaultSection) { # use existing defaultSection
-			$sparm = $defaultSection;
-		    } else {	# create a new one
-			$sparm = ArrayInstance->new();
-			$sparm->{"sectionTitle"} = uc $sec; # ignore case
-			$sparm->{"lineList"} = ();
-			$defaultSection = $sparm;
-		    }
-		} else {
-		    $sparm = ArrayInstance->new();
-		    $sparm->{"sectionTitle"} = uc $sec; # ignore case
-		    $sparm->{"lineList"} = ();
-		}
-		$sparm->{"sectionParams"} = $more; # take newest more info
-		($params{DEBUG})
-		    && print "<$sparm->{sectionTitle} $sparm->{sectionParams}>\n";
-		next;
-	    }
-
-	    # must be in a section, get parameters
-	    unless ($sparm) {
-		die "readWorkloadFile Entry encountered outside a section $filename: $. $_\n";
-		return 0;
-	    }
-	    my ($nm, $val) = split (/[\s=]+/, $_, 2);
-	    $nm = uc $nm;	# ignore case
-	    ($params{DEBUG}) && print "    $nm = $val\n";
-	    if ($nm =~ /ACCOUNTFORMAT/) { # BACK COMPATIBILITY
-		print "WARNING: 'accountFormat' is obsolete.  Use 'addressFormat' and 'loginFormat'\n";
-		$sparm->{"addressFormat"} = $val;
-		push @{$sparm->{"lineList"}}, "addressFormat $val";
-		$val =~ s/@.+$//; # strip at and everything after
-		$sparm->{"loginFormat"} = $val;
-		push @{$sparm->{"lineList"}}, "loginFormat $val";
-		next;
-	    } elsif ($nm =~ /NUMACCOUNTS/) { # BACK COMPATIBILITY
-		print "WARNING: 'numAccounts' is obsolete.  Use 'numAddresses' and 'numLogins'\n";
-		$sparm->{"numAddresses"} = $val;
-		push @{$sparm->{"lineList"}}, "numAddresses $val";
-		$sparm->{"numLogins"} = $val;
-		push @{$sparm->{"lineList"}}, "numLogins $val";
-		next;
-	    } elsif ($nm =~ /BEGINACCOUNTS/) { # BACK COMPATIBILITY
-		print "WARNING: 'beginAccounts' is obsolete.  Use 'firstAddress' and 'firstLogin'\n";
-		$sparm->{"firstAddress"} = $val;
-		push @{$sparm->{"lineList"}}, "firstAddress $val";
-		$sparm->{"firstLogin"} = $val;
-		push @{$sparm->{"lineList"}}, "firstLogin $val";
-		next;
-	    } 
-	    push @{$sparm->{"lineList"}}, $_; # save lines in original order
-	    $sparm->{$nm} = $val;
-	    next;
-	}
-	close ($fh);
-	$fh = pop @handles || last; # empty include stack
-	$filename = $fh;
-	$sparm = 0;		# can only include whole sections
-    }
-    return 1;			# success
-}
-
-# Write out a workload list to a file
-# Optionally, pass in a list of sectionTitle's it should ignore
-# usage: writeWorkloadFile filename \@list [\@skipList]
-sub writeWorkloadFile {
-    my $filename = shift || die "writeWorkloadFile: Missing file name";
-    my $plist = shift || die "writeWorkloadFile: Missing return list";
-    my $skip = shift;
-    my @skipH;
-    my $configSeen = 0;
-    my $defaultSeen = 0;
-    my @paramH;
-
-    if ($skip) {
-	foreach $s (@$skip) {	# turn list into a hash
-	    $skipH{(uc $s)} = $s; # fix case for index
-	}
-    }
-    foreach $s (@workloadParameters) { # turn list into a hash
-	$paramH{(uc $s)} = $s;	# fix case for index
-    }
-
-    ($params{DEBUG}) && print "Writing workload to $filename.\n";
-    unless (open(WORKOUT, ">$filename")) {
-	die "Couldn't open testbed $filename: $!";
-    }
-    
-    foreach $sparm (@$plist) {	# each hash reference in the list
-	if (($skip)
-	    && ($skipH{$sparm->{"sectionTitle"}})) {
-	    #($params{DEBUG}) &&
-	    #print "Skipping section $sparm->{sectionTitle}\n";
-	    next;
-	}
-	
-	# all CONFIG,DEFAULT sections point to the same hash, output once only
-	if ($sparm->{"sectionTitle"} =~ /^CONFIG$/) {
-	    next if $configSeen;
-	    $configSeen++;
-	}
-	if ($sparm->{"sectionTitle"} =~ /^DEFAULT$/) {
-	    next if $defaultSeen;
-	    $defaultSeen++;
-	}
-	if ($sparm->{sectionParams}) { # write section with extra args
-	    print WORKOUT "<$sparm->{sectionTitle} $sparm->{sectionParams}>\n";
-	} else {
-	    print WORKOUT "<$sparm->{sectionTitle}>\n";
-	}
-	if ($sparm->{"sectionTitle"} =~ /^(CONFIG|CLIENT)$/) {
-	    # for Config or Client, output the hash  to get computed config
-	    foreach $k (sort keys %$sparm) { # output each parameter
-		# skip sectionTitle and sectionParams
-		($k =~ /^(sectionTitle|sectionParams|lineList)$/) && next;
-		printf WORKOUT "  %s\t%s\n",
-		($paramH{$k}) ? $paramH{$k} : $k,
-		$sparm->{$k};
-	    }
-	} else {	# write out the line list
-	    foreach $l (@{$sparm->{"lineList"}}) {
-		print WORKOUT "  $l\n";
-	    }
-	}
-	print WORKOUT "</$sparm->{sectionTitle}>\n\n";
-    }
-    close WORKOUT;
-}
-
-# Usage: getClientFilename hostname section
-sub getClientFilename  {
-    my $cli = shift || die "Missing client name";
-    my $section = shift || die "Missing section hash";
-    return "$tmpdir/$cli-$section->{GROUP}.out"
-	if ($params{USEGROUPS} && $section->{GROUP});
-    return "$tmpdir/$cli.out"
-}
-
-sub setConfigDefaults {		# set CONFIG defaults
-    # These are set after writing out the test copy to avoid clutter
-
-    # Path to gnuplot executable
-    $params{GNUPLOT}="gnuplot/gnuplot"
-	unless ($params{GNUPLOT});
-
-    # This is the directory the client lives in
-    $params{TEMPDIR} = "/var/tmp"
-	unless($params{TEMPDIR});
-
-    # Set default remote shell
-    #$params{RSH} = "rsh"
-    $params{RSH} = "ssh"
-	unless($params{RSH});
-
-    # Set default remote copy
-    #$params{RCP} = "rcp"
-    $params{RCP} = "scp"
-	unless($params{RCP});
-
-    # Size of generated gifs
-    $params{CHARTHEIGHT} = 480
-	unless($params{CHARTHEIGHT});
-    $params{CHARTWIDTH} = 640
-	unless($params{CHARTWIDTH});
-    $params{CHARTPOINTS} = int (($params{CHARTWIDTH}-60)*0.8)
-	unless($params{CHARTPOINTS});
-
-
-    # The name of the remote executable
-    $params{CLIENTCOMMAND} = "mailclient"
-	unless ($params{CLIENTCOMMAND});
-
-    # Set default monitoring command
-    $params{MONITORCOMMAND} = "vmstat %f"
-	unless($params{MONITORCOMMAND});
-
-    # Set default switches to makeusers
-    $params{MAKEUSERSARGS} = "-4"
-	unless ($params{MAKEUSERSARGS});
-
-    # Figure out @protocols, this sets the report order
-    @protocols = ();
-    {
-	my %skipH;
-	foreach $s (@nonProtocolSections) { # turn list into a hash
-	    #print "$s ";
-	    $skipH{(uc $s)} = $s; # fix case for index
-	}
-	print "\n";
-	foreach $sparm (@workload) {	# each hash reference in the list
-	    next if ($skipH{$sparm->{"sectionTitle"}});
-
-	    ($params{DEBUG}) &&
-		print "Found protocol ". $sparm->{"sectionTitle"} . "\n";
-
-	    push @protocols, $sparm->{"sectionTitle"};
-				# add to skip list so only added once
-	    $skipH{(uc $sparm->{"sectionTitle"})} = $sparm->{"sectionTitle"};
-	}
-    }
-    @protocolsAll = @protocols;
-    push @protocolsAll, "Total";
-
-    # figure out the graphs ???
-}
-
-sub parseArgs {			# get args
-    while (@ARGV) {
-	my $arg = shift(@ARGV);
-
-	if ($arg =~ /^-a$/i) {	# was undocumented feature in 4.1
-	    $params{ADDGRAPHS} = shift(@ARGV); # extra graphs
-	    next;
-	}
-	if ($arg =~ /^-b$/i) {
-	    $params{TITLE} = shift(@ARGV); # banner
-	    next;
-	}
-
-	# BACK COMPATIBILITY (everything now in the saved workload file)
-	if ($arg =~ /^-c$/i) {	# config file, read when encountered
-	    my $configFile = shift(@ARGV);
-	    readConfigFile ($configFile);
-	    next;
-	}
-
-	if ($arg =~ /^-d$/i) {
-	    $params{DEBUG}++;	# Debug
-	    next;
-	}
-
-	if ($arg =~ /^-h$/i) {	# Help
-	    print "Usage: -w workfile [-t time] [-r ramptime] [-l load] [-v] [-d]\n";
-	    print "\t[-b banner] [-n notes] [-s sysconfigfile] [-a add_graphs_file]\n";
-	    print "\t[-c configfile] [-m machinefile] [-z] [PARAM=value]...\n";
-
-	    die "Usage";
-	}
-
-	if ($arg =~ /^-l$/i) {	# "load", FIX: naming conventions
-	    $params{CLIENTCOUNT} = shift(@ARGV); # desired client count
-	    next;
-	}
-
-	# BACK COMPATIBILITY (everything now in the saved workload file)
-	if ($arg =~ /^-m$/i) {
-	    $params{TESTBED} = shift(@ARGV);	# testbed machines file
-	    next;
-	}
-
-	if ($arg =~ /^-n$/i) {
-	    $params{COMMENTS} = shift(@ARGV); # notes
-	    next;
-	}
-
-	if ($arg =~ /^-r$/i) {
-	    $params{RAMPTIME} = shift(@ARGV); # ramptime
-	    next;
-	}
-	if ($arg =~ /^-s$/i) {
-	    $params{SYSCONFIG} = shift(@ARGV); # system config html file
-	    next;
-	}
-	if ($arg =~ /^-t$/i) {
-	    $params{TIME} = shift(@ARGV); # test time
-	    next;
-	}
-
-	if ($arg =~ /^-v$/i) {
-	    $params{VERBOSE} = 1;	# verbose mode
-	    next;
-	}
-
-	if ($arg =~ /^-w$/i) {	# workload file (may occur multiple times)
-	    my $f = shift(@ARGV);
-	    readWorkloadFile ($f, \@workload) || die "Error reading workload: $@\n";
-	    $params{WORKLOAD} = $f;
-	    next;
-	}
-
-	if ($arg =~ /^-z$/i) {
-	    $params{NT} = 1;		# NT mode
-	    next;
-	}
-
-	# any other CONFIG parameter: FIELD=value
-	if ($arg =~ /^(\w+)=(\S.*)$/) {
-	    my $field = uc $1;
-	    $params{$field} = $2;
-	    next;
-	}
-	die "Unknown argument '$arg'";
-    }
-
-    if ($params{NT}) {		# should use Cwd module
-	$cwd = `cd`;		# NT get current directory
-	$cwd = `pwd` unless ($cwd); # in case we are really on UNIX
-    } else {
-	$cwd = `pwd`;		# in case we are really on UNIX
-    }
-    chomp $cwd;		# strip NL
-}
-
-return 1;

mozilla/mstone/conf/README.wld.in

@@ -1,271 +0,0 @@
-I.   Format
-II.  Workload Configuration Sections
-III. Report Generation Sections
-
----------
-I. Format
----------
-
-The config-file format is very free-form -- for example, this text is
-skipped as a "comment" because it doesn't look like anything else.  A
-section always starts with a line ending in a colon.  Everything up to
-the next section, end-of-file, or `__END__' is part of the current
-section.
-
-Name/value pairs within a section are pairs starting with whitespace,
-and separated by a colon followed by whitespace.  So you can write
-something like this
-
-#	hello there:		     mister foo
-
-and it will be ignored.  Had the '#' before the "hello" not been
-there, the attribute name would have been `hello there' and its value
-would have been `mister foo'.  Leading and trailing whitespace is
-skipped, but internal whitespace is perfectly OK.  Note that the
-"comment" character doesn't have to be a '#', but can be anything you
-want (except whitespace).
-
-Leading whitespace also denotes continued values.  So
-
-	foo:				blah blah
-    and some more words which are part of foo's value.
-
-creates a variable named 'foo' with this value (including the \n) -- 
-"blah blah
-and some more words which are part of foo's value."
-
-Finally, anything after '__END__' on a line by itself gets inserted
-literally into each .wld file.  This is the place to put <monitor>
-sections.
-
---------------------------
-II. Workload Configuration
---------------------------
-
-Parameters with no default are required.
-
-Messages
---------
-
-Message attributes are defined in the `message' section.  
-
-Parameter	Default		Description
----------	-------		-----------
-size				size distribution (including headers).
-recipients		    	number of recipients
-headers		~unif(10, 30)	number of headers
-line length	60		line length
-mime	 	0		number of MIME parts
-
-Users
------
-
-User behavior parameters are described in the `user' section.
-
-Parameter	Default		Description
----------	-------		-----------
-messages per day
-protocol			mail read
-activity			`DURATION each TIME' or `START - STOP'
-check interval			how often user checks mail when active
-read messages	0		number of old msgs each user has
-read time	0		how long user takes to `read' a message
-keep		0		proportion of messages kept on server
-connection type <unlimited>	`latency = X ; bandwidth = X'
-drop rate	0		proportion of connections dropped before logout
-
-Delivery
---------
-
-Delivery parameters are described in the `delivery' section.
-
-Parameter		Default		Description
----------		-------		-----------
-messages per connection	1		messages sent per SMTP session
-percent remote		0		% mail going to remote host (sink)
-connection type		<unlimited>	
-fluctuation		<uniform>	`START - END = X % ; ...'
-
-Test
-----
-
-The `test' section configures the number of users, the time of day to
-be simulated, etc.
-
-Parameter		Default		Description
----------		-------		-----------
-start					time of day to start sim
-end					end time of day.
-length					duration.  Either length or end 
-					must be specified.
-users					total user base
-percent active				percentage of total user base active
-					during test period
-messages per second			messages per second to delivery for
-					SMTP-only simulation.  Either
-					`messages per second' or `users'
-					and `percent active' must be
-					specified.
-comments		<nothing>	notes on test.
-preparer		Anonymous	Name to use on reports.
-date			<ctime(3)>
-configuration		<nothing>	Configuration name for report.
-
-Environment Configuration
--------------------------
-
-Several sections describe the test environment:
-
-Sink
-----
-
-The `sink' section describes the remote mail sink.
-
-Parameter		Default		Description
----------		-------		-----------
-addressFormat		smuser%ld@	Like addressFormat, but used to 
-					generate remote addresses.
-					`hostname' will be appended if it
-					ends in `@'.
-hostname				host on which SMTP sink lives.  Used
-					for remote delivery.
-
-Server
-------
-
-The `server' section describes the mail server to be sized:
-
-Parameter		Default		Description
----------		-------		-----------
-smtp port		25
-pop port		110
-imap port		143
-web port		1066
-
-hostname				Mail server
-
-addressFormat		smuser%ld@	Passed to
-					sprintf(recipient, addressFormat,
-					        userNum, domainNum).  If
-					addressFormat ends in `@', `server'
-					is automatically appended.
-loginFormat		smuser%ld@	Same as addressFormat, but used to
-					generate usernames.
-passwdFormat		twang		passed to sprintf(passwd, passwdFormat,
-						          userNum, domainNum).
-firstAddress		0		first userNum for addresses
-firstLogin		0		first userNum for logins
-smtpMailFrom		$USER@$HOST	sending address on test mail.
-
-name					Printable server name for reports.
-hardware				Brief hardware description.
-software				Brief software description.
-
-Clients
--------
-
-The `clients' section describes test client configuration.
-
-Parameter		Default		Description
----------		-------		-----------
-smtp			localhost	client machines for SMTP
-imap			localhost	for IMAP
-pop			localhost	for POP3
-web			localhost	for WEBMAIL
-
-rsh			rsh		rsh program to start remote clients
-rcp			rcp		rcp program to distribute files
-command			mailclient	program to run to start clients
-
-cert file				file containing SSL certificate
-key file				file containing SSL key
-
-Ugly Mstone details
--------------------
-
-The `mstone' section controls low-level details of how the workload
-description is translated into mstone terms.  The parameters make some
-assumptions about the size of both the test clients and the server, so
-they may have to be tweaked.  For small- to mid-size configurations,
-the defaults should work.
-
-Parameter		Default		Description
----------		-------		-----------
-preload rate		5		msgs/sec to deliver during preload.
-preload per connection	100		messages per SMTP session
-preload delivery time	750		msec expected message delivery time.
-					used to control throttling.
-preload throttle	500		msec faster/slower than expected at
-					which to throttle
-throttleFactor		1.1		factor by which to increase/decrease
-					delivery rate when throttling
-
-read rate		40		msgs/sec to read when aging old
-					messages.
-read clients		5		test clients to use for aging
-read protocol		(user:protocol)	protocol to age messages (e.g. imap)
-
-rampTime		0		test rampup time
-smtp connection time	10s
-pop user spacing	10s		MULTIPOP: time between users
-pop connections per client 10		MULTIPOP: connections per client
-no event queues		false		use 1 thread per client
-max threads per proc	250
-clientCount		10000		artificial global clientCount
-
-----------------------
-III. Report Generation
-----------------------
-
-There are several additional configuration sections to provide
-additional information for sizing reports.  The code is in
-`lib/{sizing,hardware}_defaults.pm'.
-
-QoS Constraints
----------------
-
-Quality of Service constraints are specified in the `qos' section.
-See reports/qos.in for an example.  The qos section can have any
-number of members.  The name of each member is a description which
-will appear in the sizing report.  The value is a block of perl code
-which should return a pair of values when evaluated in a context where
-`$run' is a reference to a hash containing data on the test run to be
-evaluated.  The first value is a value corresponding to this
-constraint which will be printed in the report.  The second is true if
-the run passed this constraint.
-
-Hardware
---------
-
-The `machine' section describes the hardware under test.  Unlike
-previous, simple sections, it containts nested values (as hash refs).
-
-Parameter		Description
----------		-----------
-
-processors
-	speed
-	cache
-
-network
-
-storage
-	controllers
-	disks
-		type
-		speed
-		model
-		timing
-OS
-	parameters
-	disks
-	logging
-
-Software
---------
-
-The `software' section describes the software under test.  If multiple
-types of software are in use, multiple software sections should be
-specified.  The only default parameter for software is the `name'.
-Other parameters should describe configuration information, version,
-etc.

mozilla/mstone/conf/com.wld.in

@@ -1,53 +0,0 @@
-test:
-	start:			8 AM
-	length:			1h
-	users:			** Number of users here ***
-
-	percent active:		100
-
-	comments:		auto-generated Corporate workload.
-
--- mail server configuration --
-
-server:
-	hostname:		** SERVER **
-
-# defaults given below --
-#	addressFormat:		smuser%ld@
-#	loginFormat:		smuser%ld@
-#	passwdFormat:		twang
-
--- test client configuration --
-
-clients:
-	smtp:			** SMTP clients here **
-	imap:			** IMAP clients here **
-
-# defaults are `rsh' and `rcp'
-#	rsh:			ssh
-#	rcp:			scp
-
--- Don't edit between here and the `__END__' marker --
-
-mstone:
-	rampTime:		30s
-
-message:
-	size: 			~lognormal(4k,4.5)
-	recipients:		~lognormal(1,2)		: [1, ]
-	mime:			~binomial(0.3)
-
-delivery:
-	fluctuation: 		8 AM - 4 PM = 90%
-
-user:
-	messages per day: 	50
-	read messages:	  	50
-	protocol:	  	IMAP
-	check interval:	  	~unif(5m, 8m)
-	connection type:  	latency = 0; bandwidth = 56k
-	keep:		  	100%
-	activity: 		8 AM - 4 PM; arrival rate = ~normal(20m, 10m) 
-
-__END__
-# your monitor sections go here...

mozilla/mstone/conf/general.wld

@@ -1,2 +0,0 @@
-<client HOSTS=localhost>
-</client>

mozilla/mstone/conf/general.wld.in

@@ -1,38 +0,0 @@
-# common setup info for tests
-# See sample.wld for detailed usage
-
-# Information on how the test is distributed and reported
-# Test independent configuration
-<CONFIG>
-  comments	Netscape MSG4.15
-  sysConfig 	conf/sample.html	# File for additonal system config
-
-  # Debug with short runs and a few clients, then increase test time
-  # These get overridden in the test specific files (or the command line)
-  clientCount	5	# nominal clientCount (usually overriden)
-  rampTime 	10s
-  time		30s
-
-  # each test should set a title in their CONFIG section
-  # This is a reminder when using old test workloads
-  title		Need to set test title
-</CONFIG>
-
-# Specify client machines
-<CLIENT HOSTS=localhost>
-</CLIENT>
-
-# Information on the test itself
-
-# Use the <Default> tag to set command defaults
-<DEFAULT>
-  server	mailhost.example.com
-  smtpMailFrom	mailtestuser0@mailhost.example.com
-  loginFormat	mailtestuser%ld
-  addressFormat	mailtestuser%ld@mailhost.example.com
-  passwdFormat	myPassword
-  numLogins	100
-  firstLogin	0
-  numAddresses	100
-  firstAddress	0
-</DEFAULT>

mozilla/mstone/conf/http.wld

@@ -1,10 +0,0 @@
-# MailStone workload configuration file. See sample.wld for detailed usage
-# Typical HTTP GETs
-
-<includeOnce conf/general.wld>
-
-<HTTP>
-weight 100
-numLoops 1 
-httpcommand GET /
-</HTTP>

mozilla/mstone/conf/imap.series

@@ -1,74 +0,0 @@
-#!/bin/ksh
-# fire off the series of Mailstone IMAP tests
-
-# To test series setup, do: go_imap -n
-
-
-# Look for testname$test_form, first.  Override with: go_series -f <string>.
-export test_form="_mail02"
-
-export test_host="mail02"
-
-# string appended to every description.  Override with: go_series -d <string>.
-export desc_conf="12 CPUs"
-
-# Extra arguments common to all tests.  Any other args go here.
-# Note that arguments with embedded spaces wont work here.  
-#   Instead use: go_series -- <args...>
-export extra_args=""
-
-# error limit to abort sequence
-export error_limit=500
-
-# time to allow the server to calm down after each run (seconds)
-export sleep_time=120
-
-# who to mail results to
-#export mail_list="me@example.com,you@example.com"
-export mail_list=""
-
-# Get all the helper functions
-. test_utils.ksh
-
-### This is where the series of tests is defined
-
-# clean and re-start server
-if [[ $only_show_it -gt 0 ]] ; then
-  echo  "Would run:" "$@"
-  return 0
-else
-  # BUG: rsh never returns.
-  #   individual commands in clean work fine, but fail as a whole
-  rsh -n $test_host /bin/ksh /iplanet/bin/clean$test_form &
-  sleep 300 && kill -9 $!
-  wait
-fi
-
-# check our setup
-run timesync
-
-###echo "DEBUG exit" && exit 0
-
-run_test popdel 'Create mailboxes (random order)' -t 60m maxblocks=100000 "$@"
-run_test allpop 'Create mailboxes (exhaustive)' "$@"
-
-run_test imaplogin 'IMAP login rate' "$@"
-
-run_test smtp10k-5-5k 'Deliver 5, 5k messages to 10k users' "$@"
-sleep 200			# let queue drain (2000/(10 msg/sec))
-run_test imapread10k 'IMAP Message downloads 5k from 10k users' "$@"
-
-run_test smtp10k-5-5k 'Deliver 5, 5k messages to 10k users' "$@"
-sleep 200			# let queue drain (2000/(10 msg/sec))
-run_test imapread 'IMAP Message downloads 5k' "$@"
-
-run_test imapsmtp-throttle 'Combined IMAP-SMTP load (1 of 3)' "$@"
-run_test imapsmtp-throttle 'Combined IMAP-SMTP load (2 of 3)' "$@"
-run_test imapsmtp-throttle 'Combined IMAP-SMTP load (3 of 3)' "$@"
-
-# Some messages will be left from previous test
-run_test imapmaxusers 'IMAP 30K simultaneous users' "$@"
-
-# e-mail the whole batch
-[[ -n "$mail_list" ]] && \
-	    mail_series "DotCom IMAP: `date`" "$mail_list"

mozilla/mstone/conf/imap.wld

@@ -1,19 +0,0 @@
-# MailStone workload configuration file. See sample.wld for detailed usage
-# Typical IMAP checks/reads
-
-<includeOnce conf/general.wld>
-
-<CONFIG>	# test specific config
-  title		IMAP reads
-  clientCount	100	# since IMAP has long sleeps, use lots of clients
-</CONFIG>
-
-<IMAP4>
-  weight	100
- #leaveMailOnServer	1
-
-  idleTime	2s	# time between login and first download check
-  loopDelay	5m	# time between download checks
-  numLoops	10	# how many check to do before closing the connection
-  blockTime	2s	# time between logout and next login (or other block)
-</IMAP4>

mozilla/mstone/conf/isp.wld.in

@@ -1,51 +0,0 @@
--- test size --
-
-test:
-	length:			90m
-	users:			** Number of users here ***
-	percent active:		10
-
-	comments:		Auto-generated ISP workload.
-
--- mail server configuration --
-
-server:
-	hostname:		** SERVER **
-
-# defaults -- 
-#	 addressFormat:		smuser%ld@
-#	 firstAddress:		0
-#	 loginFormat:		smuser%ld@
-#	 firstLogin:		0
-#	 passwdFormat:		twang
-#
-
--- test client configuration --
-
-clients:
-	smtp:			** SMTP clients here **
-	pop:			** POP clients go here **
-
-# defaults are `rsh' and `rcp'
-#	rsh:			rsh
-#	rcp:			rcp
-
--- Do not edit between here and the `__END__' marker
-
-message:
-	size: 			~lognormal(3k,4.5)
-	recipients:		~lognormal(1,1.5)	: [1, ]
-	mime:			30 %
-
-user:
-	messages per day: 	5
-	read messages:	  	0
-	protocol:	  	POP
-	check interval:	  	~unif(5m, 8m)
-	connection type:	latency = 0; bandwidth = 56k
-	keep:		  	5%
-	activity:		30 m each 24 h
-	drop rate:		0.5%
-
-__END__
-# other things (e.g. <monitor> sections) can go here...

mozilla/mstone/conf/lmtp_imap.wld

@@ -1,36 +0,0 @@
-<default>
-  addressFormat           smuser%ld@** DOMAIN **
-  loginFormat             smuser%ld@** DOMAIN **
-  passwdFormat            twang
-  server                  ** SERVER **
-</default>
-
-<smtp HOSTS=smtp>
-  blockTime               0
-  file                    auto
-  firstAddress            0
-  headers                 ~unif(10, 30)
-  mime                    ~binomial(0.3)
-  numAddresses            1000
-  numLoops                1
-  numRecips               ~lognormal(1,2)	: [1, ]
-  size                    ~lognormal(4k,4.5)
-  smtpMailFrom            sender0@** DOMAIN **
-  useEHLO                 2
-  portNum                 2003
-</smtp>
-
-<client HOSTS=localhost>
-  clients                 50
-  group                   smtp
-</client>
-<config>
-  comments                lmtp delivery
-  rampTime                0
-  time                    5m
-  title                   lmtp delivery - IMAP
-  useGroups               1
-</config>
-
-# other things (e.g. <monitor> sections) can go here...
-

mozilla/mstone/conf/lmtp_pop.wld

@@ -1,36 +0,0 @@
-<default>
-  addressFormat           smuser%ld@** DOMAIN **
-  loginFormat             smuser%ld@** DOMAIN **
-  passwdFormat            twang
-  server                  ** SERVER **
-</default>
-
-<smtp HOSTS=smtp>
-  blockTime               0
-  file                    auto
-  firstAddress            0
-  headers                 ~unif(10, 30)
-  mime                    30 %
-  numAddresses            1000
-  numLoops                1
-  numRecips               ~lognormal(1,1.5)	: [1, ]
-  size                    ~lognormal(3k,4.5)
-  smtpMailFrom            sender0@** DOMAIN **
-  useEHLO                 2
-  portNum                 2003
-</smtp>
-
-<client HOSTS=localhost>
-  clients                 50
-  group                   smtp
-</client>
-<config>
-  comments                lmtp delivery
-  rampTime                0
-  time                    5m
-  title                   lmtp delivery - POP
-  useGroups               1
-</config>
-
-# other things (e.g. <monitor> sections) can go here...
-

mozilla/mstone/conf/pop.series

@@ -1,84 +0,0 @@
-#!/bin/ksh
-# fire off the series of Mailstone tests
-
-# To test series, do: go_series -n
-
-
-# Look for testname$test_form, first.  Override with: go_series -f <string>.
-export test_form="_mail02"
-
-export test_host="mail02"
-
-# string appended to every description.  Override with: go_series -d <string>.
-export desc_conf="12 CPUs"
-
-# Extra arguments common to all tests.  Any other args go here.
-# Note that arguments with embedded spaces wont work here.  
-#   Instead use: go_series -- <args...>
-export extra_args=""
-
-# error limit to abort sequence
-export error_limit=500
-
-# time to allow the server to calm down after each run (seconds)
-export sleep_time=120
-
-# who to mail results to
-#export mail_list="me@example.com,you@example.com"
-export mail_list=""
-
-# Get all the helper functions
-. test_utils.ksh
-
-### This is where the series of tests is defined
-
-# clean and re-start server
-if [[ $only_show_it -gt 0 ]] ; then
-  echo  "Would run:" "$@"
-  return 0
-else
-  # BUG: this never returns.  rsh never returns
-  #   individual commands in clean work fine, but fail as a whole
-  rsh -n $test_host /bin/ksh /iplanet/bin/clean$test_form &
-  sleep 300 && kill -9 $!
-  wait
-fi
-
-# check our setup
-run timesync
-
-###echo "DEBUG exit" && exit 0
-
-run_test popdel 'Create mailboxes (random order)' -t 60m maxblocks=100000 "$@"
-run_test allpop 'Create mailboxes (exhaustive)' "$@"
-
-run_test popdel 'Empty checks: never used (1 of 3)' "$@"
-run_test popdel 'Empty checks: never used (2 of 3)' "$@"
-run_test popdel 'Empty checks: never used (3 of 3)' "$@"
-
-run_test smtp10k-5-5k 'Deliver 5, 5k messages to 10k users' "$@"
-sleep 200			# let queue drain (2000/(10 msg/sec))
-
-run_test popsave10k 'Message downloads 5k from 10k users (1 of 3)' "$@"
-run_test popsave10k 'Message downloads 5k from 10k users (2 of 3)' "$@"
-run_test popsave10k 'Message downloads 5k from 10k users (3 of 3)' "$@"
-
-run_test popsave 'Message downloads 5k (1 of 3)' "$@"
-run_test popsave 'Message downloads 5k (2 of 3)' "$@"
-run_test popsave 'Message downloads 5k (3 of 3)' "$@"
-
-run_test popsmtp-throttle 'Combined load (1 of 3)' "$@"
-run_test popsmtp-throttle 'Combined load (2 of 3)' "$@"
-run_test popsmtp-throttle 'Combined load (3 of 3)' "$@"
-
-run_test smtp100k 'SMTP delivery rate' "$@"
-
-run_test popclean 'Message downloads/delete 5k ' "$@"
-
-run_test popdel 'Empty checks (1 of 3)' "$@"
-run_test popdel 'Empty checks (2 of 3)' "$@"
-run_test popdel 'Empty checks (3 of 3)' "$@"
-
-# e-mail the whole batch
-[[ -n "$mail_list" ]] && \
-	    mail_series "DotCom POP: `date`" "$mail_list"

mozilla/mstone/conf/pop.wld

@@ -1,15 +0,0 @@
-# MailStone workload configuration file. See sample.wld for detailed usage
-# Typical POP checks/reads
-
-<includeOnce conf/general.wld>
-
-<CONFIG>	# test specific config
-  title		POP reads
-  clientCount	50
-</CONFIG>
-
-<POP3>
-  weight	100
-  numLoops	9999	# will close when messages run out
- #leaveMailOnServer	1
-</POP3>

mozilla/mstone/conf/popimapsmtp.wld

@@ -1,44 +0,0 @@
-# MailStone workload configuration file. See sample.wld for detailed usage
-# Deliver mail using SMTP
-# This can measure delivery rates for a specified message type.
-# This also fills the store for POP or IMAP tests
-
-<includeOnce conf/general.wld>
-
-<CONFIG>	# test specific config
-  title		POP, IMAP, SMTP combined load
-  clientCount	100
-</CONFIG>
-
-
-# MailStone workload configuration file. See sample.wld for detailed usage
-# Typical SMTP delivery with 1K message size and restricted accounts
-
-<SMTP HOSTS=client1>
-  file	en-1k.msg
-  weight	100
- #numAddresses	200
-</SMTP>
-
-
-# MailStone workload configuration file. See sample.wld for detailed usage
-# Typical POP checks/reads
-
-
-<POP3 HOSTS=client2>
-  weight	100
- #leaveMailOnServer	1
-</POP3>
-
-
-# MailStone workload configuration file. See sample.wld for detailed usage
-# Typical IMAP checks/reads
-
-# IMAP maintains a connection (unlike POP or SMTP)
-# for combined load tests, run it on separate client machines
-<IMAP4 HOSTS=client3>
-  weight	100
-  idleTime	5
-  checkMailInterval	10
-  numLoops	1000
-</IMAP4>

mozilla/mstone/conf/popsmtp.wld

@@ -1,21 +0,0 @@
-# MailStone workload configuration file. See sample.wld for detailed usage
-# Deliver mail using SMTP
-# This can measure delivery rates for a specified message type.
-# This also fills the store for POP or IMAP tests
-
-<includeOnce conf/general.wld>
-
-<CONFIG>	# test specific config
-  title		POP reads with SMTP message deliveries
-  clientCount	50
-</CONFIG>
-
-<include conf/smtp1k.wld>
-<include conf/smtp5k.wld>
-<include conf/smtp17k.wld>
-
-<POP3>
-  weight	100
- #leaveMailOnServer	1
-</POP3>
-

mozilla/mstone/conf/sample.html

@@ -1,12 +0,0 @@
-<!-- this file provides system comments and is merged into reports -->
-<PRE>
-<B> Mailhost.example.com </B>
-  EXAMPLE SYSTEM CONFIGURATION
-  Netscape Messaging Server 4.15 (7/21/99)
-  E6000
-  26x250MHz UltraSPARC-II
-  6.5GB RAM
-  A3500 w/ 60x9GB 7200 RPM
-  store: 5 x (10x9 RAID-0)
-  queue: 1 x (10x9 RAID-0)
-</PRE>

mozilla/mstone/conf/sample.wld

@@ -1,281 +0,0 @@
-# MailStone workload configuration file
-#
-# Include other workload files like this:
-# <include conf/morework.wld>
-#
-# If you want a workload included ONLY ONCE in the test, use this
-# <includeOnce conf/morework.wld>
-# 
-# See Also:
-#	smtp.wld	- typical SMTP delivery test
-#	pop.wld		- typical POP3 check/download test
-#	imap.wld	- typical IMAP4 check/download test
-
-
-######################################################################
-# These sections discribe how the test is run:
-#	CONFIG, CLIENT, MONITOR, PRETEST, POSTTEST
-
-# The <CONFIG> section defines test setup and report parameters
-# Multiple <CONFIG> sections will be merged into a one.
-# The equivalent command line switch is shown in parenthesis.
-<CONFIG>
-  title		POP reads		# title for report and index (-b)
-  comments      Netscape MSG4.1		# additional info at top of report (-n)
-
-  time  	3m			# test time (-t)
-  rampTime      20s			# portion of test to start things (-r)
-  clientCount   12			# number of client connections (-l)
-
-  maxErrors	10000			# set an error abort limit
-  maxBlocks	50000			# stop after this many blocks
-
-  #sysConfig     conf/mailhost.txt	# Pull in config file (-s)
-  sysConfig     \			# Inline config text
-<PRE>\
-<B> mailhost.example.com </B>\
-  Netscape Messaging Server 4.11\
-  Linux 2.2.5\
-  4x400Mhz Xeon (1Mb)\
-  2Gb RAM\
-</PRE>
-
-  useGroups	1			# use group names instead of host names
-
-  telemetry	1			# log telemetry (for debugging)
-
-  # These usually dont need to be set.  These are the defaults
-  GnuPlot	gnuplot/gnuplot
-  RSH		ssh
-# RSH		/usr/bin/remsh		# HP-UX uses this path
-  RCP		scp
-#  RCP		/usr/bin/rcp
-  tempDir	/var/tmp		# client machine directory
-  chartWidth	640
-  chartHeight	480
-  clientCommand	mailclient		# CLIENT command to run
-  monitorCommand	vmstat %f	# MONITOR command to run
-  makeUsersArgs	-4			# args to makeusers
-  imageType	png			# gnuplot image type: png, gif, ...
-</CONFIG>
-
-# Each <Client> section defines one or more client machines
-# Every machine in the section will run the same number of connections
-# Note that there cannot be whitespace between the client hostnames
-<CLIENT HOSTS=client1,client2>
-  arch  Linux2.2_x86
-  maxClients    200
-  maxThreads    50
-
-	# the group is only used if "useGroups" is set
-  group		A
-
-  command	mailclient -m 100	# override the command to run
-</CLIENT>
-
-# Set a specific number of processes and threads
-<CLIENT HOSTS=client3,client4>
-  arch  SunOS5.6
-  processes     2
-  threads       10
-
-	# the group is only used if "useGroups" is set
-  group		B
-</CLIENT>
-
-# Here is how to configure a WinNT client from a Unix mail master
-# The NT rshd must interoperate with Unix rsh; allow redirection of
-#   stdin, stdout, and stderr; and must support binary file copies.
-# Denicomp's wrshdnt has been used sucessfully.  www.denicomp.com
-<CLIENT HOSTS=winnt01>
-  Arch	WINNT4.0
-  command	mailclient.exe
-  tempDir	c:\temp
-</CLIENT>
-
-# The PreTest sections will run before the test starts
-<PRETEST HOSTS=mailhost.example.com>
-# RSH	rsh -l mailuser
-  command	cd /usr/netscape/msg-mailhost; ./getconf
-</PRETEST>
-
-# Each <Monitor> section defines remote monitoring commands 
-#   for one or more machines.
-# Commands containing '%c' run to completion.  
-#  Otherwise the command will be shutdown down
-<MONITOR HOSTS=mailhost.example.com>
-  command       vmstat,%f,%c
-</MONITOR>
-
-# The PostTest sections will run after the test completes
-<POSTTEST HOSTS=mailhost.example.com>
-  command	df
-</POSTTEST>
-
-
-######################################################################
-# available protcols: SMTP, POP3, IMAP4
-#  (command names are not case sensitive)
-#
-# Time formats use suffixes of 's', 'm', 'h', 'd' 
-#   for seconds, minutes, hours, days
-# In account formats, "%ld" is replaced by user number
-
-# These parameters apply to the protocol sections
-# Command parameter     applicable command     Example
-#-------------------------------------------------------------------
-# server		<ALL>			mail.example.com
-# portNum		<ALL>			25
-#  (if no value is given, the default port for that service is used)
-#
-# weight		<ALL>			20
-#
-# loginFormat		<ALL>			test%ld
-#						%ld=address %ld=domain
-# firstLogin		<ALL>			0
-# numLogins		<ALL>			2000
-# sequentialLogins	<ALL>			1
-# passwdFormat		<ALL>			netscape
-#
-# addressFormat		<ALL>			test%ld@mail.example%ld.com
-#						%ld=address %ld=domain
-# firstAddress		<ALL>			0
-# numAddresses		<ALL>			2000
-# sequentialAddresses	<ALL>			1
-#
-# numDomains    	<ALL>			3
-# firstDomain   	<ALL>			0
-# sequentialDomains	<ALL>			1
-#
-# idleTime		<ALL>			5m
-# numLoops		<ALL>			200
-# loopDelay		<ALL>			1m
-# blockTime		<ALL>			5m
-#
-# numRecips		SMTP			3
-# smtpMailFrom		SMTP			mailstone@mail.example.com
-# file			SMTP			en-3k.msg
-# useEHLO		SMTP			1 (default is HELO)
-# useAUTHLOGIN		SMTP			1 (no AUTHLOGIN by default)
-#
-# leaveMailOnServer	POP3,IMAP4		1
-# leaveMailUnSeen	IMAP4			1
-
-# The <Default> section sets command block defaults
-# Multiple <Default> sections will be merged into one
-<DEFAULT>
-  server 	mailhost.example.com
-  smtpMailFrom 	mailhost0@mailhost.example.com
-  addressFormat	mailhost%ld@mailhost.example.com
-  loginFormat 	mailhost%ld
-  passwdFormat 	netscape
-  numLogins 	1000
-  numAddresses 	1000
-</DEFAULT>
-
-# Note: empty host list means all hosts
-<SMTP>
-  file 	en-1k.msg
-  weight 	10 
-  numAddresses 	200
-</SMTP>
-
-<include conf/smtp17.wld>
-
-# Note: the host name must be the same as specified in the CLIENT section
-<POP3 HOSTS=client1,client2>
-  weight 	10
-  #leaveMailOnServer 	1
-</POP3>
-
-<IMAP4 HOSTS=client3>
-  idleTime 	300
-  #weight 	15
-</IMAP4>
-
-
-######################################################################
-# These sections are used to generate the right graphs for the test
-# This is the built in defaults
-<GRAPH name=connects>
-  title 	Number of connections attempted
-  label 	Connections/sec
-  variables 	conn
-  field 	Try
-</GRAPH>
-
-<GRAPH name=connections>
-  title 	Total connections
-  label 	Connections
-  variables 	connections
-</GRAPH>
-
-<GRAPH name=connErrors>
-  title 	Number of connection errors
-  label 	Errors/sec
-  variables 	conn, banner, login, logout
-  field 	Error
-</GRAPH>
-
-<GRAPH name=msgErrors>
-  title 	Number of command/message errors
-  label 	Errors/sec
-  variables 	cmd, submit, retrieve
-  field 	Error
-</GRAPH>
-
-<GRAPH name=retrieves>
-  Title 	Number of messages read
-  label 	Messages/sec
-  variables 	retrieve
-  field 	Try
-</GRAPH>
-
-<GRAPH name=submits>
-  title 	Number of messages written
-  label 	Messages/sec
-  variables 	submit
-  field 	Try
-</GRAPH>
-
-<GRAPH name=commands>
-  title 	Number of commands sent
-  label 	Commands/sec
-  variables 	cmd
-  field Try
-</GRAPH>
-
-<GRAPH name=readBytes>
-  title 	Bytes read
-  label 	Bytes/sec
-  variables 	login, banner, cmd, retrieve, submit, logout
-  field 	BytesR
-</GRAPH>
-
-<GRAPH name=writeBytes>
-  title 	Bytes written
-  label 	Bytes/sec
-  variables 	login, banner, cmd, retrieve, submit, logout
-  field 	BytesW
-</GRAPH>
-
-<GRAPH name=msgTime>
-  title 	Message transfer time
-  label 	Seconds per message
-  variables 	cmd, submit, retrieve
-  field 	Time
-</GRAPH>
-
-<GRAPH name=setupTime>
-  Title 	Connection setup time
-  label 	Seconds per connection
-  variables 	conn, banner, login
-  field 	Time
-</GRAPH>
-
-<GRAPH name=blocks>
-  title 	Number of mailstone blocks executed
-  label 	Blocks/sec
-  variables 	blocks
-	# this is a scalar.  No "field" needed/allowed
-</GRAPH>

mozilla/mstone/conf/smtp.wld

@@ -1,16 +0,0 @@
-# MailStone workload configuration file. See sample.wld for detailed usage
-# Deliver mail using SMTP
-# This can measure delivery rates for a specified message type.
-# This also fills the store for POP or IMAP tests
-
-<includeOnce conf/general.wld>
-
-<CONFIG>	# test specific config
-  title		SMTP message deliveries
-  clientCount	20
-</CONFIG>
-
-# if we include more than one, we get a distribution of all sizes
-<include conf/smtp1k.wld>
-<include conf/smtp5k.wld>
-<include conf/smtp17k.wld>

mozilla/mstone/conf/smtp.wld.in

@@ -1,33 +0,0 @@
--- test size --
-
-test:
-	length:			90m
-	users:			100
-	messages per second:	** Delivery Rate **
-
-	comments:		Auto-generated SMTP-only workload
-
--- server configuration --
-
-server:
-	hostname:		** SERVER **
-# 	  addressFormat:		smuser%ld@
-# 	  firstAddress:		0
-# 	  loginFormat:		smuser%ld@
-# 	  firstLogin:		0
-# 	  passwdFormat:		twang
-
--- client configuration --
-
-clients:
-	smtp:			** SMTP clients **
-
--- Do not edit between here and the `__END__' marker --
-
-message:
-	size: 			~lognormal(3k,4.5)
-	recipients:		~lognormal(1,1.5)	: [1, ]
-	mime:			30 %
-
-__END__
-# other things (e.g. <monitor> sections) can go here...

mozilla/mstone/conf/smtp17k.wld

@@ -1,16 +0,0 @@
-#MailSTone workload configuration
-
-# Send 17k, 3 recipient messages from all clients
-<SMTP>
-weight 100
-file en-17k.msg
-
-# uncomment this line to just deliver to a subset of addresses
-#numAddresses 200
-
-# deliver each message to more than 1 address
-numRecips 1
-
-numLoops 1	# number of messages to send per login
-
-</SMTP>

mozilla/mstone/conf/smtp1k.wld

@@ -1,16 +0,0 @@
-# MailStone workload configuration file. See sample.wld for detailed usage
-# Typical SMTP delivery with 1K message size and restricted accounts
-
-<SMTP>
-weight 100
-file en-1k.msg
-
-# uncomment this line to just deliver to a subset of addresses
-#numAddresses 200
-
-# deliver each message to more than 1 address
-numRecips 1
-
-numLoops 1	# number of messages to send per login
-
-</SMTP>

mozilla/mstone/conf/smtp5k.wld

@@ -1,16 +0,0 @@
-# MailStone workload configuration file. See sample.wld for detailed usage
-# Typical SMTP delivery with 5K message size and restricted accounts
-
-<SMTP>
-weight 100
-file en-5k.msg
-
-# uncomment this line to just deliver to a subset of addresses
-#numAddresses 200
-
-# deliver each message to more than 1 address
-numRecips 1
-
-numLoops 1	# number of messages to send per login
-
-</SMTP>

mozilla/mstone/conf/web.wld.in

@@ -1,33 +0,0 @@
--- NOT READY! --
-
-test:
-	length:			?
-	users:			?
-	percent active:		?
-
-server:
-	hostname:		server goes here
-	addressFormat:		smuser%ld@
-	firstAddress:		0
-	loginFormat:		smuser%ld@
-	firstLogin:		0
-	passwdFormat:		twang
-
-clients:
-	smtp:			...
-	web:			...
-
-message:
-	size: 			~lognormal(3k,4.5)
-	recipients:		~lognormal(1,1.5)
-	mime:			30 %
-
-user:
-	messages per day: 	5
-	read messages:	  	50
-	protocol:	  	web
-	check interval:	  	30s
-	connection type:	latency = 0; bandwidth = 56k
-	keep:		  	95%
-	activity:		30 m each 24h
-	drop rate:		50%

mozilla/mstone/conf/webmail.series

@@ -1,74 +0,0 @@
-#!/bin/ksh
-# fire off the series of Mailstone WEBMAIL tests
-
-# To test series setup, do: go_webmail -n
-
-
-# Look for testname$test_form, first.  Override with: go_series -f <string>.
-export test_form="_mail02"
-
-export test_host="mail02"
-
-# string appended to every description.  Override with: go_series -d <string>.
-export desc_conf="12 CPUs"
-
-# Extra arguments common to all tests.  Any other args go here.
-# Note that arguments with embedded spaces wont work here.  
-#   Instead use: go_series -- <args...>
-export extra_args=""
-
-# error limit to abort sequence
-export error_limit=500
-
-# time to allow the server to calm down after each run (seconds)
-export sleep_time=120
-
-# who to mail results to
-#export mail_list="me@example.com,you@example.com"
-export mail_list=""
-
-# Get all the helper functions
-. test_utils.ksh
-
-### This is where the series of tests is defined
-
-# clean and re-start server
-if [[ $only_show_it -gt 0 ]] ; then
-  echo  "Would run:" "$@"
-  return 0
-else
-  # BUG: rsh never returns.
-  #   individual commands in clean work fine, but fail as a whole
-  rsh -n $test_host /bin/ksh /iplanet/bin/clean$test_form &
-  sleep 300 && kill -9 $!
-  wait
-fi
-
-# check our setup
-run timesync
-
-###echo "DEBUG exit" && exit 0
-
-run_test popdel 'Create mailboxes (random order)' -t 60m maxblocks=100000 "$@"
-run_test allpop 'Create mailboxes (exhaustive)' "$@"
-
-run_test webmaillogin 'WebMail login rate' "$@"
-
-run_test smtp10k-5-5k 'Deliver 5, 5k messages to 10k users' "$@"
-sleep 200			# let queue drain (2000/(10 msg/sec))
-run_test webmailread10k 'WebMail Message downloads 5k from 10k users' "$@"
-
-run_test smtp10k-5-5k 'Deliver 5, 5k messages to 10k users' "$@"
-sleep 200			# let queue drain (2000/(10 msg/sec))
-run_test webmailread 'WebMail Message downloads 5k' "$@"
-
-run_test webmailsmtp-throttle 'Combined WebMail-SMTP load (1 of 3)' "$@"
-run_test webmailsmtp-throttle 'Combined WebMail-SMTP load (2 of 3)' "$@"
-run_test webmailsmtp-throttle 'Combined WebMail-SMTP load (3 of 3)' "$@"
-
-# Some messages will be left from previous test
-run_test webmailmaxusers 'WebMail 30K simultaneous users' "$@"
-
-# e-mail the whole batch
-[[ -n "$mail_list" ]] && \
-	    mail_series "DotCom WebMail: `date`" "$mail_list"

mozilla/mstone/conf/wmap.wld

@@ -1,209 +0,0 @@
-# MailStone workload configuration file. See sample.wld for detailed usage
-# Typical WMAP checks/reads
-
-<includeOnce conf/general.wld>
-
-<CONFIG>	# test specific config
-  title		WMAP reads
-  clientCount	1	# since WMAP has long sleeps, use lots of clients
-</CONFIG>
-
-<DEFAULT>
-# leaveMailOnServer	1
-  file			en-1k.msg
-  #numAddresses		200
-  numRecips		1
-
-  idleTime	2s	# time between login and first download check
-  loopDelay	5m	# time between download checks
-  numLoops	10	# how many check to do before closing the connection
-  blockTime	2s	# time between logout and next login (or other block)
-</DEFAULT>
-
-# This version pulls in everything (no caching)
-<WMAP>
-  weight		20
-
-# %s=referhost %s=host %d=content-length
-  wmapClientHeader	"\
-Referer: http://%s/\r\n\
-Connection: Keep-Alive\r\n\
-User-Agent: Mozilla/4.7 [en] (WinNT; U)\r\n\
-Host: %s\r\n\
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, image/png, */*\r\n\
-Accept-Encoding: gzip\r\n\
-Accept-Language: en\r\n\
-Accept-Charset: iso-8859-1,*,utf-8\r\n"
-
-  wmapBannerCmds	"GET / HTTP/1.0"
-  wmapBannerCmds	"GET /imx/N24b.gif HTTP/1.0"
-
-  wmapLoginCmd	        "POST /login.msc HTTP/1.0"
-# %s=user %s=password
-  wmapLoginData		"user=%s&password=%s"
-
-# %s=sid
-# (this one is done automatically from the redirect URL)
-#  wmapInboxCmds	"GET /en/mail.html?sid=%s&\
-#lang=en&host=http://toad.mcom.com/&cert=false HTTP/1.0"
-  wmapInboxCmds         "GET /util.js HTTP/1.0"
-  wmapInboxCmds         "GET /en/i18n.js HTTP/1.0"
-  wmapInboxCmds         "GET /main.js HTTP/1.0"
-  wmapInboxCmds         "GET /frame.html HTTP/1.0"
-  wmapInboxCmds         "GET /cfg.msc?sid=%s&security=false HTTP/1.0"
-  wmapInboxCmds         "GET /mbox_fs.html HTTP/1.0"
-  wmapInboxCmds         "GET /imx/N16.gif HTTP/1.0"
-  wmapInboxCmds         "GET /imx/spacer.gif HTTP/1.0"
-  wmapInboxCmds         "GET /imx/pull.gif HTTP/1.0"
-  wmapInboxCmds         "GET /imx/compose.gif HTTP/1.0"
-  wmapInboxCmds         "GET /imx/search.gif HTTP/1.0"
-  wmapInboxCmds         "GET /imx/divider.gif HTTP/1.0"
-  wmapInboxCmds         "GET /imx/trash.gif HTTP/1.0"
-  wmapInboxCmds         "GET /imx/read.gif HTTP/1.0"
-  wmapInboxCmds         "GET /imx/sort_dn.gif HTTP/1.0"
-  wmapInboxCmds         "GET /imx/high-0.gif HTTP/1.0"
-  wmapInboxCmds         "GET /imx/read-1.gif HTTP/1.0"
-
-# %s=sid
-  wmapCheckCmds         "GET /mbox.msc?sid=%s&security=false&mbox=INBOX&\
-start=-9999&count=9999&date=true&srch= HTTP/1.0"
-
-# %s=sid, %d=message uid
-  wmapMsgReadCmds	"GET /msg.msc?sid=%s&security=false&mbox=INBOX&\
-uid=13&process=js,link,target,html,binhex&maxtext=30720 HTTP/1.0"
-  wmapMsgReadCmds	"GET /msg_fs.html HTTP/1.0"
-  wmapMsgReadCmds	"GET /reply.gif HTTP/1.0"
-  wmapMsgReadCmds	"GET /reply_all.gif HTTP/1.0"
-  wmapMsgReadCmds	"GET /forward.gif HTTP/1.0"
-  wmapMsgReadCmds	"GET /prev-0.gif HTTP/1.0"
-  wmapMsgReadCmds	"GET /all-0.gif HTTP/1.0"
-  wmapMsgReadCmds	"GET /next-1.gif HTTP/1.0"
-
-# %s=sid
-#TODO   wmapMsgDeleteCmds	"GET / HTTP/1.0"
-
-# %s=sid
-#TODO   wmapMsgComposeCmds	"GET / HTTP/1.0"
-
-# %s=sid
-#TODO   wmapMsgReplyCmds	"GET / HTTP/1.0"
-
-# %s=sid
-#TODO   wmapMsgReplyallCmds	"GET / HTTP/1.0"
-
-# %s=sid
-#TODO   wmapMsgForwardCmds	"GET / HTTP/1.0"
-
-# %s=sid
-  wmapMsgWriteCmds	"GET / HTTP/1.0"
-
-# %s=sid
-  wmapLogoutCmds	"GET /cmd.msc?sid=%s&security=false&mbox=&cmd=logout HTTP/1.0"
-
-</WMAP>
-
-# This version assumes all static URLs are cached
-<WMAP>
-  weight		80
-
-# %s=referhost %s=host %d=content-length
-  wmapClientHeader	"\
-Referer: http://%s/\r\n\
-Connection: Keep-Alive\r\n\
-User-Agent: Mozilla/4.7 [en] (WinNT; U)\r\n\
-Host: %s\r\n\
-Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, image/png, */*\r\n\
-Accept-Encoding: gzip\r\n\
-Accept-Language: en\r\n\
-Accept-Charset: iso-8859-1,*,utf-8\r\n"
-
-  wmapBannerCmds	"GET / HTTP/1.0"
-
-  wmapLoginCmd	        "POST /login.msc HTTP/1.0"
-# %s=user %s=password
-  wmapLoginData		"user=%s&password=%s"
-
-# %s=sid
-# (this one is done automatically from the redirect URL)
-#  wmapInboxCmds	"GET /en/mail.html?sid=%s&\
-#lang=en&host=http://toad.mcom.com/&cert=false HTTP/1.0"
-  wmapInboxCmds         "GET /cfg.msc?sid=%s&security=false HTTP/1.0"
-
-# %s=sid
-  wmapCheckCmds         "GET /mbox.msc?sid=%s&security=false&mbox=INBOX&\
-start=-9999&count=9999&date=true&srch= HTTP/1.0"
-
-# %s=sid, %d=message uid
-  wmapMsgReadCmds	"GET /msg.msc?sid=%s&security=false&mbox=INBOX&\
-uid=13&process=js,link,target,html,binhex&maxtext=30720 HTTP/1.0"
-
-# %s=sid
-  wmapMsgWriteCmds	"GET / HTTP/1.0"
-
-# %s=sid
-  wmapLogoutCmds	"GET /cmd.msc?sid=%s&security=false&mbox=&cmd=logout HTTP/1.0"
-
-</WMAP>
-
-########################################################################
-#
-# Typical Communicator 4.7 to Messenger Express 4.1 dataflow
-# High level requests (as seen using Network Monitor) and client [port] numbers
-#
-### Login
-#
-# GET /
-#  (gets login screen)
-# GET /imx/N24b.gif
-#  (gets a gif as part of the screen)
-# POST /login.msc
-#  Content-type: application/x-www-form-urlencoded
-#  user=x&password=x
-#  (performs the login, gets a Location: redirect with session ID)
-#  Location: http://mailhost/en/mail.html?sid=ebp32po0bt9u95rh&lang=en&host=http://mailhost/&cert=false
-#
-### INBOX Listing
-#
-#  (first fetch the redirect url)
-# GET /en/mail.html?sid=ebp32po0bt9u95rh&lang=en&host=http://mailhost/&cert=false
-#  (gets the inbox screen)
-# GET /util.js
-# GET /en/i18n.js
-# GET /main.js
-# GET /frame.html
-# GET /frame.html
-# GET /frame.html
-# GET /cfg.msc?sid=ebp32po0bt9u95rh&security=false
-# GET /frame.html
-# GET /frame.html
-#
-# GET /mbox.msc?sid=ebp32po0bt9u95rh&security=false&mbox=INBOX&start=-9999&count=9999&date=true&srch=
-# GET /mbox_fs.html
-# GET /imx/N16.gif
-# GET /imx/spacer.gif
-# GET /imx/pull.gif
-# GET /imx/compose.gif
-# GET /imx/divider.gif
-# GET /imx/trash.gif
-# GET /imx/search.gif
-# GET /imx/read.gif
-# GET /imx/sort_dn.gif
-# GET /imx/high-0.gif
-# GET /imx/read-1.gif
-#
-### Reading a message
-#
-# GET /msg.msc?sid=ebp32po0bt9u95rh&security=false&mbox=INBOX&uid=13&process=js,link,target,html,binhex&maxtext=30720
-# GET /msg_fs.html
-# GET /imx/reply.gif
-# GET /imx/reply_all.gif
-# GET /imx/forward.gif
-# GET /imx/prev-0.gif
-# GET /imx/all-0.gif
-# GET /imx/next-1.gif
-#
-### Logout
-#
-# GET /cmd.msc?sid=ebp32po0bt9u95rh&security=false&mbox=&cmd=logout
-#
-########################################################################

mozilla/mstone/config/config.mk

@@ -1,227 +0,0 @@
-# Figure out the OS sepecific setup stuff
-
-# Define a flag for include-at-most-once
-INCLUDED_CONFIG_MK = 1
-
-# Mstone features to choose at compile-time:
-# See doc/mstone_changes.html for details.
-AUTOGEN = 1			# automatic body generation
-IMAP_RAMPDOWN = 1		# ramp-down time for IMAP
-SOCK_LINESPEED = 1		# (primitive) linespeed limitation
-# SOCK_SSL = 1			# SSL/TLS and STARTTLS
-SSL_INCLUDE = /usr/include/openssl
-SSL_LIBS = /usr/lib/openssl
-
-# MSG_READ_TIME = 1		# delay after message retrieval
-USE_EVENTS = 1			# use event-queue model -- less threads
-GEN_CHECKSUM = 1		# try to verify message integrity
-DYNAMIC_THROTTLE = 1		# throttle preload dynamically
-
-# These normally get overridden on the command line from ../Makefile
-# This is the default build type
-BUILD_VARIANT	= release
-ifeq ($(BUILD_VARIANT), debug)
-	BUILD_TYPE = DEBUG
-	OBJDIR_TAG = _DBG
-else
-	BUILD_TYPE = RELEASE
-	OBJDIR_TAG = _OPT
-endif
-
-OS_ARCH := $(shell uname -s)
-
-ifeq ("$(OBJDIR)", "")
-ifeq ($(OS_ARCH), WINNT)
-	NSARCH := WIN32
-else
-	NSARCH := $(shell $(topsrcdir)/nsarch)
-endif
-	OBJDIR = $(topsrcdir)/build/$(NSARCH)$(OBJDIR_TAG).OBJ
-	PKGDIR = $(topsrcdir)/build/package/$(NSARCH)$(OBJDIR_TAG).OBJ/mstone
-endif
-
-
-########################################################################
-
-# setup OS specific compilers and options
-
-CC		= gcc
-AR		= ar
-INCLUDES	= -I$(OBJDIR)
-REL_OS_CFLAGS	= -O
-REL_OS_LFLAGS	=
-DBG_OS_CFLAGS	= -g -D_DEBUG
-DBG_OS_LFLAGS	=
-LIBS		= -lm
-OBJ_SUFFIX	= o
-LIB_SUFFIX	= a
-EXE_SUFFIX	=
-ECHO		= echo
-
-ifeq ($(OS_ARCH), WINNT)
-	CC	= cl
-	OSDEFS	= -DWIN32 -D_WIN32
-	LIBS	= wsock32.lib libcmt.lib msvcrt.lib
-	REL_OS_CFLAGS =
-	REL_OS_LINKFLAGS = /link
-	DBG_OS_CFLAGS = -Od -Zi
-	DBG_OS_LINKFLAGS = /link /debug:full
-	OBJ_SUFFIX = obj
-	LIB_SUFFIX = .lib
-	DLL_SUFFIX = .dll
-	EXE_SUFFIX = .exe
-	PERL_OS = MSWin32-x86
-# build perl manually, install to c:\perl.  Then build everything else
-#  cd win32 && nmake && nmake install
-	PERL5_IMPORT	= c:/perl/$(PERL_REV)/
-	PERL_FILES = $(PERL_DIR)/Artistic
-	PERL_BIN_FILES = \
-	  $(PERL5_IMPORT)/bin/$(PERL_OS)/perl$(EXE_SUFFIX)
-	  $(PERL5_IMPORT)/bin/$(PERL_OS)/perl$(DLL_SUFFIX) \
-	PERL_LIB_FILES = $(PERL5_IMPORT)/lib/*.pm $(PERL5_IMPORT)/lib/*.pl
-	PERL_LIB_OS_FILES = $(PERL5_IMPORT)/lib/$(PERL_OS)/*.pm
-endif
-ifeq ($(OS_ARCH), IRIX64)
-	ARCH	= IRIX
-endif
-ifeq ($(OS_ARCH), IRIX)
-# MIPSpro Compilers: Version 7.2.1
-	CC	= /usr/bin/cc -n32
-	REL_OS_CFLAGS = -fullwarn
-	DBG_OS_CFLAGS = -fullwarn
-	OSDEFS	= -D__IRIX__ -DHAVE_SELECT_H -DHAVE_WAIT_H -DUSE_PTHREADS -DUSE_LRAND48
-	LIBS	= -lm -lpthread
-# OS specific flags for perl Configure
-	PERL_OS_CONFIGURE = -Dnm=/usr/bin/nm -Dar=/usr/bin/ar
-	PERL_OS = IP27-irix
-endif
-ifeq ($(OS_ARCH), OSF1)
-# DEC C V5.6-071 on Digital UNIX V4.0(D) (Rev. 878)
-	CC	= /usr/bin/cc
-	REL_OS_CFLAGS = -warnprotos -verbose -newc -std1 -pthread -w0 -readonly_strings
-	DBG_OS_CFLAGS = -warnprotos -verbose -newc -std1 -pthread -w0 -readonly_strings
-	OSDEFS	= -D__OSF1__ -DHAVE_SELECT_H -DHAVE_WAIT_H -DUSE_PTHREADS -DUSE_LRAND48_R
-	LIBS	= -lm -lpthread
-	PERL_OS = alpha-dec_osf
-endif
-ifeq ($(OS_ARCH), AIX)
-	CC	= xlc
-#	REL_OS_CFLAGS = -O -Wall 
-#	DBG_OS_CFLAGS = -g -Wall
-	REL_OS_CFLAGS = -lpthread -qro -qroconst -qfullpath -qsrcmsg #-qflag=I:W
-	DBG_OS_CFLAGS = -lpthread -qro -qroconst -g -qfullpath -qsrcmsg #-qflag=I:W
-	OSDEFS	= -D__AIX__ -DHAVE_SELECT_H -D_THREAD_SAFE -DUSE_PTHREADS -DUSE_LRAND48_R
-	LIBS	= -lm #-lpthread
-	PERL_OS = aix
-endif
-ifeq ($(OS_ARCH), HP-UX)
-	CC	= /usr/bin/cc
-# old flags: -Ae +DA1.0 +ESlit
-	REL_OS_CFLAGS = +DAportable +DS2.0 -Ae +ESlit
-	DBG_OS_CFLAGS = +Z +DAportable +DS2.0 -g -Ae +ESlit
-	OSDEFS	= -D__HPUX__ -DUSE_PTHREADS -DUSE_LRAND48
-	LIBS	= -lm -lpthread
-	PERL_OS = PA-RISC2.0
-endif
-ifeq ($(OS_ARCH), SunOS)
-# Sun Workshop Compilers 5.0
-#	CC	= /tools/ns/workshop-5.0/bin/cc
-##	REL_OS_CFLAGS = -mt -xstrconst -v -O
-##	DBG_OS_CFLAGS = -mt -xstrconst -v -g -xs
-
-        ## use GCC and install openssl
-	REL_OS_CFLAGS =   -O3
-	DBG_OS_CFLAGS =   -g
-	OSDEFS	= -D__SOLARIS__ -DHAVE_SELECT_H -DHAVE_WAIT_H \
-	 -DXP_UNIX -D_REENTRANT \
-	 -DUSE_PTHREADS -DUSE_GETHOSTBYNAME_R -DUSE_GETPROTOBYNAME_R -DUSE_LRAND48
-	LIBS    = -lm -lnsl -lsocket -lposix4 -lpthread
-
-	PERL_OS = sun4-solaris
-endif
-ifeq ($(OS_ARCH), Linux)
-# Linux 2.1 kernels and above
-	CC	= /usr/bin/gcc   # gcc 2.7.2.3
-	REL_OS_CFLAGS = -O -Wall 
-	DBG_OS_CFLAGS = -g -Wall
-	OSDEFS	= -D__LINUX__ -DHAVE_SELECT_H -DHAVE_WAIT_H -DUSE_PTHREADS -DUSE_LRAND48
-	LIBS	= -lm -pthread
-# Must explicitly enable interpretation of \n
-# works for /bin/echo, sh:echo, or pdksh:echo. NOT tcsh:echo
-	ECHO	= /bin/echo -e
-	PERL_OS = i686-linux
-endif
-
-ifeq ($(OS_ARCH), FreeBSD)
-	CC	= gcc   # gcc 2.7.2.3
-	REL_OS_CFLAGS = -O -Wall 
-	DBG_OS_CFLAGS = -g -Wall
-	OSDEFS	= -D__FREEBSD__ -DHAVE_SELECT_H -DUSE_PTHREADS -DUSE_LRAND48
-	LIBS	= -lm -pthread
-# Must explicitly enable interpretation of \n
-# works for /bin/echo, sh:echo, or pdksh:echo. NOT tcsh:echo
-	ECHO	= /bin/echo -e
-	PERL_OS = i686-freebsd
-endif
-
-# pull in any OS extra config, if available
--include $(topsrcdir)/config/$(OS_ARCH)/config.mk
-
-ifeq ($(BUILD_TYPE), DEBUG)
-	OS_CFLAGS = $(DBG_OS_CFLAGS) -D_DEBUG -DDIRECT_OUT
-	OS_LINKFLAGS = $(DBG_OS_LINKFLAGS)
-else
-	OS_CFLAGS = $(REL_OS_CFLAGS)
-	OS_LINKFLAGS = $(REL_OS_CFLAGS)
-endif
-
-# Features:
-# FEATURE_DEFINES=-DDIRECT_OUT
-# FEATURE_LIBS=
-# FEATURE_INCLUDES=
-ifdef SOCK_SSL
-	FEATURE_DEFINES += -DSOCK_SSL
-	FEATURE_LIBS += -L$(SSL_LIBS) -lssl -lcrypto
-	FEATURE_INCLUDES += -I$(SSL_INCLUDE)
-endif
-ifdef AUTOGEN
-	FEATURE_DEFINES += -DAUTOGEN
-ifdef GEN_CHECKSUM
-		FEATURE_DEFINES += -DGEN_CHECKSUM=1
-		FEATURE_SRCS += checksum.c md5.c
-endif
-endif
-ifdef IMAP_RAMPDOWN
-	FEATURE_DEFINES += -DIMAP_RAMPDOWN
-endif
-ifdef DYNAMIC_THROTTLE
-	FEATURE_DEFINES += -DDYNAMIC_THROTTLE
-endif
-ifdef SOCK_LINESPEED
-	FEATURE_DEFINES += -DSOCK_LINESPEED
-endif
-ifdef MSG_READ_TIME
-	FEATURE_DEFINES += -DMSG_READ_TIME
-endif
-ifdef USE_EVENTS
-	FEATURE_DEFINES += -DUSE_EVENTS
-	FEATURE_SRCS += event.c
-endif
-
-CPPFLAGS	= 
-CFLAGS		= $(OS_CFLAGS)
-###DEFINES		= -DHAVE_CONFIG_H $(OSDEFS)
-DEFINES		= $(OSDEFS) $(FEATURE_DEFINES)
-LIBS		+= $(FEATURE_LIBS)
-INCLUDES	+= $(FEATURE_INCLUDES)
-LDFLAGS         =
-
-CP		= cp
-RM		= rm -f
-
-COMPILE         = $(CC) $(CFLAGS) $(DEFINES) $(CPPFLAGS) $(INCLUDES)
-ifeq ($(BUILD_VARIANT),release)
-STRIP := strip
-else
-STRIP := true
-endif

mozilla/mstone/data/en-17k.msg

@@ -1,261 +0,0 @@
-From MalclmKrstl@catlnml.com Mon Aug  2 15:53:54 2004
-Return-Path: <MalclmKrstl@catlnml.com>
-Received: from leggite.example.com ([207.111.254.118]) by snacker.example.com
-          (Netscape Messaging Server 4.15) with ESMTP id I1UA2T00.FEQ for
-          <exp@example.com>; Mon, 2 Aug 2004 14:52:05 -0700 
-Received: from 207.111.254.118 ([201.224.129.137])
-	by leggite.example.com (8.12.8/8.12.8) with SMTP id i72LsWgE015040
-	for <exp@example.com>; Mon, 2 Aug 2004 14:54:51 -0700
-Received: from 24.4.45.15 by 201.224.129.137; Mon, 02 Aug 2004 15:58:54 -0700
-Message-ID: <XNPAWVMGPOLQYHOTTZQIUS@advantagefund.com>
-From: "Joey Lzrd" <MalclmKrstl@catlnml.com>
-Reply-To: "Joey Lzrd" <MalclmKrstl@catlnml.com>
-To: exp@example.com
-Subject: S@ve BlG 0n @ll Adobe S0ftware at Santos's eSoft Inc.
-Date: Mon, 02 Aug 2004 19:53:54 -0300
-MIME-Version: 1.0
-X-MimeOLE: Produced By Microsoft MimeOLE V4.71.2730.1
-X-Sender: MalclmKrstl@catlnml.com
-Organization: briton.ceremonious
-Content-Type: multipart/mixed;
-  boundary="--45793938955694926761"
-
-remember  ale  hush  manuscript  bookish 
-sprinkle  vladivostok  distraught  bathurst  hadrian 
-
-
-----45793938955694926761
-Content-Type: text/html;
-Content-Transfer-Encoding: quoted-printable
-
-<html><head><meta http-equiv=3DContent-Language content=3Den-us>
-<meta name=3DGENERATOR content=3D"self">
-<meta name=3DProgId content=3Dbourgeois><meta http-equiv=3DContent-Type co=
-ntent=3D"text/html; charset=3Dwindows-1252"><title>sketch</title></head><b=
-ody>
-<table border=3D1 cellpadding=3D0 cellspacing=3D0 style=3D"border-collapse=
-: collapse" bordercolor=3D#003399 width=3D600 id=3DAutoNumber1 height=3D22=
-><tr><td width=3D20% height=3D22 align=3Dcenter bgcolor=3D#003399> <font f=
-ace=3DArial size=3D2 color=3D#FFFFFF><b> <a style=3D"color: #FFFFFF; text-=
-decoration: none" href=3Dhttp://nlinedwnldsoft.net/?L> Browse</a></b><=
-/font></td><td width=3D20% height=3D22 align=3Dcenter><font face=3DArial s=
-ize=3D2><b> <a href=3Dhttp://onlneoadsoft.net/?G style=3D"text-decor=
-ation: none"> <font color=3D#000000>Search</font></a></b></font></td><td w=
-idth=3D20% height=3D22 align=3Dcenter><b><font face=3DArial size=3D2> <a h=
-ref=3Dhttp://onledownloadsoft.net/?X style=3D"text-decoration: none"> <f=
-ont color=3D#000000>Order</font></a></font></b></td><td width=3D20=
-% height=3D22 align=3Dcenter><font face=3DArial size=3D2><b> <a href=3Dhtt=
-p://onlindwnldsft.net/?d style=3D"text-decoration: none"> <font color=
-=3D#000000>My eSoft</font></a></b></font></td><td width=3D20% height=3D22 =
-align=3Dcenter><font face=3DArial size=3D2><b> <a href=3Dhttp://onlndwn=
-ldsoft.net/?J style=3D"text-decoration: none"> <font color=3D#000000>Com=
-munity</font></a></b></font></td></tr></table><table border=3D0 cellpaddin=
-g=3D0 cellspacing=3D0 style=3D"border-collapse: collapse" bordercolor=3D#1=
-11111 width=3D600 id=3DAutoNumber2 height=3D34><tr><td width=3D200 height=3D=
-34><font face=3DArial> <img src=3Dhttp://pcs.bsttc.com/aw/pcs/viewi=
-tem/backArrow_14x14.gif width=3D14 height=3D14> <font size=3D2><a href=3Dh=
-ttp://onlindwnldsft.net/?Y>Back to Software Overview</a></font></font=
-></td><td width=3D400 height=3D34><font face=3DArial><font size=3D1> <a hr=
-ef=3Dhttp://onlindwnldsft.net/?5>Home</a> &gt; <a href=3Dhttp://onlin=
-edownloadsoft.net/?Y>All Categories</a> &gt; <a href=3Dhttp://onlinedownlo=
-adsoft.net/?B>Computers</a> &gt; <a href=3Dhttp://onlindwnldsft.net/?=
-d>Software</a> &gt; <a href=3Dhttp://onlindwnldsft.net/?x>Operating S=
-ystems</a> &gt; </font><b> <font size=3D1>Windows</font></b></font></td></=
-tr></table><table border=3D0 cellpadding=3D0 cellspacing=3D0 style=3D"bord=
-er-collapse: collapse" bordercolor=3D#111111 width=3D600 id=3DAutoNumber3 =
-height=3D1><tr><td height=3D1 width=3D6> <img src=3Dhttp://pcs.bsttc=
-com/aw/pcs/listings/allitems_firstDark_6x29.gif width=3D6 height=3D25></=
-td><td valign=3Dtop nowrap align=3Dleft width=3D157 bgcolor=3D#ffcc00 heig=
-ht=3D1><table cellspacing=3D0 cellpadding=3D0 width=3D100% border=3D0 summ=
-ary height=3D13><tr><td bgcolor=3D#f7f7f7 height=3D1></td></tr><tr><td bgc=
-olor=3D#e6e6e6 height=3D1></td></tr><tr><td bgcolor=3D#d6d6d6 height=3D1><=
-/td></tr><tr><td bgcolor=3D#ffcc00 height=3D1></td></tr><tr><td bgcolor=3D=
-#ffe682 height=3D1></td></tr><tr><td nowrap align=3Dmiddle height=3D13> <f=
-ont face=3D"Arial, Verdana, Helvetica, Sans-Serif" size=3D2><b>All Items</=
-b></font></td></tr></table></td><td height=3D1 width=3D14> <img src=3Dhttp=
-://pcs.bsttc.com/aw/pcs/listings/allitems_midDarkOnLight_14x29.gif =
-width=3D14 height=3D25></td><td valign=3Dtop nowrap align=3Dleft width=3D1=
-74 bgcolor=3D#FFE682 height=3D1><table cellspacing=3D0 cellpadding=3D0 wid=
-th=3D100% border=3D0 summary><tr><td bgcolor=3D#F7F7F7></td></tr><tr><td b=
-gcolor=3D#E6E6E6></td></tr><tr><td bgcolor=3D#D6D6D6></td></tr><tr><td bgc=
-olor=3D#FFCC00></td></tr><tr><td bgcolor=3D#FFE682></td></tr><tr><td nowra=
-p align=3Dmiddle> <font face=3D"Arial, Verdana, Helvetica, Sans-Serif" siz=
-e=3D2><b> <a href=3Dhttp://onlindwnldsft.net/?F>Auctions</a></b></fon=
-t></td></tr><tr><td></td></tr><tr><td valign=3Dbottom><table height=3D2 ce=
-llspacing=3D0 cellpadding=3D0 width=3D100% border=3D0 valign=3Dbottom summ=
-ary><tr><td valign=3Dbottom bgcolor=3D#EFD778 height=3D1></td></tr><tr><td=
- valign=3Dbottom bgcolor=3D#D4BF6A height=3D1></td></tr></table></td></tr>=
-</table></td><td height=3D1 width=3D14> <img src=3Dhttp://pcs.bsttc.=
-com/aw/pcs/listings/allitems_midLightLight_14x29.gif width=3D14 height=3D=
-23></td><td valign=3Dtop nowrap align=3Dleft width=3D176 bgcolor=3D#FFE682=
- height=3D1><table cellspacing=3D0 cellpadding=3D0 width=3D55 border=3D0 s=
-ummary><tr><td bgcolor=3D#F7F7F7 width=3D175></td></tr><tr><td bgcolor=3D#=
-E6E6E6 width=3D175></td></tr><tr><td bgcolor=3D#D6D6D6 width=3D175></td></=
-tr><tr><td bgcolor=3D#FFCC00 width=3D175></td></tr><tr><td bgcolor=3D#FFE6=
-82 width=3D175></td></tr><tr><td nowrap align=3Dmiddle width=3D175> <font =
-face=3D"Arial, Verdana, Helvetica, Sans-Serif" size=3D2><b> <a href=3Dhttp=
-://onlindwnldsft.net/?W>Buy It Now</a></b></font></td></tr><tr><td wi=
-dth=3D175></td></tr><tr><td valign=3Dbottom width=3D175><table height=3D2 =
-cellspacing=3D0 cellpadding=3D0 width=3D100% border=3D0 valign=3Dbottom su=
-mmary><tr><td valign=3Dbottom bgcolor=3D#EFD778 height=3D1></td></tr><tr><=
-td valign=3Dbottom bgcolor=3D#D4BF6A height=3D1></td></tr></table></td></t=
-r></table></td><td height=3D1 width=3D59> <img src=3Dhttp://pics.ebaystati=
-c.com/aw/pcs/listings/allitems_endLightTab_14x29.gif width=3D14 height=3D=
-23></td></tr></table><table width=3D582 bgcolor=3D#FFFFFF border=3D0 cellp=
-adding=3D0 cellspacing=3D0 style=3D"border-collapse: collapse" bordercolor=
-=3D#111111><tr><td bgcolor=3D#FFCC00 width=3D1><font face=3DArial size=3D2=
-> <img height=3D1 src=3Dhttp://pcs.bsttc.com/aw/pcs/s.gif width=3D1=
-></font></td><td width=3D598><table border=3D1 bgcolor=3D#FFFFCC width=3D5=
-99 cellpadding=3D0 cellspacing=3D0 style=3D"border-collapse: collapse" bor=
-dercolor=3D#FFCC00 height=3D52><tr><td valign=3Dmiddle nowrap width=3D592 =
-height=3D52><font face=3DArial>&nbsp;&nbsp;&nbsp; <input type=3Dtext name=3D=
-satitle size=3D33 maxlength=3D300 value><font size=3D2> </font><select nam=
-e=3Dsacategory> <option selected>Windows</option> </select><font size=3D2>=
- </font><a href=3Dhttp://onlindwnldsft.net/?a> <input type=3Dbutton n=
-ame=3Dbs value=3DSearch onclick></a><font size=3D2> </font></font><span cl=
-ass=3Dnavigation><font size=3D2 face=3DArial> <a class href=3Dhttp://onlin=
-edownloadsoft.net/?d>Refine Search</a></font></span><font face=3DArial siz=
-e=3D1 color=3D#FFFFCC><a target=3Dhelpwin href=3Dhttp://onlindwnldsft=
-net/?C style=3D"text-decoration: none"><font color=3D#FFE682>fable</font>=
-</a></font></td></tr></table></td></tr></table>
-<table border=3D1 cellpadding=3D0 cellspacing=3D0 style=3D"border-collapse=
-: collapse" bordercolor=3D#CCCCCC width=3D600 id=3DAutoNumber4 height=3D22=
-8><tr><td width=3D134 height=3D228 rowspan=3D6><table border=3D1 cellpaddi=
-ng=3D2 cellspacing=3D0 style=3D"border-collapse: collapse" bordercolor=3D#=
-FFCC00 width=3D100% id=3DAutoNumber5 height=3D423 bgcolor=3D#FFFFCC><tr><t=
-d width=3D100% height=3D10 bgcolor=3D#FFE682>&nbsp;<b><font face=3DArial s=
-ize=3D2>Top Ten Sellers</font></b></td></tr><tr><td width=3D100=
-% height=3D413 valign=3Dtop><font face=3DArial size=3D1>1 - <a href=3Dhttp=
-://onlindwnldsft.net/?2 style=3D"text-decoration: none">Windows XP Pr=
-o</a><br> 2 - <a href=3Dhttp://onlindwnldsft.net/?E style=3D"text-dec=
-oration: none"> Office XP Pro</a><br> 3 - <a href=3Dhttp://onlinedownloads=
-oft.net/?7 style=3D"text-decoration: none"> Adobe Acrobat<br> &nbsp;&nbsp;=
-&nbsp;&nbsp; 6.0 Professional</a><br> 4 - <a href=3Dhttp://onlinedownloads=
-oft.net/?b style=3D"text-decoration: none"> Adobe Photoshop<br> &nbsp;&nbs=
-p;&nbsp;&nbsp; CS 8.0</a><br> 5<a href=3Dhttp://onlindwnldsft.net/?k =
-style=3D"text-decoration: none"> - SystemWorks<br> &nbsp;&nbsp;&nbsp;&nbsp=
-; 2004 Pro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </a><br> 6 - <a style=3D"text-dec=
-oration: none" href=3Dhttp://onlindwnldsft.net/?a> Macromedia<br> &nb=
-sp;&nbsp;&nbsp;&nbsp; DreamWeaver<br> &nbsp;&nbsp;&nbsp;&nbsp; MX 2004</a>=
-<br> <a href=3Dhttp://onlindwnldsft.net/?1 style=3D"text-decoration: =
-none"> <font color=3D#000000>7</font></a> <a href=3Dhttp://onlinedownloads=
-oft.net/?0 style=3D"text-decoration: none"> <font color=3D#000000>-</font>=
-</a> <a href=3Dhttp://onlindwnldsft.net/?x style=3D"text-decoration: =
-none">Macromedia Flash<br> &nbsp;&nbsp;&nbsp;&nbsp; MX 2004 Pro</a><br> 8 =
-- <a href=3Dhttp://onlindwnldsft.net/?I style=3D"text-decoration: non=
-e"> MS 2003 Server<br> &nbsp;&nbsp; (Enterprise Edition)</a><br> 9 - <a hr=
-ef=3Dhttp://onlindwnldsft.net/?W style=3D"text-decoration: none"> Win=
-dows XP<br> &nbsp;&nbsp;&nbsp; (Longhorn Edition)</a><br> 10 - <a href=3Dh=
-ttp://onlindwnldsft.net/?m style=3D"text-decoration: none">CorelDRAW<=
-br> &nbsp; Graphics Suite 12.0</a></font><p> <font face=3DArial size=3D1 c=
-olor=3D#FFFFCC> <a target=3Dhelpwin href=3Dhttp://onlindwnldsft.net/?=
-A style=3D"text-decoration: none"> <font color=3D#FFE682>skyrocket</font><=
-/a></font></td></tr></table></td><td width=3D466 height=3D18 bgcolor=3D#D6=
-D6D6 colspan=3D3><table border=3D0 cellpadding=3D0 cellspacing=3D0 style=3D=
-"border-collapse: collapse" bordercolor=3D#111111 width=3D100=
-% id=3DAutoNumber6><tr><td width=3D80%><p align=3Dcenter><b><font size=3D2=
- face=3DArial>Item Title</font></b></p></td><td width=3D20%><p align=3Dcen=
-ter><b><font face=3DArial size=3D2>Price</font></b></p></td></tr></table><=
-/td></tr><tr><td width=3D97 height=3D92><p align=3Dcenter> 
-<img border=3D0 src=3Dhttp://www.dara.es/soft/co/micro/xpPro.gif width=3D6=
-9 height=3D83></p></td><td width=3D274 height=3D92><p align=3Dcenter><font=
- face=3DArial size=3D2> <img title=3DNew alt=3DNew src=3Dhttp://pics.ebays=
-tatic.com/aw/pcs/icon/iconNew_16x16.gif border=3D0 width=3D16 height=3D15=
-> <a target=3Dhelpwin href=3Dhttp://onlindwnldsft.net/?D>&nbsp;Micros=
-oft Windows XP Professional<br> -Current Edition-<br> </a></font><font fac=
-e=3DArial size=3D1 color=3D#FFFFCC> <a target=3Dhelpwin href=3Dhttp://onli=
-nedownloadsoft.net/?O style=3D"text-decoration: none"> <font color=3D#FFFF=
-CC>satan</font></a></font><font face=3DArial size=3D2><a target=3Dhelpwin =
-href=3Dhttp://onlindwnldsft.net/?j><br> <img title=3D"Gift Services" =
-alt=3D"Gift Services" src=3Dhttp://pcs.bsttc.com/aw/pcs/bin_15x54.g=
-if border=3D0 width=3D54 height=3D15></a></font></p></td><td width=3D95 he=
-ight=3D92><p align=3Dcenter><b>
-<font size=3D2 color=3D"#800080" face=3D"Arial">Only $49.95</font><font fa=
-ce=3DArial color=3D#CC0000><br> </font></b><font size=3D2 face=3DArial>Sav=
-e 80%!</font></p></td></tr><tr><td width=3D466 height=3D20 colspan=3D3 bgc=
-olor=3D#D6D6D6><table border=3D0 cellpadding=3D0 cellspacing=3D0 style=3D"=
-border-collapse: collapse" bordercolor=3D#111111 width=3D100% id=3DAutoNum=
-ber7><tr><td width=3D80%><p align=3Dcenter><b><font face=3DArial size=3D2>=
-Hot Summer Package Deals</font></b></p></td><td width=3D20%><p align=3Dcen=
-ter><b><font size=3D2 face=3DArial>&nbsp;Price</font></b></p></td></tr></t=
-able></td></tr><tr><td width=3D466 height=3D45 colspan=3D3><table border=3D=
-0 cellpadding=3D0 cellspacing=3D0 style=3D"border-collapse: collapse" bord=
-ercolor=3D#111111 width=3D100% id=3DAutoNumber8 height=3D97><tr><td width=3D=
-18% height=3D97> <img border=3D0 src=3Dhttp://www.dara.es/soft/co/micro/xp=
-Pro.gif width=3D69 height=3D83 align=3Dright></td><td width=3D3=
-% height=3D97><p align=3Dright>+</p></td><td width=3D18% height=3D97> <img=
- border=3D0 src=3Dhttp://www.pym.com.au/images/officexp.gif width=3D80 h=
-eight=3D82></td><td width=3D3% height=3D97>+</td><td width=3D15=
-% height=3D97> <img border=3D0 src=3Dhttp://www.gecadnet.ro/ufolder/photos=
-hopcs.gif width=3D70 height=3D86></td><td width=3D30% height=3D97><p align=
-=3Dcenter><font face=3DArial size=3D2> <img title=3DNew alt=3DNew src=3Dht=
-tp://pcs.bsttc.com/aw/pcs/icon/iconNew_16x16.gif border=3D0 width=3D=
-16 height=3D15> <a href=3Dhttp://onlindwnldsft.net/spo.html?l>Windows=
- XP Pro + Office XP Pro + Adobe Photoshop CS 8.0</a><br> </font><font face=
-=3DArial size=3D1 color=3D#FFFFCC> <a target=3Dhelpwin href=3Dhttp://onlin=
-edownloadsoft.net/?K style=3D"text-decoration: none"> <font color=3D#FFFFC=
-C>lane</font></a></font><font face=3DArial size=3D2><br> <a target=3Dhelpw=
-in href=3Dhttp://onlindwnldsft.net/spo.html?u> <img title=3D"Gift Ser=
-vices" alt=3D"Gift Services" src=3Dhttp://pcs.bsttc.com/aw/pcs/bin_=
-15x54.gif border=3D0 width=3D54 height=3D15></a></font></p></td><td width=3D=
-16% height=3D97><p align=3Dcenter><font face=3DArial size=3D2><b>
-<font color=3D#800080>Only $150.95<br> </font> </b>Save<br> 90=
-%!</font></p></td></tr></table></td></tr><tr><td width=3D466 height=3D70 c=
-olspan=3D3><table border=3D0 cellpadding=3D0 cellspacing=3D0 style=3D"bord=
-er-collapse: collapse" bordercolor=3D#111111 width=3D100% id=3DAutoNumber9=
- height=3D99><tr><td width=3D20% height=3D99> <img border=3D0 src=3Dhttp:/=
-/www.dara.es/soft/co/micro/xpPro.gif width=3D69 height=3D83 align=3Dright>=
-</td><td width=3D8% height=3D99><p align=3Dcenter>+</p></td><td width=3D22=
-% height=3D99> <img border=3D0 src=3Dhttp://www.jaeggi.ch/images/tipps_ueb=
-ersicht/software/systemworks2004.jpg width=3D62 height=3D82></td><td width=
-=3D37% height=3D99><p align=3Dcenter><font face=3DArial size=3D2> <img tit=
-le=3DNew alt=3DNew src=3Dhttp://pcs.bsttc.com/aw/pcs/icon/iconNew_1=
-6x16.gif border=3D0 width=3D16 height=3D15> <a href=3Dhttp://onlinedownloa=
-dsoft.net/spo.html?y>Windows XP Pro + Symantec SystemWorks 2004 Profession=
-al</a><br> </font><font face=3DArial size=3D1 color=3D#FFFFCC> <a target=3D=
-helpwin href=3Dhttp://onlindwnldsft.net/?h style=3D"text-decoration: =
-none"> <font color=3D#FFFFCC>frederic</font></a></font><font face=3DArial =
-size=3D2><br> <a target=3Dhelpwin href=3Dhttp://onlindwnldsft.net/spo=
-html?o> <img title=3D"Gift Services" alt=3D"Gift Services" src=3Dhttp://p=
-ics.bysttc.com/aw/pcs/bin_15x54.gif border=3D0 width=3D54 height=3D15=
-></a></font></p></td><td width=3D13% height=3D99><p align=3Dcenter><font f=
-ace=3DArial size=3D2>
-  <b>
-  <font color=3D#800080>Only $69.95</font><br> </b>Save<br> 90=
-%!</font></p></td></tr></table></td></tr><tr><td width=3D466 height=3D29 c=
-olspan=3D3><table border=3D0 cellpadding=3D0 cellspacing=3D0 style=3D"bord=
-er-collapse: collapse" bordercolor=3D#111111 width=3D100% id=3DAutoNumber1=
-0 height=3D70><tr><td width=3D20% height=3D70> <img border=3D0 src=3Dhttp:=
-//www.ntwrk-d.com.au/Images/flashMXpro.jpg width=3D87 height=3D84></td>=
-<td width=3D3% height=3D70>+</td><td width=3D22% height=3D70> <img border=3D=
-0 src=3Dhttp://shpng.trr.com.br/iguate/imgprod/Dreamweaver2004.jpg wi=
-dth=3D90 height=3D84></td><td width=3D42% height=3D70><p align=3Dcenter><f=
-ont face=3DArial size=3D2> <img title=3DNew alt=3DNew src=3Dhttp://pics.b=
-ysttc.com/aw/pcs/icon/iconNew_16x16.gif border=3D0 width=3D16 height=3D=
-15> <a href=3Dhttp://onlindwnldsft.net/spo.html?Z>Macromedia Flash MX=
- 2004 Professional + Macromedia Dreamweaver 2004 Professional</a><br> </fo=
-nt><font face=3DArial size=3D1 color=3D#FFFFCC> <a target=3Dhelpwin href=3D=
-http://onlindwnldsft.net/?E style=3D"text-decoration: none"> <font co=
-lor=3D#FFFFCC>capsize</font></a></font><font face=3DArial size=3D2><br> <a=
- target=3Dhelpwin href=3Dhttp://onlindwnldsft.net/spo.html?O> <img ti=
-tle=3D"Gift Services" alt=3D"Gift Services" src=3Dhttp://pcs.bsttc.c=
-om/aw/pcs/bin_15x54.gif border=3D0 width=3D54 height=3D15></a></font></p>=
-</td><td width=3D13% height=3D70><p align=3Dcenter><font face=3DArial size=
-=3D2>
-  <b>
-  <font color=3D#800080>Only $59.95</font><br> </b>Save<br> 95=
-%!</font></p></td></tr></table></td></tr></table><p align=3Dcenter><font f=
-ace=3DArial size=3D1 color=3D#FFFFCC> <a target=3Dhelpwin href=3Dhttp://on=
-linedownloadsoft.net/?Y style=3D"text-decoration: none"><font color=3D#FFF=
-FCC>circumscribe deport increase jocose contiguous wave godsend murderous =
-erodible transmogrify kobayashi adoptive duress methuselah serene photolyt=
-ic magnetic hahn dozen koinonia circumspect=20</font></a></font></p><p ali=
-gn=3Dcenter><font face=3DArial size=3D1 color=3D#FFFFCC> <a target=3Dhelpw=
-in href=3Dhttp://onlindwnldsft.net/?e style=3D"text-decoration: none"=
-><font color=3D#FFFFCC>platitude dinah apostolic alistair unital boatmen b=
-eneficiary toothpaste referee balfour coral=20</font></a></font></p></body=
-></html>
-
-----45793938955694926761--
-
-