Commit 6c57f58e authored by Yoni Fogel's avatar Yoni Fogel

[t:2499] Windows port.

*pthread* -> *toku_pthread*
Printf format issues
Including toku_portability and toku_os before everything else

git-svn-id: file:///svn/toku/tokudb@19938 c7de825b-a66e-492c-adef-691d508d4ae1
parent 7990bd18
......@@ -102,7 +102,7 @@ void brt_loader_destroy_poll_callback(brtloader_poll_callback p) {
void brt_loader_set_poll_function(brtloader_poll_callback p, brt_loader_poll_func poll_function, void *poll_extra) {
p->poll_function = poll_function;
p->poll_extra = poll_extra;
};
}
int brt_loader_call_poll_function(brtloader_poll_callback p, float progress) {
int r = 0;
......
......@@ -149,7 +149,7 @@ struct brtloader_s {
LSN load_lsn; //LSN of the fsynced 'load' log entry. Write this LSN (as checkpoint_lsn) in brt headers made by this loader.
QUEUE *fractal_queues; // an array of work queues, one for each secondary index.
pthread_t *fractal_threads;
toku_pthread_t *fractal_threads;
BOOL *fractal_threads_live; // an array of bools indicating that fractal_threads[i] is a live thread. (There is no NULL for a pthread_t, so we have to maintain this separately).
};
......
......@@ -2084,7 +2084,7 @@ static void finish_leafnode (struct dbout *out, struct leaf_buf *lbuf, int progr
int size = header_len + compressed_len;
if (0) {
fprintf(stderr, "uncompressed buf size=%d (amount of data compressed)\n", uncompressed_len);
fprintf(stderr, "compressed buf size=%u, off=%lld\n", compressed_len, off_of_leaf);
fprintf(stderr, "compressed buf size=%d, off=%lld\n", compressed_len, off_of_leaf);
fprintf(stderr, "compressed bytes are:");
//for (int i=0; i<compressed_len; i++) {
// unsigned char c = compressed_buf[28+i];
......
......@@ -3,6 +3,8 @@
#ident "Copyright (c) 2010 Tokutek Inc. All rights reserved."
#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
#include <toku_portability.h>
#include "toku_os.h"
#include "brt-internal.h"
#include "brtloader-internal.h"
#include "pqueue.h"
......
#include <toku_portability.h>
#include "toku_os.h"
#include <errno.h>
#include <toku_assert.h>
#include "queue.h"
......@@ -19,8 +21,8 @@ struct queue {
BOOL eof;
pthread_mutex_t mutex;
pthread_cond_t cond;
toku_pthread_mutex_t mutex;
toku_pthread_cond_t cond;
};
// Representation invariant:
......
#include <toku_portability.h>
#include "toku_os.h"
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment