Mercurial > mplayer.hg
annotate stream/cache2.c @ 21421:d7b2fa4c39da
Remove superfluous bswap.h include.
author | diego |
---|---|
date | Sat, 02 Dec 2006 12:32:44 +0000 |
parents | 64d82a45a05d |
children | 84f95595f31f |
rev | line source |
---|---|
2324 | 1 #include "config.h" |
2 | |
2322 | 3 // Initial draft of my new cache system... |
2352 | 4 // Note it runs in 2 processes (using fork()), but doesn't requires locking!! |
2322 | 5 // TODO: seeking, data consistency checking |
6 | |
2352 | 7 #define READ_USLEEP_TIME 10000 |
8 #define FILL_USLEEP_TIME 50000 | |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
9 #define PREFILL_SLEEP_TIME 200 |
2322 | 10 |
11 #include <stdio.h> | |
12 #include <stdlib.h> | |
13 #include <string.h> | |
14 #include <signal.h> | |
3726 | 15 #include <sys/types.h> |
16 #include <unistd.h> | |
2322 | 17 |
17012 | 18 #include "osdep/timer.h" |
10197 | 19 #ifndef WIN32 |
10242 | 20 #include <sys/wait.h> |
17012 | 21 #include "osdep/shmem.h" |
10197 | 22 #else |
23 #include <windows.h> | |
24 static DWORD WINAPI ThreadProc(void* s); | |
25 #endif | |
2322 | 26 |
2371 | 27 #include "mp_msg.h" |
16793
8d4fb5469efb
Make a few more messages translatable by moving them into help_mp-en.h.
diego
parents:
16750
diff
changeset
|
28 #include "help_mp.h" |
2371 | 29 |
2322 | 30 #include "stream.h" |
31 | |
32 int stream_fill_buffer(stream_t *s); | |
33 int stream_seek_long(stream_t *s,off_t pos); | |
34 | |
7862
013c255225d8
mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents:
7472
diff
changeset
|
35 extern int mp_input_check_interrupt(int time); |
2322 | 36 |
37 typedef struct { | |
38 // constats: | |
39 unsigned char *buffer; // base pointer of the alllocated buffer memory | |
2352 | 40 int buffer_size; // size of the alllocated buffer memory |
41 int sector_size; // size of a single sector (2048/2324) | |
42 int back_size; // we should keep back_size amount of old bytes for backward seek | |
43 int fill_limit; // we should fill buffer only if space>=fill_limit | |
16152
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
12899
diff
changeset
|
44 int seek_limit; // keep filling cache if distanse is less that seek limit |
2374 | 45 // filler's pointers: |
46 int eof; | |
47 off_t min_filepos; // buffer contain only a part of the file, from min-max pos | |
48 off_t max_filepos; | |
49 off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte) | |
2322 | 50 // reader's pointers: |
2374 | 51 off_t read_filepos; |
2322 | 52 // commands/locking: |
2352 | 53 // int seek_lock; // 1 if we will seek/reset buffer, 2 if we are ready for cmd |
54 // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads. | |
2322 | 55 // callback |
56 stream_t* stream; | |
57 } cache_vars_t; | |
58 | |
2352 | 59 static int min_fill=0; |
60 | |
61 int cache_fill_status=0; | |
2322 | 62 |
63 void cache_stats(cache_vars_t* s){ | |
64 int newb=s->max_filepos-s->read_filepos; // new bytes in the buffer | |
18176
f72bc5754209
Part3 of Otvos Attila's oattila AT chello-hu mp_msg changes, with lots of modifications as usual
reynaldo
parents:
18067
diff
changeset
|
65 mp_msg(MSGT_CACHE,MSGL_INFO,"0x%06X [0x%06X] 0x%06X ",(int)s->min_filepos,(int)s->read_filepos,(int)s->max_filepos); |
f72bc5754209
Part3 of Otvos Attila's oattila AT chello-hu mp_msg changes, with lots of modifications as usual
reynaldo
parents:
18067
diff
changeset
|
66 mp_msg(MSGT_CACHE,MSGL_INFO,"%3d %% (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size); |
2322 | 67 } |
68 | |
69 int cache_read(cache_vars_t* s,unsigned char* buf,int size){ | |
70 int total=0; | |
71 while(size>0){ | |
72 int pos,newb,len; | |
2352 | 73 |
74 //printf("CACHE2_READ: 0x%X <= 0x%X <= 0x%X \n",s->min_filepos,s->read_filepos,s->max_filepos); | |
2322 | 75 |
2374 | 76 if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){ |
2352 | 77 // eof? |
78 if(s->eof) break; | |
79 // waiting for buffer fill... | |
10197 | 80 usec_sleep(READ_USLEEP_TIME); // 10ms |
2352 | 81 continue; // try again... |
82 } | |
83 | |
2374 | 84 newb=s->max_filepos-s->read_filepos; // new bytes in the buffer |
2322 | 85 if(newb<min_fill) min_fill=newb; // statistics... |
86 | |
87 // printf("*** newb: %d bytes ***\n",newb); | |
2352 | 88 |
89 pos=s->read_filepos - s->offset; | |
90 if(pos<0) pos+=s->buffer_size; else | |
91 if(pos>=s->buffer_size) pos-=s->buffer_size; | |
92 | |
2322 | 93 if(newb>s->buffer_size-pos) newb=s->buffer_size-pos; // handle wrap... |
94 if(newb>size) newb=size; | |
95 | |
2352 | 96 // check: |
2371 | 97 if(s->read_filepos<s->min_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"Ehh. s->read_filepos<s->min_filepos !!! Report bug...\n"); |
2352 | 98 |
2322 | 99 // len=write(mem,newb) |
100 //printf("Buffer read: %d bytes\n",newb); | |
101 memcpy(buf,&s->buffer[pos],newb); | |
102 buf+=newb; | |
2352 | 103 len=newb; |
2322 | 104 // ... |
105 | |
106 s->read_filepos+=len; | |
107 size-=len; | |
108 total+=len; | |
109 | |
110 } | |
18067
ac7eaa0313c2
avoid cache fill status overflow with caches > ca. 20 MB
reimar
parents:
17384
diff
changeset
|
111 cache_fill_status=(s->max_filepos-s->read_filepos)/(s->buffer_size / 100); |
2322 | 112 return total; |
113 } | |
114 | |
115 int cache_fill(cache_vars_t* s){ | |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7204
diff
changeset
|
116 int back,back2,newb,space,len,pos; |
2374 | 117 off_t read=s->read_filepos; |
2322 | 118 |
2352 | 119 if(read<s->min_filepos || read>s->max_filepos){ |
120 // seek... | |
17366 | 121 mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%"PRIX64" \n",(int64_t)read); |
8938
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
122 // streaming: drop cache contents only if seeking backward or too much fwd: |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
123 if(s->stream->type!=STREAMTYPE_STREAM || |
16152
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
12899
diff
changeset
|
124 read<s->min_filepos || read>=s->max_filepos+s->seek_limit) |
8938
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
125 { |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
126 s->offset= // FIXME!? |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
127 s->min_filepos=s->max_filepos=read; // drop cache content :( |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
128 if(s->stream->eof) stream_reset(s->stream); |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
129 stream_seek(s->stream,read); |
17366 | 130 mp_msg(MSGT_CACHE,MSGL_DBG2,"Seek done. new pos: 0x%"PRIX64" \n",(int64_t)stream_tell(s->stream)); |
8938
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
131 } |
2352 | 132 } |
133 | |
2322 | 134 // calc number of back-bytes: |
135 back=read - s->min_filepos; | |
136 if(back<0) back=0; // strange... | |
137 if(back>s->back_size) back=s->back_size; | |
138 | |
139 // calc number of new bytes: | |
140 newb=s->max_filepos - read; | |
141 if(newb<0) newb=0; // strange... | |
142 | |
143 // calc free buffer space: | |
144 space=s->buffer_size - (newb+back); | |
145 | |
146 // calc bufferpos: | |
147 pos=s->max_filepos - s->offset; | |
148 if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around | |
149 | |
150 if(space<s->fill_limit){ | |
151 // printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit); | |
152 return 0; // no fill... | |
153 } | |
154 | |
155 // printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos); | |
156 | |
157 // reduce space if needed: | |
158 if(space>s->buffer_size-pos) space=s->buffer_size-pos; | |
159 | |
160 // if(space>32768) space=32768; // limit one-time block size | |
161 if(space>4*s->sector_size) space=4*s->sector_size; | |
162 | |
2352 | 163 // if(s->seek_lock) return 0; // FIXME |
164 | |
165 #if 1 | |
166 // back+newb+space <= buffer_size | |
167 back2=s->buffer_size-(space+newb); // max back size | |
168 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2; | |
169 #else | |
2322 | 170 s->min_filepos=read-back; // avoid seeking-back to temp area... |
2352 | 171 #endif |
2322 | 172 |
173 // .... | |
174 //printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size); | |
175 //len=stream_fill_buffer(s->stream); | |
176 //memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy! | |
177 // .... | |
2348 | 178 len=stream_read(s->stream,&s->buffer[pos],space); |
179 if(!len) s->eof=1; | |
2322 | 180 |
181 s->max_filepos+=len; | |
182 if(pos+len>=s->buffer_size){ | |
183 // wrap... | |
184 s->offset+=s->buffer_size; | |
185 } | |
186 | |
187 return len; | |
188 | |
189 } | |
190 | |
191 cache_vars_t* cache_init(int size,int sector){ | |
192 int num; | |
10197 | 193 #ifndef WIN32 |
2322 | 194 cache_vars_t* s=shmem_alloc(sizeof(cache_vars_t)); |
10197 | 195 #else |
196 cache_vars_t* s=malloc(sizeof(cache_vars_t)); | |
197 #endif | |
12899 | 198 if(s==NULL) return NULL; |
199 | |
2322 | 200 memset(s,0,sizeof(cache_vars_t)); |
201 num=size/sector; | |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
202 if(num < 16){ |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
203 num = 16; |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
204 }//32kb min_size |
2322 | 205 s->buffer_size=num*sector; |
206 s->sector_size=sector; | |
10197 | 207 #ifndef WIN32 |
2322 | 208 s->buffer=shmem_alloc(s->buffer_size); |
10197 | 209 #else |
210 s->buffer=malloc(s->buffer_size); | |
211 #endif | |
12899 | 212 |
213 if(s->buffer == NULL){ | |
214 #ifndef WIN32 | |
215 shmem_free(s,sizeof(cache_vars_t)); | |
216 #else | |
217 free(s); | |
218 #endif | |
219 return NULL; | |
220 } | |
221 | |
2322 | 222 s->fill_limit=8*sector; |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
223 s->back_size=s->buffer_size/2; |
2322 | 224 return s; |
225 } | |
226 | |
9915 | 227 void cache_uninit(stream_t *s) { |
228 cache_vars_t* c = s->cache_data; | |
229 if(!s->cache_pid) return; | |
10197 | 230 #ifndef WIN32 |
9915 | 231 kill(s->cache_pid,SIGKILL); |
232 waitpid(s->cache_pid,NULL,0); | |
10197 | 233 #else |
234 TerminateThread((HANDLE)s->cache_pid,0); | |
235 free(c->stream); | |
236 #endif | |
9915 | 237 if(!c) return; |
10197 | 238 #ifndef WIN32 |
9915 | 239 shmem_free(c->buffer,c->buffer_size); |
240 shmem_free(s->cache_data,sizeof(cache_vars_t)); | |
10197 | 241 #else |
242 free(c->buffer); | |
243 free(s->cache_data); | |
244 #endif | |
9915 | 245 } |
246 | |
2322 | 247 static void exit_sighandler(int x){ |
248 // close stream | |
249 exit(0); | |
250 } | |
251 | |
16152
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
12899
diff
changeset
|
252 int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){ |
3562 | 253 int ss=(stream->type==STREAMTYPE_VCD)?VCD_SECTOR_DATA:STREAM_BUFFER_SIZE; |
5991 | 254 cache_vars_t* s; |
7006
c0b490505298
disable cache if stream->fd<0 (no regular file/pipe but some special thing)
arpi
parents:
5991
diff
changeset
|
255 |
7204 | 256 if (stream->type==STREAMTYPE_STREAM && stream->fd < 0) { |
257 // The stream has no 'fd' behind it, so is non-cacheable | |
258 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n"); | |
259 return 1; | |
260 } | |
7006
c0b490505298
disable cache if stream->fd<0 (no regular file/pipe but some special thing)
arpi
parents:
5991
diff
changeset
|
261 |
5991 | 262 s=cache_init(size,ss); |
12899 | 263 if(s == NULL) return 0; |
3562 | 264 stream->cache_data=s; |
265 s->stream=stream; // callback | |
16152
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
12899
diff
changeset
|
266 s->seek_limit=seek_limit; |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
267 |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
268 |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
269 //make sure that we won't wait from cache_fill |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
270 //more data than it is alowed to fill |
16152
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
12899
diff
changeset
|
271 if (s->seek_limit > s->buffer_size - s->fill_limit ){ |
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
12899
diff
changeset
|
272 s->seek_limit = s->buffer_size - s->fill_limit; |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
273 } |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
274 if (min > s->buffer_size - s->fill_limit) { |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
275 min = s->buffer_size - s->fill_limit; |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
276 } |
3562 | 277 |
10197 | 278 #ifndef WIN32 |
3562 | 279 if((stream->cache_pid=fork())){ |
10197 | 280 #else |
281 { | |
282 DWORD threadId; | |
283 stream_t* stream2=malloc(sizeof(stream_t)); | |
284 memcpy(stream2,s->stream,sizeof(stream_t)); | |
285 s->stream=stream2; | |
286 stream->cache_pid = CreateThread(NULL,0,ThreadProc,s,0,&threadId); | |
287 #endif | |
3562 | 288 // wait until cache is filled at least prefill_init % |
17366 | 289 mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%d eof:%d \n", |
17384 | 290 (int64_t)s->min_filepos,(int64_t)s->read_filepos,(int64_t)s->max_filepos,min,s->eof); |
3562 | 291 while(s->read_filepos<s->min_filepos || s->max_filepos-s->read_filepos<min){ |
16793
8d4fb5469efb
Make a few more messages translatable by moving them into help_mp-en.h.
diego
parents:
16750
diff
changeset
|
292 mp_msg(MSGT_CACHE,MSGL_STATUS,MSGTR_CacheFill, |
3600 | 293 100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size), |
17366 | 294 (int64_t)s->max_filepos-s->read_filepos |
3562 | 295 ); |
296 if(s->eof) break; // file is smaller than prefill size | |
7862
013c255225d8
mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents:
7472
diff
changeset
|
297 if(mp_input_check_interrupt(PREFILL_SLEEP_TIME)) |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
298 return 0; |
3562 | 299 } |
16870 | 300 mp_msg(MSGT_CACHE,MSGL_STATUS,"\n"); |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
301 return 1; // parent exits |
3562 | 302 } |
303 | |
10197 | 304 #ifdef WIN32 |
305 } | |
306 static DWORD WINAPI ThreadProc(void*s){ | |
307 #endif | |
308 | |
2322 | 309 // cache thread mainloop: |
310 signal(SIGTERM,exit_sighandler); // kill | |
311 while(1){ | |
10197 | 312 if(!cache_fill((cache_vars_t*)s)){ |
313 usec_sleep(FILL_USLEEP_TIME); // idle | |
2322 | 314 } |
2327 | 315 // cache_stats(s->cache_data); |
2322 | 316 } |
317 } | |
318 | |
319 int cache_stream_fill_buffer(stream_t *s){ | |
320 int len; | |
321 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; } | |
322 if(!s->cache_pid) return stream_fill_buffer(s); | |
323 | |
2352 | 324 // cache_stats(s->cache_data); |
325 | |
2371 | 326 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 | 327 |
2322 | 328 len=cache_read(s->cache_data,s->buffer, ((cache_vars_t*)s->cache_data)->sector_size); |
2352 | 329 //printf("cache_stream_fill_buffer->read -> %d\n",len); |
2327 | 330 |
2322 | 331 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } |
332 s->buf_pos=0; | |
333 s->buf_len=len; | |
334 s->pos+=len; | |
335 // printf("[%d]",len);fflush(stdout); | |
336 return len; | |
337 | |
338 } | |
339 | |
2352 | 340 int cache_stream_seek_long(stream_t *stream,off_t pos){ |
341 cache_vars_t* s; | |
342 off_t newpos; | |
343 if(!stream->cache_pid) return stream_seek_long(stream,pos); | |
344 | |
345 s=stream->cache_data; | |
346 // s->seek_lock=1; | |
347 | |
17366 | 348 mp_msg(MSGT_CACHE,MSGL_DBG2,"CACHE2_SEEK: 0x%"PRIX64" <= 0x%"PRIX64" (0x%"PRIX64") <= 0x%"PRIX64" \n",s->min_filepos,pos,s->read_filepos,s->max_filepos); |
2322 | 349 |
2352 | 350 newpos=pos/s->sector_size; newpos*=s->sector_size; // align |
351 stream->pos=s->read_filepos=newpos; | |
352 s->eof=0; // !!!!!!! | |
353 | |
354 cache_stream_fill_buffer(stream); | |
2322 | 355 |
2352 | 356 pos-=newpos; |
357 if(pos>=0 && pos<=stream->buf_len){ | |
358 stream->buf_pos=pos; // byte position in sector | |
359 return 1; | |
360 } | |
361 | |
362 // stream->buf_pos=stream->buf_len=0; | |
363 // return 1; | |
364 | |
16750
0a31740dd5e6
Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents:
16152
diff
changeset
|
365 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",(int64_t)(pos+newpos)); |
2322 | 366 return 0; |
367 } |