From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- .../UserStatistics/Clients_report.cs | 23 +++++-------- .../UserStatistics/Default_Report.cs | 19 +++++----- .../OptionalModules/UserStatistics/HTMLUtil.cs | 4 +-- .../OptionalModules/UserStatistics/LogLinesAJAX.cs | 12 +++---- .../UserStatistics/Prototype_distributor.cs | 2 +- .../UserStatistics/Sessions_Report.cs | 11 +++--- .../OptionalModules/UserStatistics/SimStatsAJAX.cs | 8 ++--- .../UserStatistics/WebStatsModule.cs | 40 +++++++++++----------- 8 files changed, 57 insertions(+), 62 deletions(-) (limited to 'OpenSim/Region/OptionalModules/UserStatistics') diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs index 4a6f7be..d3b97b1 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs @@ -97,9 +97,8 @@ namespace OpenSim.Region.UserStatistics sdr.Read(); totalregions = Convert.ToInt32(sdr["regcnt"]); } - sdr.Close(); - sdr.Dispose(); + cmd.Dispose(); sql = "select client_version, count(*) as cnt, avg(avg_sim_fps) as simfps from stats_session_data group by client_version order by count(*) desc LIMIT 10;"; @@ -116,20 +115,20 @@ namespace OpenSim.Region.UserStatistics udata.fps = Convert.ToSingle(sdr["simfps"]); clidata.Add(udata); totalclients += udata.count; - + } } sdr.Close(); - sdr.Dispose(); + cmd.Dispose(); if (totalregions > 1) { sql = "select region_id, client_version, count(*) as cnt, avg(avg_sim_fps) as simfps from stats_session_data group by region_id, client_version order by region_id, count(*) desc;"; cmd = new SqliteCommand(sql, dbConn); - + sdr = cmd.ExecuteReader(); - + if (sdr.HasRows) { while (sdr.Read()) @@ -143,16 +142,13 @@ namespace OpenSim.Region.UserStatistics } } sdr.Close(); - sdr.Dispose(); - - + cmd.Dispose(); } - } - + foreach (ClientVersionData cvd in cliRegData) { - + if (regionTotals.ContainsKey(cvd.region_id)) { int regiontotal = (int)regionTotals[cvd.region_id]; @@ -163,9 +159,6 @@ namespace OpenSim.Region.UserStatistics { regionTotals.Add(cvd.region_id, cvd.count); } - - - } modeldata["ClientData"] = clidata; diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs index fabe3d4..fcc7cee 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs @@ -61,7 +61,7 @@ namespace OpenSim.Region.UserStatistics Hashtable nh = new Hashtable(); nh.Add("hdata", mData); nh.Add("Reports", pParams["Reports"]); - + return nh; } @@ -76,7 +76,7 @@ namespace OpenSim.Region.UserStatistics public string rep_Default_report_view(stats_default_page_values values) { - + StringBuilder output = new StringBuilder(); @@ -105,7 +105,7 @@ TD.align_top { vertical-align: top; } "; HTMLUtil.HtmlHeaders_O(ref output); - + HTMLUtil.InsertProtoTypeAJAX(ref output); string[] ajaxUpdaterDivs = new string[3]; int[] ajaxUpdaterSeconds = new int[3]; @@ -124,7 +124,7 @@ TD.align_top { vertical-align: top; } ajaxUpdaterReportFragments[2] = "activelogajax.html"; HTMLUtil.InsertPeriodicUpdaters(ref output, ajaxUpdaterDivs, ajaxUpdaterSeconds, ajaxUpdaterReportFragments); - + output.Append(STYLESHEET); HTMLUtil.HtmlHeaders_C(ref output); HTMLUtil.AddReportLinks(ref output, values.stats_reports, ""); @@ -200,7 +200,7 @@ TD.align_top { vertical-align: top; } return output.ToString(); } - + public stats_default_page_values rep_DefaultReport_data(SqliteConnection db, List m_scene) { @@ -208,8 +208,8 @@ TD.align_top { vertical-align: top; } returnstruct.all_scenes = m_scene.ToArray(); lock (db) { - string SQL = @"SELECT COUNT(DISTINCT agent_id) as agents, COUNT(*) as sessions, AVG(avg_fps) as client_fps, - AVG(avg_sim_fps) as savg_sim_fps, AVG(avg_ping) as sav_ping, SUM(n_out_kb) as num_in_kb, + string SQL = @"SELECT COUNT(DISTINCT agent_id) as agents, COUNT(*) as sessions, AVG(avg_fps) as client_fps, + AVG(avg_sim_fps) as savg_sim_fps, AVG(avg_ping) as sav_ping, SUM(n_out_kb) as num_in_kb, SUM(n_out_pk) as num_in_packets, SUM(n_in_kb) as num_out_kb, SUM(n_in_pk) as num_out_packets, AVG(mem_use) as sav_mem_use FROM stats_session_data;"; SqliteCommand cmd = new SqliteCommand(SQL, db); @@ -227,7 +227,10 @@ TD.align_top { vertical-align: top; } returnstruct.avg_client_mem_use = Convert.ToSingle(sdr["sav_mem_use"]); } + sdr.Close(); + cmd.Dispose(); } + return returnstruct; } @@ -273,5 +276,5 @@ TD.align_top { vertical-align: top; } public Dictionary sim_stat_data; public Dictionary stats_reports; } - + } diff --git a/OpenSim/Region/OptionalModules/UserStatistics/HTMLUtil.cs b/OpenSim/Region/OptionalModules/UserStatistics/HTMLUtil.cs index c07619f..20e045a 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/HTMLUtil.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/HTMLUtil.cs @@ -95,7 +95,7 @@ namespace OpenSim.Region.UserStatistics { o.Append("\n"); } - + public static void BLOCKQUOTE_O(ref StringBuilder o, string pclass) { o.Append("ActiveLog\n"); @@ -102,13 +102,13 @@ namespace OpenSim.Region.UserStatistics } } StringBuilder replaceStr = new StringBuilder(); - //string titlecolorresults = - + //string titlecolorresults = + string formatresult = Regex.Replace(TitleColor.Replace(result[i], "$1"), "[^ABCDEFabcdef0-9]", ""); if (formatresult.Length > 6) { formatresult = formatresult.Substring(0, 6); - + } for (int j = formatresult.Length; j <= 5; j++) formatresult += "0"; @@ -116,12 +116,12 @@ namespace OpenSim.Region.UserStatistics replaceStr.Append(formatresult); replaceStr.Append("\">$3] $4
"); string repstr = replaceStr.ToString(); - + output.Append(formatopen); output.Append(webFormat.Replace(result[i], repstr)); output.Append(formatclose); } - + return output.ToString(); } diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Prototype_distributor.cs b/OpenSim/Region/OptionalModules/UserStatistics/Prototype_distributor.cs index 6f8b2aa..63dc87e 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/Prototype_distributor.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/Prototype_distributor.cs @@ -44,7 +44,7 @@ namespace OpenSim.Region.UserStatistics jsFileName = "prototype.js"; } - public Prototype_distributor(string jsName) + public Prototype_distributor(string jsName) { jsFileName = jsName; } diff --git a/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs index 0e94912..8d5434f 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs @@ -52,7 +52,7 @@ namespace OpenSim.Region.UserStatistics SqliteConnection dbConn = (SqliteConnection)pParams["DatabaseConnection"]; List lstSessions = new List(); Hashtable requestvars = (Hashtable) pParams["RequestVars"]; - + string puserUUID = string.Empty; string clientVersionString = string.Empty; @@ -113,7 +113,7 @@ namespace OpenSim.Region.UserStatistics cmd.Parameters.Add(new SqliteParameter(":client_version", clientVersionString)); SqliteDataReader sdr = cmd.ExecuteReader(); - + if (sdr.HasRows) { UUID userUUID = UUID.Zero; @@ -134,7 +134,7 @@ namespace OpenSim.Region.UserStatistics } ShortSessionData ssd = new ShortSessionData(); - + ssd.last_update = Utils.UnixTimeToDateTime((uint)Convert.ToInt32(sdr["last_updated"])); ssd.start_time = Utils.UnixTimeToDateTime((uint)Convert.ToInt32(sdr["start_time"])); ssd.session_id = UUID.Parse(sdr["session_id"].ToString()); @@ -145,8 +145,7 @@ namespace OpenSim.Region.UserStatistics } } sdr.Close(); - sdr.Dispose(); - + cmd.Dispose(); } modeldata["SessionData"] = lstSessions; return modeldata; @@ -249,7 +248,7 @@ TD.align_top { vertical-align: top; } output.Append(sesdata.client_version); HTMLUtil.TD_C(ref output); HTMLUtil.TR_C(ref output); - + } HTMLUtil.TR_O(ref output, ""); HTMLUtil.TD_O(ref output, "align_top", 1, 5); diff --git a/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs b/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs index 06d9e91..513686d 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs @@ -50,7 +50,7 @@ namespace OpenSim.Region.UserStatistics public Hashtable ProcessModel(Hashtable pParams) { List m_scene = (List)pParams["Scenes"]; - + Hashtable nh = new Hashtable(); nh.Add("hdata", m_scene); nh.Add("simstats", pParams["SimStats"]); @@ -207,9 +207,9 @@ namespace OpenSim.Region.UserStatistics HTMLUtil.TD_C(ref output); HTMLUtil.TR_C(ref output); HTMLUtil.TABLE_C(ref output); - + } - + return output.ToString(); } @@ -218,7 +218,7 @@ namespace OpenSim.Region.UserStatistics /// 
         /// {"REGIONNAME": {
         ///     "region": "REGIONNAME",
-        ///     "timeDilation": "101", 
+        ///     "timeDilation": "101",
         ///     ...     // the rest of the stat info
         ///     },
         ///  ...    // entries for each region
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
index f6772db..c15b194 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.UserStatistics
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private static SqliteConnection dbConn;
 
         /// 
@@ -67,7 +67,7 @@ namespace OpenSim.Region.UserStatistics
 
         private List m_scenes = new List();
         private Dictionary reports = new Dictionary();
-        private Dictionary m_simstatsCounters = new Dictionary(); 
+        private Dictionary m_simstatsCounters = new Dictionary();
         private const int updateStatsMod = 6;
         private int updateLogMod = 1;
         private volatile int updateLogCounter = 0;
@@ -96,7 +96,7 @@ namespace OpenSim.Region.UserStatistics
 
             //IConfig startupConfig = config.Configs["Startup"];
 
-            dbConn = new SqliteConnection("URI=file:../db/LocalUserStatistics.db,version=3");
+            dbConn = new SqliteConnection("URI=file:LocalUserStatistics.db,version=3");
             dbConn.Open();
             CreateTables(dbConn);
 
@@ -217,7 +217,7 @@ namespace OpenSim.Region.UserStatistics
                     {
                         m_loglines = readLogLines(10);
 
-                        if (updateLogCounter > 10000) 
+                        if (updateLogCounter > 10000)
                             updateLogCounter = 1;
                     }
 
@@ -228,12 +228,12 @@ namespace OpenSim.Region.UserStatistics
                         ss.ConsumeSimStats(stats);
                     }
                 }
-            } 
+            }
             catch (KeyNotFoundException)
             {
             }
         }
-        
+
         private Hashtable HandleUnknownCAPSRequest(Hashtable request)
         {
             //string regpath = request["uri"].ToString();
@@ -257,7 +257,7 @@ namespace OpenSim.Region.UserStatistics
             int response_code = 404;
             string contenttype = "text/html";
             bool jsonFormatOutput = false;
-            
+
             string strOut = string.Empty;
 
             // The request patch should be "/SStats/reportName" where 'reportName'
@@ -288,15 +288,15 @@ namespace OpenSim.Region.UserStatistics
                 repParams["SimStats"] = m_simstatsCounters;
                 repParams["LogLines"] = m_loglines;
                 repParams["Reports"] = reports;
-                
+
                 concurrencyCounter++;
 
-                if (jsonFormatOutput) 
+                if (jsonFormatOutput)
                 {
                     strOut = rep.RenderJson(rep.ProcessModel(repParams));
                     contenttype = "text/json";
                 }
-                else 
+                else
                 {
                     strOut = rep.RenderView(rep.ProcessModel(repParams));
                 }
@@ -312,7 +312,7 @@ namespace OpenSim.Region.UserStatistics
                 }
 
                 concurrencyCounter--;
-                
+
                 response_code = 200;
             }
             else
@@ -463,7 +463,7 @@ namespace OpenSim.Region.UserStatistics
                                       UUID agentID, Caps caps)
         {
 //            m_log.DebugFormat("[WEB STATS MODULE]: Received viewer starts report from {0}", agentID);
- 
+
             UpdateUserStats(ParseViewerStats(request, agentID), dbConn);
 
             return String.Empty;
@@ -525,7 +525,7 @@ namespace OpenSim.Region.UserStatistics
                     }
                 }
             }
-           
+
             usd = uid.session_data;
 
             if (message.Type != OSDType.Map)
@@ -747,16 +747,16 @@ namespace OpenSim.Region.UserStatistics
             );";
 
         private const string SQL_STATS_TABLE_INSERT = @"INSERT OR REPLACE INTO stats_session_data (
-session_id, agent_id, region_id, last_updated, remote_ip, name_f, name_l, avg_agents_in_view, min_agents_in_view, max_agents_in_view, 
-mode_agents_in_view, avg_fps, min_fps, max_fps, mode_fps, a_language, mem_use, meters_traveled, avg_ping, min_ping, max_ping, mode_ping, 
+session_id, agent_id, region_id, last_updated, remote_ip, name_f, name_l, avg_agents_in_view, min_agents_in_view, max_agents_in_view,
+mode_agents_in_view, avg_fps, min_fps, max_fps, mode_fps, a_language, mem_use, meters_traveled, avg_ping, min_ping, max_ping, mode_ping,
 regions_visited, run_time, avg_sim_fps, min_sim_fps, max_sim_fps, mode_sim_fps, start_time, client_version, s_cpu, s_gpu, s_os, s_ram,
 d_object_kb, d_texture_kb, d_world_kb, n_in_kb, n_in_pk, n_out_kb, n_out_pk, f_dropped, f_failed_resends, f_invalid, f_off_circuit,
 f_resent, f_send_packet
 )
 VALUES
 (
-:session_id, :agent_id, :region_id, :last_updated, :remote_ip, :name_f, :name_l, :avg_agents_in_view, :min_agents_in_view, :max_agents_in_view, 
-:mode_agents_in_view, :avg_fps, :min_fps, :max_fps, :mode_fps, :a_language, :mem_use, :meters_traveled, :avg_ping, :min_ping, :max_ping, :mode_ping, 
+:session_id, :agent_id, :region_id, :last_updated, :remote_ip, :name_f, :name_l, :avg_agents_in_view, :min_agents_in_view, :max_agents_in_view,
+:mode_agents_in_view, :avg_fps, :min_fps, :max_fps, :mode_fps, :a_language, :mem_use, :meters_traveled, :avg_ping, :min_ping, :max_ping, :mode_ping,
 :regions_visited, :run_time, :avg_sim_fps, :min_sim_fps, :max_sim_fps, :mode_sim_fps, :start_time, :client_version, :s_cpu, :s_gpu, :s_os, :s_ram,
 :d_object_kb, :d_texture_kb, :d_world_kb, :n_in_kb, :n_in_pk, :n_out_kb, :n_out_pk, :f_dropped, :f_failed_resends, :f_invalid, :f_off_circuit,
 :f_resent, :f_send_packet
@@ -980,7 +980,7 @@ VALUES
 
             if ((srtArr[srtArr.Length - 1]) == 0 || (srtArr[srtArr.Length - 1]) == 1)
                 return 0;
-           
+
             float freqtest = (float)freq.Length / freq.Rank;
 
             for (i = 0; i < freqtest; i++)
@@ -1116,7 +1116,7 @@ VALUES
         public List _sim_fps;
         public List _agents_in_view;
     }
-  
+
     #endregion
 
     public class USimStatsData
@@ -1197,7 +1197,7 @@ VALUES
             m_pendingDownloads = stats.StatsBlock[17].StatValue;
             m_pendingUploads = stats.StatsBlock[18].StatValue;
             m_activeScripts = stats.StatsBlock[19].StatValue;
-            m_scriptLinesPerSecond = stats.StatsBlock[20].StatValue;
+            m_scriptLinesPerSecond = stats.ExtraStatsBlock[0].StatValue;
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.1