From c98f4d015826875b3692dc93a55158083ab25f0e Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 27 Nov 2018 13:40:09 +0000 Subject: [PATCH] remove unmaintaned and obsolete GlynnTucker.Cache --- .../Asset/GlynnTuckerAssetCache.cs | 172 ------------------ bin/GlynnTucker.Cache.dll | Bin 22016 -> 0 bytes bin/config-include/GridCommon.ini.example | 2 - .../StandaloneCommon.ini.example | 2 - prebuild.xml | 2 - 5 files changed, 178 deletions(-) delete mode 100644 OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs delete mode 100755 bin/GlynnTucker.Cache.dll diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs deleted file mode 100644 index abe9b23770..0000000000 --- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using log4net; -using System; -using System.IO; -using System.Collections.Generic; -using System.Reflection; -using GlynnTucker.Cache; -using Mono.Addins; -using Nini.Config; -using OpenSim.Framework; -using OpenSim.Region.Framework.Interfaces; -using OpenSim.Region.Framework.Scenes; -using OpenSim.Services.Interfaces; - -namespace OpenSim.Region.CoreModules.Asset -{ - [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GlynnTuckerAssetCache")] - public class GlynnTuckerAssetCache : ISharedRegionModule, IAssetCache - { - private static readonly ILog m_log = - LogManager.GetLogger( - MethodBase.GetCurrentMethod().DeclaringType); - - private bool m_Enabled; - private ICache m_Cache; - private ulong m_Hits; - private ulong m_Requests; - - // Instrumentation - private uint m_DebugRate; - - public Type ReplaceableInterface - { - get { return null; } - } - - public string Name - { - get { return "GlynnTuckerAssetCache"; } - } - - public void Initialise(IConfigSource source) - { - IConfig moduleConfig = source.Configs["Modules"]; - - if (moduleConfig != null) - { - string name = moduleConfig.GetString("AssetCaching"); - //m_log.DebugFormat("[ASSET CACHE] name = {0} (this module's name: {1}). Sync? ", name, Name, m_Cache.IsSynchronized); - - if (name == Name) - { - m_Cache = new GlynnTucker.Cache.SimpleMemoryCache(); - m_Enabled = true; - - m_log.Info("[ASSET CACHE]: GlynnTucker asset cache enabled"); - - // Instrumentation - IConfig cacheConfig = source.Configs["AssetCache"]; - if (cacheConfig != null) - m_DebugRate = (uint)cacheConfig.GetInt("DebugRate", 0); - } - } - } - - public void PostInitialise() - { - } - - public void Close() - { - } - - public void AddRegion(Scene scene) - { - if (m_Enabled) - scene.RegisterModuleInterface(this); - } - - public void RemoveRegion(Scene scene) - { - } - - public void RegionLoaded(Scene scene) - { - } - - //////////////////////////////////////////////////////////// - // IAssetCache - // - - public bool Check(string id) - { - return m_Cache.Contains(id); - } - - public void Cache(AssetBase asset) - { - if (asset != null) - m_Cache.AddOrUpdate(asset.ID, asset); - } - - public void CacheNegative(string id) - { - // We don't do negative caching - } - - public bool Get(string id, out AssetBase asset) - { - Object a = null; - m_Cache.TryGet(id, out a); - - Debug(a); - - asset = (AssetBase)a; - return true; - } - - public void Expire(string id) - { - Object asset = null; - if (m_Cache.TryGet(id, out asset)) - m_Cache.Remove(id); - } - - public void Clear() - { - m_Cache.Clear(); - } - - private void Debug(Object asset) - { - // Temporary instrumentation to measure the hit/miss rate - if (m_DebugRate > 0) - { - ++m_Requests; - if (asset != null) - ++m_Hits; - - if ((m_Requests % m_DebugRate) == 0) - m_log.DebugFormat("[ASSET CACHE]: Hit Rate {0} / {1} == {2}%", m_Hits, m_Requests, ((float)m_Hits / (float)m_Requests) * 100.0f); - } - // End instrumentation - } - } -} diff --git a/bin/GlynnTucker.Cache.dll b/bin/GlynnTucker.Cache.dll deleted file mode 100755 index c6ab8d59ca93689453f48619c84e372feaa4145c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22016 zcmeHv4R}=7dFFS2=FZI3kI?`USc*NE9}5{2@gtB3#>kQYVg4lnwn<>nT#13vTybZF z5d>R)LR^#BZsIseNwZ#?C5_$IO|wqexCu#6XWBpKV&N zz3=y(duOgBP|OzRdHQTGKIfkAobP;p=R4o|nJaI;>l0)Uk%{!qJ49c@o1e9kPo0gT zx$?%}tE8{Q|76bBv`v39r{_Q>pB(bs0WUR}>`UcxZXvnfNqWP%WG0vF*xH>Obkj~_ zMTI@jC%vtcXp?5pL*H7lA>j5ZRn95XETS!_VZr!G`e_tzmM)2xUTO}|==W7Ua?y)u zn*3LK`yeCWnUy5k%7sy)pRpk(K2H#pPpo?v@U$dREQFT^TvQPCjRogu0q@dOcX%4bz)UYW5lDA(%ai%&Z>8@SAyL_9%>OdcYm3j}Tc4?&WqDmG&rLvjKgt zzn8Ha=muT7HLTOWhbEoz?RvPb1*F<0n|1*ggsKd#vvaz{%scOqb7rUlx3~o$gWn9m_T^qF*q7Bqmr-r%~E$>I#h{Ra@)HapVCcGhi zRZW;H5XNzx2_#<%_>b*YAZtM{s>_24aSmfei&&KsU&wf?E?(Yol5T6 zKp7`h#D!HL?$wAAmZJj%q0A&XFgdPLj;lAx)N;(E(~t`@bt*a7B|`SF)tF-TkcE*% zOt#9#I5Jy?i-~8q@-l%kyvAApjB#VSQ?TE?ArTSAkLd}(4ZxL64Uj^ks>aT4sYdm?oo+lhfq!wFxE*PtpMMZ_h{02h z4YLeM;sUm>&LAKV$iefTV;OHL!anjLz=&&8$uY?ySnIBGWX8+E_CTN;CkNXDQ)enU zCfWmXy*KuNt)`M=l0A4vU+utz$K`VN*b94L-I_{{$*afRS1(9d4qj3@sD=H5<$w=g zog90vy&U@>2UfqSMgI8VU$b{{2rS%C*?N!QwS#}NO=+|ZUdIAfIskXYhaRQ4s zZ&+)aX3~Fyt*{fQGFI_OdYEcMc{q!G%&cC`+e;5-8S?U64V&4=4EK7xYSu{G7r0Hj zV5^BPhKrr2eVerXoZGl_UfOgQFRW;cVBWb#m^m6+-^V@m<1CVU1IlGBJT_7HMwD${ z9FyF`l8Cl@njUrM0A6+Bop;_D<1K1*7*k!Fzt~#Pf~^#}H=*@HD5ic4m5oSzhGl$y zYMaVrPYf9GJ;b}bg+-4E?=mZ@c-k?=^0k0v>~bu5Zy)#rViV0rT80$xwDkt?t)}Nu z2Z^inYkuTS%_57R-{sCi;BoT9GiMYb%=z<$Cm+ z--?_pcOlAqTVQIxJinFoT97c`o(VhGR+%keKqS0KnE7Ts9q4#jvnrXVM-ma?R^0Qm zeGeo3N2EaC>9Fw@zzBfQRYrF%q@M@GUG8w( zUqU4PIJ>WvhflDb4;CF6tC6XjdDPh_Y?Rr?3n``H3@?1SJvj{~b>VOrY2>Dzp!!(R0v!;CPw2))T#Of@z&z=`Jj04kF zwA>{q*4znEFhNP58B%J7kb`s^OXRGCCEAGl=m3~f&F)gK7T}WZCSmgOu_~0uAQMc% zCUq-;e1VTXMW1H}Ylq#tkr4sbLloYP_b|;(3W4x2nd|Og~s*?_;nCpk4yF27TnIt!;H4uicFVkcNL0k zH}+#r_6+vf8|ih_VZv6`e*kqg?rQ15MC)%waTRz_gMOTabJw84y$xAe%PCaD3D*L! zEjI;{rrQRf9@_-FwI8keaaJ?=Aas$7g)xo_ARiw}posf@}cFszV$^Fw|Vpg^CM)AJJwbS3vK!G*|)W zek9C(`T|nmHz>;96CKDwVv*sV8slSTN}PEKZ|1=d*E7y}q`yK6=+rh{N1p|ZB?i7F zBHsb_c0zl5CeAvV)ylIdY@zGWTqcV^xE6C8!^b{ixSLQ8CObw3y`|oCH=_YF7NM8M zSRtzwgXI(VZxLG9H+?~Dpz{n0){M1iT7q;KiM#Vt+f+rrjW?FXYal-ltKlLh`|?+e z?Eq~flHUtq%he#qOm`~~ln)p&cN;5Jadk??i|fK#(1!=n14t8fLMVSPb=vpK)u~MG zi<3p2)O^Em+q&VxbuC$db?jyk53B{aLYo7dFkH`YjUA4#;;0f~5g-EpK&AKxW_QTH z%j9eXTD~nO^M!XZp9sewVSH0i0Z*Nh^Z3}l4BZejCh-QjU(6dpZ#-`VfPWQlTV#Pa z<7Tg#rxGK#7rmJ8o&4F$w_*0A05;yn3qTVAKBT8D_oY|{ChHlB39H1=5sE^}`_|9`i_NVL+p^+7?9H0Gp%2)jM?s1Cw-V?eD=3s<4DEF|X_&A%s zi#lw)rqs=kWY7=+qzB9@#vVntaEO$^>4yy!W7tuHieB^yB8~rx1V@B1=;X5uE@i_*DH_KymRQ7jJ?KD!iRd?wxFqE92}oX`MjGg~-ZoyP!7Q z0j4OLWecj*c2KMlww5wXP_qt*93-%*brjdRN zY2tYQ4(h&%RI1z)%$`Zhz6$P@t(LjI3?|&g?NKh@KgxfZv5c0 zHA535jHp&?>^ho22mAZ0+|0_c0vs{tRiNeIV?=75nT%@Cu^vHQ(n=w9lDY4_ENT zOtl(A7jx4-GrvZSJiD`fhA)&P=7w++mU@1*jr%#_x|n* z^J|K`tBLEgD6t!2m$mR&9LJzL0Xzh>THC-0?JhuO4KB0Lg0ru^>c59hOnXpq!8g+f zQLbpgagyRLM6k;ZY|x9ntV1ej=h@8`Hiq)$pcumGx<*O z0KO~2TFSp0SIxjV_CshZvs|1@__a^HYWNl9Gp>!LnO5nBoaoGYoFw2y2gkv<6FLCI z6V-4hbtlvhnX!6fuEH&^@=l1URJ$1v{C~O=`dc>1aV9e1PDm)u0om3ij1tBv-3bZO zK_EQ@@wF4M`&C>FF;n*tI$!&XAw=M*E{1}&1x`;JVEf%jfzPbdkFy#htk7Z3FrL$! z48AAgyIPFV_-4Lz$wCRB74fh;ye!_Jk5`NPo@Ky?A6NO;g|=0nLn}6W>`Nz*;qFkC zv9U78uze$|ek0m&K@rFgN0xmv;tVkYKebIU`Mv?8R;342k25`)k?O2>oM{RyCjorG z!Rm*ZjQd@d=h-48Y+plsq8#67>0~}I6LuHEf{S6YCE1xK?z;$QmmS*-?$SWbfyRYDr>G<`glUaIPcf!uI=_r}{b|LZ7rpd(8gn;M&& zRxVu$fFgu(qitAl=H5&6`*@!$L%F-)WpV@11?Qj}i2e!u=Js~e>YMN_M+D{DvwVD{ zZ``cTLvz>nc6Bha|6r{+qYcxHI#Pj1Y60N zLk+&SLTAibB<|1T7)GxM!!QEb=w$)(7Ub*jWmFj*koxYmlD{PNKa~0kgYmC7 znA&oqPP1tZYHS)X1`V5zBe&>DgXQ@>$^QcRagqO1^gp1eMQ@_7P5&a8H=9hS3;A)s zb=bTG8(hEuF;tFEb@!i*L9OFSqt=T!Ph7mO&BIEie8U=O>_=&)!GwH8w$q| zItKMc2MmL}=pp3yMGJ;TpNyVB{#o>5I`d48ek<07{5i>g8tX&(Ut$N4SH=$^za>7$ z_*oKy(*v_+iIx6ApsHCBYYC)lnZs?LiIrQ;fY$oZO;#(Q4GN+))*4->Jw>QpH|T;7 z-Ho;gZM#XR&;dXeJ>^430Yxc2SGB!Dd-NF9%?qFby^PKlp~L!hv}nF+`=Yf+pH7#G z&;TrYls8v6;eF9MtRwPa)-!ZoJEq@25Bbou)~KGO8TG2|IqQ@@hd%E^Z)%^y&mi+S zjH6#a`pu)?_M!9E$YHV96%}W&hSbH)$qP5ZiA9_A|Qu_d9 zedvEi&(Ufc66k)ai9KMfrvJK>`@OEcLXR73=s_%;3OZ}7r9HfyOWQf4otii}0{Wu$ zxUr6&Dne(C4K!~>(00zagP!oA_iGw{MJ<cymZl*e`kcwo=Y6Ov_Bf^K2_M=m&{+kE7o=&? zT1AD&y`P$Vh{wI3mMaM3J_Kk;p!?}SOapXQAohYnm^PIQo)D*6#Nd-=Y8lBJmerfFA#f3r+JW)?b1&?D@zah5PMdZE+{C@RI>Cl zA7Uz5ddr8HUzYZDDDLcoSuWyvA;R7hhRzx})g*1_jKf8Uy$AaUd0vQo(K>4!2|?$K zks`!C@!3JW@#UBUsk`JAX-)lZfFDr=7#x=CXI+^9` z+H2-1wDJ1YVsYM8%yrscEQjk=S*HikYJ_@)YfSoBvG4f$PhYlvGR=2SAuOBXb)_0^ z)vqY?)yps@y8LhCI{hChUy^b%%9dpN=)QfptkKFC*Q`N4xm95rzTHZF4N?{>)r9*_ zjju4nc~~A@cm*S<=rgZy4foZ@X)&Gx`^=SP2wUbc(Op?4Tz*mNfACAT$$PK6vL}vy z#j(Ck%Fo0Ntjh*D*x&bJS2qu74pK9cgI#4W&UCFvz1Z`&BK1-n?Qyin(QebX@#dXV zx#Y9`@)7JD7h*>+2YvoCZsBJGuMs#uz^SvGUP0|_`U!f?rhkJR3Kk#|A%nhc!XE=?KV3ww(H_aul5eN&MqK+j$`zWX z&B9gU&*@iv`fmT0wR zN^8@Wn1{4G=~gpKUD|fj#k$Nk+#`8GG%bjxv$ea;f;OA>nU6!NAJ72uS7-$IJVtwD zjM9?tk#R{&e$mf)_mPIaZNTLGBIuulY;S6(v=2k7Piv>>r1>n$ydHm8I9^2S5Nyt? zejBuS4*huN5Ep4Lij~rS&i->zaP|P_o7zRedEAT|0Oh~&YyZ}G%UEnQo6Y8Ca|hCH^CRXr4ISF^1%io)5kbU=;@lX+jX)eH zL>sf0=#Q;0=|s<3mVujtsExcTT8Vs<@jSb4Vt2dA$cuy(Ge%2$lnKDbh-&Q z7dmbmE1>T(x(?-~$TdWTD&)=3Sf>x*mR-jv*C4+Yx?^?4{hUr~K|_bv--vuYqN0w! z3Y?3)3pZ9eZN`C3$G(3d@~yZh(eZ86V$j@;`*sa6ZwYEr;Hkq?o00e7M5JSn-3l2u zU^YZ>5|1O_M0enq(UbHEIzwNguhaMGhx8-Nqo3n^-=*!)p45I*`y=i9+K)7Il-Ggq z!)JI5Qt{zC1AfAFm!K&>7WhVyVn}%8&;PQS{j_!eL8q@k-6Q#eGf0hn1=pjFOkW}6 z=2G6szNLOkW4oKp0uj~u#`R9l@iKk1!%3wbZXQb4T z2AslP)a0pWWXPc%!?{9c(BbliR4$!$XuVTlXr1Q{`ZaCfcqGL#wS#2A>B{8`sa&5! zZGDG_GoBOT-R|ZJ_`}9L7~nIuG=$4KseBm2@1vv^d0C(?*1M~ua-c*>?mV@FlowD8 z^=BgOu6rosQ11}_k~Z!1xFL~tID_sHhdSJQa?;3(g_?VyefLl*M_k|S^triop425F zL7To*f$g`&Ev$2gbLq~bea;ZupW8%J>MF@7wrvMqA*@ShZg|k~#D1`C2x{{N(2^@` z8O~-)goE0x!-cK=J5sp;C*0?Ppl7j@fmGM<#(pC z!;Ww*mAdlXBe}ih6ejdbQPC#f_J)PdQ<5{%=IQOpaE?#w_gm6djP2*a4q z_Z)y@mXv4xHlsQ(T=|lXJ5>_7$R}&O_?0%AI%hmW>>y6Q#Lr+G&{45!M0S! z_L0l=3hoF{p)QOKE*} zB$w+M?mOgojqRzv0}id;?52ma&YH;Ni3=UTYh^y?4{r_B;0OYU}EuKE}w?-n7%7 z8qO9vj}B$L5gAg1&a@gJ4$>SxFvIc)_7d&cTpg48uwzZGJtDIS;ngQXeTtZ3E@53_ zWzfuT4$1+nB4Pj?f({OgDKm}on0Ht-L~vCDMq9n!p)`CKVsmg?k0}cG=9gbTS;)T9 zQbie=>g3%c@jm5o5W^DU6}ob1=P0J8?{*VHf>R8fdFoTqDl`~=jlXmjqgh+~hR(g) zdUvev+`Hi}Qmb3K8xxWzO@T-5a)1(qn>|RoZP**&g;TA^<5u0!8r8@P+%G`!7oW>v z`KlmJVkr+V3(Vb7p4K)rl+9oX8W#fd4y@+k49VUh3nx2|n&?||Sv4iQ^6N53p(|o5 z^}CpSyuiX;{Ry3?5Ple!=PE{6&1iOS6&>ItA=8TkhG4XIyTcxK1k&P{u`u$~mteiO zYT90|8OG0zOm5ibA>8&ACO7a#z{?CAxJ*+I@2Un<-l0-24DQZMJ_GkH z)diZUS=Wew?|AM|x8ohjz>2hfIFl|R2YRf_WSyOkmxqs+8vSjlcu*m;Ka<5WTWX!a zhp|A!D>B*!uN!RRFjMN|M<}cd`yH=TP1mI{llpN=7{-k=?v87F@GGT5Nt_j2%Av-= z@7x8z_%Uei&3MBVcg z6F*QLdUsM}(KnBONl11;c&HLf$Za{?e{f3@v{?==b6ZJb$Upk0%BUQ)l47c`@z{*R zAj3rR_|ZNE(=%Q_4Cg|4uAOW~X62$SV927R0bfas0H3Mz&<-M{!HWl&#m(X$%f|4a zD4YSs68%1riNP+A#*Wk2Lbg7q$eIrTf04+_W0w^jgXzF+Y?FI{r|ik{W+6cz928ue?*PUK>Vh6@ znPEUYepj+O-O&ZAJT?>MWLKN)S1I7NL$^M0$e^#{%x7;SNm}f`9NV*V_VQOxMQ0}B zdSzmsourwGD*Q-19UmNMiJ4Wiahk77%rujl7K!KCNm# zkgFC}SY%Y<;Xa({bzl`Ulay$Upl@YmjG1gkUu$M!yOwB1lax23Yyl(D8AA^ptsg`U z7)+-afRsW_^hRb@Wi%c2Xow?cDnejT^BaBiUXZC%WO~D@j_8T{I#IbUQ4gF77PW$f ztDD7|Bu4MY^+aOyqYPAyo-*<0Wp!mN_2?(XHe9Y6{j`*0QVW7HsX`%=q^i-=xcJfW z!hhgU2@)^{GPHtC9XLv+3EisEr$cm~@#%7{Pxl!vNKY|jvl8aZf(Qknc&oAyObq5< zRZ6!)3-FI(h#<&9XcI#LtYb0r4cuLs{MWDey@H=hx0(ERfVvf96&B#_ z8sBwkNO4wzGriJ+hLwq#k*J=Sr<+k-*R80bSIx(l3Wi=;S7$^uJ&r3(6u}mkno?Sb z+c6YC0e5mycope&m5f^#fycF0no;CYp)jpZI#t$HEi_^jk17?LArLzN56=4%%{JIK zvp*%8%c4dsDBlpZf}&tg$nfXI?@RQ?K$cS-lJ1l5Rpev3RTpDttN`AeXq5Y7gpui` zVyP63Y66r;L(RHX0Rs-RLB-{iW!dMf#0ltGwU8%MU1IbyXp|*}|8Bb%hIy9rOunx0GuY>h`1icakP#1Tq!!(4+=G2)n zxL`DznCw(;%V;6%Ctt@_GPGSy^S(2$HbsL%_(Tx90 z3o_}JZdkse0C|2xLQMIpg+fi-u}(;y2KTCk)f!bzJ|j~^V=rBx(Hv<^suOe)o4`Dd znK-N@J99X*IM_%L;j7AJ#ob);J5MKnVV~sErY3wX!GSp;>#l^4o&SYUav=lv)zyZqpH7UVr>{XgA@0e?M}<_J)7y*oL0Gxr^4+eGQZqsf~i4{w&Jq*2LcSJr2f*d!Rw4$#4Ui)b@6&JW%VtvVTNHHPZkQ2;f9 z=KQ^R40a3nO!NT4$)yoEL1K@r2L4vxt~`#cThN~& - -