diff options
Diffstat (limited to 'ringbuffer.c')
| -rw-r--r-- | ringbuffer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ringbuffer.c b/ringbuffer.c index 3473a9e..e00a524 100644 --- a/ringbuffer.c +++ b/ringbuffer.c @@ -7,7 +7,7 @@ * Parts of this file were inspired by the 'ringbuffy.c' from the * LinuxDVB driver (see linuxtv.org). * - * $Id: ringbuffer.c 1.21 2004/10/15 13:49:25 kls Exp $ + * $Id: ringbuffer.c 1.23 2005/12/30 15:42:08 kls Exp $ */ #include "ringbuffer.h" @@ -46,7 +46,7 @@ void cRingBuffer::UpdatePercentage(int Fill) int percent = Fill * 100 / (Size() - 1) / PERCENTAGEDELTA * PERCENTAGEDELTA; if (percent != lastPercent) { if (percent >= PERCENTAGETHRESHOLD && percent > lastPercent || percent < PERCENTAGETHRESHOLD && lastPercent >= PERCENTAGETHRESHOLD) { - dsyslog("buffer usage: %d%% (tid=%ld)", percent, getThreadTid); + dsyslog("buffer usage: %d%% (tid=%d)", percent, getThreadTid); lastPercent = percent; } } @@ -165,10 +165,10 @@ cRingBufferLinear::cRingBufferLinear(int Size, int Margin, bool Statistics, cons Clear(); } else - esyslog("ERROR: illegal margin for ring buffer (%d > %d)", Margin, Size / 2); + esyslog("ERROR: invalid margin for ring buffer (%d > %d)", Margin, Size / 2); } else - esyslog("ERROR: illegal size for ring buffer (%d)", Size); + esyslog("ERROR: invalid size for ring buffer (%d)", Size); #ifdef DEBUGRINGBUFFERS lastHead = head; lastTail = tail; @@ -286,7 +286,7 @@ uchar *cRingBufferLinear::Get(int &Count) uchar *p = NULL; int Head = head; if (getThreadTid <= 0) - getThreadTid = pthread_self(); + getThreadTid = cThread::ThreadId(); int rest = Size() - tail; if (rest < margin && Head < tail) { int t = margin - rest; |