annotate stream/cache2.c @ 24576:6704a924d4aa

According to MSDN a thread must call CoUninitialize once for each successful call it has made to CoInitialize or CoInitializeEx, including any call that returns S_FALSE. Only the CoUninitialize call corresponding to the CoInitialize or CoInitializeEx call that initialized the library can close it. patch by Gianluigi Tiesi, mplayer netfarm it
author diego
date Sun, 23 Sep 2007 20:37:33 +0000
parents 84f95595f31f
children 8f2154e066cf
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2324
0e4210657f0e ehh. include config.h... 10l
arpi
parents: 2322
diff changeset
1 #include "config.h"
0e4210657f0e ehh. include config.h... 10l
arpi
parents: 2322
diff changeset
2
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
3 // Initial draft of my new cache system...
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
4 // Note it runs in 2 processes (using fork()), but doesn't requires locking!!
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
5 // TODO: seeking, data consistency checking
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
6
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
7 #define READ_USLEEP_TIME 10000
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
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
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
10
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
11 #include <stdio.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
12 #include <stdlib.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
13 #include <string.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
14 #include <signal.h>
3726
1acf2f1f9dc8 missing #include's
pl
parents: 3600
diff changeset
15 #include <sys/types.h>
1acf2f1f9dc8 missing #include's
pl
parents: 3600
diff changeset
16 #include <unistd.h>
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
17
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16870
diff changeset
18 #include "osdep/timer.h"
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
19 #ifndef WIN32
10242
4e34d468f549 warning fixes by Dominik
alex
parents: 10197
diff changeset
20 #include <sys/wait.h>
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16870
diff changeset
21 #include "osdep/shmem.h"
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
22 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
23 #include <windows.h>
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
24 static DWORD WINAPI ThreadProc(void* s);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
25 #endif
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
26
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
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
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
29
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
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
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
32
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
33 int stream_fill_buffer(stream_t *s);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
34 int stream_seek_long(stream_t *s,off_t pos);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
35
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
36 typedef struct {
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
37 // constats:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
38 unsigned char *buffer; // base pointer of the alllocated buffer memory
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
39 int buffer_size; // size of the alllocated buffer memory
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
40 int sector_size; // size of a single sector (2048/2324)
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
41 int back_size; // we should keep back_size amount of old bytes for backward seek
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
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
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
44 // filler's pointers:
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
45 int eof;
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
46 off_t min_filepos; // buffer contain only a part of the file, from min-max pos
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
47 off_t max_filepos;
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
48 off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte)
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
49 // reader's pointers:
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
50 off_t read_filepos;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
51 // commands/locking:
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
52 // int seek_lock; // 1 if we will seek/reset buffer, 2 if we are ready for cmd
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
53 // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads.
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
54 // callback
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
55 stream_t* stream;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
56 } cache_vars_t;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
57
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
58 static int min_fill=0;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
59
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
60 int cache_fill_status=0;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
61
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
62 void cache_stats(cache_vars_t* s){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
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
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
66 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
67
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
68 int cache_read(cache_vars_t* s,unsigned char* buf,int size){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
69 int total=0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
70 while(size>0){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
71 int pos,newb,len;
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
72
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
73 //printf("CACHE2_READ: 0x%X <= 0x%X <= 0x%X \n",s->min_filepos,s->read_filepos,s->max_filepos);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
74
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
75 if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
76 // eof?
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
77 if(s->eof) break;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
78 // waiting for buffer fill...
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
79 usec_sleep(READ_USLEEP_TIME); // 10ms
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
80 continue; // try again...
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
81 }
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
82
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
83 newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
84 if(newb<min_fill) min_fill=newb; // statistics...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
85
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
86 // printf("*** newb: %d bytes ***\n",newb);
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
87
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
88 pos=s->read_filepos - s->offset;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
89 if(pos<0) pos+=s->buffer_size; else
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
90 if(pos>=s->buffer_size) pos-=s->buffer_size;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
91
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
92 if(newb>s->buffer_size-pos) newb=s->buffer_size-pos; // handle wrap...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
93 if(newb>size) newb=size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
94
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
95 // check:
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
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
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
97
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
98 // len=write(mem,newb)
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
99 //printf("Buffer read: %d bytes\n",newb);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
100 memcpy(buf,&s->buffer[pos],newb);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
101 buf+=newb;
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
102 len=newb;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
103 // ...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
104
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
105 s->read_filepos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
106 size-=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
107 total+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
108
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
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
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
111 return total;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
112 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
113
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
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
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
116 off_t read=s->read_filepos;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
117
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
118 if(read<s->min_filepos || read>s->max_filepos){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
119 // seek...
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
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
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
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
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
131 }
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
132
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
133 // calc number of back-bytes:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
134 back=read - s->min_filepos;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
135 if(back<0) back=0; // strange...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
136 if(back>s->back_size) back=s->back_size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
137
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
138 // calc number of new bytes:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
139 newb=s->max_filepos - read;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
140 if(newb<0) newb=0; // strange...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
141
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
142 // calc free buffer space:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
143 space=s->buffer_size - (newb+back);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
144
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
145 // calc bufferpos:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
146 pos=s->max_filepos - s->offset;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
147 if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
148
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
149 if(space<s->fill_limit){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
150 // printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
151 return 0; // no fill...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
152 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
153
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
154 // printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
155
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
156 // reduce space if needed:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
157 if(space>s->buffer_size-pos) space=s->buffer_size-pos;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
158
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
159 // if(space>32768) space=32768; // limit one-time block size
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
160 if(space>4*s->sector_size) space=4*s->sector_size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
161
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
162 // if(s->seek_lock) return 0; // FIXME
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
163
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
164 #if 1
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
165 // back+newb+space <= buffer_size
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
166 back2=s->buffer_size-(space+newb); // max back size
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
167 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
168 #else
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
169 s->min_filepos=read-back; // avoid seeking-back to temp area...
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
170 #endif
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
171
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
172 // ....
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
173 //printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
174 //len=stream_fill_buffer(s->stream);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
175 //memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy!
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
176 // ....
2348
76778e307ddc EOF bug fixed
arpi
parents: 2327
diff changeset
177 len=stream_read(s->stream,&s->buffer[pos],space);
76778e307ddc EOF bug fixed
arpi
parents: 2327
diff changeset
178 if(!len) s->eof=1;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
179
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
180 s->max_filepos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
181 if(pos+len>=s->buffer_size){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
182 // wrap...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
183 s->offset+=s->buffer_size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
184 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
185
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
186 return len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
187
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
188 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
189
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
190 cache_vars_t* cache_init(int size,int sector){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
191 int num;
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
192 #ifndef WIN32
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
193 cache_vars_t* s=shmem_alloc(sizeof(cache_vars_t));
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
194 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
195 cache_vars_t* s=malloc(sizeof(cache_vars_t));
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
196 #endif
12899
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
197 if(s==NULL) return NULL;
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
198
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
199 memset(s,0,sizeof(cache_vars_t));
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
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
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
204 s->buffer_size=num*sector;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
205 s->sector_size=sector;
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
206 #ifndef WIN32
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
207 s->buffer=shmem_alloc(s->buffer_size);
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
208 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
209 s->buffer=malloc(s->buffer_size);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
210 #endif
12899
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
211
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
212 if(s->buffer == NULL){
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
213 #ifndef WIN32
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
214 shmem_free(s,sizeof(cache_vars_t));
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
215 #else
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
216 free(s);
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
217 #endif
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
218 return NULL;
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
219 }
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
220
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
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
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
223 return s;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
224 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
225
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
226 void cache_uninit(stream_t *s) {
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
227 cache_vars_t* c = s->cache_data;
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
228 if(!s->cache_pid) return;
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
229 #ifndef WIN32
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
230 kill(s->cache_pid,SIGKILL);
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
231 waitpid(s->cache_pid,NULL,0);
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
232 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
233 TerminateThread((HANDLE)s->cache_pid,0);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
234 free(c->stream);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
235 #endif
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
236 if(!c) return;
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
237 #ifndef WIN32
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
238 shmem_free(c->buffer,c->buffer_size);
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
239 shmem_free(s->cache_data,sizeof(cache_vars_t));
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
240 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
241 free(c->buffer);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
242 free(s->cache_data);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
243 #endif
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
244 }
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
245
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
246 static void exit_sighandler(int x){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
247 // close stream
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
248 exit(0);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
249 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
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
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
252 int ss=(stream->type==STREAMTYPE_VCD)?VCD_SECTOR_DATA:STREAM_BUFFER_SIZE;
5991
ddfae38afc28 cache lower limit 32kb
arpi
parents: 5931
diff changeset
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
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
255 if (stream->type==STREAMTYPE_STREAM && stream->fd < 0) {
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
256 // The stream has no 'fd' behind it, so is non-cacheable
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
257 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n");
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
258 return 1;
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
259 }
7006
c0b490505298 disable cache if stream->fd<0 (no regular file/pipe but some special thing)
arpi
parents: 5991
diff changeset
260
5991
ddfae38afc28 cache lower limit 32kb
arpi
parents: 5931
diff changeset
261 s=cache_init(size,ss);
12899
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
262 if(s == NULL) return 0;
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
263 stream->cache_data=s;
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
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
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
276
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
277 #ifndef WIN32
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
278 if((stream->cache_pid=fork())){
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
279 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
280 {
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
281 DWORD threadId;
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
282 stream_t* stream2=malloc(sizeof(stream_t));
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
283 memcpy(stream2,s->stream,sizeof(stream_t));
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
284 s->stream=stream2;
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
285 stream->cache_pid = CreateThread(NULL,0,ThreadProc,s,0,&threadId);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
286 #endif
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
287 // wait until cache is filled at least prefill_init %
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
288 mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%d eof:%d \n",
17384
95d02479f1d6 1l - one cast too many
rathann
parents: 17366
diff changeset
289 (int64_t)s->min_filepos,(int64_t)s->read_filepos,(int64_t)s->max_filepos,min,s->eof);
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
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
3094e7b6a15b pre-cache fixed
arpi
parents: 3562
diff changeset
292 100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size),
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
293 (int64_t)s->max_filepos-s->read_filepos
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
294 );
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
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
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
298 }
16870
09ad0b5e6643 add a \n after whole cache fill.
ods15
parents: 16793
diff changeset
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
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
301 }
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
302
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
303 #ifdef WIN32
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
304 }
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
305 static DWORD WINAPI ThreadProc(void*s){
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
306 #endif
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
307
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
308 // cache thread mainloop:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
309 signal(SIGTERM,exit_sighandler); // kill
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
310 while(1){
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
311 if(!cache_fill((cache_vars_t*)s)){
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
312 usec_sleep(FILL_USLEEP_TIME); // idle
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
313 }
2327
2332ba356d03 print stats at read instead of fill
arpi
parents: 2324
diff changeset
314 // cache_stats(s->cache_data);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
315 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
316 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
317
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
318 int cache_stream_fill_buffer(stream_t *s){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
319 int len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
320 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
321 if(!s->cache_pid) return stream_fill_buffer(s);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
322
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
323 // cache_stats(s->cache_data);
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
324
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
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
2332ba356d03 print stats at read instead of fill
arpi
parents: 2324
diff changeset
326
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
327 len=cache_read(s->cache_data,s->buffer, ((cache_vars_t*)s->cache_data)->sector_size);
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
328 //printf("cache_stream_fill_buffer->read -> %d\n",len);
2327
2332ba356d03 print stats at read instead of fill
arpi
parents: 2324
diff changeset
329
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
330 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
331 s->buf_pos=0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
332 s->buf_len=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
333 s->pos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
334 // printf("[%d]",len);fflush(stdout);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
335 return len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
336
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
337 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
338
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
339 int cache_stream_seek_long(stream_t *stream,off_t pos){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
340 cache_vars_t* s;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
341 off_t newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
342 if(!stream->cache_pid) return stream_seek_long(stream,pos);
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
343
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
344 s=stream->cache_data;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
345 // s->seek_lock=1;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
346
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
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
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
348
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
349 newpos=pos/s->sector_size; newpos*=s->sector_size; // align
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
350 stream->pos=s->read_filepos=newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
351 s->eof=0; // !!!!!!!
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
353 cache_stream_fill_buffer(stream);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
354
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
355 pos-=newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
356 if(pos>=0 && pos<=stream->buf_len){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
357 stream->buf_pos=pos; // byte position in sector
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
358 return 1;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
359 }
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
360
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
361 // stream->buf_pos=stream->buf_len=0;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
362 // return 1;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
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
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
365 return 0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
366 }