Mercurial > mplayer.hg
annotate libmpdemux/cache2.c @ 14504:e394a9cfaf3f
Transition of suboption parser to subopt-helper parser.
Removal of stupid malloc_failed function.
author | ivo |
---|---|
date | Sat, 15 Jan 2005 20:06:49 +0000 |
parents | 061dd89b6a23 |
children | 10a69a812eff |
rev | line source |
---|---|
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
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
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 |
10197 | 20 #include "../osdep/timer.h" |
21 #ifndef WIN32 | |
10242 | 22 #include <sys/wait.h> |
9380 | 23 #include "../osdep/shmem.h" |
10197 | 24 #else |
25 #include <windows.h> | |
26 static DWORD WINAPI ThreadProc(void* s); | |
27 #endif | |
2322 | 28 |
2371 | 29 #include "mp_msg.h" |
30 | |
2322 | 31 #include "stream.h" |
32 | |
33 int stream_fill_buffer(stream_t *s); | |
34 int stream_seek_long(stream_t *s,off_t pos); | |
35 | |
7862
013c255225d8
mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents:
7472
diff
changeset
|
36 extern int mp_input_check_interrupt(int time); |
2322 | 37 |
38 typedef struct { | |
39 // constats: | |
40 unsigned char *buffer; // base pointer of the alllocated buffer memory | |
2352 | 41 int buffer_size; // size of the alllocated buffer memory |
42 int sector_size; // size of a single sector (2048/2324) | |
43 int back_size; // we should keep back_size amount of old bytes for backward seek | |
44 int fill_limit; // we should fill buffer only if space>=fill_limit | |
3562 | 45 int prefill; // we should fill min prefill bytes if cache gets empty |
2374 | 46 // filler's pointers: |
47 int eof; | |
48 off_t min_filepos; // buffer contain only a part of the file, from min-max pos | |
49 off_t max_filepos; | |
50 off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte) | |
2322 | 51 // reader's pointers: |
2374 | 52 off_t read_filepos; |
2322 | 53 // commands/locking: |
2352 | 54 // int seek_lock; // 1 if we will seek/reset buffer, 2 if we are ready for cmd |
55 // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads. | |
2322 | 56 // callback |
57 stream_t* stream; | |
58 } cache_vars_t; | |
59 | |
2352 | 60 static int min_fill=0; |
61 | |
62 int cache_fill_status=0; | |
2322 | 63 |
64 void cache_stats(cache_vars_t* s){ | |
65 int newb=s->max_filepos-s->read_filepos; // new bytes in the buffer | |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7204
diff
changeset
|
66 printf("0x%06X [0x%06X] 0x%06X ",(int)s->min_filepos,(int)s->read_filepos,(int)s->max_filepos); |
2322 | 67 printf("%3d %% (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size); |
68 } | |
69 | |
70 int cache_read(cache_vars_t* s,unsigned char* buf,int size){ | |
71 int total=0; | |
72 while(size>0){ | |
73 int pos,newb,len; | |
2352 | 74 |
75 //printf("CACHE2_READ: 0x%X <= 0x%X <= 0x%X \n",s->min_filepos,s->read_filepos,s->max_filepos); | |
2322 | 76 |
2374 | 77 if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){ |
2352 | 78 // eof? |
79 if(s->eof) break; | |
80 // waiting for buffer fill... | |
10197 | 81 usec_sleep(READ_USLEEP_TIME); // 10ms |
2352 | 82 continue; // try again... |
83 } | |
84 | |
2374 | 85 newb=s->max_filepos-s->read_filepos; // new bytes in the buffer |
2322 | 86 if(newb<min_fill) min_fill=newb; // statistics... |
87 | |
88 // printf("*** newb: %d bytes ***\n",newb); | |
2352 | 89 |
90 pos=s->read_filepos - s->offset; | |
91 if(pos<0) pos+=s->buffer_size; else | |
92 if(pos>=s->buffer_size) pos-=s->buffer_size; | |
93 | |
2322 | 94 if(newb>s->buffer_size-pos) newb=s->buffer_size-pos; // handle wrap... |
95 if(newb>size) newb=size; | |
96 | |
2352 | 97 // check: |
2371 | 98 if(s->read_filepos<s->min_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"Ehh. s->read_filepos<s->min_filepos !!! Report bug...\n"); |
2352 | 99 |
2322 | 100 // len=write(mem,newb) |
101 //printf("Buffer read: %d bytes\n",newb); | |
102 memcpy(buf,&s->buffer[pos],newb); | |
103 buf+=newb; | |
2352 | 104 len=newb; |
2322 | 105 // ... |
106 | |
107 s->read_filepos+=len; | |
108 size-=len; | |
109 total+=len; | |
110 | |
111 } | |
2352 | 112 cache_fill_status=100*(s->max_filepos-s->read_filepos)/s->buffer_size; |
2322 | 113 return total; |
114 } | |
115 | |
116 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
|
117 int back,back2,newb,space,len,pos; |
2374 | 118 off_t read=s->read_filepos; |
2322 | 119 |
2352 | 120 if(read<s->min_filepos || read>s->max_filepos){ |
121 // seek... | |
2371 | 122 mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%X \n",read); |
8938
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
123 // 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
|
124 if(s->stream->type!=STREAMTYPE_STREAM || |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
125 read<s->min_filepos || read>=s->max_filepos+s->buffer_size) |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
126 { |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
127 s->offset= // FIXME!? |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
128 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
|
129 if(s->stream->eof) stream_reset(s->stream); |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
130 stream_seek(s->stream,read); |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
131 mp_msg(MSGT_CACHE,MSGL_DBG2,"Seek done. new pos: 0x%X \n",(int)stream_tell(s->stream)); |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
132 } |
2352 | 133 } |
134 | |
2322 | 135 // calc number of back-bytes: |
136 back=read - s->min_filepos; | |
137 if(back<0) back=0; // strange... | |
138 if(back>s->back_size) back=s->back_size; | |
139 | |
140 // calc number of new bytes: | |
141 newb=s->max_filepos - read; | |
142 if(newb<0) newb=0; // strange... | |
143 | |
144 // calc free buffer space: | |
145 space=s->buffer_size - (newb+back); | |
146 | |
147 // calc bufferpos: | |
148 pos=s->max_filepos - s->offset; | |
149 if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around | |
150 | |
151 if(space<s->fill_limit){ | |
152 // printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit); | |
153 return 0; // no fill... | |
154 } | |
155 | |
156 // printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos); | |
157 | |
158 // reduce space if needed: | |
159 if(space>s->buffer_size-pos) space=s->buffer_size-pos; | |
160 | |
161 // if(space>32768) space=32768; // limit one-time block size | |
162 if(space>4*s->sector_size) space=4*s->sector_size; | |
163 | |
2352 | 164 // if(s->seek_lock) return 0; // FIXME |
165 | |
166 #if 1 | |
167 // back+newb+space <= buffer_size | |
168 back2=s->buffer_size-(space+newb); // max back size | |
169 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2; | |
170 #else | |
2322 | 171 s->min_filepos=read-back; // avoid seeking-back to temp area... |
2352 | 172 #endif |
2322 | 173 |
174 // .... | |
175 //printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size); | |
176 //len=stream_fill_buffer(s->stream); | |
177 //memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy! | |
178 // .... | |
2348 | 179 len=stream_read(s->stream,&s->buffer[pos],space); |
180 if(!len) s->eof=1; | |
2322 | 181 |
182 s->max_filepos+=len; | |
183 if(pos+len>=s->buffer_size){ | |
184 // wrap... | |
185 s->offset+=s->buffer_size; | |
186 } | |
187 | |
188 return len; | |
189 | |
190 } | |
191 | |
192 cache_vars_t* cache_init(int size,int sector){ | |
193 int num; | |
10197 | 194 #ifndef WIN32 |
2322 | 195 cache_vars_t* s=shmem_alloc(sizeof(cache_vars_t)); |
10197 | 196 #else |
197 cache_vars_t* s=malloc(sizeof(cache_vars_t)); | |
198 #endif | |
12899 | 199 if(s==NULL) return NULL; |
200 | |
2322 | 201 memset(s,0,sizeof(cache_vars_t)); |
202 num=size/sector; | |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
203 if(num < 16){ |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
204 num = 16; |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
205 }//32kb min_size |
2322 | 206 s->buffer_size=num*sector; |
207 s->sector_size=sector; | |
10197 | 208 #ifndef WIN32 |
2322 | 209 s->buffer=shmem_alloc(s->buffer_size); |
10197 | 210 #else |
211 s->buffer=malloc(s->buffer_size); | |
212 #endif | |
12899 | 213 |
214 if(s->buffer == NULL){ | |
215 #ifndef WIN32 | |
216 shmem_free(s,sizeof(cache_vars_t)); | |
217 #else | |
218 free(s); | |
219 #endif | |
220 return NULL; | |
221 } | |
222 | |
2322 | 223 s->fill_limit=8*sector; |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
224 s->back_size=s->buffer_size/2; |
2322 | 225 return s; |
226 } | |
227 | |
9915 | 228 void cache_uninit(stream_t *s) { |
229 cache_vars_t* c = s->cache_data; | |
230 if(!s->cache_pid) return; | |
10197 | 231 #ifndef WIN32 |
9915 | 232 kill(s->cache_pid,SIGKILL); |
233 waitpid(s->cache_pid,NULL,0); | |
10197 | 234 #else |
235 TerminateThread((HANDLE)s->cache_pid,0); | |
236 free(c->stream); | |
237 #endif | |
9915 | 238 if(!c) return; |
10197 | 239 #ifndef WIN32 |
9915 | 240 shmem_free(c->buffer,c->buffer_size); |
241 shmem_free(s->cache_data,sizeof(cache_vars_t)); | |
10197 | 242 #else |
243 free(c->buffer); | |
244 free(s->cache_data); | |
245 #endif | |
9915 | 246 } |
247 | |
2322 | 248 static void exit_sighandler(int x){ |
249 // close stream | |
250 exit(0); | |
251 } | |
252 | |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
253 int stream_enable_cache(stream_t *stream,int size,int min,int prefill){ |
3562 | 254 int ss=(stream->type==STREAMTYPE_VCD)?VCD_SECTOR_DATA:STREAM_BUFFER_SIZE; |
5991 | 255 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
|
256 |
7204 | 257 if (stream->type==STREAMTYPE_STREAM && stream->fd < 0) { |
258 // The stream has no 'fd' behind it, so is non-cacheable | |
259 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n"); | |
260 return 1; | |
261 } | |
7006
c0b490505298
disable cache if stream->fd<0 (no regular file/pipe but some special thing)
arpi
parents:
5991
diff
changeset
|
262 |
5991 | 263 s=cache_init(size,ss); |
12899 | 264 if(s == NULL) return 0; |
3562 | 265 stream->cache_data=s; |
266 s->stream=stream; // callback | |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
267 s->prefill=prefill; |
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 |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
270 //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
|
271 //more data than it is alowed to fill |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
272 if (s->prefill > s->buffer_size - s->fill_limit ){ |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
273 s->prefill = s->buffer_size - s->fill_limit; |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
274 } |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
275 if (min > s->buffer_size - s->fill_limit) { |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
276 min = s->buffer_size - s->fill_limit; |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
277 } |
3562 | 278 |
10197 | 279 #ifndef WIN32 |
3562 | 280 if((stream->cache_pid=fork())){ |
10197 | 281 #else |
282 { | |
283 DWORD threadId; | |
284 stream_t* stream2=malloc(sizeof(stream_t)); | |
285 memcpy(stream2,s->stream,sizeof(stream_t)); | |
286 s->stream=stream2; | |
287 stream->cache_pid = CreateThread(NULL,0,ThreadProc,s,0,&threadId); | |
288 #endif | |
3562 | 289 // wait until cache is filled at least prefill_init % |
5931 | 290 mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %d [%d] %d pre:%d eof:%d \n", |
3600 | 291 s->min_filepos,s->read_filepos,s->max_filepos,min,s->eof); |
3562 | 292 while(s->read_filepos<s->min_filepos || s->max_filepos-s->read_filepos<min){ |
293 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rCache fill: %5.2f%% (%d bytes) ", | |
3600 | 294 100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size), |
3562 | 295 s->max_filepos-s->read_filepos |
296 ); | |
297 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
|
298 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
|
299 return 0; |
3562 | 300 } |
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 | |
2371 | 348 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 | 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 | |
2371 | 365 #ifdef _LARGEFILE_SOURCE |
366 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%llX !\n",(long long)(pos+newpos)); | |
367 #else | |
368 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%X !\n",(pos+newpos)); | |
369 #endif | |
2322 | 370 return 0; |
371 } | |
372 | |
373 #endif |