|
2324
|
1 #include "config.h"
|
|
|
2
|
|
2322
|
3 #ifdef USE_STREAM_CACHE
|
|
|
4
|
|
|
5 // Initial draft of my new cache system...
|
|
2352
|
6 // Note it runs in 2 processes (using fork()), but doesn't requires locking!!
|
|
2322
|
7 // TODO: seeking, data consistency checking
|
|
|
8
|
|
2352
|
9 #define READ_USLEEP_TIME 10000
|
|
|
10 #define FILL_USLEEP_TIME 50000
|
|
4825
|
11 #define PREFILL_SLEEP_TIME 200
|
|
2322
|
12
|
|
|
13 #include <stdio.h>
|
|
|
14 #include <stdlib.h>
|
|
|
15 #include <string.h>
|
|
|
16 #include <signal.h>
|
|
3726
|
17 #include <sys/types.h>
|
|
|
18 #include <unistd.h>
|
|
2322
|
19
|
|
9380
|
20 #include "../osdep/shmem.h"
|
|
2322
|
21
|
|
2371
|
22 #include "mp_msg.h"
|
|
|
23
|
|
2322
|
24 #include "stream.h"
|
|
|
25
|
|
|
26 int stream_fill_buffer(stream_t *s);
|
|
|
27 int stream_seek_long(stream_t *s,off_t pos);
|
|
|
28
|
|
7862
|
29 extern int mp_input_check_interrupt(int time);
|
|
2322
|
30
|
|
|
31 typedef struct {
|
|
|
32 // constats:
|
|
|
33 unsigned char *buffer; // base pointer of the alllocated buffer memory
|
|
2352
|
34 int buffer_size; // size of the alllocated buffer memory
|
|
|
35 int sector_size; // size of a single sector (2048/2324)
|
|
|
36 int back_size; // we should keep back_size amount of old bytes for backward seek
|
|
|
37 int fill_limit; // we should fill buffer only if space>=fill_limit
|
|
3562
|
38 int prefill; // we should fill min prefill bytes if cache gets empty
|
|
2374
|
39 // filler's pointers:
|
|
|
40 int eof;
|
|
|
41 off_t min_filepos; // buffer contain only a part of the file, from min-max pos
|
|
|
42 off_t max_filepos;
|
|
|
43 off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte)
|
|
2322
|
44 // reader's pointers:
|
|
2374
|
45 off_t read_filepos;
|
|
2322
|
46 // commands/locking:
|
|
2352
|
47 // int seek_lock; // 1 if we will seek/reset buffer, 2 if we are ready for cmd
|
|
|
48 // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads.
|
|
2322
|
49 // callback
|
|
|
50 stream_t* stream;
|
|
|
51 } cache_vars_t;
|
|
|
52
|
|
2352
|
53 static int min_fill=0;
|
|
|
54
|
|
|
55 int cache_fill_status=0;
|
|
2322
|
56
|
|
|
57 void cache_stats(cache_vars_t* s){
|
|
|
58 int newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
|
|
7472
|
59 printf("0x%06X [0x%06X] 0x%06X ",(int)s->min_filepos,(int)s->read_filepos,(int)s->max_filepos);
|
|
2322
|
60 printf("%3d %% (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size);
|
|
|
61 }
|
|
|
62
|
|
|
63 int cache_read(cache_vars_t* s,unsigned char* buf,int size){
|
|
|
64 int total=0;
|
|
|
65 while(size>0){
|
|
|
66 int pos,newb,len;
|
|
2352
|
67
|
|
|
68 //printf("CACHE2_READ: 0x%X <= 0x%X <= 0x%X \n",s->min_filepos,s->read_filepos,s->max_filepos);
|
|
2322
|
69
|
|
2374
|
70 if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){
|
|
2352
|
71 // eof?
|
|
|
72 if(s->eof) break;
|
|
|
73 // waiting for buffer fill...
|
|
|
74 usleep(READ_USLEEP_TIME); // 10ms
|
|
|
75 continue; // try again...
|
|
|
76 }
|
|
|
77
|
|
2374
|
78 newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
|
|
2322
|
79 if(newb<min_fill) min_fill=newb; // statistics...
|
|
|
80
|
|
|
81 // printf("*** newb: %d bytes ***\n",newb);
|
|
2352
|
82
|
|
|
83 pos=s->read_filepos - s->offset;
|
|
|
84 if(pos<0) pos+=s->buffer_size; else
|
|
|
85 if(pos>=s->buffer_size) pos-=s->buffer_size;
|
|
|
86
|
|
2322
|
87 if(newb>s->buffer_size-pos) newb=s->buffer_size-pos; // handle wrap...
|
|
|
88 if(newb>size) newb=size;
|
|
|
89
|
|
2352
|
90 // check:
|
|
2371
|
91 if(s->read_filepos<s->min_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"Ehh. s->read_filepos<s->min_filepos !!! Report bug...\n");
|
|
2352
|
92
|
|
2322
|
93 // len=write(mem,newb)
|
|
|
94 //printf("Buffer read: %d bytes\n",newb);
|
|
|
95 memcpy(buf,&s->buffer[pos],newb);
|
|
|
96 buf+=newb;
|
|
2352
|
97 len=newb;
|
|
2322
|
98 // ...
|
|
|
99
|
|
|
100 s->read_filepos+=len;
|
|
|
101 size-=len;
|
|
|
102 total+=len;
|
|
|
103
|
|
|
104 }
|
|
2352
|
105 cache_fill_status=100*(s->max_filepos-s->read_filepos)/s->buffer_size;
|
|
2322
|
106 return total;
|
|
|
107 }
|
|
|
108
|
|
|
109 int cache_fill(cache_vars_t* s){
|
|
7472
|
110 int back,back2,newb,space,len,pos;
|
|
2374
|
111 off_t read=s->read_filepos;
|
|
2322
|
112
|
|
2352
|
113 if(read<s->min_filepos || read>s->max_filepos){
|
|
|
114 // seek...
|
|
2371
|
115 mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%X \n",read);
|
|
8938
|
116 // streaming: drop cache contents only if seeking backward or too much fwd:
|
|
|
117 if(s->stream->type!=STREAMTYPE_STREAM ||
|
|
|
118 read<s->min_filepos || read>=s->max_filepos+s->buffer_size)
|
|
|
119 {
|
|
|
120 s->offset= // FIXME!?
|
|
|
121 s->min_filepos=s->max_filepos=read; // drop cache content :(
|
|
|
122 if(s->stream->eof) stream_reset(s->stream);
|
|
|
123 stream_seek(s->stream,read);
|
|
|
124 mp_msg(MSGT_CACHE,MSGL_DBG2,"Seek done. new pos: 0x%X \n",(int)stream_tell(s->stream));
|
|
|
125 }
|
|
2352
|
126 }
|
|
|
127
|
|
2322
|
128 // calc number of back-bytes:
|
|
|
129 back=read - s->min_filepos;
|
|
|
130 if(back<0) back=0; // strange...
|
|
|
131 if(back>s->back_size) back=s->back_size;
|
|
|
132
|
|
|
133 // calc number of new bytes:
|
|
|
134 newb=s->max_filepos - read;
|
|
|
135 if(newb<0) newb=0; // strange...
|
|
|
136
|
|
|
137 // calc free buffer space:
|
|
|
138 space=s->buffer_size - (newb+back);
|
|
|
139
|
|
|
140 // calc bufferpos:
|
|
|
141 pos=s->max_filepos - s->offset;
|
|
|
142 if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around
|
|
|
143
|
|
|
144 if(space<s->fill_limit){
|
|
|
145 // printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit);
|
|
|
146 return 0; // no fill...
|
|
|
147 }
|
|
|
148
|
|
|
149 // printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos);
|
|
|
150
|
|
|
151 // reduce space if needed:
|
|
|
152 if(space>s->buffer_size-pos) space=s->buffer_size-pos;
|
|
|
153
|
|
|
154 // if(space>32768) space=32768; // limit one-time block size
|
|
|
155 if(space>4*s->sector_size) space=4*s->sector_size;
|
|
|
156
|
|
2352
|
157 // if(s->seek_lock) return 0; // FIXME
|
|
|
158
|
|
|
159 #if 1
|
|
|
160 // back+newb+space <= buffer_size
|
|
|
161 back2=s->buffer_size-(space+newb); // max back size
|
|
|
162 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2;
|
|
|
163 #else
|
|
2322
|
164 s->min_filepos=read-back; // avoid seeking-back to temp area...
|
|
2352
|
165 #endif
|
|
2322
|
166
|
|
|
167 // ....
|
|
|
168 //printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size);
|
|
|
169 //len=stream_fill_buffer(s->stream);
|
|
|
170 //memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy!
|
|
|
171 // ....
|
|
2348
|
172 len=stream_read(s->stream,&s->buffer[pos],space);
|
|
|
173 if(!len) s->eof=1;
|
|
2322
|
174
|
|
|
175 s->max_filepos+=len;
|
|
|
176 if(pos+len>=s->buffer_size){
|
|
|
177 // wrap...
|
|
|
178 s->offset+=s->buffer_size;
|
|
|
179 }
|
|
|
180
|
|
|
181 return len;
|
|
|
182
|
|
|
183 }
|
|
|
184
|
|
|
185 cache_vars_t* cache_init(int size,int sector){
|
|
|
186 int num;
|
|
|
187 cache_vars_t* s=shmem_alloc(sizeof(cache_vars_t));
|
|
|
188 memset(s,0,sizeof(cache_vars_t));
|
|
|
189 num=size/sector;
|
|
|
190 s->buffer_size=num*sector;
|
|
|
191 s->sector_size=sector;
|
|
|
192 s->buffer=shmem_alloc(s->buffer_size);
|
|
|
193 s->fill_limit=8*sector;
|
|
|
194 s->back_size=size/2;
|
|
3562
|
195 s->prefill=size/20; // default: 5%
|
|
2322
|
196 return s;
|
|
|
197 }
|
|
|
198
|
|
9915
|
199 void cache_uninit(stream_t *s) {
|
|
|
200 cache_vars_t* c = s->cache_data;
|
|
|
201 if(!s->cache_pid) return;
|
|
|
202 kill(s->cache_pid,SIGKILL);
|
|
|
203 waitpid(s->cache_pid,NULL,0);
|
|
|
204 if(!c) return;
|
|
|
205 shmem_free(c->buffer,c->buffer_size);
|
|
|
206 shmem_free(s->cache_data,sizeof(cache_vars_t));
|
|
|
207 }
|
|
|
208
|
|
2322
|
209 static void exit_sighandler(int x){
|
|
|
210 // close stream
|
|
|
211 exit(0);
|
|
|
212 }
|
|
|
213
|
|
4825
|
214 int stream_enable_cache(stream_t *stream,int size,int min,int prefill){
|
|
3562
|
215 int ss=(stream->type==STREAMTYPE_VCD)?VCD_SECTOR_DATA:STREAM_BUFFER_SIZE;
|
|
5991
|
216 cache_vars_t* s;
|
|
7006
|
217
|
|
7204
|
218 if (stream->type==STREAMTYPE_STREAM && stream->fd < 0) {
|
|
|
219 // The stream has no 'fd' behind it, so is non-cacheable
|
|
|
220 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n");
|
|
|
221 return 1;
|
|
|
222 }
|
|
7006
|
223
|
|
5991
|
224 if(size<32*1024) size=32*1024; // 32kb min
|
|
|
225 s=cache_init(size,ss);
|
|
3562
|
226 stream->cache_data=s;
|
|
|
227 s->stream=stream; // callback
|
|
|
228 s->prefill=size*prefill;
|
|
|
229
|
|
|
230 if((stream->cache_pid=fork())){
|
|
|
231 // wait until cache is filled at least prefill_init %
|
|
5931
|
232 mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %d [%d] %d pre:%d eof:%d \n",
|
|
3600
|
233 s->min_filepos,s->read_filepos,s->max_filepos,min,s->eof);
|
|
3562
|
234 while(s->read_filepos<s->min_filepos || s->max_filepos-s->read_filepos<min){
|
|
|
235 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rCache fill: %5.2f%% (%d bytes) ",
|
|
3600
|
236 100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size),
|
|
3562
|
237 s->max_filepos-s->read_filepos
|
|
|
238 );
|
|
|
239 if(s->eof) break; // file is smaller than prefill size
|
|
7862
|
240 if(mp_input_check_interrupt(PREFILL_SLEEP_TIME))
|
|
4825
|
241 return 0;
|
|
3562
|
242 }
|
|
4825
|
243 return 1; // parent exits
|
|
3562
|
244 }
|
|
|
245
|
|
2322
|
246 // cache thread mainloop:
|
|
|
247 signal(SIGTERM,exit_sighandler); // kill
|
|
|
248 while(1){
|
|
3562
|
249 if(!cache_fill(s)){
|
|
2352
|
250 usleep(FILL_USLEEP_TIME); // idle
|
|
2322
|
251 }
|
|
2327
|
252 // cache_stats(s->cache_data);
|
|
2322
|
253 }
|
|
|
254 }
|
|
|
255
|
|
|
256 int cache_stream_fill_buffer(stream_t *s){
|
|
|
257 int len;
|
|
|
258 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; }
|
|
|
259 if(!s->cache_pid) return stream_fill_buffer(s);
|
|
|
260
|
|
2352
|
261 // cache_stats(s->cache_data);
|
|
|
262
|
|
2371
|
263 if(s->pos!=((cache_vars_t*)s->cache_data)->read_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"!!! read_filepos differs!!! report this bug...\n");
|
|
2327
|
264
|
|
2322
|
265 len=cache_read(s->cache_data,s->buffer, ((cache_vars_t*)s->cache_data)->sector_size);
|
|
2352
|
266 //printf("cache_stream_fill_buffer->read -> %d\n",len);
|
|
2327
|
267
|
|
2322
|
268 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
|
|
|
269 s->buf_pos=0;
|
|
|
270 s->buf_len=len;
|
|
|
271 s->pos+=len;
|
|
|
272 // printf("[%d]",len);fflush(stdout);
|
|
|
273 return len;
|
|
|
274
|
|
|
275 }
|
|
|
276
|
|
2352
|
277 int cache_stream_seek_long(stream_t *stream,off_t pos){
|
|
|
278 cache_vars_t* s;
|
|
|
279 off_t newpos;
|
|
|
280 if(!stream->cache_pid) return stream_seek_long(stream,pos);
|
|
|
281
|
|
|
282 s=stream->cache_data;
|
|
|
283 // s->seek_lock=1;
|
|
|
284
|
|
2371
|
285 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);
|
|
2322
|
286
|
|
2352
|
287 newpos=pos/s->sector_size; newpos*=s->sector_size; // align
|
|
|
288 stream->pos=s->read_filepos=newpos;
|
|
|
289 s->eof=0; // !!!!!!!
|
|
|
290
|
|
|
291 cache_stream_fill_buffer(stream);
|
|
2322
|
292
|
|
2352
|
293 pos-=newpos;
|
|
|
294 if(pos>=0 && pos<=stream->buf_len){
|
|
|
295 stream->buf_pos=pos; // byte position in sector
|
|
|
296 return 1;
|
|
|
297 }
|
|
|
298
|
|
|
299 // stream->buf_pos=stream->buf_len=0;
|
|
|
300 // return 1;
|
|
|
301
|
|
2371
|
302 #ifdef _LARGEFILE_SOURCE
|
|
|
303 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%llX !\n",(long long)(pos+newpos));
|
|
|
304 #else
|
|
|
305 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%X !\n",(pos+newpos));
|
|
|
306 #endif
|
|
2322
|
307 return 0;
|
|
|
308 }
|
|
|
309
|
|
|
310 #endif
|
