summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Bostic <keith.bostic@mongodb.com>2016-06-08 11:37:10 -0400
committerKeith Bostic <keith.bostic@mongodb.com>2016-06-08 11:37:10 -0400
commit422a9ef67701c4a9095d6375224e08da2873b9bf (patch)
tree5adf15ba5fd9464431a8cf9a877ba8fe3d3b4459
parent43f0d0a62a8920ac3ad0e45fb695197e2455c4a5 (diff)
downloadmongo-422a9ef67701c4a9095d6375224e08da2873b9bf.tar.gz
WT-2682 add option to configure WiredTiger with strict compiler flags (#2790)
* WT-2682 add option to configure WiredTiger with strict compiler flags Some additional fallout from adding --enable-strict: --enable-attach, and building Berkeley DB with test/format. * Go back to sleeping basically forever, it's reasonable to run overnight and attach in the morning.
-rw-r--r--src/support/global.c4
-rw-r--r--test/format/bdb.c14
2 files changed, 10 insertions, 8 deletions
diff --git a/src/support/global.c b/src/support/global.c
index e0d5bafeaa8..eba88bf2b20 100644
--- a/src/support/global.c
+++ b/src/support/global.c
@@ -111,11 +111,13 @@ void
__wt_attach(WT_SESSION_IMPL *session)
{
#ifdef HAVE_ATTACH
+ u_int i;
+
__wt_errx(session, "process ID %" PRIdMAX
": waiting for debugger...", (intmax_t)getpid());
/* Sleep forever, the debugger will interrupt us when it attaches. */
- for (;;)
+ for (i = 0; i < WT_MILLION; ++i)
__wt_sleep(10, 0);
#else
WT_UNUSED(session);
diff --git a/test/format/bdb.c b/test/format/bdb.c
index 48229cfd5e7..e56281f2c3e 100644
--- a/test/format/bdb.c
+++ b/test/format/bdb.c
@@ -106,9 +106,9 @@ bdb_insert(
DBC *dbc;
key.data = (void *)key_data;
- key.size = (uint32_t)key_size;
+ key.size = (u_int32_t)key_size;
value.data = (void *)value_data;
- value.size = (uint32_t)value_size;
+ value.size = (u_int32_t)value_size;
dbc = g.dbc;
@@ -147,7 +147,7 @@ bdb_read(uint64_t keyno, void *valuep, size_t *valuesizep, int *notfoundp)
key_gen(&keyitem, keyno);
key.data = (void *)keyitem.data;
- key.size = keyitem.size;
+ key.size = (u_int32_t)keyitem.size;
*notfoundp = 0;
if ((ret = dbc->get(dbc, &key, &value, DB_SET)) != 0) {
@@ -169,9 +169,9 @@ bdb_update(const void *arg_key, size_t arg_key_size,
int ret;
key.data = (void *)arg_key;
- key.size = (uint32_t)arg_key_size;
+ key.size = (u_int32_t)arg_key_size;
value.data = (void *)arg_value;
- value.size = (uint32_t)arg_value_size;
+ value.size = (u_int32_t)arg_value_size;
if ((ret = dbc->put(dbc, &key, &value, DB_KEYFIRST)) != 0)
testutil_die(ret, "dbc.put: DB_KEYFIRST: {%.*s}{%.*s}",
@@ -188,10 +188,10 @@ bdb_remove(uint64_t keyno, int *notfoundp)
key_gen(&keyitem, keyno);
key.data = (void *)keyitem.data;
- key.size = keyitem.size;
+ key.size = (u_int32_t)keyitem.size;
bdb_read(keyno, &value.data, &size, notfoundp);
- value.size = (uint32_t)size;
+ value.size = (u_int32_t)size;
if (*notfoundp)
return;