2001-10-20 23:57:55 +00:00
|
|
|
#include "config.h"
|
|
|
|
|
2001-10-20 23:51:02 +00:00
|
|
|
#ifdef USE_STREAM_CACHE
|
|
|
|
|
|
|
|
// Initial draft of my new cache system...
|
2001-10-21 22:13:12 +00:00
|
|
|
// Note it runs in 2 processes (using fork()), but doesn't requires locking!!
|
2001-10-20 23:51:02 +00:00
|
|
|
// TODO: seeking, data consistency checking
|
|
|
|
|
2001-10-21 22:13:12 +00:00
|
|
|
#define READ_USLEEP_TIME 10000
|
|
|
|
#define FILL_USLEEP_TIME 50000
|
2002-02-23 21:22:55 +00:00
|
|
|
#define PREFILL_SLEEP_TIME 200
|
2001-10-20 23:51:02 +00:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <signal.h>
|
2001-12-25 11:20:58 +00:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <unistd.h>
|
2001-10-20 23:51:02 +00:00
|
|
|
|
2003-05-26 18:35:42 +00:00
|
|
|
#include "../osdep/timer.h"
|
|
|
|
#ifndef WIN32
|
2003-02-09 20:18:23 +00:00
|
|
|
#include "../osdep/shmem.h"
|
2003-05-26 18:35:42 +00:00
|
|
|
#else
|
|
|
|
#undef DATADIR
|
|
|
|
#include <windows.h>
|
|
|
|
static DWORD WINAPI ThreadProc(void* s);
|
|
|
|
#endif
|
2001-10-20 23:51:02 +00:00
|
|
|
|
2001-10-22 16:09:34 +00:00
|
|
|
#include "mp_msg.h"
|
|
|
|
|
2001-10-20 23:51:02 +00:00
|
|
|
#include "stream.h"
|
|
|
|
|
|
|
|
int stream_fill_buffer(stream_t *s);
|
|
|
|
int stream_seek_long(stream_t *s,off_t pos);
|
|
|
|
|
2002-10-23 14:46:20 +00:00
|
|
|
extern int mp_input_check_interrupt(int time);
|
2001-10-20 23:51:02 +00:00
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
// constats:
|
|
|
|
unsigned char *buffer; // base pointer of the alllocated buffer memory
|
2001-10-21 22:13:12 +00:00
|
|
|
int buffer_size; // size of the alllocated buffer memory
|
|
|
|
int sector_size; // size of a single sector (2048/2324)
|
|
|
|
int back_size; // we should keep back_size amount of old bytes for backward seek
|
|
|
|
int fill_limit; // we should fill buffer only if space>=fill_limit
|
2001-12-17 16:55:40 +00:00
|
|
|
int prefill; // we should fill min prefill bytes if cache gets empty
|
2001-10-20 23:51:02 +00:00
|
|
|
// filler's pointers:
|
2001-10-21 18:14:24 +00:00
|
|
|
int eof;
|
2001-10-22 17:08:24 +00:00
|
|
|
off_t min_filepos; // buffer contain only a part of the file, from min-max pos
|
|
|
|
off_t max_filepos;
|
|
|
|
off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte)
|
|
|
|
// reader's pointers:
|
|
|
|
off_t read_filepos;
|
2001-10-20 23:51:02 +00:00
|
|
|
// commands/locking:
|
2001-10-21 22:13:12 +00:00
|
|
|
// int seek_lock; // 1 if we will seek/reset buffer, 2 if we are ready for cmd
|
|
|
|
// int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads.
|
2001-10-20 23:51:02 +00:00
|
|
|
// callback
|
|
|
|
stream_t* stream;
|
|
|
|
} cache_vars_t;
|
|
|
|
|
2001-10-21 22:13:12 +00:00
|
|
|
static int min_fill=0;
|
|
|
|
|
|
|
|
int cache_fill_status=0;
|
2001-10-20 23:51:02 +00:00
|
|
|
|
|
|
|
void cache_stats(cache_vars_t* s){
|
|
|
|
int newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
|
2002-09-22 02:33:28 +00:00
|
|
|
printf("0x%06X [0x%06X] 0x%06X ",(int)s->min_filepos,(int)s->read_filepos,(int)s->max_filepos);
|
2001-10-20 23:51:02 +00:00
|
|
|
printf("%3d %% (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
int cache_read(cache_vars_t* s,unsigned char* buf,int size){
|
|
|
|
int total=0;
|
|
|
|
while(size>0){
|
|
|
|
int pos,newb,len;
|
2001-10-21 22:13:12 +00:00
|
|
|
|
|
|
|
//printf("CACHE2_READ: 0x%X <= 0x%X <= 0x%X \n",s->min_filepos,s->read_filepos,s->max_filepos);
|
2001-10-20 23:51:02 +00:00
|
|
|
|
2001-10-22 17:08:24 +00:00
|
|
|
if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){
|
2001-10-21 18:14:24 +00:00
|
|
|
// eof?
|
|
|
|
if(s->eof) break;
|
2001-10-20 23:51:02 +00:00
|
|
|
// waiting for buffer fill...
|
2003-05-26 18:35:42 +00:00
|
|
|
usec_sleep(READ_USLEEP_TIME); // 10ms
|
2001-10-21 22:13:12 +00:00
|
|
|
continue; // try again...
|
2001-10-20 23:51:02 +00:00
|
|
|
}
|
2001-10-21 22:13:12 +00:00
|
|
|
|
2001-10-22 17:08:24 +00:00
|
|
|
newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
|
2001-10-21 22:13:12 +00:00
|
|
|
if(newb<min_fill) min_fill=newb; // statistics...
|
|
|
|
|
2001-10-20 23:51:02 +00:00
|
|
|
// printf("*** newb: %d bytes ***\n",newb);
|
2001-10-21 22:13:12 +00:00
|
|
|
|
|
|
|
pos=s->read_filepos - s->offset;
|
|
|
|
if(pos<0) pos+=s->buffer_size; else
|
|
|
|
if(pos>=s->buffer_size) pos-=s->buffer_size;
|
|
|
|
|
2001-10-20 23:51:02 +00:00
|
|
|
if(newb>s->buffer_size-pos) newb=s->buffer_size-pos; // handle wrap...
|
|
|
|
if(newb>size) newb=size;
|
|
|
|
|
2001-10-21 22:13:12 +00:00
|
|
|
// check:
|
2001-10-22 16:09:34 +00:00
|
|
|
if(s->read_filepos<s->min_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"Ehh. s->read_filepos<s->min_filepos !!! Report bug...\n");
|
2001-10-21 22:13:12 +00:00
|
|
|
|
2001-10-20 23:51:02 +00:00
|
|
|
// len=write(mem,newb)
|
|
|
|
//printf("Buffer read: %d bytes\n",newb);
|
|
|
|
memcpy(buf,&s->buffer[pos],newb);
|
|
|
|
buf+=newb;
|
2001-10-21 22:13:12 +00:00
|
|
|
len=newb;
|
2001-10-20 23:51:02 +00:00
|
|
|
// ...
|
|
|
|
|
|
|
|
s->read_filepos+=len;
|
|
|
|
size-=len;
|
|
|
|
total+=len;
|
|
|
|
|
|
|
|
}
|
2001-10-21 22:13:12 +00:00
|
|
|
cache_fill_status=100*(s->max_filepos-s->read_filepos)/s->buffer_size;
|
2001-10-20 23:51:02 +00:00
|
|
|
return total;
|
|
|
|
}
|
|
|
|
|
|
|
|
int cache_fill(cache_vars_t* s){
|
2002-09-22 02:33:28 +00:00
|
|
|
int back,back2,newb,space,len,pos;
|
2001-10-22 17:08:24 +00:00
|
|
|
off_t read=s->read_filepos;
|
2001-10-20 23:51:02 +00:00
|
|
|
|
2001-10-21 22:13:12 +00:00
|
|
|
if(read<s->min_filepos || read>s->max_filepos){
|
|
|
|
// seek...
|
2001-10-22 16:09:34 +00:00
|
|
|
mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%X \n",read);
|
2003-01-13 03:08:56 +00:00
|
|
|
// streaming: drop cache contents only if seeking backward or too much fwd:
|
|
|
|
if(s->stream->type!=STREAMTYPE_STREAM ||
|
|
|
|
read<s->min_filepos || read>=s->max_filepos+s->buffer_size)
|
|
|
|
{
|
|
|
|
s->offset= // FIXME!?
|
|
|
|
s->min_filepos=s->max_filepos=read; // drop cache content :(
|
|
|
|
if(s->stream->eof) stream_reset(s->stream);
|
|
|
|
stream_seek(s->stream,read);
|
|
|
|
mp_msg(MSGT_CACHE,MSGL_DBG2,"Seek done. new pos: 0x%X \n",(int)stream_tell(s->stream));
|
|
|
|
}
|
2001-10-21 22:13:12 +00:00
|
|
|
}
|
|
|
|
|
2001-10-20 23:51:02 +00:00
|
|
|
// calc number of back-bytes:
|
|
|
|
back=read - s->min_filepos;
|
|
|
|
if(back<0) back=0; // strange...
|
|
|
|
if(back>s->back_size) back=s->back_size;
|
|
|
|
|
|
|
|
// calc number of new bytes:
|
|
|
|
newb=s->max_filepos - read;
|
|
|
|
if(newb<0) newb=0; // strange...
|
|
|
|
|
|
|
|
// calc free buffer space:
|
|
|
|
space=s->buffer_size - (newb+back);
|
|
|
|
|
|
|
|
// calc bufferpos:
|
|
|
|
pos=s->max_filepos - s->offset;
|
|
|
|
if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around
|
|
|
|
|
|
|
|
if(space<s->fill_limit){
|
|
|
|
// printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit);
|
|
|
|
return 0; // no fill...
|
|
|
|
}
|
|
|
|
|
|
|
|
// printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos);
|
|
|
|
|
|
|
|
// reduce space if needed:
|
|
|
|
if(space>s->buffer_size-pos) space=s->buffer_size-pos;
|
|
|
|
|
|
|
|
// if(space>32768) space=32768; // limit one-time block size
|
|
|
|
if(space>4*s->sector_size) space=4*s->sector_size;
|
|
|
|
|
2001-10-21 22:13:12 +00:00
|
|
|
// if(s->seek_lock) return 0; // FIXME
|
|
|
|
|
|
|
|
#if 1
|
|
|
|
// back+newb+space <= buffer_size
|
|
|
|
back2=s->buffer_size-(space+newb); // max back size
|
|
|
|
if(s->min_filepos<(read-back2)) s->min_filepos=read-back2;
|
|
|
|
#else
|
2001-10-20 23:51:02 +00:00
|
|
|
s->min_filepos=read-back; // avoid seeking-back to temp area...
|
2001-10-21 22:13:12 +00:00
|
|
|
#endif
|
2001-10-20 23:51:02 +00:00
|
|
|
|
|
|
|
// ....
|
|
|
|
//printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size);
|
|
|
|
//len=stream_fill_buffer(s->stream);
|
|
|
|
//memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy!
|
|
|
|
// ....
|
2001-10-21 18:14:24 +00:00
|
|
|
len=stream_read(s->stream,&s->buffer[pos],space);
|
|
|
|
if(!len) s->eof=1;
|
2001-10-20 23:51:02 +00:00
|
|
|
|
|
|
|
s->max_filepos+=len;
|
|
|
|
if(pos+len>=s->buffer_size){
|
|
|
|
// wrap...
|
|
|
|
s->offset+=s->buffer_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
return len;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
cache_vars_t* cache_init(int size,int sector){
|
|
|
|
int num;
|
2003-05-26 18:35:42 +00:00
|
|
|
#ifndef WIN32
|
2001-10-20 23:51:02 +00:00
|
|
|
cache_vars_t* s=shmem_alloc(sizeof(cache_vars_t));
|
2003-05-26 18:35:42 +00:00
|
|
|
#else
|
|
|
|
cache_vars_t* s=malloc(sizeof(cache_vars_t));
|
|
|
|
#endif
|
2001-10-20 23:51:02 +00:00
|
|
|
memset(s,0,sizeof(cache_vars_t));
|
|
|
|
num=size/sector;
|
|
|
|
s->buffer_size=num*sector;
|
|
|
|
s->sector_size=sector;
|
2003-05-26 18:35:42 +00:00
|
|
|
#ifndef WIN32
|
2001-10-20 23:51:02 +00:00
|
|
|
s->buffer=shmem_alloc(s->buffer_size);
|
2003-05-26 18:35:42 +00:00
|
|
|
#else
|
|
|
|
s->buffer=malloc(s->buffer_size);
|
|
|
|
#endif
|
2001-10-20 23:51:02 +00:00
|
|
|
s->fill_limit=8*sector;
|
|
|
|
s->back_size=size/2;
|
2001-12-17 16:55:40 +00:00
|
|
|
s->prefill=size/20; // default: 5%
|
2001-10-20 23:51:02 +00:00
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2003-04-12 13:53:33 +00:00
|
|
|
void cache_uninit(stream_t *s) {
|
|
|
|
cache_vars_t* c = s->cache_data;
|
|
|
|
if(!s->cache_pid) return;
|
2003-05-26 18:35:42 +00:00
|
|
|
#ifndef WIN32
|
2003-04-12 13:53:33 +00:00
|
|
|
kill(s->cache_pid,SIGKILL);
|
|
|
|
waitpid(s->cache_pid,NULL,0);
|
2003-05-26 18:35:42 +00:00
|
|
|
#else
|
|
|
|
TerminateThread((HANDLE)s->cache_pid,0);
|
|
|
|
free(c->stream);
|
|
|
|
#endif
|
2003-04-12 13:53:33 +00:00
|
|
|
if(!c) return;
|
2003-05-26 18:35:42 +00:00
|
|
|
#ifndef WIN32
|
2003-04-12 13:53:33 +00:00
|
|
|
shmem_free(c->buffer,c->buffer_size);
|
|
|
|
shmem_free(s->cache_data,sizeof(cache_vars_t));
|
2003-05-26 18:35:42 +00:00
|
|
|
#else
|
|
|
|
free(c->buffer);
|
|
|
|
free(s->cache_data);
|
|
|
|
#endif
|
2003-04-12 13:53:33 +00:00
|
|
|
}
|
|
|
|
|
2001-10-20 23:51:02 +00:00
|
|
|
static void exit_sighandler(int x){
|
|
|
|
// close stream
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2002-02-23 21:22:55 +00:00
|
|
|
int stream_enable_cache(stream_t *stream,int size,int min,int prefill){
|
2001-12-17 16:55:40 +00:00
|
|
|
int ss=(stream->type==STREAMTYPE_VCD)?VCD_SECTOR_DATA:STREAM_BUFFER_SIZE;
|
2002-05-05 21:43:16 +00:00
|
|
|
cache_vars_t* s;
|
2002-08-14 21:46:48 +00:00
|
|
|
|
2002-08-31 15:59:10 +00:00
|
|
|
if (stream->type==STREAMTYPE_STREAM && stream->fd < 0) {
|
|
|
|
// The stream has no 'fd' behind it, so is non-cacheable
|
|
|
|
mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n");
|
|
|
|
return 1;
|
|
|
|
}
|
2002-08-14 21:46:48 +00:00
|
|
|
|
2002-05-05 21:43:16 +00:00
|
|
|
if(size<32*1024) size=32*1024; // 32kb min
|
|
|
|
s=cache_init(size,ss);
|
2001-12-17 16:55:40 +00:00
|
|
|
stream->cache_data=s;
|
|
|
|
s->stream=stream; // callback
|
|
|
|
s->prefill=size*prefill;
|
|
|
|
|
2003-05-26 18:35:42 +00:00
|
|
|
#ifndef WIN32
|
2001-12-17 16:55:40 +00:00
|
|
|
if((stream->cache_pid=fork())){
|
2003-05-26 18:35:42 +00:00
|
|
|
#else
|
|
|
|
{
|
|
|
|
DWORD threadId;
|
|
|
|
stream_t* stream2=malloc(sizeof(stream_t));
|
|
|
|
memcpy(stream2,s->stream,sizeof(stream_t));
|
|
|
|
s->stream=stream2;
|
|
|
|
stream->cache_pid = CreateThread(NULL,0,ThreadProc,s,0,&threadId);
|
|
|
|
#endif
|
2001-12-17 16:55:40 +00:00
|
|
|
// wait until cache is filled at least prefill_init %
|
2002-05-02 10:28:33 +00:00
|
|
|
mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %d [%d] %d pre:%d eof:%d \n",
|
2001-12-19 02:16:43 +00:00
|
|
|
s->min_filepos,s->read_filepos,s->max_filepos,min,s->eof);
|
2001-12-17 16:55:40 +00:00
|
|
|
while(s->read_filepos<s->min_filepos || s->max_filepos-s->read_filepos<min){
|
|
|
|
mp_msg(MSGT_CACHE,MSGL_STATUS,"\rCache fill: %5.2f%% (%d bytes) ",
|
2001-12-19 02:16:43 +00:00
|
|
|
100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size),
|
2001-12-17 16:55:40 +00:00
|
|
|
s->max_filepos-s->read_filepos
|
|
|
|
);
|
|
|
|
if(s->eof) break; // file is smaller than prefill size
|
2002-10-23 14:46:20 +00:00
|
|
|
if(mp_input_check_interrupt(PREFILL_SLEEP_TIME))
|
2002-02-23 21:22:55 +00:00
|
|
|
return 0;
|
2001-12-17 16:55:40 +00:00
|
|
|
}
|
2002-02-23 21:22:55 +00:00
|
|
|
return 1; // parent exits
|
2001-12-17 16:55:40 +00:00
|
|
|
}
|
|
|
|
|
2003-05-26 18:35:42 +00:00
|
|
|
#ifdef WIN32
|
|
|
|
}
|
|
|
|
static DWORD WINAPI ThreadProc(void*s){
|
|
|
|
#endif
|
|
|
|
|
2001-10-20 23:51:02 +00:00
|
|
|
// cache thread mainloop:
|
|
|
|
signal(SIGTERM,exit_sighandler); // kill
|
|
|
|
while(1){
|
2003-05-26 18:35:42 +00:00
|
|
|
if(!cache_fill((cache_vars_t*)s)){
|
|
|
|
usec_sleep(FILL_USLEEP_TIME); // idle
|
2001-10-20 23:51:02 +00:00
|
|
|
}
|
2001-10-21 00:32:47 +00:00
|
|
|
// cache_stats(s->cache_data);
|
2001-10-20 23:51:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int cache_stream_fill_buffer(stream_t *s){
|
|
|
|
int len;
|
|
|
|
if(s->eof){ s->buf_pos=s->buf_len=0; return 0; }
|
|
|
|
if(!s->cache_pid) return stream_fill_buffer(s);
|
|
|
|
|
2001-10-21 22:13:12 +00:00
|
|
|
// cache_stats(s->cache_data);
|
|
|
|
|
2001-10-22 16:09:34 +00:00
|
|
|
if(s->pos!=((cache_vars_t*)s->cache_data)->read_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"!!! read_filepos differs!!! report this bug...\n");
|
2001-10-21 00:32:47 +00:00
|
|
|
|
2001-10-20 23:51:02 +00:00
|
|
|
len=cache_read(s->cache_data,s->buffer, ((cache_vars_t*)s->cache_data)->sector_size);
|
2001-10-21 22:13:12 +00:00
|
|
|
//printf("cache_stream_fill_buffer->read -> %d\n",len);
|
2001-10-21 00:32:47 +00:00
|
|
|
|
2001-10-20 23:51:02 +00:00
|
|
|
if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
|
|
|
|
s->buf_pos=0;
|
|
|
|
s->buf_len=len;
|
|
|
|
s->pos+=len;
|
|
|
|
// printf("[%d]",len);fflush(stdout);
|
|
|
|
return len;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2001-10-21 22:13:12 +00:00
|
|
|
int cache_stream_seek_long(stream_t *stream,off_t pos){
|
|
|
|
cache_vars_t* s;
|
|
|
|
off_t newpos;
|
|
|
|
if(!stream->cache_pid) return stream_seek_long(stream,pos);
|
|
|
|
|
|
|
|
s=stream->cache_data;
|
|
|
|
// s->seek_lock=1;
|
|
|
|
|
2001-10-22 16:09:34 +00:00
|
|
|
mp_msg(MSGT_CACHE,MSGL_DBG2,"CACHE2_SEEK: 0x%X <= 0x%X (0x%X) <= 0x%X \n",s->min_filepos,(int)pos,s->read_filepos,s->max_filepos);
|
2001-10-21 22:13:12 +00:00
|
|
|
|
|
|
|
newpos=pos/s->sector_size; newpos*=s->sector_size; // align
|
|
|
|
stream->pos=s->read_filepos=newpos;
|
|
|
|
s->eof=0; // !!!!!!!
|
|
|
|
|
|
|
|
cache_stream_fill_buffer(stream);
|
|
|
|
|
|
|
|
pos-=newpos;
|
|
|
|
if(pos>=0 && pos<=stream->buf_len){
|
|
|
|
stream->buf_pos=pos; // byte position in sector
|
|
|
|
return 1;
|
|
|
|
}
|
2001-10-20 23:51:02 +00:00
|
|
|
|
2001-10-21 22:13:12 +00:00
|
|
|
// stream->buf_pos=stream->buf_len=0;
|
|
|
|
// return 1;
|
2001-10-20 23:51:02 +00:00
|
|
|
|
2001-10-22 16:09:34 +00:00
|
|
|
#ifdef _LARGEFILE_SOURCE
|
|
|
|
mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%llX !\n",(long long)(pos+newpos));
|
|
|
|
#else
|
|
|
|
mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%X !\n",(pos+newpos));
|
|
|
|
#endif
|
2001-10-20 23:51:02 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|