diff --git a/newbrt/dbufio.c b/newbrt/dbufio.c index b9c4735ddc7..e0fd80959c9 100644 --- a/newbrt/dbufio.c +++ b/newbrt/dbufio.c @@ -378,7 +378,7 @@ dbufio_print(DBUFIO_FILESET bfs) { fprintf(stderr, "%s:%d bfs=%p", __FILE__, __LINE__, bfs); if (bfs->panic) fprintf(stderr, " panic=%d", bfs->panic_errno); - fprintf(stderr, " N=%d %d %"PRIuMAX, bfs->N, bfs->n_not_done, bfs->bufsize); + //fprintf(stderr, " N=%d %d %"PRIuMAX, bfs->N, bfs->n_not_done, bfs->bufsize); for (int i = 0; i < bfs->N; i++) { struct dbufio_file *dbf = &bfs->files[i]; if (dbf->error_code[0] || dbf->error_code[1]) diff --git a/newbrt/logger.c b/newbrt/logger.c index 6712152dde4..eecd1efd38c 100644 --- a/newbrt/logger.c +++ b/newbrt/logger.c @@ -775,13 +775,13 @@ int toku_logger_maybe_fsync (TOKULOGGER logger, LSN lsn, int do_fsync) write_outbuf_to_logfile(logger, &fsynced_lsn); if (fsynced_lsn.lsn < lsn.lsn) { // it may have gotten fsynced by the write_outbuf_to_logfile. - toku_add_trace_mem("fsync", __LINE__); + //toku_add_trace_mem("fsync", __LINE__); r = toku_file_fsync_without_accounting(logger->fd); if (r!=0) { toku_logger_panic(logger, r); return r; } - toku_add_trace_mem("fsyncdone", __LINE__); + //toku_add_trace_mem("fsyncdone", __LINE__); assert(fsynced_lsn.lsn <= logger->written_lsn.lsn); fsynced_lsn = logger->written_lsn; } diff --git a/newbrt/threadpool.c b/newbrt/threadpool.c index 41288a0d4ac..4b373da4cf3 100644 --- a/newbrt/threadpool.c +++ b/newbrt/threadpool.c @@ -188,6 +188,8 @@ toku_thread_pool_add(struct toku_thread_pool *pool) { return r; } +#define EWOULDBLOCK 10101 + // get one thread from the free pool. static int toku_thread_pool_get_one(struct toku_thread_pool *pool, int dowait, struct toku_thread **toku_thread_return) { diff --git a/newbrt/ule.c b/newbrt/ule.c index e00aca76fe7..82904bd5ff6 100644 --- a/newbrt/ule.c +++ b/newbrt/ule.c @@ -1798,9 +1798,9 @@ cleanup: } // -// Iterates over "possible" TXNIDs in a leafentry's stack, until one is accepted by 'f'. Set +// Iterates over TXNIDs relevant for MVCC reads in a leafentry's stack, until one is accepted by 'f'. Set // valpp and vallenp to value and length associated with accepted TXNID -// The "possible" TXNIDs are: +// The relevant TXNIDs are: // if provisionals exist, then the first possible TXNID is the outermost provisional. // The next possible TXNIDs are the committed TXNIDs, from most recently committed to T_0. // If provisionals exist, and the outermost provisional is accepted by 'f', @@ -2019,7 +2019,6 @@ bool transaction_open(TXNID xid) { #endif -#if BRT_LAYOUT_MIN_SUPPORTED_VERSION <= BRT_LAYOUT_VERSION_12 #if TOKU_WINDOWS #pragma pack(push, 1) #endif @@ -2216,5 +2215,3 @@ toku_le_upgrade_12_13(LEAFENTRY_12 old_leafentry, return rval; } -#endif -