diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2012-11-09 17:33:24 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2012-11-09 17:33:24 +1100 |
| commit | 6dc4df748b8066f651c44fec6105f1508fe038e8 (patch) | |
| tree | fd0d21f22dc0d47e3d0e103a6cb972dcd665da48 | |
| parent | 877240b1450c4ab0d3cafc7ac2328945b383d194 (diff) | |
| download | mongo-6dc4df748b8066f651c44fec6105f1508fe038e8.tar.gz | |
Move src/btree/bt_cache.c to src/conn/conn_cache.c also s_all.
| -rw-r--r-- | dist/config.py | 8 | ||||
| -rw-r--r-- | dist/filelist | 2 | ||||
| -rw-r--r-- | src/conn/conn_cache.c (renamed from src/btree/bt_cache.c) | 0 | ||||
| -rw-r--r-- | src/include/extern.h | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/dist/config.py b/dist/config.py index 6a8adcf92c6..37c2f022a77 100644 --- a/dist/config.py +++ b/dist/config.py @@ -76,19 +76,19 @@ def parseconfig(c, name_indent=''): return output def getconfcheck(c): - check = '{ "' + c.name + '", "' + gettype(c) + '", ' + check = '{ "' + c.name + '", "' + gettype(c) + '",' cstr = checkstr(c) sstr = getsubconfigstr(c) if cstr != 'NULL': cstr = '"\n\t "'.join(w.wrap(cstr)) # Manually re-wrap when there is a check string to avoid ugliness # between string and non-string wrapping - if len(check + cstr + ',\n\t ' + sstr + '},') >= 68: + if len(check + ' ' + cstr + ',\n\t ' + sstr + '},') >= 68: check = check + '\n\t ' + cstr + ',\n\t ' + sstr + '},' else: - check = check + cstr + ', ' + sstr + '},' + check = check + ' ' + cstr + ', ' + sstr + '},' else: - check = '\n\t '.join(w.wrap(check + cstr + ', ' + sstr + '},')) + check = '\n\t '.join(w.wrap(check + ' ' + cstr + ', ' + sstr + '},')) return check skip = False diff --git a/dist/filelist b/dist/filelist index 52d1a26c91c..63de8917c36 100644 --- a/dist/filelist +++ b/dist/filelist @@ -16,7 +16,6 @@ src/block/block_vrfy.c src/block/block_write.c src/bloom/bloom.c src/btree/bt_bulk.c -src/btree/bt_cache.c src/btree/bt_compact.c src/btree/bt_curnext.c src/btree/bt_curprev.c @@ -51,6 +50,7 @@ src/config/config_check.c src/config/config_collapse.c src/config/config_concat.c src/config/config_def.c +src/conn/conn_cache.c src/conn/conn_cache_pool.c src/conn/conn_api.c src/conn/conn_btree.c diff --git a/src/btree/bt_cache.c b/src/conn/conn_cache.c index eed28257dc8..eed28257dc8 100644 --- a/src/btree/bt_cache.c +++ b/src/conn/conn_cache.c diff --git a/src/include/extern.h b/src/include/extern.h index 3352430f6fa..f9e6a3f6db5 100644 --- a/src/include/extern.h +++ b/src/include/extern.h @@ -267,10 +267,6 @@ extern int __wt_bloom_drop(WT_BLOOM *bloom, const char *config); extern int __wt_bulk_init(WT_CURSOR_BULK *cbulk); extern int __wt_bulk_insert(WT_CURSOR_BULK *cbulk); extern int __wt_bulk_end(WT_CURSOR_BULK *cbulk); -extern int __wt_cache_config(WT_CONNECTION_IMPL *conn, const char *cfg[]); -extern int __wt_cache_create(WT_CONNECTION_IMPL *conn, const char *cfg[]); -extern void __wt_cache_stats_update(WT_CONNECTION_IMPL *conn); -extern void __wt_cache_destroy(WT_CONNECTION_IMPL *conn); extern int __wt_compact(WT_SESSION_IMPL *session, const char *cfg[]); extern int __wt_compact_page_skip( WT_SESSION_IMPL *session, WT_PAGE *parent, @@ -607,6 +603,10 @@ extern const char *__wt_confdfl_table_meta; extern WT_CONFIG_CHECK __wt_confchk_table_meta[]; extern const char *__wt_confdfl_wiredtiger_open; extern WT_CONFIG_CHECK __wt_confchk_wiredtiger_open[]; +extern int __wt_cache_config(WT_CONNECTION_IMPL *conn, const char *cfg[]); +extern int __wt_cache_create(WT_CONNECTION_IMPL *conn, const char *cfg[]); +extern void __wt_cache_stats_update(WT_CONNECTION_IMPL *conn); +extern void __wt_cache_destroy(WT_CONNECTION_IMPL *conn); extern int __wt_conn_cache_pool_config(WT_SESSION_IMPL *session, const char **cfg); extern int __wt_conn_cache_pool_open(WT_SESSION_IMPL *session); |