summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--opentracker.c2
-rw-r--r--ot_http.c2
-rw-r--r--ot_mutex.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/opentracker.c b/opentracker.c
index 596c2a7..b1fa87a 100644
--- a/opentracker.c
+++ b/opentracker.c
@@ -217,7 +217,7 @@ static void handle_write( const int64 sock ) {
217 chunked = 1; 217 chunked = 1;
218 218
219 for( i = 0; i < cookie->batches; ++i ) { 219 for( i = 0; i < cookie->batches; ++i ) {
220 fprintf(stderr, "handle_write inspects batch %d of %d (bytes left: %d)\n", i, cookie->batches, cookie->batch[i].bytesleft); 220 fprintf(stderr, "handle_write inspects batch %zu of %zu (bytes left: %llu)\n", i, cookie->batches, cookie->batch[i].bytesleft);
221 if( cookie->batch[i].bytesleft ) { 221 if( cookie->batch[i].bytesleft ) {
222 int64 res = iob_send( sock, cookie->batch + i ); 222 int64 res = iob_send( sock, cookie->batch + i );
223 223
diff --git a/ot_http.c b/ot_http.c
index 66899b1..5b96e6f 100644
--- a/ot_http.c
+++ b/ot_http.c
@@ -185,7 +185,7 @@ fprintf(stderr, "http_sendiovecdata sending %d iovec entries found cookie->batch
185 for( i=0; i<iovec_entries; ++i ) { 185 for( i=0; i<iovec_entries; ++i ) {
186 /* If the current batch's limit is reached, try to reallocate a new batch to work on */ 186 /* If the current batch's limit is reached, try to reallocate a new batch to work on */
187 if( current->bytesleft > OT_BATCH_LIMIT ) { 187 if( current->bytesleft > OT_BATCH_LIMIT ) {
188fprintf(stderr, "http_sendiovecdata found batch above limit: %zd\n", current->bytesleft); 188fprintf(stderr, "http_sendiovecdata found batch above limit: %llu\n", current->bytesleft);
189 io_batch * new_batch = realloc( cookie->batch, (cookie->batches + 1) * sizeof(io_batch) ); 189 io_batch * new_batch = realloc( cookie->batch, (cookie->batches + 1) * sizeof(io_batch) );
190 if( new_batch ) { 190 if( new_batch ) {
191 cookie->batch = new_batch; 191 cookie->batch = new_batch;
diff --git a/ot_mutex.c b/ot_mutex.c
index b61b915..15f3da5 100644
--- a/ot_mutex.c
+++ b/ot_mutex.c
@@ -205,12 +205,12 @@ int mutex_workqueue_pushchunked(ot_taskid taskid, struct iovec *iovec) {
205 for (task = tasklist; task; task = task->next) 205 for (task = tasklist; task; task = task->next)
206 if (task->taskid == taskid) { 206 if (task->taskid == taskid) {
207 if( iovec ) { 207 if( iovec ) {
208fprintf(stderr, "mutex_workqueue_pushchunked pushing on taskid %d\n", taskid); 208fprintf(stderr, "mutex_workqueue_pushchunked pushing on taskid %lu\n", taskid);
209 if (!iovec_append(&task->iovec_entries, &task->iovec, iovec) ) 209 if (!iovec_append(&task->iovec_entries, &task->iovec, iovec) )
210 return -1; 210 return -1;
211 task->tasktype = TASK_DONE_PARTIAL; 211 task->tasktype = TASK_DONE_PARTIAL;
212 } else { 212 } else {
213fprintf(stderr, "mutex_workqueue_pushchunked finished taskid %d\n", taskid); 213fprintf(stderr, "mutex_workqueue_pushchunked finished taskid %lu\n", taskid);
214 task->tasktype = TASK_DONE; 214 task->tasktype = TASK_DONE;
215 } 215 }
216 break; 216 break;
@@ -221,7 +221,7 @@ fprintf(stderr, "mutex_workqueue_pushchunked finished taskid %d\n", taskid);
221 221
222 io_trywrite( g_self_pipe[1], &byte, 1 ); 222 io_trywrite( g_self_pipe[1], &byte, 1 );
223if(!task) 223if(!task)
224fprintf(stderr, "mutex_workqueue_pushchunked taskid %d not found\n", taskid); 224fprintf(stderr, "mutex_workqueue_pushchunked taskid %lu not found\n", taskid);
225 225
226 /* Indicate whether the worker has to throw away results */ 226 /* Indicate whether the worker has to throw away results */
227 return task ? 0 : -1; 227 return task ? 0 : -1;
@@ -240,7 +240,7 @@ int64 mutex_workqueue_popresult( int *iovec_entries, struct iovec ** iovec, int
240 for (task = &tasklist; *task; task = &((*task)->next)) 240 for (task = &tasklist; *task; task = &((*task)->next))
241 if (((*task)->tasktype & TASK_CLASS_MASK ) == TASK_DONE) { 241 if (((*task)->tasktype & TASK_CLASS_MASK ) == TASK_DONE) {
242 struct ot_task *ptask = *task; 242 struct ot_task *ptask = *task;
243fprintf(stderr, "Got task %d type %d with %d entries\n", (*task)->taskid, (*task)->tasktype, ptask->iovec_entries); 243fprintf(stderr, "Got task %lu type %d with %d entries\n", (*task)->taskid, (*task)->tasktype, ptask->iovec_entries);
244 *iovec_entries = ptask->iovec_entries; 244 *iovec_entries = ptask->iovec_entries;
245 *iovec = ptask->iovec; 245 *iovec = ptask->iovec;
246 sock = ptask->sock; 246 sock = ptask->sock;