stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

timeshift: minor addition to atomics (check max size correctly).

Browse source
This commit is contained in:
Adam Sutton 2013-02-09 23:22:11 +00:00
parent 79c134f9c4
commit 5c4c611e59
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/atomic.h
View file

@ -35,3 +35,15 @@ atomic_add_u64(volatile uint64_t *ptr, uint64_t incr)
{
return __sync_fetch_and_add(ptr, incr);
}
static inline uint64_t
atomic_pre_add_u64(volatile uint64_t *ptr, uint64_t incr)
{
return __sync_add_and_fetch(ptr, incr);
}
static inline uint64_t
atomic_pre_add_u64(volatile uint64_t *ptr, uint64_t incr)
{
return __sync_add_and_fetch(ptr, incr);
}

2
src/timeshift/timeshift_filemgr.c
View file

@ -226,7 +226,7 @@ timeshift_file_t *timeshift_filemgr_get ( timeshift_t *ts, int create )
/* Check size */
if (!timeshift_unlimited_size &&
atomic_add_u64(&timeshift_total_size, 0) >= timeshift_max_size) {
atomic_pre_add_u64(&timeshift_total_size, 0) >= timeshift_max_size) {
tvhlog(LOG_DEBUG, "timshift", "ts %d buffer full", ts->id);
ts->full = 1;
}

1
src/timeshift/timeshift_reader.c
View file

@ -356,7 +356,6 @@ static int _timeshift_read
} else {
streaming_message_t *ssm = _timeshift_find_sstart(*cur_file, (*sm)->sm_time);
if (ssm && ssm->sm_data != ts->smt_start) {
printf("SENDING NEW SMT_START MESSAGE\n");
streaming_target_deliver2(ts->output, streaming_msg_clone(ssm));
if (ts->smt_start)
streaming_start_unref(ts->smt_start);