1 files changed, 231 insertions, 251 deletions

diff --git a/src/third_party/wiredtiger/test/thread/rw.c b/src/third_party/wiredtiger/test/thread/rw.c
index f874695d584..52a98c77f3c 100644
--- a/src/third_party/wiredtiger/test/thread/rw.c
+++ b/src/third_party/wiredtiger/test/thread/rw.c
@@ -28,19 +28,19 @@
 
 #include "thread.h"
 
-static void  print_stats(u_int);
+static void print_stats(u_int);
 static WT_THREAD_RET reader(void *);
 static WT_THREAD_RET writer(void *);
 
 typedef struct {
-	char *name;				/* object name */
-	u_int nops;				/* Thread op count */
+    char *name; /* object name */
+    u_int nops; /* Thread op count */
 
-	WT_RAND_STATE rnd;			/* RNG */
+    WT_RAND_STATE rnd; /* RNG */
 
-	int remove;				/* cursor.remove */
-	int update;				/* cursor.update */
-	int reads;				/* cursor.search */
+    int remove; /* cursor.remove */
+    int update; /* cursor.update */
+    int reads;  /* cursor.search */
 } INFO;
 
 static INFO *run_info;
@@ -48,289 +48,269 @@ static INFO *run_info;
 void
 rw_start(u_int readers, u_int writers)
 {
-	struct timeval start, stop;
-	wt_thread_t *tids;
-	double seconds;
-	u_int i, name_index, offset, total_nops;
-
-	tids = NULL;	/* Keep GCC 4.1 happy. */
-	total_nops = 0;
-
-	/* Create per-thread structures. */
-	run_info = dcalloc((size_t)(readers + writers), sizeof(*run_info));
-	tids = dcalloc((size_t)(readers + writers), sizeof(*tids));
-
-	/* Create the files and load the initial records. */
-	for (i = 0; i < writers; ++i) {
-		if (i == 0 || multiple_files) {
-			run_info[i].name = dmalloc(64);
-			testutil_check(__wt_snprintf(
-			    run_info[i].name, 64, FNAME, i));
-
-			/* Vary by orders of magnitude */
-			if (vary_nops)
-				run_info[i].nops = WT_MAX(1000, max_nops >> i);
-			load(run_info[i].name);
-		} else
-			run_info[i].name = run_info[0].name;
-
-		/* Setup op count if not varying ops. */
-		if (run_info[i].nops == 0)
-			run_info[i].nops = max_nops;
-		total_nops += run_info[i].nops;
-	}
-
-	/* Setup the reader configurations */
-	for (i = 0; i < readers; ++i) {
-		offset = i + writers;
-		if (multiple_files) {
-			run_info[offset].name = dmalloc(64);
-			/* Have readers read from tables with writes. */
-			name_index = i % writers;
-			testutil_check(__wt_snprintf(
-			    run_info[offset].name, 64, FNAME, name_index));
-
-			/* Vary by orders of magnitude */
-			if (vary_nops)
-				run_info[offset].nops =
-				    WT_MAX(1000, max_nops >> name_index);
-		} else
-			run_info[offset].name = run_info[0].name;
-
-		/* Setup op count if not varying ops. */
-		if (run_info[offset].nops == 0)
-			run_info[offset].nops = max_nops;
-		total_nops += run_info[offset].nops;
-	}
-
-	(void)gettimeofday(&start, NULL);
-
-	/* Create threads. */
-	for (i = 0; i < readers; ++i)
-		testutil_check(__wt_thread_create(
-		    NULL, &tids[i], reader, (void *)(uintptr_t)i));
-	for (; i < readers + writers; ++i)
-		testutil_check(__wt_thread_create(
-		    NULL, &tids[i], writer, (void *)(uintptr_t)i));
-
-	/* Wait for the threads. */
-	for (i = 0; i < readers + writers; ++i)
-		testutil_check(__wt_thread_join(NULL, &tids[i]));
-
-	(void)gettimeofday(&stop, NULL);
-	seconds = (stop.tv_sec - start.tv_sec) +
-	    (stop.tv_usec - start.tv_usec) * 1e-6;
-	fprintf(stderr, "timer: %.2lf seconds (%d ops/second)\n",
-	    seconds, (int)(((readers + writers) * total_nops) / seconds));
-
-	/* Verify the files. */
-	for (i = 0; i < readers + writers; ++i) {
-		verify(run_info[i].name);
-		if (!multiple_files)
-			break;
-	}
-
-	/* Output run statistics. */
-	print_stats(readers + writers);
-
-	/* Free allocated memory. */
-	for (i = 0; i < readers + writers; ++i) {
-		free(run_info[i].name);
-		if (!multiple_files)
-			break;
-	}
-
-	free(run_info);
-	free(tids);
+    struct timeval start, stop;
+    wt_thread_t *tids;
+    double seconds;
+    u_int i, name_index, offset, total_nops;
+
+    tids = NULL; /* Keep GCC 4.1 happy. */
+    total_nops = 0;
+
+    /* Create per-thread structures. */
+    run_info = dcalloc((size_t)(readers + writers), sizeof(*run_info));
+    tids = dcalloc((size_t)(readers + writers), sizeof(*tids));
+
+    /* Create the files and load the initial records. */
+    for (i = 0; i < writers; ++i) {
+        if (i == 0 || multiple_files) {
+            run_info[i].name = dmalloc(64);
+            testutil_check(__wt_snprintf(run_info[i].name, 64, FNAME, i));
+
+            /* Vary by orders of magnitude */
+            if (vary_nops)
+                run_info[i].nops = WT_MAX(1000, max_nops >> i);
+            load(run_info[i].name);
+        } else
+            run_info[i].name = run_info[0].name;
+
+        /* Setup op count if not varying ops. */
+        if (run_info[i].nops == 0)
+            run_info[i].nops = max_nops;
+        total_nops += run_info[i].nops;
+    }
+
+    /* Setup the reader configurations */
+    for (i = 0; i < readers; ++i) {
+        offset = i + writers;
+        if (multiple_files) {
+            run_info[offset].name = dmalloc(64);
+            /* Have readers read from tables with writes. */
+            name_index = i % writers;
+            testutil_check(__wt_snprintf(run_info[offset].name, 64, FNAME, name_index));
+
+            /* Vary by orders of magnitude */
+            if (vary_nops)
+                run_info[offset].nops = WT_MAX(1000, max_nops >> name_index);
+        } else
+            run_info[offset].name = run_info[0].name;
+
+        /* Setup op count if not varying ops. */
+        if (run_info[offset].nops == 0)
+            run_info[offset].nops = max_nops;
+        total_nops += run_info[offset].nops;
+    }
+
+    (void)gettimeofday(&start, NULL);
+
+    /* Create threads. */
+    for (i = 0; i < readers; ++i)
+        testutil_check(__wt_thread_create(NULL, &tids[i], reader, (void *)(uintptr_t)i));
+    for (; i < readers + writers; ++i)
+        testutil_check(__wt_thread_create(NULL, &tids[i], writer, (void *)(uintptr_t)i));
+
+    /* Wait for the threads. */
+    for (i = 0; i < readers + writers; ++i)
+        testutil_check(__wt_thread_join(NULL, &tids[i]));
+
+    (void)gettimeofday(&stop, NULL);
+    seconds = (stop.tv_sec - start.tv_sec) + (stop.tv_usec - start.tv_usec) * 1e-6;
+    fprintf(stderr, "timer: %.2lf seconds (%d ops/second)\n", seconds,
+      (int)(((readers + writers) * total_nops) / seconds));
+
+    /* Verify the files. */
+    for (i = 0; i < readers + writers; ++i) {
+        verify(run_info[i].name);
+        if (!multiple_files)
+            break;
+    }
+
+    /* Output run statistics. */
+    print_stats(readers + writers);
+
+    /* Free allocated memory. */
+    for (i = 0; i < readers + writers; ++i) {
+        free(run_info[i].name);
+        if (!multiple_files)
+            break;
+    }
+
+    free(run_info);
+    free(tids);
 }
 
 /*
  * reader_op --
- *	Read operation.
+ *     Read operation.
  */
 static inline void
 reader_op(WT_SESSION *session, WT_CURSOR *cursor, INFO *s)
 {
-	WT_ITEM *key, _key;
-	size_t len;
-	uint64_t keyno;
-	int ret;
-	char keybuf[64];
-
-	key = &_key;
-
-	keyno = __wt_random(&s->rnd) % nkeys + 1;
-	if (ftype == ROW) {
-		testutil_check(__wt_snprintf_len_set(
-		    keybuf, sizeof(keybuf), &len, "%017" PRIu64, keyno));
-		key->data = keybuf;
-		key->size = (uint32_t)len;
-		cursor->set_key(cursor, key);
-	} else
-		cursor->set_key(cursor, keyno);
-	if ((ret = cursor->search(cursor)) != 0 && ret != WT_NOTFOUND)
-		testutil_die(ret, "cursor.search");
-	if (log_print)
-		testutil_check(session->log_printf(session,
-		    "Reader Thread %p key %017" PRIu64, pthread_self(), keyno));
+    WT_ITEM *key, _key;
+    size_t len;
+    uint64_t keyno;
+    int ret;
+    char keybuf[64];
+
+    key = &_key;
+
+    keyno = __wt_random(&s->rnd) % nkeys + 1;
+    if (ftype == ROW) {
+        testutil_check(__wt_snprintf_len_set(keybuf, sizeof(keybuf), &len, "%017" PRIu64, keyno));
+        key->data = keybuf;
+        key->size = (uint32_t)len;
+        cursor->set_key(cursor, key);
+    } else
+        cursor->set_key(cursor, keyno);
+    if ((ret = cursor->search(cursor)) != 0 && ret != WT_NOTFOUND)
+        testutil_die(ret, "cursor.search");
+    if (log_print)
+        testutil_check(
+          session->log_printf(session, "Reader Thread %p key %017" PRIu64, pthread_self(), keyno));
 }
 
 /*
  * reader --
- *	Reader thread start function.
+ *     Reader thread start function.
  */
 static WT_THREAD_RET
 reader(void *arg)
 {
-	INFO *s;
-	WT_CURSOR *cursor;
-	WT_SESSION *session;
-	u_int i;
-	int id;
-	char tid[128];
-
-	id = (int)(uintptr_t)arg;
-	s = &run_info[id];
-	testutil_check(__wt_thread_str(tid, sizeof(tid)));
-	__wt_random_init(&s->rnd);
-
-	printf(" read thread %2d starting: tid: %s, file: %s\n",
-	    id, tid, s->name);
-
-	__wt_yield();		/* Get all the threads created. */
-
-	if (session_per_op) {
-		for (i = 0; i < s->nops; ++i, ++s->reads, __wt_yield()) {
-			testutil_check(
-			    conn->open_session(conn, NULL, NULL, &session));
-			testutil_check(session->open_cursor(
-			    session, s->name, NULL, NULL, &cursor));
-			reader_op(session, cursor, s);
-			testutil_check(session->close(session, NULL));
-		}
-	} else {
-		testutil_check(conn->open_session(conn, NULL, NULL, &session));
-		testutil_check(session->open_cursor(
-		    session, s->name, NULL, NULL, &cursor));
-		for (i = 0; i < s->nops; ++i, ++s->reads, __wt_yield())
-			reader_op(session, cursor, s);
-		testutil_check(session->close(session, NULL));
-	}
-
-	printf(" read thread %2d stopping: tid: %s, file: %s\n",
-	    id, tid, s->name);
-
-	return (WT_THREAD_RET_VALUE);
+    INFO *s;
+    WT_CURSOR *cursor;
+    WT_SESSION *session;
+    u_int i;
+    int id;
+    char tid[128];
+
+    id = (int)(uintptr_t)arg;
+    s = &run_info[id];
+    testutil_check(__wt_thread_str(tid, sizeof(tid)));
+    __wt_random_init(&s->rnd);
+
+    printf(" read thread %2d starting: tid: %s, file: %s\n", id, tid, s->name);
+
+    __wt_yield(); /* Get all the threads created. */
+
+    if (session_per_op) {
+        for (i = 0; i < s->nops; ++i, ++s->reads, __wt_yield()) {
+            testutil_check(conn->open_session(conn, NULL, NULL, &session));
+            testutil_check(session->open_cursor(session, s->name, NULL, NULL, &cursor));
+            reader_op(session, cursor, s);
+            testutil_check(session->close(session, NULL));
+        }
+    } else {
+        testutil_check(conn->open_session(conn, NULL, NULL, &session));
+        testutil_check(session->open_cursor(session, s->name, NULL, NULL, &cursor));
+        for (i = 0; i < s->nops; ++i, ++s->reads, __wt_yield())
+            reader_op(session, cursor, s);
+        testutil_check(session->close(session, NULL));
+    }
+
+    printf(" read thread %2d stopping: tid: %s, file: %s\n", id, tid, s->name);
+
+    return (WT_THREAD_RET_VALUE);
 }
 
 /*
  * writer_op --
- *	Write operation.
+ *     Write operation.
  */
 static inline void
 writer_op(WT_SESSION *session, WT_CURSOR *cursor, INFO *s)
 {
-	WT_ITEM *key, _key, *value, _value;
-	size_t len;
-	uint64_t keyno;
-	int ret;
-	char keybuf[64], valuebuf[64];
-
-	key = &_key;
-	value = &_value;
-
-	keyno = __wt_random(&s->rnd) % nkeys + 1;
-	if (ftype == ROW) {
-		testutil_check(__wt_snprintf_len_set(
-		    keybuf, sizeof(keybuf), &len, "%017" PRIu64, keyno));
-		key->data = keybuf;
-		key->size = (uint32_t)len;
-		cursor->set_key(cursor, key);
-	} else
-		cursor->set_key(cursor, keyno);
-	if (keyno % 5 == 0) {
-		++s->remove;
-		if ((ret = cursor->remove(cursor)) != 0 && ret != WT_NOTFOUND)
-			testutil_die(ret, "cursor.remove");
-	} else {
-		++s->update;
-		value->data = valuebuf;
-		if (ftype == FIX)
-			cursor->set_value(cursor, 0x10);
-		else {
-			testutil_check(__wt_snprintf_len_set(
-			    valuebuf, sizeof(valuebuf),
-			    &len, "XXX %37" PRIu64, keyno));
-			value->size = (uint32_t)len;
-			cursor->set_value(cursor, value);
-		}
-		testutil_check(cursor->update(cursor));
-	}
-	if (log_print)
-		testutil_check(session->log_printf(session,
-		    "Writer Thread %p key %017" PRIu64, pthread_self(), keyno));
+    WT_ITEM *key, _key, *value, _value;
+    size_t len;
+    uint64_t keyno;
+    int ret;
+    char keybuf[64], valuebuf[64];
+
+    key = &_key;
+    value = &_value;
+
+    keyno = __wt_random(&s->rnd) % nkeys + 1;
+    if (ftype == ROW) {
+        testutil_check(__wt_snprintf_len_set(keybuf, sizeof(keybuf), &len, "%017" PRIu64, keyno));
+        key->data = keybuf;
+        key->size = (uint32_t)len;
+        cursor->set_key(cursor, key);
+    } else
+        cursor->set_key(cursor, keyno);
+    if (keyno % 5 == 0) {
+        ++s->remove;
+        if ((ret = cursor->remove(cursor)) != 0 && ret != WT_NOTFOUND)
+            testutil_die(ret, "cursor.remove");
+    } else {
+        ++s->update;
+        value->data = valuebuf;
+        if (ftype == FIX)
+            cursor->set_value(cursor, 0x10);
+        else {
+            testutil_check(
+              __wt_snprintf_len_set(valuebuf, sizeof(valuebuf), &len, "XXX %37" PRIu64, keyno));
+            value->size = (uint32_t)len;
+            cursor->set_value(cursor, value);
+        }
+        testutil_check(cursor->update(cursor));
+    }
+    if (log_print)
+        testutil_check(
+          session->log_printf(session, "Writer Thread %p key %017" PRIu64, pthread_self(), keyno));
 }
 
 /*
  * writer --
- *	Writer thread start function.
+ *     Writer thread start function.
  */
 static WT_THREAD_RET
 writer(void *arg)
 {
-	INFO *s;
-	WT_CURSOR *cursor;
-	WT_SESSION *session;
-	u_int i;
-	int id;
-	char tid[128];
-
-	id = (int)(uintptr_t)arg;
-	s = &run_info[id];
-	testutil_check(__wt_thread_str(tid, sizeof(tid)));
-	__wt_random_init(&s->rnd);
-
-	printf("write thread %2d starting: tid: %s, file: %s\n",
-	    id, tid, s->name);
-
-	__wt_yield();		/* Get all the threads created. */
-
-	if (session_per_op) {
-		for (i = 0; i < s->nops; ++i, __wt_yield()) {
-			testutil_check(conn->open_session(
-			    conn, NULL, NULL, &session));
-			testutil_check(session->open_cursor(
-			    session, s->name, NULL, NULL, &cursor));
-			writer_op(session, cursor, s);
-			testutil_check(session->close(session, NULL));
-		}
-	} else {
-		testutil_check(conn->open_session(conn, NULL, NULL, &session));
-		testutil_check(session->open_cursor(
-		    session, s->name, NULL, NULL, &cursor));
-		for (i = 0; i < s->nops; ++i, __wt_yield())
-			writer_op(session, cursor, s);
-		testutil_check(session->close(session, NULL));
-	}
-
-	printf("write thread %2d stopping: tid: %s, file: %s\n",
-	    id, tid, s->name);
-
-	return (WT_THREAD_RET_VALUE);
+    INFO *s;
+    WT_CURSOR *cursor;
+    WT_SESSION *session;
+    u_int i;
+    int id;
+    char tid[128];
+
+    id = (int)(uintptr_t)arg;
+    s = &run_info[id];
+    testutil_check(__wt_thread_str(tid, sizeof(tid)));
+    __wt_random_init(&s->rnd);
+
+    printf("write thread %2d starting: tid: %s, file: %s\n", id, tid, s->name);
+
+    __wt_yield(); /* Get all the threads created. */
+
+    if (session_per_op) {
+        for (i = 0; i < s->nops; ++i, __wt_yield()) {
+            testutil_check(conn->open_session(conn, NULL, NULL, &session));
+            testutil_check(session->open_cursor(session, s->name, NULL, NULL, &cursor));
+            writer_op(session, cursor, s);
+            testutil_check(session->close(session, NULL));
+        }
+    } else {
+        testutil_check(conn->open_session(conn, NULL, NULL, &session));
+        testutil_check(session->open_cursor(session, s->name, NULL, NULL, &cursor));
+        for (i = 0; i < s->nops; ++i, __wt_yield())
+            writer_op(session, cursor, s);
+        testutil_check(session->close(session, NULL));
+    }
+
+    printf("write thread %2d stopping: tid: %s, file: %s\n", id, tid, s->name);
+
+    return (WT_THREAD_RET_VALUE);
 }
 
 /*
  * print_stats --
- *	Display reader/writer thread stats.
+ *     Display reader/writer thread stats.
  */
 static void
 print_stats(u_int nthreads)
 {
-	INFO *s;
-	u_int id;
+    INFO *s;
+    u_int id;
 
-	s = run_info;
-	for (id = 0; id < nthreads; ++id, ++s)
-		printf("%3u: read %6d, remove %6d, update %6d\n",
-		    id, s->reads, s->remove, s->update);
+    s = run_info;
+    for (id = 0; id < nthreads; ++id, ++s)
+        printf("%3u: read %6d, remove %6d, update %6d\n", id, s->reads, s->remove, s->update);
 }