Commit Graph

74 Commits (53d5aeec2459b5788da9882f651ed33d3138a753)

Author SHA1 Message Date
Justin Clarke Casey 53d5aeec24 * Remove unused texture dictionaries from AssetCache
* Add documentation to AssetCache
2008-02-20 19:02:04 +00:00
Justin Clarke Casey c66b5a9e71 Report command string on ConsoleBase.RunCommand exception 2008-02-20 17:54:14 +00:00
Justin Clarke Casey 877713999c * Report 'asset not found' situations back to UserTextureDownloadService
* This fixes some of the 'runaway downloads' problem but not all of it
* Also fix up logging messages so texture requests are reported as such rather than as assets
2008-02-20 17:34:10 +00:00
lbsa71 4c6e5a5090 * re-enabled AssetNotFound code
* turned script asset fetching asynchronous
2008-02-20 13:11:19 +00:00
lbsa71 9be5f9d6cc * Fixed xml loading bug (the xml was scheduled for update before added to a scene)
* Fixed ClickAction situation on the same note (properties shouldn't cause big changes)
* Added some more debug output to AssetCache
2008-02-20 09:38:45 +00:00
Tedd Hansen 47c909ca0a Playing "Name that thread". Adding names and isbackground=true to all threads so it will be easier to debug. 2008-02-19 12:02:53 +00:00
Jeff Ames 001ce95e4c Clean up more unnecessary String.Format calls 2008-02-13 03:38:18 +00:00
Jeff Ames e207284fef Clean up logging calls using String.Format explicitly 2008-02-10 01:57:59 +00:00
lbsa71 e9eaf8e949 * fixed typo. thanks, nebadon! 2008-02-09 22:26:28 +00:00
lbsa71 7486762aa0 * Refactored some asset code and in the process uncovered a bug; now, I think first transfer of asset should start faster. 2008-02-09 22:23:36 +00:00
lbsa71 0b0bb28fd5 * added count of texture data bytes and asset bytes 2008-02-09 21:50:45 +00:00
lbsa71 e2ed5bf6b9 * Added count of temporary assets 2008-02-09 21:25:34 +00:00
lbsa71 176a1fe382 * added two new commands (for debug/disaster recovery)
'show assets' shows the current state of the asset cache (number of cached assets, requests, et c)
  'clear-assets' forcibly re-initializes the asset cache thereby freeing all cached items.

'clear-assets' is not to be used lightly, as it probably introduces mem inconsistencies and doubling up of textures.
2008-02-09 21:17:47 +00:00
Sean Dague 598c5a95d9 fix the issue found on IRC this morning. The logging call was mistructured
so threw and exception when attempting to log that we missed an asset and
were waiting for it.
2008-02-08 15:29:53 +00:00
Jeff Ames 6ed5283bc0 Converted logging to use log4net.
Changed LogBase to ConsoleBase, which handles console I/O.
This is mostly an in-place conversion, so lots of refactoring can still be done.
2008-02-05 19:44:27 +00:00
Adam Frisby 35a8c95e1d * Lowered maxchunk from 1500 bytes to 1250 bytes to make sure packets fit below the average maximum MTU of 1500 bytes inc. header. Thanks Alex for reporting this. 2008-02-04 10:28:39 +00:00
Justin Clarke Casey a4bf98f4ba * Add asset/texture cache statistics to region server console
* You can type 'stats' at the REGION# prompt to get this information in grid or standalone mode
* Don't take these numbers as gospel yet, since for some reason textures displayed from inventory which require downloading from the server are being recorded as assets 
rather than textures
* But I don't have any reason to believe they aren't broadly accurate.
* I've put these in so I can tell whether the high memory usage on regions is down to the asset/texture cache
* This will require a prebuild
* DEV: Only adds needed to be implemented since, as far as I can tell, assets cached are currently never released.  For my part, seeing large cache memory numbers will 
provoke me to think about doing something about this.
* DEV: Now switched to using a singleton to get the stats reporters rather than threading the object through various layers
* DEV: Will refactor the other server stats reporters to do this in one of the next commits
2008-01-31 00:42:31 +00:00
Adam Frisby b25f9f322c * Mother of all commits:
* Cleaned up copyright notices in AssemblyInfo.cs's
* Added Copyright headers to a bunch of files missing them
* Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate.
2008-01-15 02:09:55 +00:00
Jeff Ames 5a6fd21a2c Whitespace cleanup. 2008-01-10 06:49:29 +00:00
lbsa71 4b4ee98070 * Trying to address TextureSender issues
* The BlockingQueue exposes Contains so we can make sure we don't add a TextureSender to the queue if there's already one present
* introduced some TryGetValue and various code convention stuff
2008-01-02 09:07:11 +00:00
lbsa71 efd90b56b7 * Optimized usings
* shortened references
* Removed redundant 'this'
* Normalized EOF
2007-12-27 21:41:48 +00:00
Justin Clarke Casey c470efea57 Make copying of scripts into prim inventories more reliable on the first attempt when the asset server is lagging by formalising the de facto polling.
This may not be the best solution in the long run, but should improve things for now.
This may also improve reliability when updating inventory item metadata (e.g. renaming an item) and in retrieving textures
for the main map view.
2007-12-22 19:48:01 +00:00
Justin Clarke Casey ed0f8bd572 minor refactor 2007-12-22 16:45:44 +00:00
Jeff Ames 6702b03733 Misc. cleanup:
* added Util.Clip(value, min, max)
* modified asset cache's numPackets calculation to use max packet size (600) instead of 1000
* removed a few magic numbers
2007-12-19 08:44:25 +00:00
Charles Krinke 4e7763f8de Thank you Justin for:
0000188: Clean up of some AssetCache.ProcessAssetQueue() code
2007-12-14 20:09:44 +00:00
Teravus Ovares fef8c77a8a patch from justincc for Mantis #163 - Opening a script in inventory longer than 1500characters can cause looping crash. 2007-12-14 00:54:12 +00:00
MW 611327e104 more work on texture downloading.
Refractored the TextureDownloadModule (but currently to make debugging easier, it is running as a non shared module, so this results in a instance of this module being created for each region (and a extra thread per region), this will be changed back soon.
Removed the old texture handling/sending code from AssetCache.
A few other small changes/fixes.
2007-12-10 13:27:23 +00:00
Jeff Ames af6eb67999 saved OpenSim source code from the giant rampaging unterminated copyright notice of doom 2007-12-10 05:25:16 +00:00
Sean Dague 1ad83bcf1b reversing the r2599 patch, as this started causing CreateThread errors for
me on Mono 1.2.4, which led to client crashes.  I think the Timer.Stop() 
wasn't doing what was desired on Mono.  The Queue refactoring should address
the readability issues lbsa71 was working on as soon as I get the merge together.
2007-12-06 20:13:02 +00:00
lbsa71 395637acdd * now the throttle timer is stopped whilst processing Queue so that it won't fire twice
* started to refactored throttling method
* some code convention refactorings
2007-12-06 14:08:22 +00:00
lbsa71 fb2588b409 * Refactored NumPackets calculation 2007-11-23 13:21:39 +00:00
Teravus Ovares 615b40b68b * Refactored IClientAPI.OutPacket to require a second mandatory parameter. This parameter has an enum:int ThrottleOutPacketType and contains types; Resend, Land, Wind, Cloud, Task, Texture, and Asset. 2007-11-18 15:54:05 +00:00
Jeff Ames d10c79d421 first stab at implementation of CopyInventoryItem 2007-11-18 13:50:46 +00:00
Brian McBee 46fbcad2aa Fixed bug in assetcache where certain textures were not being packetized correctly 2007-11-11 00:11:34 +00:00
lbsa71 ee1fcc729c * Added better logging to AssetCache
* AssetCache now ignores duplicate uploads
* some m_ refactoring
* ignored some bins
2007-11-06 11:10:45 +00:00
lbsa71 4fad66f855 * Diuerse beavtificatems 2007-11-01 19:19:05 +00:00
MW 7a66eff8af renamed FetchAsset to RequestAsset on IAssetServer, as think its a more fitting name. As the call shouldn't actually return the data, but just add a request for the data to be sent back via the callback. 2007-11-01 17:28:38 +00:00
Jeff Ames 7f0d836d35 made illogical bitwise operations logical 2007-10-31 05:29:51 +00:00
lbsa71 67e12b95ea * Optimized usings
* Shortened type references
* Removed redundant 'this' qualifier
2007-10-30 09:05:31 +00:00
MW 3d8219f6c7 as per the "Filesystem cleanup for OpenSim repository" mailing list thread. Have flattened the OpenSim.Framework project/namespace. The problem is that the namespace is still wrong as its "OpenSim.Framework" while the directory is "OpenSim\Framework\General" , so we need to decide if we change the directory or correct the namespace.
Note this has lead to a big flat project, but I think a lot of the files we most likely don't even use any longer. And others belong in other projects/namespaces anyway.
2007-10-29 21:46:25 +00:00
lbsa71 27b5fad56d * Removed AssetNotFound as it crashes client
* Fixed introduced bugs in ScenePresence
2007-10-29 12:59:04 +00:00
MW 27f003b683 Started the process of cleaning up AssetCache and moving most of the code into modules. Have moved TextureRequest handling (from the client) to a module. But even though to start with I just did a little bit of cleaning up of the existing code, it doesn't seem to work as good as the old code so I need to spend more time on it. So for now am committing my changes but with them not in use. So for now all Texture and asset requests are still handled by the old code in AssetCache. 2007-10-29 09:51:23 +00:00
Tleiades Hax 75be841839 Region ground texture was not marked as temporary, when being created, and assetcache did not check if an asset was temporary prior to uploading the cache to the asset server. Consequently the asset server was constantly being swamped by temporary ground textures. 2007-10-26 13:12:49 +00:00
Tleiades Hax 5e7dba7268 Very early first implementation of grid based assets.
Run this on a major grid, and weep
2007-10-26 11:46:27 +00:00
Tleiades Hax 44ee28d963 Part of supporting gridwide assetss. A little premature release, but I'm tired of conflicts. 2007-10-24 04:07:41 +00:00
Adam Frisby 5dad0ed729 * Return of R2162. /Take that SVN!/ 2007-10-22 21:57:32 +00:00
Sean Dague 6acaabefc3 revert r2162 as it completely clobbered all the work on
the ChatModule by MW and myself.  Couldn't find Adam online
after that rev went in.
2007-10-22 15:37:54 +00:00
Adam Frisby c4707a284f * Major ass commit.
* Sqlite Storage Engine now supports terrain -- however be aware that every terrain revision stored will at 512KB to your database file. At the moment it is storing every revision from the first.
* Fixed an issue where by noverbose mode would display lots of useless junk. Noverbose mode is now quite usable.
* Fixed a whole bunch of console message issues such as naming and categorisation
2007-10-22 15:23:48 +00:00
lbsa71 46700d3b7d * Total refactoring of Asset Server for massive win
* There is now a AssetServerBase
* lolcat in ur assets
2007-10-19 07:46:03 +00:00
lbsa71 40468f18a4 * Encapsulated all CommunicationsManager services 2007-09-24 05:15:13 +00:00