diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-08-18 10:26:20 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-08-18 10:26:20 +1000 |
| commit | d4e4b25d8ca52f79781fc1fdd96d28bed08212cc (patch) | |
| tree | facbcd6d91f8ba5c62d8f6bef73ff8db36170c92 /src/third_party/wiredtiger/src/include/dhandle.h | |
| parent | 934c760404cdeb693ac72b04373b2efe659b79df (diff) | |
| download | mongo-d4e4b25d8ca52f79781fc1fdd96d28bed08212cc.tar.gz | |
Import wiredtiger-wiredtiger-2.6.1-514-g7ffa315.tar.gz from wiredtiger branch mongodb-3.2
Diffstat (limited to 'src/third_party/wiredtiger/src/include/dhandle.h')
| -rw-r--r-- | src/third_party/wiredtiger/src/include/dhandle.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/src/include/dhandle.h b/src/third_party/wiredtiger/src/include/dhandle.h index 8bb649513c7..3eb117b3341 100644 --- a/src/third_party/wiredtiger/src/include/dhandle.h +++ b/src/third_party/wiredtiger/src/include/dhandle.h @@ -28,14 +28,19 @@ */ #define WT_SAVE_DHANDLE(s, e) WT_WITH_DHANDLE(s, (s)->dhandle, e) +/* Check if a handle is inactive. */ +#define WT_DHANDLE_INACTIVE(dhandle) \ + (F_ISSET(dhandle, WT_DHANDLE_DEAD) || \ + !F_ISSET(dhandle, WT_DHANDLE_EXCLUSIVE | WT_DHANDLE_OPEN)) + /* * WT_DATA_HANDLE -- * A handle for a generic named data source. */ struct __wt_data_handle { WT_RWLOCK *rwlock; /* Lock for shared/exclusive ops */ - SLIST_ENTRY(__wt_data_handle) l; - SLIST_ENTRY(__wt_data_handle) hashl; + TAILQ_ENTRY(__wt_data_handle) q; + TAILQ_ENTRY(__wt_data_handle) hashq; /* * Sessions caching a connection's data handle will have a non-zero @@ -45,7 +50,6 @@ struct __wt_data_handle { uint32_t session_ref; /* Sessions referencing this handle */ int32_t session_inuse; /* Sessions using this handle */ time_t timeofdeath; /* Use count went to 0 */ - time_t timeofdiscard; /* Time of last failed discard */ uint64_t name_hash; /* Hash of name */ const char *name; /* Object name as a URI */ |