comparison stream/cache2.c @ 31144:c2d5a1f6360b

Extract the cache main loop into a separate function.

31143:48622875aecc

static void dummy_sighandler(int x) {
}

/**
 * \return 1 on success, 0 if the function was interrupted and -1 on error
 */
int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){
  int ss = stream->sector_size ? stream->sector_size : STREAM_BUFFER_SIZE;
  int res = -1;

  use_gui = 0; // mp_msg may not use gui stuff in forked code
#endif
// 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));
#if defined(__MINGW32__) || defined(__OS2__)
  _endthread();
#elif defined(PTHREAD_CACHE)
  return NULL;
#else
  // make sure forked code never leaves this function
  exit(0);
#endif
  }
}

int cache_stream_fill_buffer(stream_t *s){
  int len;
  if(s->eof){ s->buf_pos=s->buf_len=0; return 0; }

31144:c2d5a1f6360b

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
 */
int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){
  int ss = stream->sector_size ? stream->sector_size : STREAM_BUFFER_SIZE;
  int res = -1;

  use_gui = 0; // mp_msg may not use gui stuff in forked code
#endif
// cache thread mainloop:
  signal(SIGTERM,exit_sighandler); // kill
  signal(SIGUSR1, dummy_sighandler); // wakeup
  cache_mainloop(s);
#if defined(__MINGW32__) || defined(__OS2__)
  _endthread();
#elif defined(PTHREAD_CACHE)
  return NULL;
#else
  // make sure forked code never leaves this function
  exit(0);
#endif
}

int cache_stream_fill_buffer(stream_t *s){
  int len;
  if(s->eof){ s->buf_pos=s->buf_len=0; return 0; }