diff options
Diffstat (limited to 'innobase/sync/sync0arr.c')
| -rw-r--r-- | innobase/sync/sync0arr.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/innobase/sync/sync0arr.c b/innobase/sync/sync0arr.c index 78d1a36fcf3..426d7ff9f92 100644 --- a/innobase/sync/sync0arr.c +++ b/innobase/sync/sync0arr.c @@ -456,8 +456,9 @@ sync_array_cell_print( fprintf(file, "--Thread %lu has waited at %s line %lu for %.2f seconds the semaphore:\n", - os_thread_pf(cell->thread), cell->file, cell->line, - difftime(time(NULL), cell->reservation_time)); + (ulong) os_thread_pf(cell->thread), cell->file, + (ulong) cell->line, + difftime(time(NULL), cell->reservation_time)); if (type == SYNC_MUTEX) { /* We use old_wait_mutex in case the cell has already @@ -470,12 +471,12 @@ sync_array_cell_print( "Last time reserved in file %s line %lu, " #endif /* UNIV_SYNC_DEBUG */ "waiters flag %lu\n", - mutex, mutex->cfile_name, mutex->cline, - mutex->lock_word, + mutex, mutex->cfile_name, (ulong) mutex->cline, + (ulong) mutex->lock_word, #ifdef UNIV_SYNC_DEBUG - mutex->file_name, mutex->line, + mutex->file_name, (ulong) mutex->line, #endif /* UNIV_SYNC_DEBUG */ - mutex->waiters); + (ulong) mutex->waiters); } else if (type == RW_LOCK_EX || type == RW_LOCK_SHARED) { @@ -485,11 +486,12 @@ sync_array_cell_print( fprintf(file, " RW-latch at %p created in file %s line %lu\n", - rwlock, rwlock->cfile_name, rwlock->cline); + rwlock, rwlock->cfile_name, + (ulong) rwlock->cline); if (rwlock->writer != RW_LOCK_NOT_LOCKED) { fprintf(file, "a writer (thread id %lu) has reserved it in mode %s", - os_thread_pf(rwlock->writer_thread), + (ulong) os_thread_pf(rwlock->writer_thread), rwlock->writer == RW_LOCK_EX ? " exclusive\n" : " wait exclusive\n"); @@ -499,9 +501,12 @@ sync_array_cell_print( "number of readers %lu, waiters flag %lu\n" "Last time read locked in file %s line %lu\n" "Last time write locked in file %s line %lu\n", - rwlock->reader_count, rwlock->waiters, - rwlock->last_s_file_name, rwlock->last_s_line, - rwlock->last_x_file_name, rwlock->last_x_line); + (ulong) rwlock->reader_count, + (ulong) rwlock->waiters, + rwlock->last_s_file_name, + (ulong) rwlock->last_s_line, + rwlock->last_x_file_name, + (ulong) rwlock->last_x_line); } else { ut_error; } @@ -648,8 +653,8 @@ sync_array_detect_deadlock( if (ret) { fprintf(stderr, "Mutex %p owned by thread %lu file %s line %lu\n", - mutex, os_thread_pf(mutex->thread_id), - mutex->file_name, mutex->line); + mutex, (ulong) os_thread_pf(mutex->thread_id), + mutex->file_name, (ulong) mutex->line); sync_array_cell_print(stderr, cell); return(TRUE); @@ -968,7 +973,7 @@ sync_array_output_info( fprintf(file, "OS WAIT ARRAY INFO: reservation count %ld, signal count %ld\n", - arr->res_count, arr->sg_count); + (long) arr->res_count, (long) arr->sg_count); i = 0; count = 0; |