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