Commit graph

20 commits

Author SHA1 Message Date
Barry Perlman
46e2eba914 [t:4181] #4181 Make memory accounting a little cleaner.
git-svn-id: file:///svn/toku/tokudb@38050 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:01 -04:00
Rich Prohaska
2419230dda #4222 merge 37514 to main refs[t:4222]
git-svn-id: file:///svn/toku/tokudb@37516 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:58 -04:00
Barry Perlman
b1324bd474 [t:4181] #4181 Merge from tokudb.4181 to main. Improve memory accounting to prevent resident set size (RSS) from exceeding allocation.
git-svn-id: file:///svn/toku/tokudb@37499 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:58 -04:00
Barry Perlman
9b0d73150a [t:4182] #4182 Merge tokudb.4182 to main. Add mallocator version string to engine status.
git-svn-id: file:///svn/toku/tokudb@37423 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:58 -04:00
Rich Prohaska
35a46f2e5e #3853 make the lock tree memory accounting more accurate refs[t:3853]
git-svn-id: file:///svn/toku/tokudb@36278 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:53 -04:00
Rich Prohaska
dc4960612a #3452 new row locking APIs refs[t:3452]
git-svn-id: file:///svn/toku/tokudb@35392 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:50 -04:00
Barry Perlman
c436cfd20f [t:3825] #3825 Add max_mem_in_use to memory statistics.
git-svn-id: file:///svn/toku/tokudb@35067 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:50 -04:00
Barry Perlman
cfebabfdfa [t:3825] #3825 Do not call malloc_usable_size() with NULL. Add malloc_fail and realloc_fail to engine status.
git-svn-id: file:///svn/toku/tokudb@33948 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:47 -04:00
Barry Perlman
2b54c48dcc [t:3825] #3825 Add memory usage statistics to engine status.
git-svn-id: file:///svn/toku/tokudb@33928 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:47 -04:00
Rich Prohaska
dbee5ae7ba #3346 #3351 fix the loader malloc error injector refs[t:3346] refs[t:3351]
git-svn-id: file:///svn/toku/tokudb@29297 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:38 -04:00
Bradley C. Kuszmaul
06d1c0e1eb Get rid of {{{TAGMALLOC}}}. Fixes #2912. close[t:2912]
git-svn-id: file:///svn/toku/tokudb@23493 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:22 -04:00
Yoni Fogel
fca28d4e24 [t:2499] Windows port of casting to typeof().
Implement workaround.  Currently windows allows implicit casts from void* to whatever*.
May need to be revisited once windows cilk is included.

git-svn-id: file:///svn/toku/tokudb@19937 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:09 -04:00
Bradley C. Kuszmaul
28cc5d1ed9 Merge the changes from 2499d onto the main line. Fixes #2499. close[t:2499].
{{{
svn merge -r 19523:19895 https://svn.tokutek.com/tokudb/toku/tokudb.2499d
}}}
.


git-svn-id: file:///svn/toku/tokudb@19902 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:09 -04:00
Yoni Fogel
1bf7a7a403 closes[t:2449] [t:2484] Merge #2449 changes to main.
Rollback logs are now checkpointed.  There are no rolltmp files.


git-svn-id: file:///svn/toku/tokudb@19167 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:05 -04:00
Bradley C. Kuszmaul
178820a688 Merge changes from 2216a to main (except possibly for the windows subdirectory, which Yoni will do separately).
2216a is no longer valid.
Refs #2216. [t:2216].
{{{
svn merge -r17301:18179 https://svn.tokutek.com/tokudb/toku/tokudb.2216a/src/tests
}}}



git-svn-id: file:///svn/toku/tokudb@18181 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
838e0e5b1c [t:2318] Merge #2318 back to main up to r17166
git-svn-id: file:///svn/toku/tokudb@17178 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:59 -04:00
Yoni Fogel
580f5caafb Addresses #2037 refs[t:2037] Merged #2037 back into main
git-svn-id: file:///svn/toku/tokudb@15562 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:04 -04:00
Yoni Fogel
03d3cbfeb4 Addresses #1974 refs[t:1974] Add toku_portability include, fix printf type mismatches, svn ignore, function prototype cleanliness
git-svn-id: file:///svn/toku/tokudb@14304 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:00 -04:00
Yoni Fogel
8f2b0a7e11 Addresses #1510 Merge of 1510 (so far) back into main
Several fixes are included, particulary db remove after db truncate (with descriptor) does not crash anymore.
svn merge -r 10931:11019 ../tokudb.1510

git-svn-id: file:///svn/toku/tokudb@11020 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:47 -04:00
Bradley C. Kuszmaul
2f856f7d29 Candidate fix for #1374 (wrong db.h include file for BDB versions of code.) Addresses #1374.
git-svn-id: file:///svn/toku/tokudb@8667 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:37 -04:00
Renamed from include/memory.h (Browse further)