mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Maria:
* merging changes done to the key cache since May 2006 into Maria * enabling two small enough page cache's unit tests by default * fix to have non-buffered output in unit tests (to not have a false timeout killing in pushbuild) (patch given by Serg) * removing some warnings of gcc -ansi include/lf.h: getting rid of "warning: ISO C does not allow extra `;' outside of a function" (gcc -ansi) mysys/lf_hash.c: getting rid of "warning: ISO C does not allow extra `;' outside of a function" (gcc -ansi) mysys/mf_pagecache.c: Cosmetic changes to minimize the diff with the key cache. #define PAGECACHE_DEBUG_LOG is not needed (just define PAGECACHE_DEBUG if you want) (this change removes "warning: 'pagecache_debug_print' declared `static' but never defined"). Importing changes made to mf_keycache.c since May 2006, into the page cache. Disabling online resizing in the page cache. Fix for "warning: ISO C90 forbids mixed declarations and code". unittest/mysys/Makefile.am: Of the page cache's unit tests, two are small enough to run on pushbuild, renaming them to a -t suffix. unittest/mytap/tap.c: pushbuild kills a test after seeing no output from it for 10 minutes; so we set the mytap framework to not buffer output (patch given by Serg) so that output is seen more frequently and not "all at the end of the test".
This commit is contained in:
@@ -12,7 +12,7 @@ LDADD = $(top_builddir)/unittest/mytap/libmytap.a \
|
||||
# but don't run them by default (for this, a non "-t" suffix is used).
|
||||
# You can run them by hand (how: see "test" target in upper dir).
|
||||
noinst_PROGRAMS = bitmap-t base64-t my_atomic-t \
|
||||
mf_pagecache_single_1k-t-big mf_pagecache_single_8k-t-big \
|
||||
mf_pagecache_single_1k-t mf_pagecache_single_8k-t \
|
||||
mf_pagecache_single_64k-t-big \
|
||||
mf_pagecache_consist_1k-t-big mf_pagecache_consist_64k-t-big \
|
||||
mf_pagecache_consist_1kHC-t-big mf_pagecache_consist_64kHC-t-big \
|
||||
@@ -25,11 +25,14 @@ mf_pagecache_single_src = mf_pagecache_single.c $(top_srcdir)/mysys/mf_pagecache
|
||||
mf_pagecache_consist_src = mf_pagecache_consist.c $(top_srcdir)/mysys/mf_pagecache.c test_file.c test_file.h
|
||||
mf_pagecache_common_cppflags = -DEXTRA_DEBUG -DPAGECACHE_DEBUG -DMAIN
|
||||
|
||||
mf_pagecache_single_1k_t_big_SOURCES = $(mf_pagecache_single_src)
|
||||
mf_pagecache_single_8k_t_big_SOURCES = $(mf_pagecache_single_src)
|
||||
# Those two take reasonable resources (<100 MB) for < 1 minute
|
||||
mf_pagecache_single_1k_t_SOURCES = $(mf_pagecache_single_src)
|
||||
mf_pagecache_single_8k_t_SOURCES = $(mf_pagecache_single_src)
|
||||
mf_pagecache_single_1k_t_CPPFLAGS = $(mf_pagecache_common_cppflags) -DPAGE_SIZE=1024
|
||||
mf_pagecache_single_8k_t_CPPFLAGS = $(mf_pagecache_common_cppflags) -DPAGE_SIZE=8192
|
||||
|
||||
# All others below are big
|
||||
mf_pagecache_single_64k_t_big_SOURCES = $(mf_pagecache_single_src)
|
||||
mf_pagecache_single_1k_t_big_CPPFLAGS = $(mf_pagecache_common_cppflags) -DPAGE_SIZE=1024
|
||||
mf_pagecache_single_8k_t_big_CPPFLAGS = $(mf_pagecache_common_cppflags) -DPAGE_SIZE=8192
|
||||
mf_pagecache_single_64k_t_big_CPPFLAGS = $(mf_pagecache_common_cppflags) -DPAGE_SIZE=65536
|
||||
|
||||
mf_pagecache_consist_1k_t_big_SOURCES = $(mf_pagecache_consist_src)
|
||||
@@ -52,4 +55,4 @@ mf_pagecache_consist_1kWR_t_big_CPPFLAGS = $(mf_pagecache_common_cppflags) -DPA
|
||||
mf_pagecache_consist_64kWR_t_big_SOURCES = $(mf_pagecache_consist_src)
|
||||
mf_pagecache_consist_64kWR_t_big_CPPFLAGS = $(mf_pagecache_common_cppflags) -DPAGE_SIZE=65536 -DTEST_WRITERS
|
||||
|
||||
CLEANFILES = my_pagecache_debug.log page_cache_test_file_1
|
||||
CLEANFILES = pagecache_debug.log page_cache_test_file_1
|
||||
|
@@ -150,6 +150,8 @@ static signal_entry install_signal[]= {
|
||||
void
|
||||
plan(int const count)
|
||||
{
|
||||
|
||||
setvbuf(tapout, 0, _IONBF, 0); /* provide output at once */
|
||||
/*
|
||||
Install signal handler
|
||||
*/
|
||||
|
Reference in New Issue
Block a user