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