Commit graph

2029 commits

Author SHA1 Message Date
Rich Prohaska
2d174c3580 ignore the 3GB address space size on win32 for now. addresses #1387
git-svn-id: file:///svn/toku/tokudb@8762 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:38 -04:00
Rich Prohaska
a245f6204c imp get_max_process_data_size on windows. addresses #1387
git-svn-id: file:///svn/toku/tokudb@8748 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:38 -04:00
Rich Prohaska
492deeda11 test os_get_process_data_size on 32 bit linux. addresses #1387
git-svn-id: file:///svn/toku/tokudb@8747 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:38 -04:00
Rich Prohaska
400c9045f8 imp linux get_max_process_size. addresses #1387
git-svn-id: file:///svn/toku/tokudb@8745 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:38 -04:00
Yoni Fogel
afdb6c6bb9 Closes #1321
Remove locks around pread (pread in windows is now thread safe)

git-svn-id: file:///svn/toku/tokudb@8740 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:38 -04:00
Rich Prohaska
9dbc0241d9 get the lock_tree tests to compile and run on the main trunk. closes #1384
git-svn-id: file:///svn/toku/tokudb@8735 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:38 -04:00
Yoni Fogel
b786780000 Addresses #1032, #1343
All src/tests now have the following first 3 lines:
1- Modeline
2- Ident
3- include test.h
(test.h includes toku_portability.h immediately after modeline and ident)

Only one include for test.h, and no (direct) includes for toku_portability.h

git-svn-id: file:///svn/toku/tokudb@8713 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:38 -04:00
Yoni Fogel
521e21814c Addresses #1032
windows port of test_set_func_malloc

git-svn-id: file:///svn/toku/tokudb@8712 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:38 -04:00
Yoni Fogel
56be317ffa Addresses #1032
Port dlmalloc to windows
export.def now auto-generated
maxrss function ported

git-svn-id: file:///svn/toku/tokudb@8694 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:37 -04:00
Yoni Fogel
29b313195f Addresses #1032, #1343
Disable dlmalloc (for windows only) till it is ported.
Fix a typo for TYDB vs TYDB_BUNDLE,


git-svn-id: file:///svn/toku/tokudb@8692 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:37 -04:00
Yoni Fogel
b788efb250 Addresses #1032, #1343
Remove old references to toku_malloc/realloc/free_counter

git-svn-id: file:///svn/toku/tokudb@8691 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:37 -04:00
Yoni Fogel
07bd330963 Addresses #1032, #1343
toku_portability.h is now the first header include for all newbrt test files

git-svn-id: file:///svn/toku/tokudb@8690 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:37 -04:00
Yoni Fogel
637f0bdcb2 Addresses #1032, #1343
toku_portability.h is now the first header include for all ydb test files.
Also added modelines where missing.

git-svn-id: file:///svn/toku/tokudb@8689 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:37 -04:00
Yoni Fogel
5bd0a17aa9 Addresses #1032, #1343
Fix up (some of the) windows compilation issues during merge of 1032b to main

git-svn-id: file:///svn/toku/tokudb@8688 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:37 -04:00
Yoni Fogel
23bef2cff5 Addresses #1376
First attempt at using bundles for ipo_libtokudb.obj
This should allow a not-clean directory to make the optimized lib.

git-svn-id: file:///svn/toku/tokudb@8683 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:37 -04:00
Bradley C. Kuszmaul
65dec301cf Fixes #1374.
git-svn-id: file:///svn/toku/tokudb@8668 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:37 -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
Bradley C. Kuszmaul
d592348f56 Merged and resolved conflicts:
{{{
svn merge -r7857:8080 https://svn.tokutek.com/tokudb/toku/tokudb
}}}
Addresses #1032, #1289.


git-svn-id: file:///svn/toku/tokudb.1032b+1343@8651 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:35 -04:00
Bradley C. Kuszmaul
eddad2d02c Merge in latest changes from 1032b into 1332+1343.
About to merge 1332+1343 back to main line.
Addresses #1032, #1343.
{{{
svn merge -r8595:8646 https://svn.tokutek.com/tokudb/toku/tokudb.1032b
}}}


git-svn-id: file:///svn/toku/tokudb.1032b+1343@8648 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:35 -04:00
Rich Prohaska
9cdbdd4147 fix some helgrind issues. addresses #1277
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8634 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:35 -04:00
Rich Prohaska
84d17e804a fix some data race problems detected with helgrind. addresses #1277
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8628 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:35 -04:00
Rich Prohaska
a55b70cc05 fix a data race found with helgrind. closes #1370
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8622 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:35 -04:00
Rich Prohaska
ef40f5e25a undo an erroneous change to test_db_delete.c. closes #1369
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8621 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:35 -04:00
Rich Prohaska
be70861bf3 fix the data races in toku_malloc and toku_free. closes #1369
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8620 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:35 -04:00
Bradley C. Kuszmaul
0dfc3aa50d Some fixes for recovery (#1364). Also some temporary fixes for #1277. Addresses #1364, #1277.
Delete the 1364 branch, so I can restart it.
On the 1343 branch, I did:
{{{
svn merge -r 8586:8595 https://svn.tokutek.com/tokudb/toku/tokudb.1032b+1343+1364
}}}


git-svn-id: file:///svn/toku/tokudb.1032b+1343@8596 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:35 -04:00
Bradley C. Kuszmaul
bcff3ca394 Quiet cachetable-debug-test. Fixes #1368.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8582 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:35 -04:00
Bradley C. Kuszmaul
c40557746c Fixes #1367.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8578 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
c945aa448f Improve test robustness, found while working on #1367. Addresses #1367.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8577 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
141ef2eaa5 Clean up the MAYBEATSIGN and verbosity stuff. Fixes #1365.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8573 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
75cd8fe719 Cleanup make. Addresses #1343.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8561 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
fe0a157971 Cleaned up. Note that some stuff moved into the windows directory with symlinks from linux (since I know that symlinks work in linux, but maybe not in windows.) Addresses #1348.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8560 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
017d4f8cc3 Separate out the common malloc into newbrt/memory.c, and put the os-specific stuff into windows and linux subdirs. Things are broken. Addresses #1343.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8559 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
0adc9f9bd8 Separate out the common malloc into newbrt/memory.c, and put the os-specific stuff into windows and linux subdirs. Addresses #1343.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8558 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
f66b523f89 Merge all stuff from source:tokudb/toku/tokudb.1032 since the creation of this branch at [8452] to the present [8556], as
{{{
svn merge -r 8452:8556 https://svn.tokutek.com/tokudb/toku/tokudb.1032b/
}}}
And resolve conflicts.

It compiles, and we'll see if it runs.

Addresses #1032, #1343.


git-svn-id: file:///svn/toku/tokudb.1032b+1343@8557 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
8363a0d7de Make the symbols test pass. Addresses #1343.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8556 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
a83d6d833c Get things to compile. Addresses #1343.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8555 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
db2039c0db Compile better on linux, and more dlmalloc fixing. Addresses #1343.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8553 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
7372787c7f dlmalloc now works on Linux. Addresses #1032, #1328, #1343.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8477 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
1ea88e0c8a More hacking on dlmalloc. Addresses #1032, #1328, #1343.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8476 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
316c7f118b Add {{{db_env_set_func_malloc}}}, {{{db_env_set_func_realloc}}}, and {{{db_env_set_func_free}}}. Addresses #1343, #1032, #1328. Tests don't pass
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8474 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
8bb6a17355 Change malloc to dlmalloc. Addresses #1032, #1343, #1328.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8471 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
ccac8cbcac Make cxx compile. Addresses #1032, #1343, #1328.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8459 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
a6de887207 realloc must also be poisoned. Addresses #1032, #1343, #1328.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8458 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
d04375154d realloc must also be poisoned. Addresses #1032, #1343, #1328.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8457 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
a87c032a8f More link hacking. Addresses #1032, #1343, #1328.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8456 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:33 -04:00
Bradley C. Kuszmaul
5565b5e1f1 Try to get linking to work right. Addresses #1032, #1343, #1328.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8454 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:33 -04:00
Yoni Fogel
a9c69fd3fe Manual glue for svn-git migration for r8452 due to multiple merge + diffs in the same patch.
Original message:
Create a branch to make Doug Lea's malloc work. The big problem is having another malloc() in the system breaks things. Address #1343, #1032.
2013-04-16 23:57:33 -04:00
Rich Prohaska
68a9ae24bb use the doug mallocator
git-svn-id: file:///svn/toku/tokudb.1032b@8443 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:33 -04:00
Rich Prohaska
f3ea0d2a84 fixup the linux build. addresses #1342
git-svn-id: file:///svn/toku/tokudb.1032b@8437 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:33 -04:00
Rich Prohaska
6ddfb50dfa compile ydb.c on windows
git-svn-id: file:///svn/toku/tokudb.1032b@8436 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:33 -04:00