1
mirror of https://github.com/mpv-player/mpv synced 2025-01-05 03:06:28 +01:00

Extract the cache main loop into a separate function.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31201 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-05-23 21:58:50 +00:00
parent 7dcf9d45ed
commit 939df8d5a8

View File

@ -344,6 +344,24 @@ static void exit_sighandler(int x){
static void dummy_sighandler(int x) {
}
/**
* Main loop of the cache process or thread.
*/
static void cache_mainloop(cache_vars_t *s) {
int sleep_count = 0;
do {
if (!cache_fill(s)) {
if (sleep_count < INITIAL_FILL_USLEEP_COUNT) {
sleep_count++;
usec_sleep(INITIAL_FILL_USLEEP_TIME);
} else
usec_sleep(FILL_USLEEP_TIME); // idle
} else
sleep_count = 0;
// cache_stats(s->cache_data);
} while (cache_execute_control(s));
}
/**
* \return 1 on success, 0 if the function was interrupted and -1 on error
*/
@ -436,19 +454,7 @@ static void ThreadProc( void *s ){
// cache thread mainloop:
signal(SIGTERM,exit_sighandler); // kill
signal(SIGUSR1, dummy_sighandler); // wakeup
{
int sleep_count = 0;
do {
if(!cache_fill(s)){
if (sleep_count < INITIAL_FILL_USLEEP_COUNT) {
sleep_count++;
usec_sleep(INITIAL_FILL_USLEEP_TIME);
} else
usec_sleep(FILL_USLEEP_TIME); // idle
} else
sleep_count = 0;
// cache_stats(s->cache_data);
} while (cache_execute_control(s));
cache_mainloop(s);
#if defined(__MINGW32__) || defined(__OS2__)
_endthread();
#elif defined(PTHREAD_CACHE)
@ -457,7 +463,6 @@ static void ThreadProc( void *s ){
// make sure forked code never leaves this function
exit(0);
#endif
}
}
int cache_stream_fill_buffer(stream_t *s){