diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2015-08-13 09:09:29 -0400 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2015-08-13 09:09:29 -0400 |
| commit | 69f8c057fc16da79ac6c2683a74fc0cfa4ad66ba (patch) | |
| tree | 52004f3e5cd7499081132a2651248db2a8c3b5fc /src/include/session.h | |
| parent | 2048e12e46a583dedf3c05c9d71f5e441eb365c9 (diff) | |
| parent | 46c53331d00289f633fd8856bb52509c96dc2b93 (diff) | |
| download | mongo-69f8c057fc16da79ac6c2683a74fc0cfa4ad66ba.tar.gz | |
Merge branch 'develop' into wt-1967-evict-any
Diffstat (limited to 'src/include/session.h')
| -rw-r--r-- | src/include/session.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/include/session.h b/src/include/session.h index d68d50e30f6..df94393a57d 100644 --- a/src/include/session.h +++ b/src/include/session.h @@ -14,8 +14,8 @@ struct __wt_data_handle_cache { WT_DATA_HANDLE *dhandle; - SLIST_ENTRY(__wt_data_handle_cache) l; - SLIST_ENTRY(__wt_data_handle_cache) hashl; + TAILQ_ENTRY(__wt_data_handle_cache) q; + TAILQ_ENTRY(__wt_data_handle_cache) hashq; }; /* @@ -66,7 +66,7 @@ struct WT_COMPILER_TYPE_ALIGN(WT_CACHE_LINE_ALIGNMENT) __wt_session_impl { * across session close - so it is declared further down. */ /* Session handle reference list */ - SLIST_HEAD(__dhandles, __wt_data_handle_cache) dhandles; + TAILQ_HEAD(__dhandles, __wt_data_handle_cache) dhandles; time_t last_sweep; /* Last sweep for dead handles */ WT_CURSOR *cursor; /* Current cursor */ @@ -95,7 +95,7 @@ struct WT_COMPILER_TYPE_ALIGN(WT_CACHE_LINE_ALIGNMENT) __wt_session_impl { * table of lists. The hash table list is kept in allocated memory * that lives across session close - so it is declared further down. */ - SLIST_HEAD(__tables, __wt_table) tables; + TAILQ_HEAD(__tables, __wt_table) tables; WT_ITEM **scratch; /* Temporary memory for any function */ u_int scratch_alloc; /* Currently allocated */ @@ -156,9 +156,9 @@ struct WT_COMPILER_TYPE_ALIGN(WT_CACHE_LINE_ALIGNMENT) __wt_session_impl { WT_RAND_STATE rnd; /* Random number generation state */ /* Hashed handle reference list array */ - SLIST_HEAD(__dhandles_hash, __wt_data_handle_cache) *dhhash; + TAILQ_HEAD(__dhandles_hash, __wt_data_handle_cache) *dhhash; /* Hashed table reference list array */ - SLIST_HEAD(__tables_hash, __wt_table) *tablehash; + TAILQ_HEAD(__tables_hash, __wt_table) *tablehash; /* * Splits can "free" memory that may still be in use, and we use a |