diff options
Diffstat (limited to 'storage/tokudb/ft-index/util')
36 files changed, 54 insertions, 17 deletions
diff --git a/storage/tokudb/ft-index/util/circular_buffer.cc b/storage/tokudb/ft-index/util/circular_buffer.cc index a5dc4bc96a4..a453c5b71c7 100644 --- a/storage/tokudb/ft-index/util/circular_buffer.cc +++ b/storage/tokudb/ft-index/util/circular_buffer.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/circular_buffer.h b/storage/tokudb/ft-index/util/circular_buffer.h index b68a16d9ea8..6f40cf3046f 100644 --- a/storage/tokudb/ft-index/util/circular_buffer.h +++ b/storage/tokudb/ft-index/util/circular_buffer.h @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/constexpr.h b/storage/tokudb/ft-index/util/constexpr.h index e583e2d504e..cfea0b46924 100644 --- a/storage/tokudb/ft-index/util/constexpr.h +++ b/storage/tokudb/ft-index/util/constexpr.h @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/doubly_linked_list.h b/storage/tokudb/ft-index/util/doubly_linked_list.h index 658e4502c3c..57c290e1e27 100644 --- a/storage/tokudb/ft-index/util/doubly_linked_list.h +++ b/storage/tokudb/ft-index/util/doubly_linked_list.h @@ -52,6 +52,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/frwlock.cc b/storage/tokudb/ft-index/util/frwlock.cc index 13bfb721cde..7400f3c4abc 100644 --- a/storage/tokudb/ft-index/util/frwlock.cc +++ b/storage/tokudb/ft-index/util/frwlock.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/frwlock.h b/storage/tokudb/ft-index/util/frwlock.h index f6494d894a6..9ad2b6f7a9d 100644 --- a/storage/tokudb/ft-index/util/frwlock.h +++ b/storage/tokudb/ft-index/util/frwlock.h @@ -52,6 +52,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/growable_array.h b/storage/tokudb/ft-index/util/growable_array.h index a8b3910b7ed..763377d0ab0 100644 --- a/storage/tokudb/ft-index/util/growable_array.h +++ b/storage/tokudb/ft-index/util/growable_array.h @@ -52,6 +52,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/kibbutz.cc b/storage/tokudb/ft-index/util/kibbutz.cc index a227b48de10..e9057de7915 100644 --- a/storage/tokudb/ft-index/util/kibbutz.cc +++ b/storage/tokudb/ft-index/util/kibbutz.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/kibbutz.h b/storage/tokudb/ft-index/util/kibbutz.h index 3d5d5ed01c2..06fa624b211 100644 --- a/storage/tokudb/ft-index/util/kibbutz.h +++ b/storage/tokudb/ft-index/util/kibbutz.h @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/mempool.cc b/storage/tokudb/ft-index/util/mempool.cc index decd38df936..312848e6194 100644 --- a/storage/tokudb/ft-index/util/mempool.cc +++ b/storage/tokudb/ft-index/util/mempool.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: @@ -119,25 +120,26 @@ void toku_mempool_zero(struct mempool *mp) { void toku_mempool_copy_construct(struct mempool *mp, const void * const data_source, const size_t data_size) { // printf("mempool_copy %p %p %lu\n", mp, data_source, data_size); if (data_size) { - paranoid_invariant(data_source); - toku_mempool_construct(mp, data_size); - memcpy(mp->base, data_source, data_size); - mp->free_offset = data_size; // address of first available memory for new data + paranoid_invariant(data_source); + toku_mempool_construct(mp, data_size); + memcpy(mp->base, data_source, data_size); + mp->free_offset = data_size; // address of first available memory for new data } else { - toku_mempool_zero(mp); - // fprintf(stderr, "Empty mempool created (copy constructor)\n"); + toku_mempool_zero(mp); + // fprintf(stderr, "Empty mempool created (copy constructor)\n"); } } // TODO 4050 this is dirty, try to replace all uses of this -void toku_mempool_init(struct mempool *mp, void *base, size_t size) { +void toku_mempool_init(struct mempool *mp, void *base, size_t free_offset, size_t size) { // printf("mempool_init %p %p %lu\n", mp, base, size); paranoid_invariant(base != 0); paranoid_invariant(size < (1U<<31)); // used to be assert(size >= 0), but changed to size_t so now let's make sure it's not more than 2GB... + paranoid_invariant(free_offset <= size); mp->base = base; mp->size = size; - mp->free_offset = 0; // address of first available memory + mp->free_offset = free_offset; // address of first available memory mp->frag_size = 0; // byte count of wasted space (formerly used, no longer used or available) } @@ -145,15 +147,15 @@ void toku_mempool_init(struct mempool *mp, void *base, size_t size) { */ void toku_mempool_construct(struct mempool *mp, size_t data_size) { if (data_size) { - size_t mpsize = data_size + (data_size/4); // allow 1/4 room for expansion (would be wasted if read-only) - mp->base = toku_xmalloc(mpsize); // allocate buffer for mempool - mp->size = mpsize; - mp->free_offset = 0; // address of first available memory for new data - mp->frag_size = 0; // all allocated space is now in use + size_t mpsize = data_size + (data_size/4); // allow 1/4 room for expansion (would be wasted if read-only) + mp->base = toku_xmalloc(mpsize); // allocate buffer for mempool + mp->size = mpsize; + mp->free_offset = 0; // address of first available memory for new data + mp->frag_size = 0; // all allocated space is now in use } else { - toku_mempool_zero(mp); - // fprintf(stderr, "Empty mempool created (base constructor)\n"); + toku_mempool_zero(mp); + // fprintf(stderr, "Empty mempool created (base constructor)\n"); } } @@ -161,7 +163,7 @@ void toku_mempool_construct(struct mempool *mp, size_t data_size) { void toku_mempool_destroy(struct mempool *mp) { // printf("mempool_destroy %p %p %lu %lu\n", mp, mp->base, mp->size, mp->frag_size); if (mp->base) - toku_free(mp->base); + toku_free(mp->base); toku_mempool_zero(mp); } diff --git a/storage/tokudb/ft-index/util/mempool.h b/storage/tokudb/ft-index/util/mempool.h index 983f770102f..f6a2bc6dde3 100644 --- a/storage/tokudb/ft-index/util/mempool.h +++ b/storage/tokudb/ft-index/util/mempool.h @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: @@ -123,7 +124,7 @@ void toku_mempool_copy_construct(struct mempool *mp, const void * const data_sou /* initialize the memory pool with the base address and size of a contiguous chunk of memory */ -void toku_mempool_init(struct mempool *mp, void *base, size_t size); +void toku_mempool_init(struct mempool *mp, void *base, size_t free_offset, size_t size); /* allocate memory and construct mempool */ diff --git a/storage/tokudb/ft-index/util/nb_mutex.h b/storage/tokudb/ft-index/util/nb_mutex.h index 6c499e5ef6c..f781e9d6dda 100644 --- a/storage/tokudb/ft-index/util/nb_mutex.h +++ b/storage/tokudb/ft-index/util/nb_mutex.h @@ -52,6 +52,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/omt.cc b/storage/tokudb/ft-index/util/omt.cc index b1dd720807d..8bff7ef7099 100644 --- a/storage/tokudb/ft-index/util/omt.cc +++ b/storage/tokudb/ft-index/util/omt.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/omt.h b/storage/tokudb/ft-index/util/omt.h index 0726a7723dd..6e963badafa 100644 --- a/storage/tokudb/ft-index/util/omt.h +++ b/storage/tokudb/ft-index/util/omt.h @@ -53,6 +53,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/partitioned_counter.cc b/storage/tokudb/ft-index/util/partitioned_counter.cc index f2917553c6a..4ac60cc8e29 100644 --- a/storage/tokudb/ft-index/util/partitioned_counter.cc +++ b/storage/tokudb/ft-index/util/partitioned_counter.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/partitioned_counter.h b/storage/tokudb/ft-index/util/partitioned_counter.h index 09d95218cee..b7401080f11 100644 --- a/storage/tokudb/ft-index/util/partitioned_counter.h +++ b/storage/tokudb/ft-index/util/partitioned_counter.h @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/rwlock.h b/storage/tokudb/ft-index/util/rwlock.h index c8538e8f64d..cb72e153eb6 100644 --- a/storage/tokudb/ft-index/util/rwlock.h +++ b/storage/tokudb/ft-index/util/rwlock.h @@ -52,6 +52,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/sort.h b/storage/tokudb/ft-index/util/sort.h index ddde4559e5a..825909d4e9f 100644 --- a/storage/tokudb/ft-index/util/sort.h +++ b/storage/tokudb/ft-index/util/sort.h @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/status.h b/storage/tokudb/ft-index/util/status.h index af223567ef1..16a709237dd 100644 --- a/storage/tokudb/ft-index/util/status.h +++ b/storage/tokudb/ft-index/util/status.h @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/marked-omt-test.cc b/storage/tokudb/ft-index/util/tests/marked-omt-test.cc index 4d4031fc20a..883a414c566 100644 --- a/storage/tokudb/ft-index/util/tests/marked-omt-test.cc +++ b/storage/tokudb/ft-index/util/tests/marked-omt-test.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/omt-tmpl-test.cc b/storage/tokudb/ft-index/util/tests/omt-tmpl-test.cc index 339aa2a45bb..8a9e13af89d 100644 --- a/storage/tokudb/ft-index/util/tests/omt-tmpl-test.cc +++ b/storage/tokudb/ft-index/util/tests/omt-tmpl-test.cc @@ -51,6 +51,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/rwlock_condvar.h b/storage/tokudb/ft-index/util/tests/rwlock_condvar.h index 27ff3402fb7..db4b759ea52 100644 --- a/storage/tokudb/ft-index/util/tests/rwlock_condvar.h +++ b/storage/tokudb/ft-index/util/tests/rwlock_condvar.h @@ -54,6 +54,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/sort-tmpl-test.cc b/storage/tokudb/ft-index/util/tests/sort-tmpl-test.cc index 9794e80f71a..a1be929fce0 100644 --- a/storage/tokudb/ft-index/util/tests/sort-tmpl-test.cc +++ b/storage/tokudb/ft-index/util/tests/sort-tmpl-test.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/test-kibbutz.cc b/storage/tokudb/ft-index/util/tests/test-kibbutz.cc index c7eea849c6b..4e0b6076f2d 100644 --- a/storage/tokudb/ft-index/util/tests/test-kibbutz.cc +++ b/storage/tokudb/ft-index/util/tests/test-kibbutz.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/test-kibbutz2.cc b/storage/tokudb/ft-index/util/tests/test-kibbutz2.cc index c73a1d21398..3afc7d5f005 100644 --- a/storage/tokudb/ft-index/util/tests/test-kibbutz2.cc +++ b/storage/tokudb/ft-index/util/tests/test-kibbutz2.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/test-rwlock-cheapness.cc b/storage/tokudb/ft-index/util/tests/test-rwlock-cheapness.cc index 12667361823..b787d1983bc 100644 --- a/storage/tokudb/ft-index/util/tests/test-rwlock-cheapness.cc +++ b/storage/tokudb/ft-index/util/tests/test-rwlock-cheapness.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/test-rwlock.cc b/storage/tokudb/ft-index/util/tests/test-rwlock.cc index d8e3e264fa6..a560ef532eb 100644 --- a/storage/tokudb/ft-index/util/tests/test-rwlock.cc +++ b/storage/tokudb/ft-index/util/tests/test-rwlock.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/test.h b/storage/tokudb/ft-index/util/tests/test.h index a11c4c8208c..0760b9bf1fb 100644 --- a/storage/tokudb/ft-index/util/tests/test.h +++ b/storage/tokudb/ft-index/util/tests/test.h @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/test_circular_buffer.cc b/storage/tokudb/ft-index/util/tests/test_circular_buffer.cc index 5ab15fb620e..8bc239ac6fc 100644 --- a/storage/tokudb/ft-index/util/tests/test_circular_buffer.cc +++ b/storage/tokudb/ft-index/util/tests/test_circular_buffer.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/test_doubly_linked_list.cc b/storage/tokudb/ft-index/util/tests/test_doubly_linked_list.cc index 7296e361225..6fad884ed8e 100644 --- a/storage/tokudb/ft-index/util/tests/test_doubly_linked_list.cc +++ b/storage/tokudb/ft-index/util/tests/test_doubly_linked_list.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/test_partitioned_counter.cc b/storage/tokudb/ft-index/util/tests/test_partitioned_counter.cc index 2f2e1261a1e..5af214f75ac 100644 --- a/storage/tokudb/ft-index/util/tests/test_partitioned_counter.cc +++ b/storage/tokudb/ft-index/util/tests/test_partitioned_counter.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/test_partitioned_counter_5833.cc b/storage/tokudb/ft-index/util/tests/test_partitioned_counter_5833.cc index a031dc04030..419f992576b 100644 --- a/storage/tokudb/ft-index/util/tests/test_partitioned_counter_5833.cc +++ b/storage/tokudb/ft-index/util/tests/test_partitioned_counter_5833.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/threadpool-test.cc b/storage/tokudb/ft-index/util/tests/threadpool-test.cc index cf460de56c4..6815cce8f8f 100644 --- a/storage/tokudb/ft-index/util/tests/threadpool-test.cc +++ b/storage/tokudb/ft-index/util/tests/threadpool-test.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/tests/threadpool-testrunf.cc b/storage/tokudb/ft-index/util/tests/threadpool-testrunf.cc index 0e5a794266a..f4d875a8941 100644 --- a/storage/tokudb/ft-index/util/tests/threadpool-testrunf.cc +++ b/storage/tokudb/ft-index/util/tests/threadpool-testrunf.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/threadpool.cc b/storage/tokudb/ft-index/util/threadpool.cc index 2de5327be22..d6652b7a71c 100644 --- a/storage/tokudb/ft-index/util/threadpool.cc +++ b/storage/tokudb/ft-index/util/threadpool.cc @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: diff --git a/storage/tokudb/ft-index/util/threadpool.h b/storage/tokudb/ft-index/util/threadpool.h index 8fddf330511..3fada1f6e54 100644 --- a/storage/tokudb/ft-index/util/threadpool.h +++ b/storage/tokudb/ft-index/util/threadpool.h @@ -50,6 +50,7 @@ UNIVERSITY PATENT NOTICE: PATENT MARKING NOTICE: This software is covered by US Patent No. 8,185,551. + This software is covered by US Patent No. 8,489,638. PATENT RIGHTS GRANT: |