Commit Graph

57 Commits (a766e26db46c7c054bae1021470dbe365f2a3cb3)

Author SHA1 Message Date
William Todd Stinson a766e26db4 Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository. 2012-09-10 10:37:02 -07:00
simon@Simon-PC.lindenlab.com 173d0fa213 Pull in viewer-development because it's painful. Merge with runitai's help. 2012-07-11 16:15:23 -07:00
Brad Payne (Vir Linden) 1435a8b9e6 SH-2789 WIP - stricter calling of memcpyNonAliased16 2012-01-04 15:21:23 -05:00
Brad Payne (Vir Linden) 9c2e0d84f8 SH-2789 WIP - various fixes to force 16-byte alignment 2011-12-19 18:17:18 -05:00
Xiaohong Bao 9850e09f76 trivial: update the memory pool log info to the latest. 2011-11-22 11:51:49 -07:00
Brad Payne (Vir Linden) 51c7887f8d merge 2011-10-31 11:35:22 -04:00
Xiaohong Bao 0637fe27bc fix for SH-2624: crash at LLPrivateMemoryPoolManager::freeMem: ASSERT (!addr) 2011-10-25 22:53:40 -06:00
Oz Linden 9785506d56 merge changes for storm-1651 2011-10-17 16:27:18 -04:00
Dave Parks 4924f0c99b b782a75c99e6 backout cleanup 2011-10-14 12:38:48 -05:00
Xiaohong Bao 897972636d fix for SH-2464: Crash on exit in LLPrivateMemoryPoolManager::freeMem 2011-10-10 16:31:56 -06:00
Xiaohong Bao 616a7b549d fix for VWR-26864: Recent commit to Snowstorm project introduces frequent errors and crashes associated with private memory pool. 2011-09-07 23:23:08 -06:00
Xiaohong Bao ba2ae6bc95 re-write the hash table code to eliminate potential flaws and simplify the implementation. 2011-09-02 11:17:03 -06:00
Xiaohong Bao 48d949150c add a debug setting "MemoryPrivatePoolEnabled" to turn on/off private memory pool. 2011-07-20 16:05:19 -06:00
Xiaohong Bao 5ee90d7848 fix a merge error 2011-07-20 10:24:44 -06:00
Xiaohong Bao 76eca5d0bc fix for memory alignment to 16 bytes. 2011-07-19 23:17:55 -06:00
Xiaohong Bao d951267467 Merge from viewer-development 2011-07-15 12:14:34 -06:00
Xiaohong Bao d31e673537 fix a crash 2011-05-11 14:41:23 -06:00
Xiaohong Bao d696977c70 fix a crash 2011-05-11 14:23:15 -06:00
Xiaohong Bao 39f033a013 fix a linux compiling error. 2011-05-10 21:13:20 -06:00
Xiaohong Bao b594d3b04d add debug mode to track the memory allocation/deallocation. 2011-05-10 21:02:20 -06:00
Xiaohong Bao 17854c4e87 fix an issue on mac and linux, also fix an assertion. 2011-04-04 14:40:07 -06:00
Xiaohong Bao a40ee94cd6 fix the bug for mac and linux of continuously adjusting memory. 2011-04-04 10:00:29 -06:00
Xiaohong Bao fc106df530 fix the compiling error: "free" is defined and in use globally. 2011-02-24 19:47:55 -07:00
Xiaohong Bao 108980f68c add types to LLPrivateMemoryPool 2011-02-23 17:53:08 -07:00
Xiaohong Bao d593f5c1d3 fix a merge error 2011-02-23 14:35:53 -07:00
Xiaohong Bao 1f0cc07482 fix an assert error 2011-02-23 12:41:33 -07:00
Xiaohong Bao bfa25219b8 Automated merge with ssh://hg.lindenlab.com/bao/private-memory-pool 2011-02-23 11:10:13 -07:00
Xiaohong Bao 01cdeb0cdd Merge from viewer-development 2011-02-23 10:44:59 -07:00
Loren Shih fbc6e5d639 Automated merge up from viewer-development into mesh-development 2011-02-01 11:28:22 -05:00
Xiaohong Bao 2ca05d4996 trivial: convert to "unix return" 2011-01-28 17:01:18 -07:00
Xiaohong Bao 6531eed04e add "pause" function for SH-846: design and implement the debug code to locate memory leaking 2011-01-26 17:03:30 -07:00
Xiaohong Bao 8f54dc2958 for SH-846: design and implement the debug code to locate memory leaking 2011-01-26 11:13:04 -07:00
Xiaohong Bao bcb5b209d1 trivial: fix some mac compiling errors 2011-01-12 07:51:14 -08:00
Xiaohong Bao 7daa3d1ca1 fixed a hash bug, enlarged the overhead for large allocations, and add new chunk to the tail of the linked list so new allocations go to oldest chunks first. 2011-01-07 14:57:35 -07:00
Xiaohong Bao 9434f0c2a0 fix an exit crash. 2011-01-06 16:48:00 -07:00
Xiaohong Bao a3759a7815 add the class LLPrivateMemoryPoolManager 2011-01-06 16:17:38 -07:00
Xiaohong Bao f4a8027feb removed some debug code, redesigned the hash function, fixed bugs 2011-01-06 12:36:44 -07:00
Xiaohong Bao 5654abd50d a wroking version with a lot of debugging code (to be removed). 2011-01-04 13:14:36 -07:00
Xiaohong Bao 43f4429363 test code and some code change 2010-12-08 20:50:39 -07:00
Xiaohong Bao f4ff1430f0 first iteration of memory pool code 2010-12-03 22:16:16 -07:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden ab31e3bb21 Fix up the SSE stuff so it compiles on Linux. Though I don't think it actually works properly. 2010-05-21 15:11:16 +01:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Adam Moss e188badaf2 QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.
2009-02-03 17:56:26 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Steven Bennetts 80be4c1d2d QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
Steven Bennetts 926ea0b39a QAR-669 1.20 Viewer RC11
QAR-648   1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-27 21:02:01 +00:00
Steven Bennetts ad33281007 QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
Steven Bennetts 63e7894148 QAR-570 maint-render-4 merge
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-08 18:41:20 +00:00