aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (unfollow)
Commit message (Collapse)AuthorFilesLines
2012-03-16minor: reuse threadpool count we just fetched instead of fetching it againJustin Clark-Casey (justincc)1-1/+1
2012-03-16Add total scripts count to "show threads"Justin Clark-Casey (justincc)1-2/+10
However, this returns 0 on Mono (at least on 2.6.7)! So not showing if it is zero.
2012-03-16Improve threadpool reporting to "show threads" console command (also gets ↵Justin Clark-Casey (justincc)1-6/+2
printed out periodically)
2012-03-08Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)1-10/+10
<category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
2012-02-29Flick master up to 0.7.4Justin Clark-Casey (justincc)1-1/+1
2012-02-24Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually ↵Justin Clark-Casey (justincc)1-1/+1
returns and for consistency.
2012-02-24Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)1-0/+2
On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
2012-02-18On Windows automatically load the correct native ODE library depending on ↵Justin Clark-Casey (justincc)1-1/+3
whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works.
2012-01-31Use Environment.TickCount & Int32.MaxValue; instead of ↵Justin Clark-Casey (justincc)1-1/+1
Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound. This matches the tickcount masking in the thread watchdog. For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
2011-12-07Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2-11/+5
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
2011-12-05Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)12-15/+210
of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-11-29On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)1-1/+3
2011-11-29With "debug http 1", show the path with the query string instead of just the ↵Justin Clark-Casey (justincc)1-21/+21
path. Also simplifies debug levels to just 0 and 1
2011-11-29Add "debug http" command for currently simple extra debug logging of ↵Justin Clark-Casey (justincc)1-12/+43
non-event queue inbound http requests to a simulator
2011-11-15fix build break on UserManagementModule.Justin Clark-Casey (justincc)1-4/+8
This also adds time since started to "show threads". Unfortunately these two changes got mixed in.
2011-11-15improve formatting of "show threads"Justin Clark-Casey (justincc)1-1/+8
2011-11-15send a watchdog heartbeat for a poll worker thread when it's actually runJustin Clark-Casey (justincc)1-0/+3
2011-11-15Add number of milliseconds since last update to "show threads"Justin Clark-Casey (justincc)1-3/+7
2011-11-07Remove unused avariable in PollServiceRequestManagerJustin Clark-Casey (justincc)1-8/+6
2011-10-25Restart the event queue worker threads that I accidentally disabled earlier ↵Justin Clark-Casey (justincc)1-7/+9
today in 8a0a78c. Also adds these to the watchdogs with very large timeouts (should really be infinite)
2011-10-25minor: add "threads show" as synonym for "show threads" for consistencyJustin Clark-Casey (justincc)1-0/+5
2011-10-25Add "threads abort <thread-id>" simulator console command that allows us to ↵Justin Clark-Casey (justincc)1-0/+25
abort a watchdog managed thread. This is for diagnostic purposes.
2011-10-25Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)4-19/+106
of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
2011-10-24Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()Justin Clark-Casey (justincc)1-12/+2
Remove() presumably does this check anyway since it just returns false if the key is not in the collection.
2011-10-24Fix bugs in EventQueueGetModule.ClientClosed() and ↵Justin Clark-Casey (justincc)2-5/+9
BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler Actually doing the tear down appear to have no ill effects with region crossing and teleport.
2011-10-12Adjust CM version tagMelanie1-1/+1
2011-10-07flip master version up to 0.7.3Justin Clark-Casey (justincc)1-1/+1
2011-09-30Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵Justin Clark-Casey (justincc)1-1/+1
allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled
2011-08-22read m_rpcHandlersKeepAlive under appropriate lockJustin Clark-Casey (justincc)1-2/+4
2011-08-22oops, fix build break from last commitJustin Clark-Casey (justincc)1-12/+8
2011-08-22improve locking of m_agentHandlers in BaseHttpServerJustin Clark-Casey (justincc)1-10/+10
2011-08-22improve locking of m_HTTPHandlers in BaseHttpServerJustin Clark-Casey (justincc)1-2/+2
2011-08-22improve locking of m_streamHandlers in BaseHttpServerJustin Clark-Casey (justincc)1-2/+4
2011-08-22remove necessity to catch a KeyNotFoundException in ↵Justin Clark-Casey (justincc)1-11/+6
BaseHttpServer.RemoveLLSDHandler()
2011-08-22improve locking of m_llsdHandlers in BaseHttpServerJustin Clark-Casey (justincc)1-30/+32
2011-08-22minor: remove mono compiler warningJustin Clark-Casey (justincc)1-3/+3
2011-08-22improve locking of m_rpcHandlers in BaseHttpServerJustin Clark-Casey (justincc)1-1/+2
2011-07-01Make default serverside_object_permissions = true since this better matches ↵Justin Clark-Casey (justincc)1-11/+0
user expectations. It also matches the default setting in the OpenSim.ini.example file
2011-07-01If OpenSim has been built from a git tree, then include version information ↵Justin Clark-Casey (justincc)1-4/+39
automatically by dereferencing .git/HEAD A blank bin/.version file will stop this being displayed.
2011-07-01refactor: rename gitCommitFileName to manualVersionFileName since ↵Justin Clark-Casey (justincc)1-5/+4
bin/.version doesn't necessary have to be a git hash
2011-06-12First pass at making the V2 map work. Standalones only for now. There are ↵Diva Canto1-2/+2
some issues with the zoom level -- TBD.
2011-05-26Some additional protection, it seems that responsedata needs to be locked, ↵Tom1-5/+14
but I can't immediately see where it's being accessed from another thread. For now, this will protect the server
2011-05-17If a response cannot be obtained (the script has no handler) return a more ↵Tom1-4/+18
friendly 500 error instead of crashing out with a null reference and letting the connection hang
2011-05-05Adding ssl supportBlueWall1-0/+14
Adding ssl support for "Out of Band" applications such as the remote admin module or Robust services
2011-04-24Upped VERSION_NUMBER in master to 0.7.2.Diva Canto1-1/+1
2011-04-20Get Viewer 2 voice working with OpenSim.Justin Clark-Casey (justincc)1-1/+1
See http://opensimulator.org/mantis/view.php?id=5336 It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop. Viewer 1 was quite happy to ignore the lack of response. This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work. However, at some point we need to fill out the watcher response, whatever that is.
2011-04-12Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵Diva Canto3-445/+0
OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
2011-04-07Revert master version number to 0.7.1 for now to make merging easier.Justin Clark-Casey (justincc)1-1/+1
2011-04-06bump main branch version number to 0.7.2. A separate 0.7.1-post-fixes ↵Justin Clark-Casey (justincc)1-1/+1
branch now exists.
2011-03-17Thanks Kevin Cozens for a patch that:BlueWall1-1/+1
Fixes several spelling mistakes