aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt (follow)
AgeCommit message (Collapse)AuthorFilesLines
2015-07-17Fixed MINGW duplicate library errors when MSYS folder cannot be found.NoodleDoodleNoodleDoodleNoodleDoodleNoo1-5/+5
*Thanks to luigi1111 for reporting.
2015-07-16Use g++ flag "-pthread" instead of "-lpthread", where preferredwarptangent1-1/+2
CMake supports this through THREADS_PREFER_PTHREAD_FLAG. Remove inclusion of pthread library in EXTRA_LIBRARIES, as the individual CMakeLists.txt files which need pthread already require it with CMAKE_THREAD_LIBS_INIT.
2015-07-16fixed ARM arch test to prevent breaking on short arch stringsRiccardo Spagni1-12/+17
2015-07-15** CHANGES ARE EXPERIMENTAL (FOR TESTING ONLY)NoodleDoodleNoodleDoodleNoodleDoodleNoo1-7/+69
Bockchain: 1. Optim: Multi-thread long-hash computation when encountering groups of blocks. 2. Optim: Cache verified txs and return result from cache instead of re-checking whenever possible. 3. Optim: Preload output-keys when encoutering groups of blocks. Sort by amount and global-index before bulk querying database and multi-thread when possible. 4. Optim: Disable double spend check on block verification, double spend is already detected when trying to add blocks. 5. Optim: Multi-thread signature computation whenever possible. 6. Patch: Disable locking (recursive mutex) on called functions from check_tx_inputs which causes slowdowns (only seems to happen on ubuntu/VMs??? Reason: TBD) 7. Optim: Removed looped full-tx hash computation when retrieving transactions from pool (???). 8. Optim: Cache difficulty/timestamps (735 blocks) for next-difficulty calculations so that only 2 db reads per new block is needed when a new block arrives (instead of 1470 reads). Berkeley-DB: 1. Fix: 32-bit data errors causing wrong output global indices and failure to send blocks to peers (etc). 2. Fix: Unable to pop blocks on reorganize due to transaction errors. 3. Patch: Large number of transaction aborts when running multi-threaded bulk queries. 4. Patch: Insufficient locks error when running full sync. 5. Patch: Incorrect db stats when returning from an immediate exit from "pop block" operation. 6. Optim: Add bulk queries to get output global indices. 7. Optim: Modified output_keys table to store public_key+unlock_time+height for single transaction lookup (vs 3) 8. Optim: Used output_keys table retrieve public_keys instead of going through output_amounts->output_txs+output_indices->txs->output:public_key 9. Optim: Added thread-safe buffers used when multi-threading bulk queries. 10. Optim: Added support for nosync/write_nosync options for improved performance (*see --db-sync-mode option for details) 11. Mod: Added checkpoint thread and auto-remove-logs option. 12. *Now usable on 32-bit systems like RPI2. LMDB: 1. Optim: Added custom comparison for 256-bit key tables (minor speed-up, TBD: get actual effect) 2. Optim: Modified output_keys table to store public_key+unlock_time+height for single transaction lookup (vs 3) 3. Optim: Used output_keys table retrieve public_keys instead of going through output_amounts->output_txs+output_indices->txs->output:public_key 4. Optim: Added support for sync/writemap options for improved performance (*see --db-sync-mode option for details) 5. Mod: Auto resize to +1GB instead of multiplier x1.5 ETC: 1. Minor optimizations for slow-hash for ARM (RPI2). Incomplete. 2. Fix: 32-bit saturation bug when computing next difficulty on large blocks. [PENDING ISSUES] 1. Berkely db has a very slow "pop-block" operation. This is very noticeable on the RPI2 as it sometimes takes > 10 MINUTES to pop a block during reorganization. This does not happen very often however, most reorgs seem to take a few seconds but it possibly depends on the number of outputs present. TBD. 2. Berkeley db, possible bug "unable to allocate memory". TBD. [NEW OPTIONS] (*Currently all enabled for testing purposes) 1. --fast-block-sync arg=[0:1] (default: 1) a. 0 = Compute long hash per block (may take a while depending on CPU) b. 1 = Skip long-hash and verify blocks based on embedded known good block hashes (faster, minimal CPU dependence) 2. --db-sync-mode arg=[[safe|fast|fastest]:[sync|async]:[nblocks_per_sync]] (default: fastest:async:1000) a. safe = fdatasync/fsync (or equivalent) per stored block. Very slow, but safest option to protect against power-out/crash conditions. b. fast/fastest = Enables asynchronous fdatasync/fsync (or equivalent). Useful for battery operated devices or STABLE systems with UPS and/or systems with battery backed write cache/solid state cache. Fast - Write meta-data but defer data flush. Fastest - Defer meta-data and data flush. Sync - Flush data after nblocks_per_sync and wait. Async - Flush data after nblocks_per_sync but do not wait for the operation to finish. 3. --prep-blocks-threads arg=[n] (default: 4 or system max threads, whichever is lower) Max number of threads to use when computing long-hash in groups. 4. --show-time-stats arg=[0:1] (default: 1) Show benchmark related time stats. 5. --db-auto-remove-logs arg=[0:1] (default: 1) For berkeley-db only. Auto remove logs if enabled. **Note: lmdb and berkeley-db have changes to the tables and are not compatible with official git head version. At the moment, you need a full resync to use this optimized version. [PERFORMANCE COMPARISON] **Some figures are approximations only. Using a baseline machine of an i7-2600K+SSD+(with full pow computation): 1. The optimized lmdb/blockhain core can process blocks up to 585K for ~1.25 hours + download time, so it usually takes 2.5 hours to sync the full chain. 2. The current head with memory can process blocks up to 585K for ~4.2 hours + download time, so it usually takes 5.5 hours to sync the full chain. 3. The current head with lmdb can process blocks up to 585K for ~32 hours + download time and usually takes 36 hours to sync the full chain. Averate procesing times (with full pow computation): lmdb-optimized: 1. tx_ave = 2.5 ms / tx 2. block_ave = 5.87 ms / block memory-official-repo: 1. tx_ave = 8.85 ms / tx 2. block_ave = 19.68 ms / block lmdb-official-repo (0f4a036437fd41a5498ee5e74e2422ea6177aa3e) 1. tx_ave = 47.8 ms / tx 2. block_ave = 64.2 ms / block **Note: The following data denotes processing times only (does not include p2p download time) lmdb-optimized processing times (with full pow computation): 1. Desktop, Quad-core / 8-threads 2600k (8Mb) - 1.25 hours processing time (--db-sync-mode=fastest:async:1000). 2. Laptop, Dual-core / 4-threads U4200 (3Mb) - 4.90 hours processing time (--db-sync-mode=fastest:async:1000). 3. Embedded, Quad-core / 4-threads Z3735F (2x1Mb) - 12.0 hours processing time (--db-sync-mode=fastest:async:1000). lmdb-optimized processing times (with per-block-checkpoint) 1. Desktop, Quad-core / 8-threads 2600k (8Mb) - 10 minutes processing time (--db-sync-mode=fastest:async:1000). berkeley-db optimized processing times (with full pow computation) 1. Desktop, Quad-core / 8-threads 2600k (8Mb) - 1.8 hours processing time (--db-sync-mode=fastest:async:1000). 2. RPI2. Improved from estimated 3 months(???) into 2.5 days (*Need 2AMP supply + Clock:1Ghz + [usb+ssd] to achieve this speed) (--db-sync-mode=fastest:async:1000). berkeley-db optimized processing times (with per-block-checkpoint) 1. RPI2. 12-15 hours (*Need 2AMP supply + Clock:1Ghz + [usb+ssd] to achieve this speed) (--db-sync-mode=fastest:async:1000).
2015-07-09Interpret x86_64 as x86-64 for architecturemoneromooo-monero1-1/+5
2015-05-31fixed static assert testRiccardo Spagni1-1/+1
2015-05-26explicitly include libc++ with clangRiccardo Spagni1-1/+6
2015-05-13Check for Clang before adding compiler flagwarptangent1-1/+4
See eb565a1ce208c543392808559ddea709eb1c935b
2015-05-06Merge branch 'clang_fixes' into clang_fixes-masterSergey Kazenyuk1-1/+1
2015-04-20Suppress 'register storage class is deprecated' warning in boost dependency ↵Sergey Kazenyuk1-2/+2
library
2015-04-07Merge BlockchainDB into upstreamThomas Winget1-7/+58
2015-04-07Merges PR #37Thomas Winget1-1/+9
New/updated Makefile targets
2015-04-07Only compile BerkeleyDB as an option in non-staticThomas Winget1-1/+3
2015-04-06add arm6 target and flagsRiccardo Spagni1-1/+9
2015-04-01remerged; commands JSON. logging upgrade. doxygenrfree2monero1-0/+40
2015-04-01Merge remote-tracking branch 'monero-official/master' into network-1.6-work1rfree2monero1-0/+6
2015-03-25update berkeleydb branch to blockchain branchThomas Winget1-0/+6
2015-03-25Merge upstream updates into blockchain branchThomas Winget1-0/+6
2015-03-22Fixed bug in static linking boost on MINGWThomas Winget1-0/+6
There was a workaround for linking to boost at all on MINGW, but unfortunately this workaround would not correctly link to boost statically. This workaround for that workaround works around the issue that that workaround had.
2015-03-17Pull blockchain changes into berkeleydb branchThomas Winget1-4/+19
2015-03-17Move db_drivers/ to external/Thomas Winget1-3/+0
Also change LMDB Cmake variables to CACHE rather than upgrading them through several parent scopes.
2015-03-17fixed BUILD_64 optionRiccardo Spagni1-1/+1
2015-03-17fixed arch_width optionRiccardo Spagni1-3/+9
2015-03-17fixed msys2 / mingw folders based on architecture, added license to unbound ↵Riccardo Spagni1-8/+8
CMakeList as that is not part of standard Unbound
2015-03-17moved 32-bit/64-bit detection into main CMakeListsRiccardo Spagni1-0/+9
2015-03-17Revert "Moved db_drivers/ into external/ for consistency"Thomas Winget1-0/+3
This reverts commit b21335642e75b35d3b178a754f4cdb2314989cd1.
2015-03-16CMake wiring, minor cleanup, minor test additionThomas Winget1-0/+3
Make Cmake things aware of BerkeleyDB and BlockchainBDB Make the BlockchainDB unit tests aware of BlockchainBDB
2015-03-09Moved db_drivers/ into external/ for consistencyThomas Winget1-3/+0
2015-02-202014 network limit 1.1 +utils +toc -doc -drmonerorfree2monero1-15/+8
Update of the PR with network limits works very well for all speeds (but remember that low download speed can stop upload because we then slow down downloading of blockchain requests too) more debug options fixed pedantic warnings in our code should work again on Mac OS X and FreeBSD fixed warning about size_t tested on Debian, Ubuntu, Windows(testing now) TCP options and ToS (QoS) flag FIXED peer number limit FIXED some spikes in ingress/download FIXED problems when other up and down limit
2015-02-202014 network limit 1.0a +utils +toc -doc -drmonerorfree2monero1-7/+15
commands and options for network limiting works very well e.g. for 50 KiB/sec up and down ToS (QoS) flag peer number limit TODO some spikes in ingress/download TODO problems when other up and down limit added "otshell utils" - simple logging (with colors, text files channels)
2015-02-02Add compile-time support for both db implementations: in-memory and LMDBwarptangent1-0/+21
Usage: default is lmdb for blockchain branch: $ make release same as: $ DATABASE=lmdb make release for original in-memory implementation: $ DATABASE=memory make release
2015-01-30Merge upstreamwarptangent1-2/+13
Merge branch 'monero-project/master' into blockchain
2015-01-27remove aes flag, detect no sse2Riccardo Spagni1-2/+2
2015-01-27fixed AES support flagRiccardo Spagni1-4/+4
2015-01-26allow for explicitly disabling AES-NIRiccardo Spagni1-2/+13
2015-01-18Add in-source lmdb to build processThomas Winget1-1/+4
Working on Linux, needs verified for other platforms but should be fine.
2015-01-04build: add liblmdb to the cmake autodetection systemmoneromooo-monero1-2/+2
update for rebase (warptangent 2015-01-04) src/cryptonote_core/CMakeLists.txt (edit) - replace LMDB_LIBRARIES with LMDB_LIBRARY set from autodetection
2015-01-04BlockchainDB unit tests, lmdb linker flagThomas Winget1-0/+3
Some BlockchainDB unit testing fleshed out (and working), rudimentary linker flag for lmdb in CMakeLists, but should probably be done "correctly" at some point (find it on whatever system you're building on and all that jazz). update for rebase (warptangent 2015-01-04) fix conflicts with upstream CMakeLists.txt files tests/CMakeLists.txt (remove edits from original commit)
2015-01-02year updated in licenseRiccardo Spagni1-2/+2
2014-12-01moved rapidjson to external folder, fixed CMakeRiccardo Spagni1-1/+3
2014-12-01Merge pull request #1Riccardo Spagni1-0/+1
f1eaf88 Prints seed after wallet upgrade. Removed iostream include. (Oran Juice) 70971be Doxygen comments (Oran Juice) 031ca23 Rewrites to old wallet file correctly (Oran Juice) 1f833dc Doxygen comments in (Oran Juice) 0bd88ff Writes seed language while generating wallet. Wallet open fix. (Oran Juice) 09a659e Stores seed language in wallet file. added rapidjson. Yet to test backward compatibility (Oran Juice)
2014-12-01don't build tests unless we're building all-* or *-test buildsRiccardo Spagni1-1/+4
2014-11-18cmake: work around a bug with implicit link directoriesBen Boeckel1-0/+8
Unfortunately, this is necessary because CMake doesn't detect whether mingw libraries are static or shared and doesn't put a -static flag around the -lfoo argument which then makes the shared library be linked to.
2014-11-17msys: don't use LTOBen Boeckel1-0/+2
This causes duplicate symbol errors on msys' mingw install.
2014-11-17msys: factor out -Werror on msysBen Boeckel1-1/+4
There are Windows-related warnings turned into errors here.
2014-11-17msys: look in msys' directory for filesBen Boeckel1-0/+5
This tells find_path and find_library to look under this directory first which is what we want on msys2.
2014-10-24cmake: support 2.8.7Ben Boeckel1-1/+1
Older versions of CMake support LINK_{PUBLIC,PRIVATE} while newer versions prefer PUBLIC and PRIVATE instead, but still support the LINK_ prefix.
2014-10-23cmake: clean up EXTRA_LIBRARIESBen Boeckel1-3/+1
pthread is handled by CMAKE_THREAD_LIBS_INIT while libdl isn't needed.
2014-10-23cmake: set the project nameBen Boeckel1-0/+2
2014-10-23cmake: prepend to CMAKE_MODULE_PATHBen Boeckel1-1/+2
2014-10-23unbound: import cmake build systemBen Boeckel1-0/+1
2014-10-23cmake: minor cleanups (indentation and typos)Ben Boeckel1-15/+15
2014-10-23cmake: use option() for STATICBen Boeckel1-1/+1
2014-10-23cmake: clean up if auto-dereferencingBen Boeckel1-3/+3
CMake will auto-dereference variable names in if statements, so there's no need to dereference them manually.
2014-10-23cmake: support git info in released tarballsBen Boeckel1-11/+1
2014-10-23cmake: fix up BOOST_IGNORE_SYSTEM_PATHSBen Boeckel1-2/+1
The option was set twice when it only needs to be set once. Also fix a bogus dereference and spurious whitespace.
2014-10-23cmake: remove configuration variablesBen Boeckel1-1/+0
CMAKE_BUILD_TYPE is meant for single-config build tools (e.g., make and ninja) while CMAKE_CONFIGURATION_TYPES is meant for multi-config build tools (e.g., Xcode and Visual Studio). They should not be mixed or manually set.
2014-10-23cmake: factor out error messagesBen Boeckel1-7/+14
Instead of using BoldRed and ColourReset everywhere, wrap it up in a function.
2014-10-18Stores seed language in wallet file. added rapidjson. Yet to test backward ↵Oran Juice1-0/+1
compatibility
2014-10-06mingw library tweaksRiccardo Spagni1-4/+1
2014-10-06fix for mingw not playing nicely with libunbound configure, fix for ↵Riccardo Spagni1-4/+9
correctly finding static libs on various operating systems
2014-10-06need to link with -ldl on Linux when building staticallyRiccardo Spagni1-0/+1
2014-10-06quieten CMake when it can't find packagesRiccardo Spagni1-1/+1
2014-10-06enforce static libraries when building staticallyRiccardo Spagni1-0/+8
2014-10-06build libunbound from external if no local libunbound or for static buildsRiccardo Spagni1-12/+11
2014-09-29dependencies enforced, send que error message log level movedRiccardo Spagni1-3/+16
2014-09-24never use the baked-in miniupnpc on FreeBSD because explosionsRiccardo Spagni1-2/+0
2014-09-24redo FindUnbound.cmakeRiccardo Spagni1-0/+4
2014-09-23Fixed artifacts from cherry-picking devel->masterThomas Winget1-1/+2
2014-09-23Fixed CMake search for libunboundThomas Winget1-5/+2
As it turns out, some of CMake's built-in modules for detecting headers and libraries don't work if you have certain compiler flags set, such as -Werror=old-style-definition, as they do "int main()" rather than "int main(void)". Having CMake search for libs before compiler flags are set alleviates this issue, and I believe the underlying issue will be fixed in future releases of CMake.
2014-09-23Updated CMake files -- added libunbound linker flagThomas Winget1-0/+5
CMake config file written, but was unable to test/get it working properly because of a bug in CMake with functions related to find_package. Simple "-lunbound" flag used in its stead for now. May not build on non-Linux systems, not sure yet.
2014-09-22moved msys2 toolchain, boost libs fixRiccardo Spagni1-0/+4
2014-09-22added mikezackles' missing boost function in CMakeListsRiccardo Spagni1-0/+15
2014-09-15turns out we do need -static-libgcc etc. on LinuxRiccardo Spagni1-1/+1
2014-09-15explicitly disable LTO for ClangRiccardo Spagni1-1/+5
2014-09-15Use LTO by defaultZachary Michaels1-1/+4
The mingw toolchains override this for now.
2014-09-15User setting to turn LTO on and offZachary Michaels1-9/+13
This isn't currently working on mingw
2014-09-15Remove unnecessary elseZachary Michaels1-2/+0
2014-09-15Hack to add pthread to link libraries on mingwZachary Michaels1-2/+2
This should link winpthreads. We really shouldn't be passing these this way, but that seems to be the existing solution, and it works for now.
2014-09-15Change to -static gcc flagZachary Michaels1-1/+1
2014-09-15Set the boost thread api for mingwZachary Michaels1-0/+1
2014-09-15Hack to allow toolchains to pass flags to mingwZachary Michaels1-1/+1
2014-09-15Ignore another warning to make mingw happyZachary Michaels1-1/+1
2014-09-15Remove unused CMake functionZachary Michaels1-6/+0
2014-09-15Default to static linking on both MSVC and MINGWZachary Michaels1-1/+6
2014-09-15FreeBSD static linking fixesRiccardo Spagni1-3/+3
2014-09-12versioning now includes the commit hash, or -final for tagged releasesRiccardo Spagni1-19/+7
2014-09-12always check git diffRiccardo Spagni1-6/+1
2014-09-11added license to CMakefluffypony1-0/+30
2014-09-11more CMake tweaks to allow detection on OS Xfluffypony1-8/+9
2014-09-10more dynamic miniupnp fixesfluffypony1-0/+8
2014-09-10use external miniupnpc if availablefluffypony1-4/+0
2014-09-10miniupnpc changes for freebsdfluffypony1-0/+4
2014-09-10replace ftime with gettimeofday on FreeBSD because lcompat is stupidfluffypony1-4/+0
2014-09-10make FreeBSD use -lcompat till we can fix ftime()fluffypony1-0/+4
2014-09-09exclude local miniupnpc for FreeBSD, install from ports insteadfluffypony1-0/+17
2014-06-30needed to remove REQUIRED from find_package(Threads)Thomas Winget1-1/+1
2014-06-12Fix to disable LTO for ClangZachary Michaels1-1/+1
The previous code was assuming Apple == Clang. This change should both enable LTO when using gcc on Apple and fix Clang when using it on other platforms.
2014-06-11Link to pthreads on non-apple unixZachary Michaels1-1/+6
2014-06-11Gcc 4.9 LTO fixZachary Michaels1-0/+5
The new lto format requires use of the gcc-provided gcc-ar and gcc-ranlib binaries.
2014-05-250.8.8updatemydesktop1-3/+3
2014-05-22OS X compilation fixedOracionSeis1-1/+5
2014-05-21Update CMakeLists.txtNoodleDoodleNoodleDoodleNoodleDoodleNoo1-2/+2
1. Fixed build error on machines not supporting aes-ni.
2014-05-05fix CMakeLists.txt to add -lpthread, did not compile boost 1.55vertoe1-1/+1
2014-04-30mac osx building fixesmydesktop1-8/+13
2014-04-30various fixes to allow mac osx compilationmydesktop1-2/+12
2014-04-09Port mapping with UPnPAntonio Juarez1-1/+2
2014-04-07Improvements in JSON RPCAntonio Juarez1-1/+3
2014-03-20some fixesAntonio Juarez1-6/+3
2014-03-03moved all stuff to githubAntonio Juarez1-0/+115