summaryrefslogtreecommitdiff
path: root/src/include/session.h
diff options
context:
space:
mode:
authorAlex Gorrod <alexander.gorrod@wiredtiger.com>2014-07-02 01:47:37 +0000
committerAlex Gorrod <alexander.gorrod@wiredtiger.com>2014-07-02 01:47:37 +0000
commit020dde456bbb5a33e1b74b6c9f4411542a1529a2 (patch)
treedc594b358347c04c2a498e1fa0342f2f387ffe91 /src/include/session.h
parent77ff8e033a994362cc7f7a18eaefe727039db8fc (diff)
parent96e594c22030d7d859666a618f4e26b91f6b6354 (diff)
downloadmongo-020dde456bbb5a33e1b74b6c9f4411542a1529a2.tar.gz
Merge branch 'eviction-under-load' into eviction-stats
Diffstat (limited to 'src/include/session.h')
-rw-r--r--src/include/session.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/include/session.h b/src/include/session.h
index 8ee268753ac..843ac7a3ccd 100644
--- a/src/include/session.h
+++ b/src/include/session.h
@@ -29,11 +29,12 @@ struct __wt_hazard {
};
/* Get the connection implementation for a session */
-#define S2C(session) ((WT_CONNECTION_IMPL *)(session)->iface.connection)
+#define S2C(session) ((WT_CONNECTION_IMPL *)(session)->iface.connection)
+#define S2C_SAFE(session) ((session) == NULL ? NULL : S2C(session))
/* Get the btree for a session */
-#define S2BT(session) ((WT_BTREE *)(session)->dhandle->handle)
-#define S2BT_SAFE(session) ((session)->dhandle == NULL ? NULL : S2BT(session))
+#define S2BT(session) ((WT_BTREE *)(session)->dhandle->handle)
+#define S2BT_SAFE(session) ((session)->dhandle == NULL ? NULL : S2BT(session))
/*
* WT_SESSION_IMPL --