Commit graph

82 commits

Author SHA1 Message Date
John Esmet
65cd284834 fixes #5351 fixes #5528 merge the new locktree to main. the locktree, locktree manager, and blocking lock request api are implemented at the toplevel under locktree/ and the ydb layer has been modified to use the new API. some kruft has been deleted from various parts of the source tree and these merge also includes a change where we kill 'includes.h'
git-svn-id: file:///svn/toku/tokudb@49851 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:15 -04:00
Leif Walsh
bf70bbb898 refs #5418 merge promotion to main
git-svn-id: file:///svn/toku/tokudb@49697 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:14 -04:00
Bradley C. Kuszmaul
f6ec5262c6 Refs #5622. Undo unrelated change.
git-svn-id: file:///svn/toku/tokudb@48990 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:13 -04:00
Bradley C. Kuszmaul
6d73872f04 Fixes #5622. Speed up {{{test_groupcommit_count.bdb}}}.
git-svn-id: file:///svn/toku/tokudb@48989 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:13 -04:00
Leif Walsh
2537edef0e refs #5368 fix unused warning on osx, and really stupid include file ordering issue
git-svn-id: file:///svn/toku/tokudb@48887 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:13 -04:00
Leif Walsh
774afe534d refs #5592 move circular_buffer, omt, threadpool, growable_array, rwlock, frwlock, kibbutz, mempool, partitioned_counter, nb_mutex, sort to util/, and some other cleanup stuff
git-svn-id: file:///svn/toku/tokudb@48763 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:13 -04:00
Leif Walsh
589813ac5c refs #5368 add portability wrapper for sched_setaffinity/sched_getaffinity
git-svn-id: file:///svn/toku/tokudb@48692 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:12 -04:00
Leif Walsh
e90e5db856 refs #5537 little cmake cleanup
git-svn-id: file:///svn/toku/tokudb@48383 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:11 -04:00
Leif Walsh
6497257245 refs #5537 add BUILD_SRC_TESTS to be able to build just those tests in Xcode
git-svn-id: file:///svn/toku/tokudb@48382 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:11 -04:00
Leif Walsh
b7df599b66 refs #4871 make all compiler flag changes prepends so that user-specified flags (-D CMAKE_CXX_FLAGS="-foo") will take precedence
git-svn-id: file:///svn/toku/tokudb@48354 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:11 -04:00
Leif Walsh
4fb05bf0c1 refs #5368 make conditions for running helgrind/drd more explicit
git-svn-id: file:///svn/toku/tokudb@48353 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:11 -04:00
Leif Walsh
f6a4242420 refs #5368 add some more system checks
git-svn-id: file:///svn/toku/tokudb@48332 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:11 -04:00
Leif Walsh
f29bff6189 refs #5368 change up compiler defines to make freebsd happier
git-svn-id: file:///svn/toku/tokudb@48331 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:10 -04:00
Leif Walsh
a787e376ae refs #5368 merge what I wanted to: do helgrind/drd suppression in a nicer way
git-svn-id: file:///svn/toku/tokudb@48328 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:10 -04:00
Leif Walsh
18f4a7e559 reversing accidental merge
git-svn-id: file:///svn/toku/tokudb@48327 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:10 -04:00
Leif Walsh
9ac4390564 refs #5368 suppress helgrind/drd in a nicer way
git-svn-id: file:///svn/toku/tokudb@48326 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:10 -04:00
Leif Walsh
fd213b5b92 refs #4871 some changes that may help the ninja generator
git-svn-id: file:///svn/toku/tokudb@48319 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:10 -04:00
Leif Walsh
eaaa4b6a09 refs #4871 fix gtags generation
git-svn-id: file:///svn/toku/tokudb@48318 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:10 -04:00
Leif Walsh
3dbcdf4794 refs #5485 un-screw-up coverage builds of statically linked binaries
git-svn-id: file:///svn/toku/tokudb@48064 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:08 -04:00
Leif Walsh
4d401f2816 refs #5485 fix gcov linking
git-svn-id: file:///svn/toku/tokudb@48037 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:07 -04:00
Leif Walsh
737d1a6443 refs #5368 #4781 fix integration of gcov and OBJECT libs
git-svn-id: file:///svn/toku/tokudb@48036 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:07 -04:00
Leif Walsh
bd63072bdf closes #5485 #5368 clean up cmake and get darwin portability:
for 5485:
 - remove icc handling stuff from cmake
 - clean up remaining cmake files
 - create libtokudb_static.a in a cleaner way using cmake OBJECT libs (requires cmake 2.8.9)
 - use POSITION_INDEPENDENT_CODE property instead of manually setting -fPIC
for 5368:
 - fix compilation failures due to small differences between gcc and clang, mostly in tests
 - use toku_fileids_are_equal instead of memcmp to compare fileids (closes #5505)
 - create dummy implementation of partitioned_counter for osx (quick fix for, and closes #5506)
 - add mutex->valid bit under TOKU_PTHREAD_DEBUG
 - initialize mutex of DB_TXN created during recovery for 2PC (closes #5507)


git-svn-id: file:///svn/toku/tokudb@48024 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:07 -04:00
Christian Rober
5634ac801b refs #5086 commenting out cmake line to fix linux build. We have to find a permanent fix for clang later.
git-svn-id: file:///svn/toku/tokudb@47174 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:05 -04:00
Christian Rober
4302350567 refs #5086 Adding cmake settings for Clang compatibility with c++0x on darwin.
git-svn-id: file:///svn/toku/tokudb@47172 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:05 -04:00
Leif Walsh
e6aed632eb closes #5379 add TOKU_PTHREAD_DEBUG for debug builds
git-svn-id: file:///svn/toku/tokudb@47040 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:04 -04:00
Leif Walsh
9c9aa70008 refs #4871 generate a different build name for coverage tests so they don't clobber the debug runs
git-svn-id: file:///svn/toku/tokudb@47021 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:03 -04:00
Zardosht Kasheff
7ea6dd4171 refs #4606, merge to main
git-svn-id: file:///svn/toku/tokudb@46797 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:03 -04:00
Leif Walsh
9e5e0aefcb refs #4871 default to USE_VALGRIND=ON
git-svn-id: file:///svn/toku/tokudb@46773 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:02 -04:00
Yoni Fogel
fffce5d49f refs #5155 refs #5308 closes #5309 merge new omt api functions to main (still unused), use templated omt for TOKUTXN->open_fts, OMT becomes a wrapper for omt<OMTVALUE>, other misc fixes
git-svn-id: file:///svn/toku/tokudb@46448 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:02 -04:00
Leif Walsh
f20569cd7c refs #5291 add -g -fuse-linker-plugin for link time optimization
git-svn-id: file:///svn/toku/tokudb@46102 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:01 -04:00
Leif Walsh
7467b279f5 refs #5291 add USE_VALGRIND option to control NVALGRIND, and update
nightly tests to use gcc optimized build too


git-svn-id: file:///svn/toku/tokudb@46099 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:01 -04:00
TokuBuild
720ca62b9d refs #4871 fix finding of gcov47
git-svn-id: file:///svn/toku/tokudb@46067 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:01 -04:00
Leif Walsh
389599b1a4 refs #4871 link against stdc++ instead of c
git-svn-id: file:///svn/toku/tokudb@46046 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:01 -04:00
Leif Walsh
ca1141d369 refs #4871 speed up tag generation for cscope and idutils
git-svn-id: file:///svn/toku/tokudb@46022 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:01 -04:00
Leif Walsh
e6fbdbdf81 refs #4871 use gcov47 when possible
git-svn-id: file:///svn/toku/tokudb@46020 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:01 -04:00
Yoni Fogel
81d8d1ca0d refs #5280 Intel compiler has some warnings for -WeffC++. Temporarily removing till warnings are fixed
git-svn-id: file:///svn/toku/tokudb@45982 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:00 -04:00
Yoni Fogel
2f23fc5db1 refs #5280 Add additional warning options and get it to compile cleanly.
Add comments and static asserts for on-disk formats (e.g. leafentries)

git-svn-id: file:///svn/toku/tokudb@45977 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:01:00 -04:00
Leif Walsh
958c447641 closes #5206 merge c++ changes to mainline
git-svn-id: file:///svn/toku/tokudb@45903 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:59 -04:00
Bradley C. Kuszmaul
936bb9d276 Fixes #5255. Disable intel warning 1292: {{{svn merge -c 45766 ../tokudb.3571}}}
git-svn-id: file:///svn/toku/tokudb@45767 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:59 -04:00
Leif Walsh
a367232ad2 refs #5206 merge work making our code c99 and c++11 compatible, to mainline
git-svn-id: file:///svn/toku/tokudb@45632 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:58 -04:00
Leif Walsh
3d01baeed8 refs #5163 use CMAKE_PREFIX_PATH to find BDB and valgrind
git-svn-id: file:///svn/toku/tokudb@45358 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:57 -04:00
Leif Walsh
2ee18e3d18 fix valgrind finding algorithm and usage
refs #4871

git-svn-id: file:///svn/toku/tokudb@45046 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:54 -04:00
Leif Walsh
82ae5280df [t:5136] add "NVALGRIND=1" to COMPILE_DEFINITIONS_RELEASE
git-svn-id: file:///svn/toku/tokudb@44902 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:53 -04:00
Leif Walsh
aebe247eaa [t:5094] merge to main, delete dev branch. closes #5094.
git-svn-id: file:///svn/toku/tokudb@44769 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:52 -04:00
Leif Walsh
94b291779a [t:5094] revert change for #5094 because it doesn't work yet
git-svn-id: file:///svn/toku/tokudb@44672 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:51 -04:00
Leif Walsh
0da230d143 [t:5094] build libtokudb_static.a by extracting all .o files, recompiling
with -ipo-c into one .o, and rearchiving.  closes #5094.


git-svn-id: file:///svn/toku/tokudb@44667 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:51 -04:00
Bradley C. Kuszmaul
d04b3eaa52 [t:4934] Get rid of more #4934 stuff from main. Refs #4934.
git-svn-id: file:///svn/toku/tokudb@44663 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:50 -04:00
Bradley C. Kuszmaul
2f8410fe0b [t:4934] Merge 44291 from ../../tokudb.4934-branch-from.6.0.0/newbrt/. Refs #4934.
git-svn-id: file:///svn/toku/tokudb@44632 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:50 -04:00
Leif Walsh
d6d59ec4b5 [t:4871] use shared lib for {lock,range}_tree tests, speeds up build, and add prefixes to test names to use regexes better
also better osx/clang support, compile with -O4 now
and use the same compiler for the fractal tree and lzma


git-svn-id: file:///svn/toku/tokudb@44602 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:50 -04:00
Leif Walsh
0ec18d4ef1 [t:4871] fix problems using clang on linux
use TOKU_ALLOW_DEPRECATED
don't use PIE


git-svn-id: file:///svn/toku/tokudb@44595 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:50 -04:00