[libstxxl1] 02/02: Merge tag 'upstream/1.4.1'
D Haley
mycae-guest at moszumanska.debian.org
Thu May 14 21:56:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
mycae-guest pushed a commit to branch master
in repository libstxxl1.
commit bfb5a8fabafeed582cab071b3188d185aeea9e4b
Merge: 72eb4fe 7d8f358
Author: D Haley <mycae at gmx.com>
Date: Thu May 14 23:55:45 2015 +0200
Merge tag 'upstream/1.4.1'
Upstream version 1.4.1
AUTHORS | 1 +
CHANGELOG | 38 +
CMakeLists.txt | 116 +-
Doxyfile | 5 +-
TODO | 7 -
doc/common.dox | 21 +
doc/design.dox | 35 +-
doc/faq.dox | 46 +-
doc/images/layer_diagram.pdf | Bin 106663 -> 29116 bytes
doc/images/layer_diagram.png | Bin 58493 -> 54489 bytes
doc/images/layer_diagram.svg | 184 +--
doc/images/layer_diagram_small.png | Bin 30014 -> 49060 bytes
doc/install.dox | 48 +-
doc/mainpage.dox | 44 +-
doc/tutorial.dox | 1 +
doc/tutorial_unordered_map.dox | 59 +
examples/algo/copy_and_sort_file.cpp | 27 +-
examples/algo/phonebills.cpp | 3 +-
examples/algo/phonebills_genlog.cpp | 9 +-
examples/algo/sort_file.cpp | 26 +-
examples/applications/skew3.cpp | 15 +-
examples/containers/CMakeLists.txt | 4 +-
examples/containers/deque2.cpp | 2 +-
examples/containers/unordered_map1.cpp | 89 ++
include/stxxl.h | 1 +
include/stxxl/bits/algo/adaptor.h | 126 +-
include/stxxl/bits/algo/async_schedule.h | 27 +-
include/stxxl/bits/algo/inmemsort.h | 9 +-
include/stxxl/bits/algo/intksort.h | 107 +-
include/stxxl/bits/algo/ksort.h | 332 ++--
include/stxxl/bits/algo/losertree.h | 34 +-
include/stxxl/bits/algo/random_shuffle.h | 168 +-
include/stxxl/bits/algo/run_cursor.h | 48 +-
include/stxxl/bits/algo/scan.h | 69 +-
include/stxxl/bits/algo/sort.h | 169 +-
include/stxxl/bits/algo/sort_base.h | 1 -
include/stxxl/bits/algo/sort_helper.h | 57 +-
include/stxxl/bits/algo/stable_ksort.h | 105 +-
include/stxxl/bits/common/addressable_queues.h | 44 +-
include/stxxl/bits/common/aligned_alloc.h | 46 +-
include/stxxl/bits/common/binary_buffer.h | 650 ++++++++
include/stxxl/bits/common/cmdline.h | 95 +-
include/stxxl/bits/common/condition_variable.h | 1 -
include/stxxl/bits/common/counting_ptr.h | 6 +-
include/stxxl/bits/common/error_handling.h | 1 -
include/stxxl/bits/common/exceptions.h | 41 +-
include/stxxl/bits/common/exithandler.h | 16 +-
include/stxxl/bits/common/external_shared_ptr.h | 119 ++
include/stxxl/bits/common/is_sorted.h | 41 +-
include/stxxl/bits/common/log.h | 1 -
include/stxxl/bits/common/mutex.h | 1 -
include/stxxl/bits/common/new_alloc.h | 72 +-
include/stxxl/bits/common/onoff_switch.h | 1 -
include/stxxl/bits/common/rand.h | 10 +-
include/stxxl/bits/common/seed.h | 1 -
include/stxxl/bits/common/semaphore.h | 1 -
include/stxxl/bits/common/settings.h | 7 +-
include/stxxl/bits/common/simple_vector.h | 7 +-
include/stxxl/bits/common/state.h | 1 -
include/stxxl/bits/common/timer.h | 30 +-
include/stxxl/bits/common/tmeta.h | 2 -
include/stxxl/bits/common/tuple.h | 5 -
include/stxxl/bits/common/types.h | 3 -
include/stxxl/bits/common/uint_types.h | 32 +-
include/stxxl/bits/common/utils.h | 33 +-
include/stxxl/bits/compat/hash_map.h | 43 +-
include/stxxl/bits/compat/type_traits.h | 50 +-
include/stxxl/bits/compat/unique_ptr.h | 28 +-
include/stxxl/bits/config.h.in | 5 +
include/stxxl/bits/containers/btree/btree.h | 998 ++++++------
include/stxxl/bits/containers/btree/iterator.h | 194 +--
include/stxxl/bits/containers/btree/iterator_map.h | 70 +-
include/stxxl/bits/containers/btree/leaf.h | 498 +++---
include/stxxl/bits/containers/btree/node.h | 525 ++++---
include/stxxl/bits/containers/btree/node_cache.h | 431 +++---
include/stxxl/bits/containers/btree/root_node.h | 1 -
include/stxxl/bits/containers/deque.h | 5 +-
.../stxxl/bits/containers/hash_map/block_cache.h | 613 ++++++++
include/stxxl/bits/containers/hash_map/hash_map.h | 1609 ++++++++++++++++++++
include/stxxl/bits/containers/hash_map/iterator.h | 587 +++++++
.../stxxl/bits/containers/hash_map/iterator_map.h | 279 ++++
include/stxxl/bits/containers/hash_map/tuning.h | 50 +
include/stxxl/bits/containers/hash_map/util.h | 577 +++++++
include/stxxl/bits/containers/map.h | 87 +-
include/stxxl/bits/containers/matrix.h | 26 +-
include/stxxl/bits/containers/matrix_arithmetic.h | 2 +-
include/stxxl/bits/containers/pager.h | 1 -
include/stxxl/bits/containers/pq_ext_merger.h | 55 +-
include/stxxl/bits/containers/pq_helpers.h | 68 +-
include/stxxl/bits/containers/pq_losertree.h | 123 +-
include/stxxl/bits/containers/pq_mergers.h | 22 +-
include/stxxl/bits/containers/priority_queue.h | 154 +-
include/stxxl/bits/containers/queue.h | 43 +-
include/stxxl/bits/containers/sequence.h | 39 +-
include/stxxl/bits/containers/sorter.h | 9 +-
include/stxxl/bits/containers/stack.h | 143 +-
include/stxxl/bits/containers/unordered_map.h | 498 ++++++
include/stxxl/bits/containers/vector.h | 88 +-
include/stxxl/bits/defines.h | 2 +-
include/stxxl/bits/io/boostfd_file.h | 18 +-
include/stxxl/bits/io/completion_handler.h | 58 +-
include/stxxl/bits/io/disk_queued_file.h | 17 +-
include/stxxl/bits/io/disk_queues.h | 38 +-
include/stxxl/bits/io/file.h | 131 +-
include/stxxl/bits/io/fileperblock_file.h | 7 +-
include/stxxl/bits/io/io.h | 8 +-
include/stxxl/bits/io/iostats.h | 100 +-
include/stxxl/bits/io/linuxaio_file.h | 82 +
include/stxxl/bits/io/linuxaio_queue.h | 100 ++
include/stxxl/bits/io/linuxaio_request.h | 74 +
include/stxxl/bits/io/mem_file.h | 22 +-
include/stxxl/bits/io/mmap_file.h | 16 +-
include/stxxl/bits/io/request.h | 59 +-
include/stxxl/bits/io/request_interface.h | 9 +-
include/stxxl/bits/io/request_operations.h | 28 +-
include/stxxl/bits/io/request_queue.h | 4 +-
include/stxxl/bits/io/request_queue_impl_1q.h | 15 +-
include/stxxl/bits/io/request_queue_impl_qwqr.h | 20 +-
include/stxxl/bits/io/request_queue_impl_worker.h | 6 +-
include/stxxl/bits/io/request_with_state.h | 16 +-
include/stxxl/bits/io/request_with_waiters.h | 28 +-
include/stxxl/bits/io/serving_request.h | 8 +-
include/stxxl/bits/io/simdisk_file.h | 33 +-
include/stxxl/bits/io/syscall_file.h | 13 +-
include/stxxl/bits/io/ufs_file_base.h | 1 -
include/stxxl/bits/io/wbtl_file.h | 4 +-
include/stxxl/bits/io/wfs_file_base.h | 1 -
include/stxxl/bits/io/wincall_file.h | 15 +-
include/stxxl/bits/mng/adaptor.h | 387 ++---
include/stxxl/bits/mng/bid.h | 31 +-
include/stxxl/bits/mng/block_alloc.h | 15 +-
include/stxxl/bits/mng/block_alloc_interleaved.h | 2 -
include/stxxl/bits/mng/block_manager.h | 13 +-
include/stxxl/bits/mng/block_prefetcher.h | 37 +-
include/stxxl/bits/mng/block_scheduler.h | 6 +-
include/stxxl/bits/mng/buf_istream.h | 36 +-
include/stxxl/bits/mng/buf_istream_reverse.h | 18 +-
include/stxxl/bits/mng/buf_ostream.h | 22 +-
include/stxxl/bits/mng/buf_writer.h | 16 +-
include/stxxl/bits/mng/config.h | 27 +-
include/stxxl/bits/mng/disk_allocator.h | 35 +-
include/stxxl/bits/mng/prefetch_pool.h | 2 -
include/stxxl/bits/mng/read_write_pool.h | 12 +-
include/stxxl/bits/mng/typed_block.h | 35 +-
include/stxxl/bits/mng/write_pool.h | 9 +-
include/stxxl/bits/parallel.h | 3 -
include/stxxl/bits/singleton.h | 1 -
include/stxxl/bits/stream/choose.h | 77 +-
include/stxxl/bits/stream/sort_stream.h | 430 +++---
include/stxxl/bits/stream/sorted_runs.h | 6 +-
include/stxxl/bits/stream/stream.h | 800 +++++-----
include/stxxl/bits/stream/unique.h | 10 +-
include/stxxl/bits/unused.h | 1 -
include/stxxl/bits/utils/malloc.h | 2 -
include/stxxl/bits/verbose.h | 40 +-
lib/common/rand.cpp => include/stxxl/unordered_map | 17 +-
lib/CMakeLists.txt | 13 +-
lib/algo/async_schedule.cpp | 16 +-
lib/common/cmdline.cpp | 13 +-
lib/common/exithandler.cpp | 1 -
lib/common/rand.cpp | 1 -
lib/common/seed.cpp | 3 +-
lib/common/verbose.cpp | 2 -
lib/common/version.cpp | 1 -
lib/io/boostfd_file.cpp | 46 +-
lib/io/create_file.cpp | 83 +-
lib/io/disk_queued_file.cpp | 2 -
lib/io/fileperblock_file.cpp | 31 +-
lib/io/iostats.cpp | 72 +-
lib/io/linuxaio_file.cpp | 66 +
lib/io/linuxaio_queue.cpp | 284 ++++
lib/io/linuxaio_request.cpp | 129 ++
lib/io/mem_file.cpp | 39 +-
lib/io/mmap_file.cpp | 10 +-
lib/io/request.cpp | 83 +-
lib/io/request_queue_impl_1q.cpp | 55 +-
lib/io/request_queue_impl_qwqr.cpp | 106 +-
lib/io/request_queue_impl_worker.cpp | 1 -
lib/io/request_with_state.cpp | 44 +-
lib/io/request_with_waiters.cpp | 23 +-
lib/io/serving_request.cpp | 31 +-
lib/io/simdisk_file.cpp | 17 +-
lib/io/syscall_file.cpp | 35 +-
lib/io/ufs_file_base.cpp | 5 +-
lib/io/wbtl_file.cpp | 30 +-
lib/io/wfs_file_base.cpp | 4 +-
lib/io/wincall_file.cpp | 9 +-
lib/mng/config.cpp | 65 +-
lib/mng/disk_allocator.cpp | 3 -
local/test1.cpp | 18 +-
local/test2.cpp | 68 +
misc/analyze-source.pl | 68 +-
misc/cmake/GetGitRevisionDescription.cmake | 123 --
misc/cmake/GetGitRevisionDescription.cmake.in | 38 -
misc/do-release.txt | 15 +-
misc/uncrustify.cfg | 4 +-
tests/algo/CMakeLists.txt | 1 +
tests/algo/test_asch.cpp | 3 -
tests/algo/test_bad_cmp.cpp | 46 +-
tests/algo/test_ksort.cpp | 29 +-
tests/algo/test_ksort_all_parameters.cpp | 4 +-
tests/algo/test_parallel_sort.cpp | 48 +-
tests/algo/test_random_shuffle.cpp | 2 -
tests/algo/test_scan.cpp | 4 -
tests/algo/test_sort.cpp | 17 +-
tests/algo/test_sort_all_parameters.cpp | 4 +-
tests/algo/test_sort_all_parameters.h | 26 +-
tests/algo/test_stable_ksort.cpp | 13 +-
tests/algo/test_stable_ksort_all_parameters.cpp | 4 +-
tests/common/CMakeLists.txt | 10 +-
tests/common/test_binary_buffer.cpp | 90 ++
tests/common/test_external_shared_ptr.cpp | 291 ++++
tests/containers/CMakeLists.txt | 3 +-
tests/containers/btree/CMakeLists.txt | 22 +-
tests/containers/btree/test_btree.cpp | 8 +-
...st_const_scan.cpp => test_btree_const_scan.cpp} | 4 +-
...nsert_erase.cpp => test_btree_insert_erase.cpp} | 6 +-
..._insert_find.cpp => test_btree_insert_find.cpp} | 7 +-
..._insert_scan.cpp => test_btree_insert_scan.cpp} | 5 +-
tests/containers/hash_map/CMakeLists.txt | 21 +
tests/containers/hash_map/test_hash_map.cpp | 317 ++++
.../hash_map/test_hash_map_block_cache.cpp | 155 ++
.../hash_map/test_hash_map_iterators.cpp | 390 +++++
.../hash_map/test_hash_map_reader_writer.cpp | 176 +++
tests/containers/test_ext_merger.cpp | 1 -
tests/containers/test_ext_merger2.cpp | 7 +-
tests/containers/test_iterators.cpp | 3 -
tests/containers/test_many_stacks.cpp | 1 -
tests/containers/test_map.cpp | 8 +-
tests/containers/test_map_random.cpp | 4 -
tests/containers/test_migr_stack.cpp | 11 +-
tests/containers/test_sorter.cpp | 15 +-
tests/containers/test_stack.cpp | 57 +-
tests/containers/test_vector.cpp | 2 -
tests/containers/test_vector_buf.cpp | 18 +-
tests/containers/test_vector_export.cpp | 1 -
tests/containers/test_vector_sizes.cpp | 1 -
tests/io/CMakeLists.txt | 10 +-
tests/io/test_cancel.cpp | 7 +-
tests/io/test_io.cpp | 1 -
tests/io/test_io_sizes.cpp | 15 +-
tests/io/test_mmap.cpp | 4 +-
tests/io/test_sim_disk.cpp | 11 +-
tests/mng/test_block_manager.cpp | 2 -
tests/mng/test_block_manager1.cpp | 1 -
tests/mng/test_block_manager2.cpp | 4 +-
tests/mng/test_bmlayer.cpp | 2 -
tests/mng/test_buf_streams.cpp | 1 -
tests/stream/test_loop.cpp | 5 +-
tests/stream/test_naive_transpose.cpp | 5 -
tests/stream/test_sorted_runs.cpp | 1 -
tests/stream/test_stream.cpp | 14 -
tests/stream/test_stream1.cpp | 3 +-
tools/benchmark_disks.cpp | 102 +-
tools/benchmark_disks_random.cpp | 8 +-
tools/benchmark_files.cpp | 89 +-
tools/benchmark_pqueue.cpp | 26 +-
tools/benchmark_sort.cpp | 17 +-
tools/benchmarks/CMakeLists.txt | 8 +-
tools/benchmarks/benchmark_naive_matrix.cpp | 1 -
tools/benchmarks/berkeley_db_benchmark.cpp | 54 +-
tools/benchmarks/matrix_benchmark.cpp | 4 +-
tools/benchmarks/monotonic_pq.cpp | 19 +-
tools/benchmarks/pq_benchmark.cpp | 9 -
tools/benchmarks/stack_benchmark.cpp | 6 -
tools/benchmarks/tpie_stack_benchmark.cpp | 8 +-
tools/create_files.cpp | 31 +-
tools/extras/CMakeLists.txt | 6 +-
tools/extras/benchmark_disk_and_flash.cpp | 10 +-
tools/extras/iobench_scatter_in_place.cpp | 18 +-
tools/mallinfo.cpp | 2 +-
tools/mlock.cpp | 2 +-
tools/stxxl_tool.cpp | 8 +-
273 files changed, 13025 insertions(+), 5225 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libstxxl1.git
More information about the debian-science-commits
mailing list