|
From: <sv...@va...> - 2008-05-11 06:43:01
|
Author: bart
Date: 2008-05-11 07:43:07 +0100 (Sun, 11 May 2008)
New Revision: 8038
Log:
Fixed compiler warnings in assert statements.
Modified:
trunk/exp-drd/drd_semaphore.c
trunk/exp-drd/drd_thread.c
trunk/exp-drd/drd_thread.h
Modified: trunk/exp-drd/drd_semaphore.c
===================================================================
--- trunk/exp-drd/drd_semaphore.c 2008-05-11 06:41:46 UTC (rev 8037)
+++ trunk/exp-drd/drd_semaphore.c 2008-05-11 06:43:07 UTC (rev 8038)
@@ -177,7 +177,7 @@
semaphore);
}
tl_assert(p);
- tl_assert(p->waiters >= 0);
+ tl_assert((int)p->waiters >= 0);
p->waiters++;
tl_assert(p->waiters > 0);
}
@@ -202,8 +202,8 @@
}
tl_assert(p->waiters > 0);
p->waiters--;
- tl_assert(p->waiters >= 0);
- tl_assert(p->value >= 0);
+ tl_assert((int)p->waiters >= 0);
+ tl_assert((int)p->value >= 0);
if (p->value == 0)
{
SemaphoreErrInfo sei = { semaphore };
@@ -215,7 +215,7 @@
return;
}
p->value--;
- tl_assert(p->value >= 0);
+ tl_assert((int)p->value >= 0);
if (p->last_sem_post_tid != tid
&& p->last_sem_post_tid != DRD_INVALID_THREADID)
{
Modified: trunk/exp-drd/drd_thread.c
===================================================================
--- trunk/exp-drd/drd_thread.c 2008-05-11 06:41:46 UTC (rev 8037)
+++ trunk/exp-drd/drd_thread.c 2008-05-11 06:43:07 UTC (rev 8038)
@@ -87,7 +87,7 @@
__inline__ Bool IsValidDrdThreadId(const DrdThreadId tid)
{
- return (0 <= tid && tid < DRD_N_THREADS && tid != DRD_INVALID_THREADID
+ return (0 <= (int)tid && tid < DRD_N_THREADS && tid != DRD_INVALID_THREADID
&& ! (s_threadinfo[tid].vg_thread_exists == False
&& s_threadinfo[tid].posix_thread_exists == False
&& s_threadinfo[tid].detached_posix_thread == False));
@@ -170,7 +170,8 @@
ThreadId DrdThreadIdToVgThreadId(const DrdThreadId tid)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS && tid != DRD_INVALID_THREADID);
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
+ && tid != DRD_INVALID_THREADID);
return (s_threadinfo[tid].vg_thread_exists
? s_threadinfo[tid].vg_threadid
: VG_INVALID_THREADID);
@@ -207,7 +208,7 @@
tl_assert(VgThreadIdToDrdThreadId(vg_created) == DRD_INVALID_THREADID);
created = VgThreadIdToNewDrdThreadId(vg_created);
- tl_assert(0 <= created && created < DRD_N_THREADS
+ tl_assert(0 <= (int)created && created < DRD_N_THREADS
&& created != DRD_INVALID_THREADID);
tl_assert(s_threadinfo[created].first == 0);
@@ -224,7 +225,7 @@
{
const DrdThreadId created = VgThreadIdToDrdThreadId(vg_created);
- tl_assert(0 <= created && created < DRD_N_THREADS
+ tl_assert(0 <= (int)created && created < DRD_N_THREADS
&& created != DRD_INVALID_THREADID);
s_threadinfo[created].stack_max = VG_(thread_get_stack_max)(vg_created);
@@ -243,7 +244,8 @@
/* ignored. */
void thread_set_stack_startup(const DrdThreadId tid, const Addr stack_startup)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS && tid != DRD_INVALID_THREADID);
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
+ && tid != DRD_INVALID_THREADID);
tl_assert(s_threadinfo[tid].stack_min <= stack_startup);
tl_assert(stack_startup <= s_threadinfo[tid].stack_max);
s_threadinfo[tid].stack_startup = stack_startup;
@@ -251,28 +253,28 @@
Addr thread_get_stack_min(const DrdThreadId tid)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
return s_threadinfo[tid].stack_min;
}
Addr thread_get_stack_min_min(const DrdThreadId tid)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
return s_threadinfo[tid].stack_min_min;
}
Addr thread_get_stack_max(const DrdThreadId tid)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
return s_threadinfo[tid].stack_max;
}
SizeT thread_get_stack_size(const DrdThreadId tid)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
return s_threadinfo[tid].stack_size;
}
@@ -285,7 +287,7 @@
Segment* sg;
Segment* sg_prev;
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
tl_assert(s_threadinfo[tid].synchr_nesting == 0);
for (sg = s_threadinfo[tid].last; sg; sg = sg_prev)
@@ -307,7 +309,7 @@
/* joinable threads, not for detached threads. */
void thread_finished(const DrdThreadId tid)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
s_threadinfo[tid].vg_thread_exists = False;
@@ -328,7 +330,7 @@
void thread_set_pthreadid(const DrdThreadId tid, const PThreadId ptid)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
tl_assert(s_threadinfo[tid].pt_threadid == INVALID_POSIX_THREADID);
tl_assert(ptid != INVALID_POSIX_THREADID);
@@ -338,14 +340,14 @@
Bool thread_get_joinable(const DrdThreadId tid)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
return ! s_threadinfo[tid].detached_posix_thread;
}
void thread_set_joinable(const DrdThreadId tid, const Bool joinable)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
tl_assert(!! joinable == joinable);
tl_assert(s_threadinfo[tid].pt_threadid != INVALID_POSIX_THREADID);
@@ -421,7 +423,7 @@
/** Append a new segment at the end of the segment list. */
static void thread_append_segment(const DrdThreadId tid, Segment* const sg)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
// tl_assert(sane_ThreadInfo(&s_threadinfo[tid]));
sg->prev = s_threadinfo[tid].last;
@@ -439,7 +441,7 @@
*/
static void thread_discard_segment(const DrdThreadId tid, Segment* const sg)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
//tl_assert(sane_ThreadInfo(&s_threadinfo[tid]));
@@ -458,7 +460,8 @@
VectorClock* thread_get_vc(const DrdThreadId tid)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS && tid != DRD_INVALID_THREADID);
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
+ && tid != DRD_INVALID_THREADID);
tl_assert(s_threadinfo[tid].last);
return &s_threadinfo[tid].last->vc;
}
@@ -469,7 +472,8 @@
void thread_get_latest_segment(Segment** sg, const DrdThreadId tid)
{
tl_assert(sg);
- tl_assert(0 <= tid && tid < DRD_N_THREADS && tid != DRD_INVALID_THREADID);
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
+ && tid != DRD_INVALID_THREADID);
tl_assert(s_threadinfo[tid].last);
sg_put(*sg);
@@ -679,7 +683,8 @@
{
Segment* new_sg;
- tl_assert(0 <= tid && tid < DRD_N_THREADS && tid != DRD_INVALID_THREADID);
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
+ && tid != DRD_INVALID_THREADID);
new_sg = sg_new(tid, tid);
thread_append_segment(tid, new_sg);
@@ -704,9 +709,9 @@
void thread_combine_vc(DrdThreadId joiner, DrdThreadId joinee)
{
tl_assert(joiner != joinee);
- tl_assert(0 <= joiner && joiner < DRD_N_THREADS
+ tl_assert(0 <= (int)joiner && joiner < DRD_N_THREADS
&& joiner != DRD_INVALID_THREADID);
- tl_assert(0 <= joinee && joinee < DRD_N_THREADS
+ tl_assert(0 <= (int)joinee && joinee < DRD_N_THREADS
&& joinee != DRD_INVALID_THREADID);
tl_assert(s_threadinfo[joiner].last);
tl_assert(s_threadinfo[joinee].last);
@@ -725,7 +730,8 @@
*/
void thread_combine_vc2(DrdThreadId tid, const VectorClock* const vc)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS && tid != DRD_INVALID_THREADID);
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
+ && tid != DRD_INVALID_THREADID);
tl_assert(s_threadinfo[tid].last);
tl_assert(vc);
vc_combine(&s_threadinfo[tid].last->vc, vc);
@@ -774,14 +780,16 @@
void thread_start_recording(const DrdThreadId tid)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS && tid != DRD_INVALID_THREADID);
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
+ && tid != DRD_INVALID_THREADID);
tl_assert(! s_threadinfo[tid].is_recording);
s_threadinfo[tid].is_recording = True;
}
void thread_stop_recording(const DrdThreadId tid)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS && tid != DRD_INVALID_THREADID);
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
+ && tid != DRD_INVALID_THREADID);
tl_assert(s_threadinfo[tid].is_recording);
s_threadinfo[tid].is_recording = False;
}
@@ -847,7 +855,7 @@
{
unsigned i;
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
tl_assert(p);
@@ -887,7 +895,7 @@
{
Segment* p;
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
for (p = s_threadinfo[tid].first; p; p = p->next)
@@ -931,7 +939,8 @@
{
Segment* p;
- tl_assert(0 <= tid && tid < DRD_N_THREADS && tid != DRD_INVALID_THREADID);
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
+ && tid != DRD_INVALID_THREADID);
tl_assert(tid == s_drd_running_tid);
s_update_danger_set_count++;
Modified: trunk/exp-drd/drd_thread.h
===================================================================
--- trunk/exp-drd/drd_thread.h 2008-05-11 06:41:46 UTC (rev 8037)
+++ trunk/exp-drd/drd_thread.h 2008-05-11 06:43:07 UTC (rev 8038)
@@ -158,7 +158,7 @@
static inline
Bool running_thread_is_recording(void)
{
- tl_assert(0 <= s_drd_running_tid && s_drd_running_tid < DRD_N_THREADS
+ tl_assert(0 <= (int)s_drd_running_tid && s_drd_running_tid < DRD_N_THREADS
&& s_drd_running_tid != DRD_INVALID_THREADID);
return (s_threadinfo[s_drd_running_tid].synchr_nesting == 0
&& s_threadinfo[s_drd_running_tid].is_recording);
@@ -187,7 +187,7 @@
static inline
Segment* thread_get_segment(const DrdThreadId tid)
{
- tl_assert(0 <= tid && tid < DRD_N_THREADS
+ tl_assert(0 <= (int)tid && tid < DRD_N_THREADS
&& tid != DRD_INVALID_THREADID);
tl_assert(s_threadinfo[tid].last);
return s_threadinfo[tid].last;
|