Created
April 10, 2018 18:40
-
-
Save winksaville/05493ca693d9cd947d8326f2e13a3da9 to your computer and use it in GitHub Desktop.
Content of file for a big rebase --interactive --recreate-merges
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| label onto | |
| # Branch Merging-in-work-from-branch | |
| reset [new root] | |
| pick 027dbf80 Initial commit | |
| pick cc10751a Adding benchmark namespace and removing broken flags | |
| pick e65ca767 Fix printing of time | |
| label branch-point | |
| pick bd5c1cd7 Remove duplicated macros header | |
| pick ab8645c9 benchmark_min_time now works as expected | |
| pick 5192a667 benchmark_iterations works as expected | |
| pick 45b6e5e5 benchmark_repetitions now work | |
| label Merging-in-work-from-branch | |
| # Branch master | |
| reset branch-point # Fix printing of time | |
| pick 6e370e78 Added some missing atomics in FastClock | |
| merge -R -C 5871e7a4 Merging-in-work-from-branch # Merging in work from branch | |
| pick ed16ad3b Create README.md | |
| pick 22943e4b Update README.md | |
| pick 97ae8dcc Update documentation and remove 'Threads' until threadedness works | |
| pick 1af44caf Really drop multithreading support | |
| pick 4e908a10 Multithreaded tests are reenabled | |
| pick 25e87aae Report mean/stddev times as mean/stddev | |
| pick 9fafbfb3 Remove dead code, tidy output | |
| pick cbf87824 Add Threads registration example to README.md | |
| pick d5e19b0e Add items/bytes processed to SetInsert benchmark test | |
| pick c461d578 Fix right-alignment of items/s | |
| label branch-point-2 | |
| pick c1860b31 Allow custom reporters | |
| label branch-point-3 | |
| pick 7ab310d3 Add drone.io build badge to README.md | |
| label master | |
| # Branch Merged-with-upstream | |
| reset branch-point-3 # Allow custom reporters | |
| pick d59f9bb5 ignore tags file | |
| merge -R -C 5e0d0078 master # Merge branch 'master' of https://github.com/google/benchmark | |
| pick f9d15daa Remove tunable estimate for cycles per second | |
| pick 2859f59c Explicitly remove unsupported memory usage support | |
| pick 8a189e6e Add LICENSE and copyright headers | |
| pick 9368d232 Add discussion group to README.md | |
| label Merged-with-upstream | |
| # Branch master-2 | |
| reset branch-point-2 # Fix right-alignment of items/s | |
| pick 5f63cf4f Minimum iteration and overhead support. | |
| pick 9eeefb16 Code reformat | |
| merge -R -C e22b5801 Merged-with-upstream # Merged with upstream | |
| pick f89ec4e8 More formatting tweaks | |
| label branch-point-4 | |
| pick ba273d26 add pedantic errors and fix them | |
| label master-2 | |
| # Branch sochka/patch-1 | |
| reset branch-point-4 # More formatting tweaks | |
| pick e2e151ef Add explicit pthread.h include | |
| merge -R -C f2eef3e2 master-2 # Merge branch 'master' of https://github.com/google/benchmark | |
| label branch-point-5 | |
| pick f54bef71 Fix int64_t_t typo in README code example | |
| label sochka/patch-1 | |
| # Branch dcoeurjo/cmakeFix | |
| reset branch-point-5 # Merge branch 'master' of https://github.com/google/benchmark | |
| merge -R -C 8892f67a sochka/patch-1 # Merge pull request #3 from sochka/patch-1 | |
| pick b5db11b3 Missing headers for sysctl stuff on OSX | |
| pick c804970b For those using YCM | |
| pick 9d5d031b Better include path for YCM users | |
| pick 707505e8 sysinfo conditional compilation fixes for OSX | |
| pick 3b940c82 Move linux-only variable into linux/cygwin block | |
| pick 6bd3ab7c Fix shutting down FastClock's thread on OSX. | |
| pick 4b67193a [#4] A few minor changes. | |
| pick b749df08 [#4] Cleaned up FastClock background thread. | |
| pick 6c114c5d Remove old NOTEs | |
| label branch-point-6 | |
| pick 08db9366 Cmake edit with 'make install' target | |
| pick dad5ea80 Thread is required | |
| pick b21b9d7d Missing includes in install target | |
| label dcoeurjo/cmakeFix | |
| # Branch iiSeymour/patch-1 | |
| reset branch-point-6 # Remove old NOTEs | |
| merge -R -C 89535dc0 dcoeurjo/cmakeFix # Merge pull request #8 from dcoeurjo/cmakeFix | |
| label branch-point-7 | |
| pick 44c6db91 Update README.md | |
| label iiSeymour/patch-1 | |
| # Branch Constellation/fix-segv | |
| reset branch-point-7 # Merge pull request #8 from dcoeurjo/cmakeFix | |
| pick e114ccda Create CONTRIBUTING.md | |
| pick 51f1bb35 Add AUTHORS and CONTRIBUTORS files. | |
| merge -R -C 999d0784 iiSeymour/patch-1 # Merge pull request #9 from iiSeymour/patch-1 | |
| pick eb0e5ed8 Update AUTHORS | |
| pick afefd389 Update CONTRIBUTORS | |
| pick 5e744bae Add information about CLAs. | |
| pick 9cf9db44 Christopher Seymour has signed the CLA. | |
| label branch-point-8 | |
| pick 04193598 Check families is not nullptr before using it | |
| label Constellation/fix-segv | |
| # Branch showlabor/master | |
| reset branch-point-8 # Christopher Seymour has signed the CLA. | |
| merge -R -C b048fd03 Constellation/fix-segv # Merge pull request #10 from Constellation/fix-segv | |
| label branch-point-9 | |
| pick 0cb2efa9 Fix cycleclock.h for gcc/ARM. | |
| pick 746e7213 Added AUTHOR/CONTRIBUTOR information. | |
| label showlabor/master | |
| # Branch Nukesor/patch-1 | |
| reset branch-point-9 # Merge pull request #10 from Constellation/fix-segv | |
| merge -R -C e41ac895 showlabor/master # Merge pull request #12 from showlabor/master | |
| label branch-point-10 | |
| pick 486b65b4 Unable to compile because of unused parameter | |
| pick 7fc156b0 Compile warning removed, adding myself to contributors | |
| pick e35e37c1 Update AUTHORS | |
| label Nukesor/patch-1 | |
| # Branch chenshuo/master | |
| reset branch-point-10 # Merge pull request #12 from showlabor/master | |
| merge -R -C 27e170f7 Nukesor/patch-1 # Merge pull request #15 from Nukesor/patch-1 | |
| label branch-point-11 | |
| pick ee56bc43 Use a new container in each round of push_back test. | |
| pick 3f355c59 Add Shuo Chen to CONTRIBUTORS. | |
| pick 775dccb5 Add Shuo Chen to AUTHORS | |
| label chenshuo/master | |
| # Branch ckennelly/googletest | |
| reset branch-point-11 # Merge pull request #15 from Nukesor/patch-1 | |
| merge -R -C 9fa7dc3d chenshuo/master # Merge pull request #16 from chenshuo/master | |
| label branch-point-12 | |
| pick bfe29e49 Add Chris Kennelly to the contributors list. | |
| pick 8079b19f Include stddef.h for size_t. | |
| pick a1886f64 Setup targets from each directory, rather than the top-level. | |
| pick 7d4ef129 Add ExternalProject reference to Google Test 1.7.0. | |
| pick ab543598 Partially resolve google/benchmark#17 by fixing regular expression leak. | |
| pick 90a96eb3 Resolve memory leak from benchmark instances in google/benchmark#17. | |
| label ckennelly/googletest | |
| # Branch ckennelly/googletest-2 | |
| reset ckennelly/googletest # Resolve memory leak from benchmark instances in google/benchmark#17. | |
| pick 7009a1a0 Remove URL_HASH and TLS_VERIFY from CMake configuration. | |
| label ckennelly/googletest-2 | |
| # Branch ckennelly/issue20 | |
| reset branch-point-12 # Merge pull request #16 from chenshuo/master | |
| merge -R -C 2434682c ckennelly/googletest # Merge pull request #18 from ckennelly/googletest | |
| merge -R -C 8115254d ckennelly/googletest-2 # Merge pull request #19 from ckennelly/googletest | |
| label branch-point-13 | |
| pick b47d9bde Resolve benchmark cleanup race condition in issue #20. | |
| label ckennelly/issue20 | |
| # Branch ckennelly/mutex_initialization | |
| reset branch-point-13 # Merge pull request #19 from ckennelly/googletest | |
| pick 5e875a2a Statically initialize benchmark_mutex and extend its lifetime. | |
| label ckennelly/mutex_initialization | |
| # Branch ckennelly/clock_initialization | |
| reset branch-point-13 # Merge pull request #19 from ckennelly/googletest | |
| pick d092f963 Resolve race on approx_time_ in FastClock. | |
| label ckennelly/clock_initialization | |
| # Branch pphaneuf-gitignore | |
| reset branch-point-13 # Merge pull request #19 from ckennelly/googletest | |
| merge -R -C 54514280 ckennelly/issue20 # Merge pull request #21 from ckennelly/issue20 | |
| merge -R -C 40e85ae2 ckennelly/mutex_initialization # Merge pull request #22 from ckennelly/mutex_initialization | |
| merge -R -C 8d090c25 ckennelly/clock_initialization # Merge pull request #23 from ckennelly/clock_initialization | |
| label branch-point-14 | |
| pick e3eea014 Add a few output files to .gitignore. | |
| label pphaneuf-gitignore | |
| # Branch pleroy/TwoBugs | |
| reset branch-point-14 # Merge pull request #23 from ckennelly/clock_initialization | |
| pick fa249b9a Adding myself to the contributors | |
| pick c511aee2 Two bug fixes in KeepRunning. | |
| label pleroy/TwoBugs | |
| # Branch pleroy/StatsPure | |
| reset branch-point-14 # Merge pull request #23 from ckennelly/clock_initialization | |
| pick 24b8f3a7 Fix the stddev/mean computations which had be garbled since commit e5f5a0d30e91d94b0563a0c92bbc2a71b4361daa, leading to a mean that was not in the min/max range and to zero-divide in the stddev computation, among others. | |
| pick 8d841f34 Adding myself to the contributors | |
| pick 99117a54 Print mean/stddev of the # of iterations. | |
| merge -R -C 71023cee pleroy/TwoBugs # Merge branch 'TwoBugs' into StatsPure | |
| pick e7a54bab Less of a hack: avoid the division/multiplication if the stddev is 0. | |
| pick de5c2054 Comment. | |
| label pleroy/StatsPure | |
| # Branch GoogleMaster | |
| reset branch-point-14 # Merge pull request #23 from ckennelly/clock_initialization | |
| merge -R -C 12334c93 pphaneuf-gitignore # Merge branch 'pphaneuf-gitignore' | |
| merge -R -C 0b486c4c pleroy/TwoBugs # Merge pull request #27 from pleroy/TwoBugs | |
| merge -R -C d75c00f3 pleroy/StatsPure # Merge pull request #25 from pleroy/StatsPure | |
| label GoogleMaster | |
| # Branch pleroy/PausePure | |
| reset branch-point-14 # Merge pull request #23 from ckennelly/clock_initialization | |
| pick 604496e8 Ignore the CPU time consumed when timing is paused. | |
| merge -R -C 7bdefe69 GoogleMaster # Merge branch 'GoogleMaster' into PausePure | |
| label pleroy/PausePure | |
| # Branch pleroy/DestructionPure | |
| reset GoogleMaster # Merge pull request #25 from pleroy/StatsPure | |
| merge -R -C 71b295f6 pleroy/PausePure # Merge pull request #28 from pleroy/PausePure | |
| label branch-point-15 | |
| pick 4602d910 Fix a bug in the destruction of BenchmarkFamilies. | |
| label pleroy/DestructionPure | |
| # Branch predmond/master | |
| reset branch-point-15 # Merge pull request #28 from pleroy/PausePure | |
| merge -R -C 5b6655b8 pleroy/DestructionPure # Merge pull request #31 from pleroy/DestructionPure | |
| label branch-point-16 | |
| pick 5855f43d fix signed/unsigned comparison warning | |
| pick 858228ac fix linker error by reordering link libraries | |
| label predmond/master | |
| # Branch predmond/master-2 | |
| reset branch-point-16 # Merge pull request #31 from pleroy/DestructionPure | |
| merge -R -C 6fc2e2fb predmond/master # Merge pull request #33 from predmond/master | |
| pick 75e63e8a Ignore backup files. | |
| pick 04f3c18f Add @predmond to the AUTHORS and CONTRIBUTORS files. | |
| label branch-point-17 | |
| pick d94e62d0 fix examples to use SetBytesProcessed | |
| label predmond/master-2 | |
| # Branch eddyxu/authors | |
| reset branch-point-17 # Add @predmond to the AUTHORS and CONTRIBUTORS files. | |
| pick 2439872b Ignore stanza for ninja users | |
| merge -R -C 748718b3 predmond/master-2 # Merge pull request #34 from predmond/master | |
| label branch-point-18 | |
| pick 0b38233c Add Lei Xu to AUTHORS and CONTRIBUTORS | |
| label eddyxu/authors | |
| # Branch mac | |
| reset branch-point-18 # Merge pull request #34 from predmond/master | |
| pick a4880faa Fixed compiling on Mac 10.9.3 with g++-4.8, clang or system c++ | |
| label mac | |
| # Branch eddyxu-mac | |
| reset branch-point-18 # Merge pull request #34 from predmond/master | |
| merge -R -C 06788955 eddyxu/authors # Merge pull request #38 from eddyxu/authors | |
| label branch-point-19 | |
| merge -R -C e0f9ae22 mac # Merge branch 'mac' of git://github.com/eddyxu/benchmark into eddyxu-mac | |
| label eddyxu-mac | |
| # Branch mattyclarkson/fixes | |
| reset branch-point-19 # Merge pull request #38 from eddyxu/authors | |
| merge -R -C 0ad5cf89 eddyxu-mac # Merge branch 'eddyxu-mac' | |
| label branch-point-20 | |
| pick 8c36360c Made AUTHORS and CONTRIBUTES alphabetical | |
| pick 90fd2129 Added Matt Clarkson as a contributor | |
| pick 2c25d4d1 Allow shared libraries with BUILD_SHARED_LIBS | |
| label mattyclarkson/fixes | |
| # Branch mattyclarkson/versioning | |
| reset branch-point-20 # Merge branch 'eddyxu-mac' | |
| merge -R -C 78f85fd7 mattyclarkson/fixes # Merge pull request #39 from mattyclarkson/fixes | |
| label branch-point-21 | |
| pick 4965c410 Implemented git versioning | |
| pick ce74a1bb get_git_version CMake function | |
| label mattyclarkson/versioning | |
| # Branch mattyclarkson/gtest_verify | |
| reset branch-point-21 # Merge pull request #39 from mattyclarkson/fixes | |
| merge -R -C ac8a8e28 mattyclarkson/versioning # Merge pull request #42 from mattyclarkson/versioning | |
| pick 68917bdb Detect compiler flags and append to default CMake flags | |
| pick 3e98e5d1 Add -Wshadow if supported | |
| pick 15ede584 CMake function for adding compiler flags | |
| pick 987e14cf C++11 concurrency instead of pthread | |
| label branch-point-22 | |
| pick c851311f Verify the download of gtest | |
| label mattyclarkson/gtest_verify | |
| # Branch mattyclarkson/gtest_verify-2 | |
| reset branch-point-22 # C++11 concurrency instead of pthread | |
| merge -R -C 3006a853 mattyclarkson/gtest_verify # Merge pull request #46 from mattyclarkson/gtest_verify | |
| pick 2bc57ba1 Remove URL_HASH as it is unsupported | |
| label branch-point-23 | |
| pick 3344a10d Verify gtest with URL_MD5 | |
| label mattyclarkson/gtest_verify-2 | |
| # Branch mattyclarkson/benchmark_test | |
| reset branch-point-23 # Remove URL_HASH as it is unsupported | |
| merge -R -C 9d52c0d6 mattyclarkson/gtest_verify-2 # Merge pull request #48 from mattyclarkson/gtest_verify | |
| label branch-point-24 | |
| pick 7495a26a Do not use CMake CONCAT | |
| pick 273e429c Ignore the result of make test | |
| pick 482534e1 Check the number of benchmark tests ran | |
| label mattyclarkson/benchmark_test | |
| # Branch mattyclarkson-regex | |
| reset branch-point-24 # Merge pull request #48 from mattyclarkson/gtest_verify | |
| merge -R -C 6777b8ca mattyclarkson/benchmark_test # Merge pull request #47 from mattyclarkson/benchmark_test | |
| label branch-point-25 | |
| pick aa9dd4af Consistent indentation in CMakeLists.txt | |
| pick bfca08ba CMakeLists.txt comments | |
| pick b1395948 Resolve regular expression engines | |
| pick 858f0248 C++11 regular expressions | |
| pick 72266634 Added more complicated regex test patterns | |
| pick 6f6d90ed Fixed the CMake add_cxx_compiler_flag function | |
| label mattyclarkson-regex | |
| # Branch google/pthread_dependency | |
| reset branch-point-25 # Merge pull request #47 from mattyclarkson/benchmark_test | |
| merge -R -C ed967c9c mattyclarkson-regex # Merge branch 'mattyclarkson-regex' | |
| label branch-point-26 | |
| pick 1a2a7dc5 Move pthread dependency to test CMakeLists.txt | |
| label google/pthread_dependency | |
| # Branch google/flag_variants | |
| reset branch-point-26 # Merge branch 'mattyclarkson-regex' | |
| pick ac2dc3ba Fix #54 by correcting reference to CXX flags for variants. | |
| label google/flag_variants | |
| # Branch google/zero_null | |
| reset branch-point-26 # Merge branch 'mattyclarkson-regex' | |
| pick 0b1faee9 Fix #50 by using nullptr and adding stricter warning. | |
| label google/zero_null | |
| # Branch zjx20/instance_mutex | |
| reset branch-point-26 # Merge branch 'mattyclarkson-regex' | |
| pick c182f94c Update AUTHORS | |
| pick 0f69f095 Update CONTRIBUTORS | |
| pick abf2824d Turn the global mutex into instance variables | |
| label zjx20/instance_mutex | |
| # Branch master-3 | |
| reset branch-point-26 # Merge branch 'mattyclarkson-regex' | |
| merge -R -C dc111698 google/pthread_dependency # Merge pull request #56 from google/pthread_dependency | |
| merge -R -C 5a823999 google/flag_variants # Merge pull request #57 from google/flag_variants | |
| merge -R -C 1248d69a google/zero_null # Merge pull request #58 from google/zero_null | |
| merge -R -C 74ad33f5 zjx20/instance_mutex # Merge pull request #59 from zjx20/instance_mutex | |
| label master-3 | |
| # Branch everbase/master | |
| reset branch-point-26 # Merge branch 'mattyclarkson-regex' | |
| pick b81f1728 added googletest dependency to tests (allows compilation with -j) | |
| merge -R -C 179f9861 master-3 # Merge branch 'master' of github.com:google/benchmark | |
| pick a7fab29b remove -Wzero-as-null-pointer-constant flag for now | |
| label everbase/master | |
| # Branch google/62.CHECK | |
| reset master-3 # Merge pull request #59 from zjx20/instance_mutex | |
| merge -R -C 0df117ba everbase/master # Merge pull request #60 from everbase/master | |
| label branch-point-27 | |
| pick 62cfbfc1 Remove CHECK_* from public API. | |
| label google/62.CHECK | |
| # Branch eddyxu/debug_factorial | |
| reset branch-point-27 # Merge pull request #60 from everbase/master | |
| pick 9b3ebb60 Fix example in README.md to compile. | |
| merge -R -C 466ffdb3 google/62.CHECK # Merge pull request #63 from google/62.CHECK | |
| pick 58e38403 Fix release builds | |
| label branch-point-28 | |
| pick 100ddfe7 Use #ifdef to protect calling Factorial in benchmark_test.cc | |
| label eddyxu/debug_factorial | |
| # Branch 3Hren/master | |
| reset branch-point-27 # Merge pull request #60 from everbase/master | |
| pick 826a5150 Using Travis as CI. | |
| pick 958381ba Added c++11 support for Travis. | |
| pick 39be590c Update readme. | |
| pick c3c9ddd9 Update AUTHORS and CONTRIBUTORS. | |
| label 3Hren/master | |
| # Branch google/64.32 | |
| reset branch-point-28 # Fix release builds | |
| merge -R -C 87dbef2e eddyxu/debug_factorial # Merge pull request #68 from eddyxu/debug_factorial | |
| merge -R -C dbb74439 3Hren/master # Merge pull request #66 from 3Hren/master | |
| pick 5daf9bbb Remove drone.io reference | |
| pick 7c5f3bb0 Added gtest CHECK symbol to benchmark test | |
| pick 758c62bf Actually fix issue with CHECK | |
| pick 77498c87 Add section on linking to satisfy #67 | |
| label branch-point-29 | |
| pick fc1f5b69 Fix #72 by avoiding 64-to-32-bit shortenings | |
| label google/64.32 | |
| # Branch google/64-32 | |
| reset branch-point-29 # Add section on linking to satisfy #67 | |
| merge -R -C b577fd31 google/64.32 # Merge pull request #73 from google/64.32 | |
| label branch-point-30 | |
| pick 58fae987 One more 64-bit to 32-bit conversion | |
| label google/64-32 | |
| # Branch pdavydov108/master | |
| reset branch-point-30 # Merge pull request #73 from google/64.32 | |
| pick 2bf92887 add includes for stdint.h | |
| pick b64949a7 Don't use c++14 | |
| label branch-point-31 | |
| pick 455a6f6b Fix #77 build on FreeBSD 10 | |
| pick 5e8fdbf2 Fix #77 add FreeBSD detection in cmake | |
| pick a0f40537 Fix #77 add comment to headers in wrong order | |
| label pdavydov108/master | |
| # Branch google/outofsource | |
| reset branch-point-30 # Merge pull request #73 from google/64.32 | |
| pick bcd51a8f Add top-level folders to gitignore to enable out-of-source builds | |
| label google/outofsource | |
| # Branch upgrade-step1 | |
| reset branch-point-31 # Don't use c++14 | |
| merge -R -C 9f0feb47 google/64-32 # Merge pull request #76 from google/64-32 | |
| merge -R -C 5cf9ffae pdavydov108/master # Merge pull request #78 from pdavydov108/master | |
| merge -R -C 66842d62 google/outofsource # Merge pull request #75 from google/outofsource | |
| pick f73bddaf Change std::regex detection test to detect bug in libstdc++. | |
| label branch-point-33 | |
| pick 04adcf21 Step one towards merging timer changes. | |
| pick 1c73fa37 address comments | |
| label branch-point-32 | |
| pick be13131e add env to make ctest print on failure | |
| label upgrade-step1 | |
| # Branch upgrade-step1-2 | |
| reset upgrade-step1 # add env to make ctest print on failure | |
| pick eefd509f Fix travis config by moving CTEST_OUTPUT_ON_FAILURE=1 into make test command | |
| label upgrade-step1-2 | |
| # Branch master-4 | |
| reset branch-point-33 # Change std::regex detection test to detect bug in libstdc++. | |
| merge -R -C 45d0cc1c upgrade-step1-2 # Merge pull request #81 from google/upgrade-step1 | |
| label master-4 | |
| # Branch google/upgrade-step2 | |
| reset branch-point-32 # address comments | |
| pick 70fbf908 The second step towards merging the timer changes. | |
| pick 1672c61e invert check in GetLogInstanceForLevel() | |
| pick ed798437 comment out test to prevent failures. | |
| pick 40feadd5 remove ifdefs around BM_Factorial | |
| label branch-point-34 | |
| merge -R -C 1f6abcb4 upgrade-step1 # Merge branch 'upgrade-step1' into upgrade-step2 | |
| merge -R -C 23a52f7d upgrade-step1-2 # Merge branch 'upgrade-step1' into upgrade-step2 | |
| merge -R -C bc59e347 master-4 # Merge branch 'master' into upgrade-step2 | |
| pick bdccf9ad Force static initialization of walltime. | |
| pick 48a91445 address comments | |
| label google/upgrade-step2 | |
| # Branch google/upgrade-step3 | |
| reset branch-point-34 # remove ifdefs around BM_Factorial | |
| pick bd064684 Third step in moving towards adopting new timer semantics | |
| merge -R -C ef7e5380 google/upgrade-step2 # Merge branch 'upgrade-step2' into upgrade-step3 | |
| pick 3bad26b9 update more copyright | |
| pick 91aec8cc fix missing newline and header guard name | |
| pick 421be156 remove forward declarations | |
| label google/upgrade-step3 | |
| # Branch google/filter_test | |
| reset master-4 # Merge pull request #81 from google/upgrade-step1 | |
| merge -R -C 419c30a5 google/upgrade-step2 # Merge pull request #84 from google/upgrade-step2 | |
| merge -R -C 7afe58a7 google/upgrade-step3 # Merge pull request #85 from google/upgrade-step3 | |
| label branch-point-35 | |
| pick a13ecb7b Add filter test, remove re test, and googletest deps | |
| label google/filter_test | |
| # Branch google/userealtime | |
| reset branch-point-35 # Merge pull request #85 from google/upgrade-step3 | |
| merge -R -C ba14ca92 google/filter_test # Merge pull request #87 from google/filter_test | |
| pick ee665d39 remove third_party directory. update test args | |
| label branch-point-36 | |
| pick 3b8739d5 Enable UseRealTime and fix documentation for SetLabel. | |
| label google/userealtime | |
| # Branch merge | |
| reset branch-point-36 # remove third_party directory. update test args | |
| merge -R -C fb28b675 google/userealtime # Merge pull request #90 from google/userealtime | |
| pick 0e219714 Adopt new benchmark timing internals. | |
| label branch-point-38 | |
| pick b2246e52 Fix includes in benchmark.h | |
| label merge | |
| # Branch google/pimpl-benchmark | |
| reset branch-point-38 # Adopt new benchmark timing internals. | |
| pick cfa41c00 pimpl benchmark | |
| pick fbfde18b remove unneeded includes | |
| merge -R -C 61b6c0e0 merge # merge | |
| label google/pimpl-benchmark | |
| # Branch Merge-null-pointer-warnings | |
| reset merge # Fix includes in benchmark.h | |
| pick ffacd384 Enable zero as NULL warnings and fix all occurences | |
| pick a4846f5d replace instances of NULL with nullptr | |
| label Merge-null-pointer-warnings | |
| # Branch merge-master | |
| reset merge # Fix includes in benchmark.h | |
| pick 04409695 Enable int shortening warnings | |
| label branch-point-37 | |
| pick 3564ef44 Add reference to BENCHMARK_MAIN in README | |
| merge -R -C 8afbb5cd google/pimpl-benchmark # Merge pull request #92 from google/pimpl-benchmark | |
| merge -R -C 6321c233 Merge-null-pointer-warnings # Merge null pointer warnings | |
| label merge-master | |
| # Branch google/reporter_change | |
| reset branch-point-37 # Enable int shortening warnings | |
| pick e2ab5993 add floating point comparison warnings | |
| pick 64827c57 address review comments | |
| merge -R -C a5b2c904 merge-master # merge master | |
| pick 6de76d85 add test for benchmark with two template parameters | |
| label branch-point-39 | |
| pick b7f3c77f move reporter internals in both headers and source | |
| pick e4ad40a3 move basic_test over to minimal benchmark | |
| pick b340f01b move to using C headers in minimal_benchmark.h to prevent getting any C++ STL headers | |
| pick dc7851f7 add include to minimal_benchmark.h | |
| pick 634ffdcc rename minimal_benchmark.h and fix recursive include in benchmark_api.h | |
| pick 376d5522 fix minimal_benchmark.h include | |
| pick 40a8e2f7 move ConsoleReporter out of internal namespace | |
| label google/reporter_change | |
| # Branch google/reporter_api_change | |
| reset branch-point-39 # add test for benchmark with two template parameters | |
| merge -R -C d1a19886 google/reporter_change # Merge pull request #98 from google/reporter_change | |
| label branch-point-40 | |
| pick 5bdf94d5 Apply reporter interface changes. Make report methods non-const and add a Finalize method. | |
| label google/reporter_api_change | |
| # Branch google/json_reporter | |
| reset branch-point-40 # Merge pull request #98 from google/reporter_change | |
| merge -R -C 26ff3e9d google/reporter_api_change # Merge pull request #99 from google/reporter_api_change | |
| label branch-point-41 | |
| pick 6704cbf3 add json reporter | |
| pick a796d487 address review comments | |
| pick 1e13ee38 address review comments and fix array type declaration | |
| label google/json_reporter | |
| # Branch google/variadic_macros | |
| reset branch-point-41 # Merge pull request #99 from google/reporter_api_change | |
| merge -R -C a0b7c273 google/json_reporter # Merge pull request #100 from google/json_reporter | |
| pick 4fdd4855 Add newline after every benchmark to improve readability of the json output. | |
| pick 6d3f03ca Add BENCHMARK_TEMPLATE1 macro | |
| pick d20b2338 Revert "Add BENCHMARK_TEMPLATE1 macro" | |
| pick 4553f0d6 Remove use of reserved names in benchmark macros | |
| label branch-point-42 | |
| pick eadedecd Add variadic macro for BENCHMARK_TEMPLATE in c++11 and beyond. | |
| pick af746943 add C++03 test and update README | |
| pick bb81c214 Don't treat CMAKE_CXX_FLAGS as a list | |
| pick a3dacdef Handle creation of C++03 flags differently | |
| label google/variadic_macros | |
| # Branch google/fix-negative-times | |
| reset branch-point-42 # Remove use of reserved names in benchmark macros | |
| merge -R -C f3de3e3e google/variadic_macros # Merge pull request #101 from google/variadic_macros | |
| label branch-point-43 | |
| pick 9fe1cc7c Introduce use of std::chrono and remove Walltime printing | |
| pick 642b84dd cleanup whitespace and includes | |
| pick 83e88d40 remove unneeded test repetitions | |
| pick 4ee413d9 add walltime benchmark and fix unused variable. | |
| pick d6be97f3 actually add new test | |
| pick c9f504e9 improve walltime test | |
| pick 56dd749b prevent unneeded calculation of Slow() | |
| pick ed8ca4c9 Revert "prevent unneeded calculation of Slow()" | |
| pick 12d555c4 finish selection of clock with debug information | |
| pick 322c66a0 Remove walltime implementation tests and expose less internals | |
| pick f94b1378 address review comments | |
| pick 9904a1fe Make DateTimeString part of the internal implementation | |
| label google/fix-negative-times | |
| # Branch google/fix-macros | |
| reset branch-point-43 # Merge pull request #101 from google/variadic_macros | |
| pick 94d149b1 fix macro names and use __COUNTER__ | |
| pick 7b4a82f6 remove whitespace | |
| pick bbf29f0e rename BENCHMARK_PRIVATE_NAME to BENCHMARK_PRIVATE_CONCAT | |
| pick 1ed0fced update names | |
| label google/fix-macros | |
| # Branch master-5 | |
| reset branch-point-43 # Merge pull request #101 from google/variadic_macros | |
| merge -R -C 65828d8c google/fix-negative-times # Merge pull request #104 from google/fix-negative-times | |
| merge -R -C c964275c google/fix-macros # Merge pull request #102 from google/fix-macros | |
| label master-5 | |
| # Branch master-6 | |
| reset master-5 # Merge pull request #102 from google/fix-macros | |
| pick b5453522 Add 'benchmark::DoNotOptimize(...)' to help users prevent optimizations | |
| label master-6 | |
| # Branch google/new-benchmark-interface | |
| reset branch-point-43 # Merge pull request #101 from google/variadic_macros | |
| pick e16f1e98 Change the available benchmark options | |
| pick 022a1cad Fix column width calculation and remove duplicate test | |
| merge -R -C a44c2f07 master-5 # Merge branch 'master' into new-benchmark-interface | |
| merge -R -C b4f99403 master-6 # Merge branch 'master' into new-benchmark-interface | |
| pick d9291ce6 merge new changes in basic_test.cc | |
| label google/new-benchmark-interface | |
| # Branch google/csv | |
| reset master-6 # Add 'benchmark::DoNotOptimize(...)' to help users prevent optimizations | |
| merge -R -C a483356a google/new-benchmark-interface # Merge pull request #105 from google/new-benchmark-interface | |
| label branch-point-44 | |
| pick b5f919f9 Introduce CSV reporter | |
| pick c12138ec Add double-quotes where necessary | |
| pick edf75a52 Add csv to help output | |
| pick e0cfd333 Deal with names with embedded quotes | |
| label google/csv | |
| # Branch mattyclarkson/nt | |
| reset branch-point-44 # Merge pull request #105 from google/new-benchmark-interface | |
| merge -R -C c96cd5c8 google/csv # Merge pull request #107 from google/csv | |
| pick c5b0ac60 add workaround to DoNotOptimize(...) for clang inline assembly bug. | |
| label branch-point-45 | |
| pick a0912acc Added windows executables to the ignore list | |
| pick d0626f5c Only include the correct platform headers | |
| pick 6a793b96 Use CMake to link Shlwapi on Windows | |
| pick 28447bc6 Use the WINAPI `Sleep` function | |
| pick 611ac243 Use `int64_t` rather than `int64` | |
| pick 3f2b127c NT definition of MyCPUUsage and ChildrenCPUUsage | |
| pick a3e10069 Ignore python compiled files | |
| pick ded39689 Ignore windows shared libraries | |
| pick 6a975dd8 Added a script that can download MinGW | |
| pick 7f0c26ea appveyor configuration file | |
| label mattyclarkson/nt | |
| # Branch google/list-tests | |
| reset branch-point-45 # add workaround to DoNotOptimize(...) for clang inline assembly bug. | |
| pick 571d5c47 add list test internals | |
| pick a13d0f8a redo filter test | |
| pick a7016685 Add braces for one line conditionals and loops | |
| label google/list-tests | |
| # Branch google/buildtype_log | |
| reset branch-point-45 # add workaround to DoNotOptimize(...) for clang inline assembly bug. | |
| merge -R -C 16f76774 mattyclarkson/nt # Merge pull request #64 from mattyclarkson/nt | |
| merge -R -C 3917c7be google/list-tests # Merge pull request #108 from google/list-tests | |
| label branch-point-46 | |
| pick 3b8b898c Clarify build type warning | |
| label google/buildtype_log | |
| # Branch mattyclarkson/install-fix | |
| reset branch-point-46 # Merge pull request #108 from google/list-tests | |
| merge -R -C 5679966e google/buildtype_log # Merge pull request #111 from google/buildtype_log | |
| label branch-point-47 | |
| pick c5d4f5e6 Libraries are treated as runtime objects on Windows | |
| label mattyclarkson/install-fix | |
| # Branch google/build-shared | |
| reset branch-point-47 # Merge pull request #111 from google/buildtype_log | |
| merge -R -C 5e17362d mattyclarkson/install-fix # Merge pull request #113 from mattyclarkson/install-fix | |
| pick a1a59588 Add missing paranthesis and documentation | |
| label branch-point-48 | |
| pick fab6e636 Remove BENCHMARK_ENABLE_SHARED and prefer BUILD_SHARED_LIBS | |
| pick ab974cac Fix comment about linking threading | |
| label google/build-shared | |
| # Branch davidreynolds/master | |
| reset branch-point-48 # Add missing paranthesis and documentation | |
| merge -R -C 28f740e4 google/build-shared # Merge pull request #115 from google/build-shared | |
| pick 2e1feb7e Print information about travis enviroment | |
| label branch-point-49 | |
| pick 9d989848 Fix typos: rangeY -> range_y() | |
| label davidreynolds/master | |
| # Branch geoffromer-cmake-patch | |
| reset branch-point-49 # Print information about travis enviroment | |
| pick 7e900a56 Upgrade travis to use CMake 2.8.12 and add Clang builders | |
| merge -R -C b64a8b0c davidreynolds/master # Merge pull request #118 from davidreynolds/master | |
| label branch-point-50 | |
| pick 613a3a09 Configure 'benchmark' cmake target so that when other targets depend on it, they get the appropriate include directories and link libraries automatically. | |
| pick 2948d905 Require cmake 2.8.12 in order to support target_include_directories, and simplify thread linking logic. | |
| pick 9f116ef5 Link pthread as an INTERFACE library. | |
| pick 81327c16 Drop down to CMake 2.8.11, and drop INTERFACE since that version doesn't support it. | |
| pick f45b53e9 Rearrange the pieces | |
| label geoffromer-cmake-patch | |
| # Branch google/benchmark-fixtures | |
| reset branch-point-50 # Merge pull request #118 from davidreynolds/master | |
| merge -R -C fb84b2e4 geoffromer-cmake-patch # Merge branch 'geoffromer-cmake-patch' | |
| label branch-point-51 | |
| pick 048cbe73 add ability to use benchmark filters | |
| pick e347b775 address review comments | |
| pick 824c7a9b address more review comments | |
| label google/benchmark-fixtures | |
| # Branch mattyclarkson/coverage | |
| reset branch-point-51 # Merge branch 'geoffromer-cmake-patch' | |
| merge -R -C 6082f240 google/benchmark-fixtures # Merge pull request #120 from google/benchmark-fixtures | |
| label branch-point-52 | |
| pick f6bd59c5 Improve the CMake C++ flag checker | |
| pick 6c6d51f2 Only warn on errors in release mode | |
| pick 76a3df45 Compile with link time optimisation | |
| pick 0b8c23c8 Group common C++ flags | |
| pick 45e1863e Ignore tests | |
| pick 291ec8d6 Allow the user to set the C++ standard to use | |
| pick 5e5385d7 Coverage support with LCOV and GCOV | |
| pick 52b02989 Enable strict aliasing warnings | |
| pick 5c93fffc Added coveralls support | |
| label mattyclarkson/coverage | |
| # Branch dcoeurjo/cmakeEmptybuildtype | |
| reset branch-point-52 # Merge pull request #120 from google/benchmark-fixtures | |
| pick b1b91094 Update README.md | |
| pick 0138b7ce Update README.md | |
| merge -R -C 41c0a2ba mattyclarkson/coverage # Merge pull request #122 from mattyclarkson/coverage | |
| label branch-point-53 | |
| pick 65439d43 Fixing cmake issue with empty cmake_build_type | |
| label dcoeurjo/cmakeEmptybuildtype | |
| # Branch myd7349/master | |
| reset branch-point-53 # Merge pull request #122 from mattyclarkson/coverage | |
| merge -R -C 09ace069 dcoeurjo/cmakeEmptybuildtype # Merge pull request #125 from dcoeurjo/cmakeEmptybuildtype | |
| label branch-point-54 | |
| pick 74534e8a Fix issue #127 | |
| label myd7349/master | |
| # Branch umireon/sysinfo-macosx-illegal-nullptr | |
| reset branch-point-54 # Merge pull request #125 from dcoeurjo/cmakeEmptybuildtype | |
| merge -R -C 9576f856 myd7349/master # Merge pull request #128 from myd7349/master | |
| label branch-point-55 | |
| pick 5bcca432 Fix the compilation error against G++ on Mac OS X. | |
| pick 0f80256e Add Kaito Udagawa to AUTHORS and CONTRIBUTORS | |
| label umireon/sysinfo-macosx-illegal-nullptr | |
| # Branch eliben/master | |
| reset branch-point-55 # Merge pull request #128 from myd7349/master | |
| merge -R -C e6cf96bb umireon/sysinfo-macosx-illegal-nullptr # Merge pull request #130 from umireon/sysinfo-macosx-illegal-nullptr | |
| pick dbeb0c9a trailing whitespace | |
| pick a304f087 Fix #133. Comment now contains compilable code. | |
| label branch-point-56 | |
| pick e7ccf40f Fix doc sample typos in header and README | |
| label eliben/master | |
| # Branch eliben/fix-custom-arguments-return | |
| reset eliben/master # Fix doc sample typos in header and README | |
| pick 091c0458 Custom arguments function usage with Apply - fix doc and add test. | |
| label eliben/fix-custom-arguments-return | |
| # Branch jll63/jleroy/vs2013-compatibility | |
| reset branch-point-56 # Fix #133. Comment now contains compilable code. | |
| pick a45dd5a8 Remove unnecessary `typename'. | |
| pick 8979531f Make it compile with Visual Studio 2013. | |
| pick aa608054 Iterations declared as size_t but printf'ed as a long long. Make it a long long. | |
| pick fb69d1cc Fix division in CPU usage calculation on Windows. | |
| pick af1a65ec Do not CpuScalingEnabled on Windows. | |
| pick 73b7a3dc Address Dominic's (stylistic) remarks. | |
| pick 29ae9586 Remove unused FormatKV(..., size_t) overload. | |
| label jll63/jleroy/vs2013-compatibility | |
| # Branch devjgm/master | |
| reset branch-point-56 # Fix #133. Comment now contains compilable code. | |
| merge -R -C 2da649d8 eliben/master # Merge pull request #139 from eliben/master | |
| merge -R -C ce3735c1 eliben/fix-custom-arguments-return # Merge pull request #140 from eliben/fix-custom-arguments-return | |
| merge -R -C 927ef9dc jll63/jleroy/vs2013-compatibility # Merge pull request #137 from jll63/jleroy/vs2013-compatibility | |
| label branch-point-57 | |
| pick fec02de9 Updates Initialize() to work with an argv as 'char**' | |
| label devjgm/master | |
| # Branch master-7 | |
| reset branch-point-57 # Merge pull request #137 from jll63/jleroy/vs2013-compatibility | |
| merge -R -C 8f68223e devjgm/master # Merge pull request #143 from devjgm/master | |
| label master-7 | |
| # Branch efcs/remove-check | |
| reset branch-point-56 # Fix #133. Comment now contains compilable code. | |
| pick 2b1b5a1c Remove std::is_trivially_destructible assertion because the trait may not be provided by the STL. | |
| merge -R -C 87d04d8a master-7 # Merge branch 'master' into remove-check | |
| pick 5480518b dynamically allocate WallTimeImp | |
| label efcs/remove-check | |
| # Branch efcs/fix-iteration-type | |
| reset master-7 # Merge pull request #143 from devjgm/master | |
| merge -R -C c1d907b1 efcs/remove-check # Merge pull request #136 from efcs/remove-check | |
| label branch-point-58 | |
| pick d593d698 use size_t instead of int for the iteration count | |
| pick 78c1faa2 Make the type of kMaxIterations consistent with the type of the iteration count | |
| label efcs/fix-iteration-type | |
| # Branch izaid/clang-fix | |
| reset branch-point-58 # Merge pull request #136 from efcs/remove-check | |
| merge -R -C 65aacfb5 efcs/fix-iteration-type # Merge pull request #146 from efcs/fix-iteration-type | |
| label branch-point-59 | |
| pick e685bcf2 Removed unneeded #include <cstddef> | |
| label izaid/clang-fix | |
| # Branch DiracResearch/visual-studio-warnings-fix | |
| reset branch-point-59 # Merge pull request #146 from efcs/fix-iteration-type | |
| pick d0face6c Changed MSVC warnings from Wall to W4 to avoid 10000+ warnings from stl/windows headers. | |
| pick c9cba829 Renamed the internal os macros to avoid a name clash in Shlwapi.h where OS_WINDOWS is defined to 0. | |
| pick 581b482a Fixed int64 to double cast warning. | |
| pick 45dfaab6 Removed default constructor, copy constructor and assignment operator for CheckHandler. | |
| pick 2d07dec2 Fixed bug in "ToExponentAndMantissa" when negative exponents where created. | |
| pick bae0142f Fixed double to float warning. | |
| pick 970e5796 Added _CRT_SECURE_NO_WARNINGS under MSVC. | |
| pick 5239e7bd Changed "while(true)" to "for(;;)" to avoid warning in visual studio. | |
| pick e42d24eb Use IsWindowsXPOrGreater instead of the deprecated GetVersionEx. | |
| pick 4a14828d Added Wconversion so the gcc/clang warnings will be more similar to W4 on MSVC. | |
| pick e898182d Fixed int to char warning. | |
| pick 5994a63d Revert "Added Wconversion so the gcc/clang warnings will be more similar to W4 on MSVC." | |
| label DiracResearch/visual-studio-warnings-fix | |
| # Branch mdavezac/master | |
| reset branch-point-59 # Merge pull request #146 from efcs/fix-iteration-type | |
| merge -R -C 123e0641 izaid/clang-fix # Merge pull request #151 from izaid/clang-fix | |
| merge -R -C 665a1d05 DiracResearch/visual-studio-warnings-fix # Merge pull request #150 from DiracResearch/visual-studio-warnings-fix | |
| label branch-point-60 | |
| pick fb35b79c Fixes compilation issue on Macs | |
| label mdavezac/master | |
| # Branch DiracResearch/android-fix | |
| reset branch-point-60 # Merge pull request #150 from DiracResearch/visual-studio-warnings-fix | |
| merge -R -C 19997a17 mdavezac/master # Merge pull request #152 from mdavezac/master | |
| label branch-point-61 | |
| pick efd7cb55 Added include of cstdlib needed for strtol, strtod and getenv. | |
| pick 924681d4 Changed "std::vsnprintf" to "vsnprintf" to be able to build with the android-ndk. | |
| pick 828ab04f Only include "sys/sysctl.h" if it is needed. | |
| pick 8e9155a4 Fixed tests so they build on android. | |
| pick c467047a Use stringstream instead of atoi to avoid sign error. | |
| pick 4f3e9674 Sorted include of headers. | |
| pick 39170962 Added a comment why std::vsnprintf is not used. | |
| pick de09e2b0 Removed newline. | |
| pick 385a26b0 Changed date format to ISO 8601. | |
| pick 9a77237e Fixed OS macros changed in previous pull request. | |
| label DiracResearch/android-fix | |
| # Branch DiracResearch/cmake-git-fix | |
| reset branch-point-59 # Merge pull request #146 from efcs/fix-iteration-type | |
| pick 6788a181 CMake check for git on the system | |
| pick d0171b36 Adds Dirac Research and me as Author and Contributor | |
| label DiracResearch/cmake-git-fix | |
| # Branch Zbyl/fix-getgitversion | |
| reset branch-point-61 # Merge pull request #152 from mdavezac/master | |
| merge -R -C 5df10399 DiracResearch/android-fix # Merge pull request #149 from DiracResearch/android-fix | |
| pick cfeb5d42 Update macro names in comments. | |
| merge -R -C 370ecff1 DiracResearch/cmake-git-fix # Merge pull request #148 from DiracResearch/cmake-git-fix | |
| pick df6dcceb Added IRC channel to README.md | |
| label branch-point-62 | |
| pick 0f9ceeb8 Fix get_git_version to use GIT_EXECUTABLE. | |
| label Zbyl/fix-getgitversion | |
| # Branch guanqun/fix-static-cast | |
| reset branch-point-62 # Added IRC channel to README.md | |
| merge -R -C c139ede0 Zbyl/fix-getgitversion # Merge pull request #156 from Zbyl/fix-getgitversion | |
| label branch-point-63 | |
| pick 0c78887d add static_cast to get rid of warnings for intel compiler on linux platform | |
| label guanqun/fix-static-cast | |
| # Branch RYOBG/add-cstdio | |
| reset branch-point-63 # Merge pull request #156 from Zbyl/fix-getgitversion | |
| merge -R -C 5014ce9d guanqun/fix-static-cast # Merge pull request #157 from guanqun/fix-static-cast | |
| pick fa8f27f4 Fixes #161 | |
| label branch-point-64 | |
| pick 88a16fee Fixes #159: Add inclusion of cstdio to files using stdout, vprintf, printf and etc. | |
| pick a7642724 Add myself to AUTHORS and CONTRIBUTORS as requested wrt Fix #159. | |
| label RYOBG/add-cstdio | |
| # Branch disconnect3d/master | |
| reset branch-point-64 # Fixes #161 | |
| merge -R -C 28a646f2 RYOBG/add-cstdio # Merge pull request #162 from RYOBG/add-cstdio | |
| label branch-point-65 | |
| pick 92e9468c Fixes #165: CustomArguments ret type in README | |
| label disconnect3d/master | |
| # Branch eliben/update-doc-userealtime | |
| reset branch-point-65 # Merge pull request #162 from RYOBG/add-cstdio | |
| merge -R -C 66cf41e6 disconnect3d/master # Merge pull request #166 from disconnect3d/master | |
| pick 820d06fa Rename OS_MACOSX macro to new name BENCHMARK_OS_MACOSX. Fix #169 | |
| label branch-point-66 | |
| pick 68828bfc Update README to mention UseRealTime for wallclock time measurements. | |
| label eliben/update-doc-userealtime | |
| # Branch KindDragon/master | |
| reset branch-point-66 # Rename OS_MACOSX macro to new name BENCHMARK_OS_MACOSX. Fix #169 | |
| merge -R -C 80fef1ac eliben/update-doc-userealtime # Merge pull request #171 from eliben/update-doc-userealtime | |
| label branch-point-67 | |
| pick b3d125bc Support MSVC on appveyor | |
| label KindDragon/master | |
| # Branch enh/cpuinfo-arm | |
| reset branch-point-67 # Merge pull request #171 from eliben/update-doc-userealtime | |
| pick 97eb3261 Fix ARM /proc/cpuinfo parsing. | |
| label enh/cpuinfo-arm | |
| # Branch enh/cycle-timer-aarch64 | |
| reset branch-point-67 # Merge pull request #171 from eliben/update-doc-userealtime | |
| pick a0235723 Add aarch64 support to src/cycleclock.h. | |
| label enh/cycle-timer-aarch64 | |
| # Branch google/release | |
| reset branch-point-67 # Merge pull request #171 from eliben/update-doc-userealtime | |
| merge -R -C 371f2fa9 KindDragon/master # Merge pull request #175 from KindDragon/master | |
| merge -R -C bf148286 enh/cpuinfo-arm # Merge pull request #177 from enh/cpuinfo-arm | |
| merge -R -C eeecc45e enh/cycle-timer-aarch64 # Merge pull request #176 from enh/cycle-timer-aarch64 | |
| label branch-point-68 | |
| pick 3af3ff4c Add section on optimisations to README | |
| label google/release | |
| # Branch buchgr/state_threads | |
| reset branch-point-68 # Merge pull request #176 from enh/cycle-timer-aarch64 | |
| merge -R -C 0b0e4f34 google/release # Merge pull request #180 from google/release | |
| label branch-point-69 | |
| pick 7281892f Add number of threads to State. | |
| label buchgr/state_threads | |
| # Branch google/map_test | |
| reset branch-point-69 # Merge pull request #180 from google/release | |
| pick 1dfdaec9 Pass const state to Fixture::SetUp. Add map_test. | |
| label google/map_test | |
| # Branch KindDragon/patch-1 | |
| reset branch-point-69 # Merge pull request #180 from google/release | |
| merge -R -C 98ee3777 buchgr/state_threads # Merge pull request #182 from buchgr/state_threads | |
| merge -R -C 59aea372 google/map_test # Merge pull request #181 from google/map_test | |
| label branch-point-70 | |
| pick 23f39eeb Update README.md | |
| label KindDragon/patch-1 | |
| # Branch amin-jabri/multithreaded_Fixture_TearDown | |
| reset branch-point-70 # Merge pull request #181 from google/map_test | |
| merge -R -C 823f1046 KindDragon/patch-1 # Merge pull request #184 from KindDragon/patch-1 | |
| label branch-point-71 | |
| pick 51bf8823 Pass const State to Fixture::TearDown. Fix memory leak in fixture_test | |
| label amin-jabri/multithreaded_Fixture_TearDown | |
| # Branch insertinterestingnamehere/libcpp_include_fix | |
| reset branch-point-71 # Merge pull request #184 from KindDragon/patch-1 | |
| merge -R -C abd6f8f9 amin-jabri/multithreaded_Fixture_TearDown # Merge pull request #186 from amin-jabri/multithreaded_Fixture_TearDown | |
| label branch-point-72 | |
| pick fc3dabb0 Include cstdlib in map_test to make sure std::rand is available when building with libc++. | |
| label insertinterestingnamehere/libcpp_include_fix | |
| # Branch dvyukov/patch-1 | |
| reset branch-point-72 # Merge pull request #186 from amin-jabri/multithreaded_Fixture_TearDown | |
| merge -R -C 9fe19dc5 insertinterestingnamehere/libcpp_include_fix # Merge pull request #187 from insertinterestingnamehere/libcpp_include_fix | |
| label branch-point-73 | |
| pick fb0381f0 Update benchmark_api.h | |
| label dvyukov/patch-1 | |
| # Branch google/iterationdoc | |
| reset branch-point-73 # Merge pull request #187 from insertinterestingnamehere/libcpp_include_fix | |
| merge -R -C 4cea7015 dvyukov/patch-1 # Merge pull request #195 from dvyukov/patch-1 | |
| label branch-point-74 | |
| pick 4eff13e9 Add section on iterations. | |
| label google/iterationdoc | |
| # Branch alycm/fix-leak | |
| reset branch-point-67 # Merge pull request #171 from eliben/update-doc-userealtime | |
| pick af00db58 Close a memory leak in configuration code | |
| label alycm/fix-leak | |
| # Branch master-8 | |
| reset branch-point-74 # Merge pull request #195 from dvyukov/patch-1 | |
| merge -R -C e1d3cd13 google/iterationdoc # Merge pull request #196 from google/iterationdoc | |
| merge -R -C 58b50e82 alycm/fix-leak # Merge pull request #174 from alycm/fix-leak | |
| label master-8 | |
| # Branch NewProggie-feature/add-ms-time-report | |
| reset branch-point-73 # Merge pull request #187 from insertinterestingnamehere/libcpp_include_fix | |
| pick ed4e8c23 Add optional ms time unit for console reporter | |
| pick 1bdc4716 Add myself to the contributors list | |
| pick c21404f5 Add an additional parameter for time units | |
| pick b2ba51fb Refactor GetTimeUnitAndMultiplier and add example | |
| pick 2a035dbf Add GetTimeAndMultiplier to json and csv reporter as well | |
| pick 499796c3 Add explanatory comment why src headers are needed in test/CMakeLists.txt | |
| pick 106ca226 Fix missing <tuple> header in csv/json_reporter | |
| merge -R -C 3ded9bf4 master-8 # Merge branch 'master' into feature/add-ms-time-report | |
| pick 3eb325ac Remove sleep.h dependency for tests | |
| label NewProggie-feature/add-ms-time-report | |
| # Branch google/200 | |
| reset master-8 # Merge pull request #174 from alycm/fix-leak | |
| merge -R -C 2a246692 NewProggie-feature/add-ms-time-report # Merge branch 'NewProggie-feature/add-ms-time-report' | |
| label branch-point-75 | |
| pick 4035370f Only output optional fields if they're set | |
| label google/200 | |
| # Branch jknuuttila/master | |
| reset branch-point-75 # Merge branch 'NewProggie-feature/add-ms-time-report' | |
| merge -R -C 864ec9f8 google/200 # Merge pull request #201 from google/200 | |
| label branch-point-76 | |
| pick e61d4a0b Fixed a warning caused by an implicit narrowing cast. | |
| pick da1ff537 Manual timing support. | |
| label jknuuttila/master | |
| # Branch BillyONeal/fix-appveyor | |
| reset branch-point-76 # Merge pull request #201 from google/200 | |
| merge -R -C 5ff8c041 jknuuttila/master # Merge pull request #199 from jknuuttila/master | |
| label branch-point-77 | |
| pick f2b41bb7 Use nanoseconds instead of duration<double, milli> | |
| label BillyONeal/fix-appveyor | |
| # Branch BillyONeal/msvc-cli-warnings | |
| reset branch-point-77 # Merge pull request #199 from jknuuttila/master | |
| pick dc498158 Add myself to the contributors list | |
| pick 69fe1497 Remove redundant MSVC++ /W3 triggering warnings | |
| pick 9a0e494c Fix clobbering of default CMAKE_CXX_FLAGS_RELEASE | |
| pick 5af9d842 Added support for CMake's other rel configs | |
| pick fb7acbf2 Added GCC/Clang support for other rel configs | |
| label BillyONeal/msvc-cli-warnings | |
| # Branch BillyONeal/travis-init | |
| reset branch-point-77 # Merge pull request #199 from jknuuttila/master | |
| merge -R -C bdba6552 BillyONeal/fix-appveyor # Merge pull request #209 from BillyONeal/fix-appveyor | |
| merge -R -C d1876cc4 BillyONeal/msvc-cli-warnings # Merge pull request #208 from BillyONeal/msvc-cli-warnings | |
| label branch-point-78 | |
| pick fd24c0b5 Mark sudo: required for Travis | |
| label BillyONeal/travis-init | |
| # Branch ismaelJimenez/master | |
| reset branch-point-78 # Merge pull request #208 from BillyONeal/msvc-cli-warnings | |
| merge -R -C 6c1f8503 BillyONeal/travis-init # Merge pull request #210 from BillyONeal/travis-init | |
| label branch-point-79 | |
| pick 7b0d59f2 added option to change range multiplier | |
| pick 99337809 Modified check for range multiplier | |
| label ismaelJimenez/master | |
| # Branch efcs/diagnostic-checks | |
| reset branch-point-79 # Merge pull request #210 from BillyONeal/travis-init | |
| merge -R -C 8516d706 ismaelJimenez/master # Merge pull request #212 from ismaelJimenez/master | |
| label branch-point-81 | |
| pick 4e35f921 Add myself to the CONTRIBUTORS file | |
| label branch-point-80 | |
| pick e42e5a99 Add checks that <Resume|Pause>Timing functions are not called outside of the benchmark. Fixes #204 | |
| pick 2e675b8b add newline | |
| pick 7996d73a Address review comments | |
| pick 57597cef Allow test to compile with -fno-exceptions | |
| label efcs/diagnostic-checks | |
| # Branch ismaelJimenez-complexity | |
| reset branch-point-81 # Merge pull request #212 from ismaelJimenez/master | |
| pick 6bf21852 Added test file and Complexity() interface | |
| pick eba0570d implemented Complexity for O(1) | |
| pick 5e9ca7fa addaptation of minimal_leastsq library | |
| pick 884c1e03 implemented complexity reporting | |
| pick 1a12b913 Refactor for pull request | |
| pick 2b76bc48 Added range multiplier to Readme | |
| pick bd07c5c6 Added asymptotic complexity to Readme | |
| pick 937e5953 Update Readme | |
| pick 58eff34c reworked comment for complexity report | |
| pick b5c06570 fixed non-const reference arguments | |
| pick 56ede558 refactor fitting curve | |
| pick ecc885cc refactor MinimalLEastSq | |
| pick 501790ad fixed last_benchmark_instance | |
| pick ec7bee83 refactor least square .h | |
| pick 4f431cea fix | |
| pick 1accb614 changed indentation | |
| pick c2251a33 refactor names | |
| pick 0858f2ce changed color and remove iterations | |
| pick b4d7c0a2 extracted BigO and GetBigO in own file | |
| pick e534768c added end of file carriage return | |
| pick 1f7961fb added SetComplexityN | |
| pick c3c0d706 fixed warning | |
| pick f10edf0d fixed overshadow | |
| pick 00355f24 changed complexity_n from int to size_t | |
| pick a25d0601 adapt complexity_n to leastsq inteface | |
| pick 9f0fd234 simplify format string for complexity output | |
| label ismaelJimenez-complexity | |
| # Branch merge-2 | |
| reset branch-point-80 # Add myself to the CONTRIBUTORS file | |
| pick a9ee203e Only compile and run the C++03 test when -std=c++03 is supported. Fixes #164 | |
| pick 56850dd6 Prevent re-execution of slow feature tests. | |
| pick 5a7c2979 Change RunSpecifiedBenchmarks to return the number of benchmarks run. Fixes #145 | |
| pick 434479c6 Change --benchmark_list_tests to respect the benchmark filter. | |
| merge -R -C 0f6e2338 efcs/diagnostic-checks # Merge pull request #216 from efcs/diagnostic-checks | |
| merge -R -C a8386972 ismaelJimenez-complexity # Merge branch 'ismaelJimenez-complexity' | |
| pick 01533381 Formatting updates | |
| label merge-2 | |
| # Branch master-9 | |
| reset merge-2 # Formatting updates | |
| pick 90940e8e Fix build error with libc++ | |
| label master-9 | |
| # Branch skip_with_error | |
| reset branch-point-80 # Add myself to the CONTRIBUTORS file | |
| pick ee5c477a Add SkipWithError(...) function. | |
| pick a1d32c86 add doc | |
| merge -R -C 9bf85647 merge-2 # merge | |
| pick 56f9c6a2 Reflow some wording. NFC | |
| pick 449998fc Fix error-handling in reporters | |
| merge -R -C b11cad38 master-9 # Merge branch 'master' into skip_with_error | |
| pick dc128c55 Address review comments. | |
| pick a14b9ed6 Fix bad merge which caused the benchmark name to be printed twice | |
| pick b17945f7 fix another bad merge | |
| pick e589cadc Fix csv_reporter when reporting errors | |
| label skip_with_error | |
| # Branch master-10 | |
| reset master-9 # Fix build error with libc++ | |
| pick f8e3ac95 Add a per benchmark 'Repetitions' option. | |
| label master-10 | |
| # Branch skip_with_error-2 | |
| reset skip_with_error # Fix csv_reporter when reporting errors | |
| merge -R -C 0d3a941b master-10 # Merge branch 'master' into skip_with_error | |
| label skip_with_error-2 | |
| # Branch efcs-skip_with_error | |
| reset master-10 # Add a per benchmark 'Repetitions' option. | |
| merge -R -C 55aaebaa skip_with_error # Merge branch 'skip_with_error' of git://github.com/efcs/benchmark into efcs-skip_with_error | |
| merge -R -C 623595f2 skip_with_error-2 # Merge branch 'skip_with_error' of git://github.com/efcs/benchmark into efcs-skip_with_error | |
| label efcs-skip_with_error | |
| # Branch zabereer/donotoptimize_with_test_merged | |
| reset master-10 # Add a per benchmark 'Repetitions' option. | |
| merge -R -C a2e92e36 efcs-skip_with_error # Merge branch 'efcs-skip_with_error' | |
| label branch-point-82 | |
| pick 3e563ff1 Force DoNotOptimize operand to memory for both gcc and clang | |
| label zabereer/donotoptimize_with_test_merged | |
| # Branch update_complexity | |
| reset master-10 # Add a per benchmark 'Repetitions' option. | |
| pick f38f58e6 added auto as default value for complexity | |
| pick 59af06d0 upgraded leastsq | |
| pick 0998f48a refactor leastsq into complexity | |
| pick afcfe54c Update Readme.md | |
| pick f3304d41 move include from .h into .cc | |
| pick cea641af updated complexity_test.cc to new interface for auto | |
| pick 164b7f1e indent | |
| pick 70becd2d fixed typos | |
| pick e38f0e9b initialized doubles to 0.0 | |
| pick 5bc685a8 added includes | |
| pick 0ce60a09 moved complexity.h into src and BigO enum into benchmark_api | |
| pick ac02c77b small refactor | |
| pick cdddd116 added benchmar_apit to complexity.cc | |
| label update_complexity | |
| # Branch ismaelJimenez-update_complexity | |
| reset branch-point-82 # Merge branch 'efcs-skip_with_error' | |
| merge -R -C 52166a80 zabereer/donotoptimize_with_test_merged # Merge pull request #224 from zabereer/donotoptimize_with_test_merged | |
| label branch-point-83 | |
| merge -R -C aafa8690 update_complexity # Merge branch 'update_complexity' of git://github.com/ismaelJimenez/benchmark into ismaelJimenez-update_complexity | |
| label ismaelJimenez-update_complexity | |
| # Branch added_lambdas | |
| reset branch-point-83 # Merge pull request #224 from zabereer/donotoptimize_with_test_merged | |
| merge -R -C 317b5907 ismaelJimenez-update_complexity # Merge branch 'ismaelJimenez-update_complexity' | |
| pick d1a9e581 Change reporters to use a specified output and error stream. Add tests for output. (#219) | |
| pick d51ac9af Allow benchmarks to take arbitrary arguments. (#221) | |
| pick 0cdfa406 Cleanup reporters (#226) | |
| pick 6cc9504b Move UnitTime helpers to reporter.h | |
| pick a5329199 Fix windows build in console_reporter.cc. Fixes #228 | |
| pick d5485723 Fix missing declaration of FLAGS_color_print | |
| pick 33220715 Fix flaky test | |
| label branch-point-84 | |
| pick 72e9a98c added lambdas to complexity report | |
| pick edd0bd59 fixed reporter_output_test | |
| pick 58cf2a71 removed check on automatic fit, to avoid random convergence misfits breaking the build | |
| pick 62afa983 checked format before pull request | |
| pick e0972ed3 removed functional library not needed | |
| label branch-point-85 | |
| pick b8e1bd2b Update Readme.md | |
| label added_lambdas | |
| # Branch added_lambdas-2 | |
| reset branch-point-85 # removed functional library not needed | |
| pick a56491c5 google formated | |
| merge -R -C d41fed95 added_lambdas # Merge branch 'added_lambdas' of https://github.com/ismaelJimenez/benchmark into added_lambdas | |
| pick f8f30c02 changed BigOFunc argument from size_t to int | |
| pick 6eb77a08 changed BigO logic order | |
| pick 50128264 changed global string to const char * | |
| pick 899a3b3d changed complexity_n to int and fix some whitespaces | |
| label added_lambdas-2 | |
| # Branch ismaelJimenez-added_lambdas | |
| reset branch-point-84 # Fix flaky test | |
| pick 5c077c75 Added new noexcept macros for VS2013 (#229) | |
| pick a3f49c89 Add workaround for VS2013 const-incorrect atomic (#230) | |
| label branch-point-86 | |
| merge -R -C dbc66f51 added_lambdas-2 # Merge branch 'added_lambdas' of git://github.com/ismaelJimenez/benchmark into ismaelJimenez-added_lambdas | |
| pick f55e04be fix warning on loss of integer precision | |
| label ismaelJimenez-added_lambdas | |
| # Branch mkurdej-fix-time-unit | |
| reset branch-point-86 # Add workaround for VS2013 const-incorrect atomic (#230) | |
| merge -R -C 6700aadf ismaelJimenez-added_lambdas # Merge branch 'ismaelJimenez-added_lambdas' | |
| pick 54f053cc fix issue 235 (#236) | |
| pick fd7170cf Clarified output formats (#241) | |
| pick d7b5413d Add state.SetComplexityN to docs. (#245) | |
| pick 2bac6777 fix 244 (#247) | |
| pick e70cfd15 added check for SetComplexityN (#248) | |
| pick c020e404 Add export linker flags policy to cmake (#251) | |
| pick c30113c7 Provide a better implementation of DoNotOptimize(...). | |
| pick 75cbdacf Add missing `volatile`s to 32-bit ARM cycleclock assembler. (#253) | |
| pick 4b94ce30 set cpuinfo_num_cpus on Windows (#254) | |
| pick 085d65f7 Workaround missing std::this_thread::sleep_for function in tests. | |
| pick 63897b56 Revert "Workaround missing std::this_thread::sleep_for function in tests." | |
| pick 7fb47d13 Improve failure mode in complexity_test.cc | |
| pick 5eb06df4 Fix suprious failures in complexity_test.cc | |
| pick 0eeafe1e Use correct integer type for complexity. MSVC warns otherwise | |
| pick da56189e Fix missing SYSTEM_INFO initializers | |
| pick a977bd5c add support for step in DenseRange() (#260) | |
| pick f5f56968 Add --benchmark_out=<filename> and --benchmark_out_format=<format> options. | |
| pick 94994971 update travis, squash history (#265) | |
| pick dcc64d2b Add `RegisterBenchmark(name, func, args...)` for creating/registering benchmarks. (#259) | |
| pick 679131f8 Attempt to fix MSVC build failures | |
| pick eb77def0 Hide yet another test from MSVC 2013 | |
| pick 7b25f351 Support multiple ranges in the benchmark (#257) | |
| pick 7ac03d62 Attempt to fix VC 2013 build. | |
| pick 624511ae Add myself to AUTHORS. | |
| pick 2096be5b Whitespace change to trigger appveyor. | |
| pick d3bfe5d3 Temporarly disable VC 2013 appveyor build in order to test VC 2015 | |
| pick ba68bd1a Fix signed integer overflow UB in complexity computations. | |
| pick 6a6f0032 Add ASAN and UBSAN builders to travis for both GCC and Clang. | |
| pick fe60a79c Make Appveyor show test output on failure | |
| pick 8285e01c Add libc++ and MSAN builders to to travis. | |
| pick 718751ff fix Appveyor config and add timeout | |
| pick 93070b18 Increase Appveyor timeout and fix build warning | |
| pick 9c3731f5 Rework Appveyor config | |
| pick dbfee777 Work around bogus GCC warning | |
| pick 7bccf227 Use pre-installed MinGW on Appveyor | |
| pick 9aaa2365 Document compiler requirements (#269) | |
| pick 3264a247 Add a "compare_bench.py" tooling script. (#266) | |
| pick 578bde8c Workaround flaky complexity_test.cc test case. | |
| pick 15273605 Test different Appveyor MinGW installation | |
| pick c6dc4057 Add --benchmark_report_aggregates_only={true|false} flag for better summary output. (#267) | |
| pick 1fb73cc6 Remove MinGW builder in preference of MinGW-w64. | |
| pick d46151a6 Refactor output test runner into standalone module. (#277) | |
| pick 7f99c8d4 Improve diagnostic output for output tests. | |
| pick 31dc7d14 Update libc++ install script to use new names | |
| pick 3d7c961e Fix std::cout/std::cerr static initialization order fiasco. | |
| pick 9553aacb Fix out-of-bounds std::vector access. | |
| pick 7f13f5b2 Cleanup and optimize Range generation. | |
| pick 851eca9f Supply old `RangePair` and `ArgPair` API for C++03 compatibility. (#278) | |
| pick 302d8e84 Add -DBENCHMARK_USE_LIBCXX:BOOL=<value> option. (#280) | |
| pick f97c3845 Add warning for large benchmark families (#279) | |
| pick 09a77870 Fix #202 - Document Windows dependency on shlwapi.lib | |
| pick 772b3b82 CMake: add headers to the list of source files. (#284) | |
| pick a1a9a645 Fixture: add non const Setup() and TearDown(). (#285) | |
| pick ec9787c3 Add clang-format file | |
| pick a3e79c73 Make `PauseTiming()` and `ResumeTiming()` per thread. (#286) | |
| pick 29a00a7d attempt to suppress apveyor warnings | |
| pick 54d0f61d Fix BENCHMARK_NORETURN on MSVC | |
| pick 1000f59a Add another workaround for Appveyor warnings | |
| pick a802f4cc Increase complexity_test.cc runtime to attempt to avoid appveyor failures | |
| pick 8127d120 Try and add MSVC NORETURN attribute again | |
| pick 09d192a6 Increase complexity_test runtime slightly less. | |
| pick c7dca212 Fix wording because an idiot came up with it. | |
| pick c35236db Add Thread Sanitizer bot to Travis | |
| pick 910421aa Tweak TSAN flags | |
| pick fe2a91d5 Remove TSAN builder for now. | |
| pick dcf6d5e5 Add Benchmark::ThreadRange() version with increment instead of multiply (#283) | |
| pick 3afbb4ab Document --benchmark_filter. Thanks to NAThompson for the original patch | |
| pick 6d158941 Refactor benchmark.cc into benchmark_register.cc and benchmark.cc (#287) | |
| pick 48d51f37 Cleanup RunBenchmark code. (#289) | |
| pick 780bd004 Flush reporters' output streams after writing a benchmark run (#288) | |
| pick 961e3822 Auto-detect whether Benchmark should produce colorized output (#126) | |
| pick 0d93e0a7 s/resolved/unresolved/ | |
| pick c95bf52b Fix working on mac clock_gettime (#292) | |
| pick 995aac14 Fix various uninitialized members | |
| pick a57e49cd Pass flag string to `check_cxx_compiler_flag` (#298) | |
| pick 13980487 Simplify clang-format and apply to tests (#302) | |
| pick baad8c71 Apply clang-format to all headers and source (#303) | |
| pick 40e5b3d3 Use correct RE for floating point numbers in reporter_output_test.cc | |
| pick e3a8c445 Fix #300. Emit RMS as a float not a percentage in JSON | |
| pick 83d02726 Fix #295. Remove use of BSD extensions for comparing strings | |
| pick a2e0e651 Fix #294. Add -D_GNU_SOURCE when building under Cygwin | |
| pick 400965a3 Fix getting the CPU frequency on OS X | |
| pick 0fddb197 Fix typo in timer.cc that caused negative CPU times on OS X. Fixes #293 | |
| label branch-point-87 | |
| pick 803283c5 Fix displayed time unit in mean and standard deviation. | |
| pick 8e89264a Add tests. | |
| label mkurdej-fix-time-unit | |
| # Branch mkurdej-arg-names | |
| reset branch-point-87 # Fix typo in timer.cc that caused negative CPU times on OS X. Fixes #293 | |
| merge -R -C 03ca27ff mkurdej-fix-time-unit # Merge branch 'mkurdej-fix-time-unit' | |
| label branch-point-88 | |
| pick 2736c04c Add ArgName() and ArgNames() methods to name arguments/ranges. | |
| pick 5ea777b3 Handle the case when the argument name is an empty string. | |
| pick 77f4222d Check argument count in `ArgName` and `ArgNames`. | |
| pick 1097c760 Allow calling Args and ArgNames in any order. | |
| label mkurdej-arg-names | |
| # Branch 1.1 | |
| reset branch-point-88 # Merge branch 'mkurdej-fix-time-unit' | |
| merge -R -C 7ffb4d9d mkurdej-arg-names # Merge branch 'mkurdej-arg-names' | |
| pick 062bf9d1 Add tests for reporters (#307) | |
| pick b8c09620 Report error when no benchmarks match regex. (#308) | |
| label branch-point-90 | |
| pick bc983bab Add CMake Package Config files during install | |
| pick bd023ca0 Fix ${include_install_dir} | |
| label 1.1 | |
| # Branch piribes-1.1 | |
| reset branch-point-90 # Report error when no benchmarks match regex. (#308) | |
| pick c405dd35 Rewrite compare_bench.py argument parsing. | |
| pick b33897e4 Fix obvious typo in string formatting | |
| pick 5001c397 Add compare_bench.py documentation. Fixes #309 (#318) | |
| pick 864f7cd3 Update the required CMake version to 2.8.12 (#316) | |
| pick 560ff303 Add support for building w/o exceptions (#317) | |
| pick 79e8cb7b fix argv accessed out of bounds in ParseCommandLineFlags() (#321) | |
| pick 6cdd39b7 fix compare script - output formatting - correctly align numbers >9999 (#322) | |
| pick 1bf5a195 Issue 327 (#328) | |
| pick f24601c4 Fix librt linking on systems which has it (#331) | |
| pick 1f9580ed HumanReadableNumber(): Simplify output for simple numbers. Examples: (#291) | |
| pick cfb80df3 Report unrecognized arguments from BENCHMARK_MAIN() macro (#332) | |
| pick 38a584c4 Disable iOS CPU Frequency readout (#335) | |
| pick 88f1f5c0 Fix typename for powerpc (#337) | |
| pick 03283323 Support for Web platforms (#340) | |
| pick f480ed6f Add user-defined counters. (#262) | |
| pick 02f1c835 Rename BenchmarkCounters to UserCounters (#346) | |
| label branch-point-89 | |
| pick f945c66c Fix std::string detection hack for SetLabel. | |
| pick 48cf7fcb Implement ClobberMemory() and fix DoNotOptimize on MSVC. (#352) | |
| pick 994ff42b Include cstdlib for timespec. Clang modules demands that. (#353) | |
| pick 5080e6eb Fix ICC compiler warnings (#358) | |
| pick 6c3b5a6f Replace int64_t usages with 'int' instead. (#359) | |
| pick 07ef321f Fix CPU frequency parsing on Linux (#355) (#356) | |
| pick c2437e4c Add BENCHMARK_BUILD_32_BITS option and add builders to test it (#360) | |
| pick bf19945f Python 2/3 compatibility (#361) | |
| label branch-point-91 | |
| merge -R -C fb974af8 1.1 # Merge branch '1.1' of git://github.com/piribes/benchmark into piribes-1.1 | |
| pick 42d0fa1a Remove unnecessary benchmark subfolder | |
| label piribes-1.1 | |
| # Branch master-11 | |
| reset branch-point-91 # Python 2/3 compatibility (#361) | |
| merge -R -C 46b818a7 piribes-1.1 # Merge branch 'piribes-1.1' | |
| pick 6cb0bba3 Fixes #357: broken RMS values when time unit is set. (#362) | |
| label master-11 | |
| # Branch master-12 | |
| reset master-11 # Fixes #357: broken RMS values when time unit is set. (#362) | |
| pick eb0e72e2 Fix cmake file not to use CMAKE_SOURCE_DIR (#367) | |
| pick b654abfb Enable <cassert> by removing -DNDEBUG when running the tests. | |
| pick 3eed785d Add Benchmark::Iterations for explicit iteration count control - Fixes #370 (#373) | |
| pick 283aaedb Don't limit benchmarks with manual timers to 5x the elapsed real time. | |
| pick d695d6a8 fix android compilation (#372) | |
| pick 41cda218 fix for android NDK r10e (#375) | |
| pick e01470fb Support VS2017 on AppVeyor (#376) | |
| label master-12 | |
| # Branch master-13 | |
| reset branch-point-91 # Python 2/3 compatibility (#361) | |
| pick 51e17122 Fixes #357: broken RMS values when time unit is set. | |
| merge -R -C 5a2403d2 master-11 # Merge branch 'master' of https://github.com/google/benchmark | |
| merge -R -C 7f335d12 master-12 # Merge branch 'master' of https://github.com/google/benchmark | |
| pick 0716d414 Fixes #378 (hopefully). Unit tests for counters to follow. | |
| label branch-point-92 | |
| pick 95930267 Fixes #378 coercion to double was causing counter to forget its flags, changed it so that its value is updated directly | |
| label master-13 | |
| # Branch test_usercounters | |
| reset branch-point-92 # Fixes #378 (hopefully). Unit tests for counters to follow. | |
| pick a2fbf3bd User counters: fix misplaced newline in console reporter header. | |
| pick f4270276 Reporter tests: reuse csv header. | |
| pick 69f14bb5 User counter tests: first version. | |
| pick 9ce8d13e User counters: add more unit tests. ... | |
| pick 78c4a591 Unit testing: add facilities to check benchmark results. | |
| pick 01643891 Remove some whitespace. | |
| pick 05927b6d Add epsilon check macros for float comparison. | |
| pick e02561ca Use const char* instead of std::string in entry name lookup. | |
| pick 0aa9b57a ResultsCheckerEntry: add more getter functions. | |
| pick 05db2724 Results check: add checks with epsilon. | |
| pick 0d768f67 User counters: add more tests. | |
| pick 27704deb Avoid compiler-specific pragmas in result check macros. | |
| pick 34b5ba2d Add log of the benchmark name when checking results. | |
| pick 5f3b8d0c Make result checkers execute on all regex-matching benchmarks. | |
| pick 520577a7 Fix ResultsCheckerEntry::NumThreads() | |
| pick 4773033f Add (currently failing) tests for user counters with threads. | |
| merge -R -C bb666531 master-13 # Merge branch 'master' of https://github.com/vladoovtcharov/benchmark into test_usercounters | |
| pick b2973c4d Console reporting of user counters: print rates like non-rates. | |
| pick 436dca29 Fix expected values of user counters as rates in unit tests. | |
| pick 57251b0d Result checking: move some function definitions to source file. | |
| pick 618c5790 Adopt standard style. | |
| pick f29c542d Rename ResultsCheckerEntry to Results. | |
| pick 728f195d Remove unused prototype. | |
| pick 3ddb7803 Add missing include for providing std::function. | |
| pick 64bd660c Add missing include of stringstream. | |
| pick bd14e5e0 CHECK_EPS: Use parentheses to wrap macro arguments. | |
| pick 54868100 Remove whitespace. | |
| pick da513446 Simplify printing of counters in console reporter. | |
| pick 2f97a5ed Fix g++-4.8 compile errors. | |
| pick 54aa14c2 Fix VS2013 quirk. | |
| pick 196fc135 CHECK(): rename EPS to FLOAT for consistency with googletest style. | |
| pick 08948419 Fix VS warning. | |
| pick 6278a78f Fix brace formatting (Habits die hard!). | |
| pick 45cdd604 CHECK_BENCHMARK_RESULTS() was too inconspicuous. | |
| pick 3f5b5c33 Make Results::GetTime() receive an enum. | |
| pick 8b78f79d Improve some comments. | |
| pick 3a51b606 Add output_test.h to output_test_helper for VisualStudio editing. | |
| pick 2a9e013a Fix indentation. | |
| label test_usercounters | |
| # Branch biojppm-test_usercounters | |
| reset master-12 # Support VS2017 on AppVeyor (#376) | |
| pick cba25b5d Ensure all the necessary keys are present before parsing JSON data (#380) | |
| label branch-point-93 | |
| merge -R -C 569b5c65 test_usercounters # Merge branch 'test_usercounters' of git://github.com/biojppm/benchmark into biojppm-test_usercounters | |
| label biojppm-test_usercounters | |
| # Branch upstream/master | |
| reset branch-point-93 # Ensure all the necessary keys are present before parsing JSON data (#380) | |
| merge -R -C 525a4881 biojppm-test_usercounters # Merge branch 'biojppm-test_usercounters' | |
| label upstream/master | |
| # Branch biojppm-compact | |
| reset branch-point-89 # Rename BenchmarkCounters to UserCounters (#346) | |
| pick 038db38b Add command line option --benchmark_counters_tabular | |
| pick 9a6af970 Tabular counters: fix dangling reference to color_output_. | |
| pick dab13aaf Fix use of C-style cast. | |
| pick 796eb42e Tabular counters: fix missing cast on MSVC. | |
| pick 04bde7ad User counters: document tabular output in README.md | |
| merge -R -C e4b40a3a upstream/master # Merge remote-tracking branch 'upstream/master' into compact | |
| pick 1587cc93 Fix: --benchmark_counters_tabular was not being passed to tests. | |
| pick ece97f7d Add first unit test for benchmark_tabular_counters. | |
| pick e5a76276 Add test for tabular output of rate counters. | |
| pick de23c76e Console reporter: add /s prefix to counter rates. | |
| pick 6d7cda30 Allow different counter sets in CSV reporting. | |
| pick c7cffd75 Add unit test for counter sets. | |
| pick 24e66505 Extend tabular counter tests to different counter sets. | |
| pick c0c11854 Fix (that is, ignore) clang compile error. | |
| pick d3c7e649 Fix dropped-style elses. | |
| pick 2f5eb8c4 Fix pragma clang ignore with gcc. | |
| pick b0166352 Trying again to fix error caused by -Wunused-function. | |
| label biojppm-compact | |
| # Branch efcs/fix-gtest-install | |
| reset upstream/master # Merge branch 'biojppm-test_usercounters' | |
| merge -R -C 23fcd97a biojppm-compact # Merge branch 'biojppm-compact' | |
| pick 3090e791 test commit | |
| pick dfed4bf5 Add macOS builds to .travis.yml (#389) | |
| pick 739b271d Remove unnecessary whitespace in travis yaml | |
| pick 6cc79559 Associate the required include directory with the benchmark library (#393) | |
| pick 7b08b62a Fix #342: DoNotOptimize causes compile errors on older GCC versions. (#398) | |
| pick 06309fe4 Use the sample version of standard deviation (#383) | |
| pick 8a63a969 Use NEW settings for CMP0063 policy (#399) | |
| pick 45c57d16 Revert "Use NEW settings for CMP0063 policy (#399)" (#401) | |
| pick 9a156070 Add ClearRegisteredBenchmark() function. (#402) | |
| pick 96e68afe Fix #403 HAVE_${VAR} not passed to makefile (#404) | |
| pick 40f14f49 Make Benchmark a single header library (but not header-only) (#407) | |
| pick 21d48144 Fix ThreadCPUUsage when running on RTEMS. (#414) | |
| pick 9a651a12 Google-style cleanups (#416) | |
| pick 1d6058a8 more clang tidy cleanups (#417) | |
| pick ea47863a Json reporter: don't cast floating-point to int; adjust tooling (#426) | |
| pick c98684cc Tooling: generate_difference_report(): show old/new for both values (#427) | |
| pick affe3ff3 Suppress -Wodr on C++03 tests when LTO is enabled. | |
| pick 4418688a reporter_output_test: json: iterations is int, not float (#431) | |
| pick 199e815c CMake: Fallback from try_run to try_compile when cross-compiling. (#436) | |
| pick c01bed0b compare_bench.py: fixup benchmark_options. (#435) | |
| pick 1e2690fe Allow the definition of 1k to be flexible. (#438) | |
| pick 76558cfe Drop Stat1, refactor statistics to be user-providable, add median. (#428) | |
| pick 4c59ded0 Attempting to resolve a submoduling issues... (#439) | |
| pick 0994227d [RFC] Tools: compare-bench.py: print change% with two decimal digits (#440) | |
| pick 5806540d Fix Markdown typos in readme. (#445) | |
| pick 91663bea Improve README's basic usage example (#433) | |
| pick fb57a6aa Fix #444 - Use BENCHMARK_HAS_CXX11 over __cplusplus. (#446) | |
| pick 0d3b7366 Organize AUTHORS | |
| pick 6262d76a Order CONTRIBUTORS | |
| pick cda30021 Remove myself from AUTHORS | |
| pick e0dc13e1 Alphabets are hard. CONTRIBUTORS version. | |
| pick 5afcac32 Alphabets are hard. AUTHORS version. | |
| pick 0a0d2e78 Minor move of code to cleanup up namespace spaghetti a bit | |
| pick 8c939099 Add macros for create benchmark with templated fixture (#451) | |
| pick 16c40fa9 Always use inline asm DoNotOptimize with clang. (#452) | |
| pick f26feec8 Add C++11 Ranged For loop alternative to KeepRunning (#454) | |
| pick 6655e29f Avoid implicit float to double conversion (#457) | |
| pick e6407566 Correct typo in sample code for range-based for loop. (#458) | |
| pick 6ad9d991 Improve KeepRunning loop performance to be similar to the range-based for. (#460) | |
| pick c0a0d9d8 Fix and document SkipWithError(...) using ranged-for loop. | |
| pick 587e48c5 Refactor most usages of KeepRunning to use the perfered ranged-for. (#459) | |
| pick f2ece409 Add option to install benchmark (#463) | |
| pick 9619e54b Improve BM_SetInsert example (#465) | |
| pick 500dd56b Mention how to disable CPU frequency scaling while running the benchmark. (#466) | |
| pick bba9af50 Update AUTHORS/CONTRIBUTORS (#471) | |
| pick c5a13f7a Add releasing doc (#472) | |
| pick a7310499 Remove deprecated headers (#473) | |
| pick c3de8c7d Fix #382 - MinGW often reports negative CPU times. (#475) | |
| pick e9a82c94 Fix #476. Explicit coersion of size_t to boolean (#477) | |
| pick ef99c3d0 Reorder inline to avoid warning on MSVC (#469) | |
| pick 42fd2074 [Tools] A new, more versatile benchmark output compare tool (#474) | |
| pick 3a990497 Add doc specifying the scope of the timing calculation | |
| pick 2aa1dfb7 Add a pkg-config file, for the benefit of projects not using CMake. (#480) | |
| pick b5012ba0 Add NetBSD support (#482) | |
| pick 37ef475c Refactor System information collection -- Add CPU Cache Info (#483) | |
| pick 1549b342 Improve CPU Cache info reporting -- Add Windows support. (#486) | |
| pick 9b26efd3 Improve BENCHMARK_UNREACHABLE() implementation. | |
| pick 6406931c Console reporter: properly account for the lenght of custom counter names (#484) | |
| pick 4c00225e Added the installation guide for Ubuntu (#489) | |
| pick 4b7db6a1 CMake: implement LTO for clang. Fixes #478 (#487) | |
| pick 057654c3 Fix compilation error with GCC on OSX (issue #490). (#491) | |
| pick a50d2012 Add GCC on OSX to list of Travis CI configurations. (#492) | |
| pick c42e43f4 Enforce using a semicolon after BENCHMARK_MAIN to remove compiler warnings (#495) | |
| pick c14102be fix xcode travis builds by skipping mkdir errors | |
| pick 4c792c3b Document new 'v2' branch meant for unstable development. | |
| pick 11a7ff67 Add support for GTest based unit tests. (#485) | |
| pick c06ed8ea Update README.md | |
| pick 3c5d4c75 Updated documentation. (#503) | |
| label branch-point-94 | |
| pick d2365d67 Prevent GTest and GMock from being installed with Google Benchmark. | |
| label efcs/fix-gtest-install | |
| # Branch git-subtree-add---prefix-lib/gbenchmark-gb-v1.4.0 | |
| reset branch-point-94 # Updated documentation. (#503) | |
| merge -R -C 135b37e8 efcs/fix-gtest-install # Merge pull request #509 from efcs/fix-gtest-install | |
| pick f63174b3 Wrap COMPILER macros. (#514) | |
| pick aa681edb Fixes compilation error caused by integer precision loss due to implicit (#518) | |
| pick 2ccb375a Some small clang-tidy fixes (#520) | |
| pick 90865501 .vs/ and CmakeSettings.json to gitignore (#522) | |
| pick 4d70a581 Support State::KeepRunningBatch(). (#521) | |
| pick 8757fa04 Work around Gtest build failure caused by -Werror=unused-function. (#529) | |
| pick 13e95d49 Fix GTest workaround on MSVC | |
| pick 1525b01e Make output tests more stable on slow machines. | |
| pick 13cde85f Attempt to fix travis timeouts during apt-get. (#528) | |
| pick 1b4cef89 Fixups following addition of KeepRunningBatch (296ec5693) (#526) | |
| pick dbccbddb Improve State packing: put important members on first cache line. (#527) | |
| pick 9970c2a1 Don't include <sys/resource.h> on Fuchsia. (#531) | |
| pick 79a3508b Ensure std::iterator_traits<StateIterator> instantiates. | |
| pick 8b01f69a Fix typo in README.md (#535) | |
| pick 8cb095dd Update note about linking with pthreads (#536) | |
| pick cda7daec Print the executable name as part of the context. (#534) | |
| pick a82ed1a0 Use STCK to get the CPU clock on s390x (#540) | |
| pick a6b0912d Add Solaris support (#539) | |
| pick 26c2e0f9 Spelling fixes (#543) | |
| pick 355a03c4 Do not let StrCat be renamed to lstrcatA (#546) | |
| pick dbe50130 Make string_util naming more consistent (#547) | |
| pick 846ac753 Add support for building with Bazel. (#533) | |
| pick a36fafb8 Move thread classes out to clean up monolithic code (#554) | |
| pick 0bbd06c2 Fix #538 - gtest.h not found when building with older CMake versions. | |
| pick bac0da11 Fix #552 - GCC and Clang warn on possibly invalid offsetof usage. | |
| pick dd048d43 Rely on compiler intrinsics to identify regex engine. (#555) | |
| pick 0c607031 Add tests to verify assembler output -- Fix DoNotOptimize. (#530) | |
| pick de73a87d Fix uninitialized warning (#560) | |
| pick 6691eb10 Allow AddRange to work with int64_t. (#548) | |
| label git-subtree-add---prefix-lib/gbenchmark-gb-v1.4.0 | |
| reset onto | |
| pick b72858d6 Updates to use gbenchmark plus some tools and documentation. | |
| pick 9e74ecd8 Delete lib/gbenchmark in preparation for updating to newer version. | |
| merge -R -C 21279281 git-subtree-add---prefix-lib/gbenchmark-gb-v1.4.0 # git subtree add --prefix lib/gbenchmark gb-v1.4.0 | |
| pick e7ccc6ea In gbenchmark st.range is not int64_t | |
| pick 4a81b2cf add zz | |
| # Rebase b154f12c..4a81b2cf onto b154f12c (1375 commands) | |
| # | |
| # Commands: | |
| # p, pick <commit> = use commit | |
| # r, reword <commit> = use commit, but edit the commit message | |
| # e, edit <commit> = use commit, but stop for amending | |
| # s, squash <commit> = use commit, but meld into previous commit | |
| # f, fixup <commit> = like "squash", but discard this commit's log message | |
| # x, exec <commit> = run command (the rest of the line) using shell | |
| # d, drop <commit> = remove commit | |
| # l, label <label> = label current HEAD with a name | |
| # t, reset <label> = reset HEAD to a label | |
| # m, merge [-C <commit> | -c <commit>] <label> [# <oneline>] | |
| # . create a merge commit using the original merge commit's | |
| # . message (or the oneline, if no original merge commit was | |
| # . specified). Use -c <commit> to reword the commit message. | |
| # | |
| # These lines can be re-ordered; they are executed from top to bottom. | |
| # | |
| # If you remove a line here THAT COMMIT WILL BE LOST. | |
| # | |
| # However, if you remove everything, the rebase will be aborted. | |
| # | |
| # | |
| # Note that empty commits are commented out |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment