diff options
author | Diva Canto | 2013-07-11 14:21:57 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-11 14:21:57 -0700 |
commit | 51d106cff88334e1b9eb3628f7bdb8d6a18af4f6 (patch) | |
tree | 14fcef662bc28c1ef5606756140922c19716dbe0 | |
parent | Changed the UserProfileModule so that it's less greedy in terms of thread usage. (diff) | |
download | opensim-SC-51d106cff88334e1b9eb3628f7bdb8d6a18af4f6.zip opensim-SC-51d106cff88334e1b9eb3628f7bdb8d6a18af4f6.tar.gz opensim-SC-51d106cff88334e1b9eb3628f7bdb8d6a18af4f6.tar.bz2 opensim-SC-51d106cff88334e1b9eb3628f7bdb8d6a18af4f6.tar.xz |
Added a test for the asset service
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Clients/Assets/AssetsClient.cs | 99 | ||||
-rw-r--r-- | prebuild.xml | 27 |
2 files changed, 126 insertions, 0 deletions
diff --git a/OpenSim/Tests/Clients/Assets/AssetsClient.cs b/OpenSim/Tests/Clients/Assets/AssetsClient.cs new file mode 100644 index 0000000..dd168a1 --- /dev/null +++ b/OpenSim/Tests/Clients/Assets/AssetsClient.cs | |||
@@ -0,0 +1,99 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Net; | ||
31 | using System.Text; | ||
32 | using System.Reflection; | ||
33 | using System.Threading; | ||
34 | |||
35 | using OpenMetaverse; | ||
36 | using log4net; | ||
37 | using log4net.Appender; | ||
38 | using log4net.Layout; | ||
39 | |||
40 | using OpenSim.Framework; | ||
41 | using OpenSim.Services.Interfaces; | ||
42 | using OpenSim.Services.Connectors; | ||
43 | |||
44 | namespace OpenSim.Tests.Clients.AssetsClient | ||
45 | { | ||
46 | public class AssetsClient | ||
47 | { | ||
48 | private static readonly ILog m_log = | ||
49 | LogManager.GetLogger( | ||
50 | MethodBase.GetCurrentMethod().DeclaringType); | ||
51 | |||
52 | private static int m_MaxThreadID = 0; | ||
53 | private static readonly int NREQS = 150; | ||
54 | private static int m_NReceived = 0; | ||
55 | |||
56 | public static void Main(string[] args) | ||
57 | { | ||
58 | ConsoleAppender consoleAppender = new ConsoleAppender(); | ||
59 | consoleAppender.Layout = | ||
60 | new PatternLayout("[%thread] - %message%newline"); | ||
61 | log4net.Config.BasicConfigurator.Configure(consoleAppender); | ||
62 | |||
63 | string serverURI = "http://127.0.0.1:8003"; | ||
64 | if (args.Length > 1) | ||
65 | serverURI = args[1]; | ||
66 | int max1, max2; | ||
67 | ThreadPool.GetMaxThreads(out max1, out max2); | ||
68 | m_log.InfoFormat("[ASSET CLIENT]: Connecting to {0} max threads = {1} - {2}", serverURI, max1, max2); | ||
69 | ThreadPool.GetMinThreads(out max1, out max2); | ||
70 | m_log.InfoFormat("[ASSET CLIENT]: Connecting to {0} min threads = {1} - {2}", serverURI, max1, max2); | ||
71 | ThreadPool.SetMinThreads(1, 1); | ||
72 | ThreadPool.SetMaxThreads(10, 3); | ||
73 | ServicePointManager.DefaultConnectionLimit = 12; | ||
74 | |||
75 | AssetServicesConnector m_Connector = new AssetServicesConnector(serverURI); | ||
76 | m_Connector.MaxAssetRequestConcurrency = 30; | ||
77 | |||
78 | for (int i = 0; i < NREQS; i++) | ||
79 | { | ||
80 | UUID uuid = UUID.Random(); | ||
81 | m_Connector.Get(uuid.ToString(), null, ResponseReceived); | ||
82 | m_log.InfoFormat("[ASSET CLIENT]: [{0}] requested asset {1}", i, uuid); | ||
83 | } | ||
84 | |||
85 | Thread.Sleep(20 * 1000); | ||
86 | m_log.InfoFormat("[ASSET CLIENT]: Received responses {0}", m_NReceived); | ||
87 | } | ||
88 | |||
89 | private static void ResponseReceived(string id, Object sender, AssetBase asset) | ||
90 | { | ||
91 | if (Thread.CurrentThread.ManagedThreadId > m_MaxThreadID) | ||
92 | m_MaxThreadID = Thread.CurrentThread.ManagedThreadId; | ||
93 | int max1, max2; | ||
94 | ThreadPool.GetAvailableThreads(out max1, out max2); | ||
95 | m_log.InfoFormat("[ASSET CLIENT]: Received asset {0} ({1}) ({2}-{3})", id, m_MaxThreadID, max1, max2); | ||
96 | m_NReceived++; | ||
97 | } | ||
98 | } | ||
99 | } | ||
diff --git a/prebuild.xml b/prebuild.xml index d9e32ea..c7463e4 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -2631,6 +2631,33 @@ | |||
2631 | </Project> | 2631 | </Project> |
2632 | 2632 | ||
2633 | <!-- Test Clients --> | 2633 | <!-- Test Clients --> |
2634 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.AssetClient" path="OpenSim/Tests/Clients/Assets" type="Exe"> | ||
2635 | <Configuration name="Debug"> | ||
2636 | <Options> | ||
2637 | <OutputPath>../../../../bin/</OutputPath> | ||
2638 | </Options> | ||
2639 | </Configuration> | ||
2640 | <Configuration name="Release"> | ||
2641 | <Options> | ||
2642 | <OutputPath>../../../../bin/</OutputPath> | ||
2643 | </Options> | ||
2644 | </Configuration> | ||
2645 | |||
2646 | <ReferencePath>../../../../bin/</ReferencePath> | ||
2647 | <Reference name="System"/> | ||
2648 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | ||
2649 | <Reference name="OpenMetaverse" path="../../../../bin/"/> | ||
2650 | <Reference name="OpenSim.Framework"/> | ||
2651 | <Reference name="OpenSim.Services.Interfaces"/> | ||
2652 | <Reference name="OpenSim.Services.Connectors"/> | ||
2653 | <Reference name="Nini" path="../../../../bin/"/> | ||
2654 | <Reference name="log4net" path="../../../../bin/"/> | ||
2655 | |||
2656 | <Files> | ||
2657 | <Match pattern="*.cs" recurse="true"/> | ||
2658 | </Files> | ||
2659 | </Project> | ||
2660 | |||
2634 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.GridClient" path="OpenSim/Tests/Clients/Grid" type="Exe"> | 2661 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.GridClient" path="OpenSim/Tests/Clients/Grid" type="Exe"> |
2635 | <Configuration name="Debug"> | 2662 | <Configuration name="Debug"> |
2636 | <Options> | 2663 | <Options> |