annotate stream/cache2.c @ 34421:407da2eec15e

Use check items for CD and VCD titles as well. This way, the title being played will be emphasized. (Check items are already being used in the DVD menus.)
author ib
date Thu, 05 Jan 2012 12:55:33 +0000
parents 7a4dbec9415b
children ebf95780af6e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30426
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
1 /*
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
2 * This file is part of MPlayer.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
3 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
5 * it under the terms of the GNU General Public License as published by
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
7 * (at your option) any later version.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
8 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
12 * GNU General Public License for more details.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
13 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
14 * You should have received a copy of the GNU General Public License along
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
17 */
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 30362
diff changeset
18
2324
0e4210657f0e ehh. include config.h... 10l
arpi
parents: 2322
diff changeset
19 #include "config.h"
0e4210657f0e ehh. include config.h... 10l
arpi
parents: 2322
diff changeset
20
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
21 // Initial draft of my new cache system...
31181
e735964b5d56 Fix a bunch of typos in the stream cache code.
diego
parents: 31169
diff changeset
22 // Note it runs in 2 processes (using fork()), but doesn't require locking!!
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
23 // TODO: seeking, data consistency checking
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
24
31193
f41fda4fe85f 100l, stream_check_for_interrupt argument is not in usec,
reimar
parents: 31190
diff changeset
25 #define READ_SLEEP_TIME 10
31181
e735964b5d56 Fix a bunch of typos in the stream cache code.
diego
parents: 31169
diff changeset
26 // These defines are used to reduce the cost of many successive
31142
355302f83219 Optimize cache behaviour for the many-consecutive-seeks case.
reimar
parents: 31141
diff changeset
27 // seeks (e.g. when a file has no index) by spinning quickly at first.
355302f83219 Optimize cache behaviour for the many-consecutive-seeks case.
reimar
parents: 31141
diff changeset
28 #define INITIAL_FILL_USLEEP_TIME 1000
355302f83219 Optimize cache behaviour for the many-consecutive-seeks case.
reimar
parents: 31141
diff changeset
29 #define INITIAL_FILL_USLEEP_COUNT 10
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
30 #define FILL_USLEEP_TIME 50000
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 3726
diff changeset
31 #define PREFILL_SLEEP_TIME 200
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
32 #define CONTROL_SLEEP_TIME 0
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
33
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
34 #include <stdio.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
35 #include <stdlib.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
36 #include <string.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
37 #include <signal.h>
3726
1acf2f1f9dc8 missing #include's
pl
parents: 3600
diff changeset
38 #include <sys/types.h>
1acf2f1f9dc8 missing #include's
pl
parents: 3600
diff changeset
39 #include <unistd.h>
30351
b985db55e78a Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents: 29888
diff changeset
40 #include <errno.h>
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
41
32529
0624fa95a2aa Make the file protocol read up to 64 kB at once when the cache is used,
reimar
parents: 32472
diff changeset
42 #include "libavutil/avutil.h"
27723
fb67a8f56bfc Unconditionally #include osdep/shem.h, fixes the warnings on Cygwin:
diego
parents: 27343
diff changeset
43 #include "osdep/shmem.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16870
diff changeset
44 #include "osdep/timer.h"
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
45 #if defined(__MINGW32__)
26077
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
46 #include <windows.h>
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
47 static void ThreadProc( void *s );
26077
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
48 #elif defined(__OS2__)
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
49 #define INCL_DOS
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
50 #include <os2.h>
27756
1266470a5651 Revert declaring ThreadProc as void, it breaks the WINAPI.
diego
parents: 27727
diff changeset
51 static void ThreadProc( void *s );
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
52 #elif defined(PTHREAD_CACHE)
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
53 #include <pthread.h>
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
54 static void *ThreadProc(void *s);
26077
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
55 #else
10242
4e34d468f549 warning fixes by Dominik
alex
parents: 10197
diff changeset
56 #include <sys/wait.h>
31146
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
57 #define FORKED_CACHE 1
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
58 #endif
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
59 #ifndef FORKED_CACHE
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
60 #define FORKED_CACHE 0
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
61 #endif
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
62
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
63 #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
64 #include "help_mp.h"
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
65
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
66 #include "stream.h"
27876
298a3cd86bbb Include cache2.h in cache2.c, fixes an implicit declaration warning for cache_do_control
reimar
parents: 27770
diff changeset
67 #include "cache2.h"
33517
850a3272e10d Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents: 33512
diff changeset
68 #include "mp_global.h"
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
69
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
70 typedef struct {
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
71 // constats:
31181
e735964b5d56 Fix a bunch of typos in the stream cache code.
diego
parents: 31169
diff changeset
72 unsigned char *buffer; // base pointer of the allocated buffer memory
e735964b5d56 Fix a bunch of typos in the stream cache code.
diego
parents: 31169
diff changeset
73 int buffer_size; // size of the allocated buffer memory
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
74 int sector_size; // size of a single sector (2048/2324)
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
75 int back_size; // we should keep back_size amount of old bytes for backward seek
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
76 int fill_limit; // we should fill buffer only if space>=fill_limit
31181
e735964b5d56 Fix a bunch of typos in the stream cache code.
diego
parents: 31169
diff changeset
77 int seek_limit; // keep filling cache if distance is less that seek limit
34283
3a4adac4e9a5 Make cache process detect when the main process disappeared and
reimar
parents: 33868
diff changeset
78 #if FORKED_CACHE
3a4adac4e9a5 Make cache process detect when the main process disappeared and
reimar
parents: 33868
diff changeset
79 pid_t ppid; // parent PID to detect killed parent
3a4adac4e9a5 Make cache process detect when the main process disappeared and
reimar
parents: 33868
diff changeset
80 #endif
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
81 // filler's pointers:
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
82 int eof;
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
83 off_t min_filepos; // buffer contain only a part of the file, from min-max pos
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
84 off_t max_filepos;
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
85 off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte)
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
86 // reader's pointers:
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
87 off_t read_filepos;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
88 // commands/locking:
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
89 // 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
90 // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads.
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
91 // callback
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
92 stream_t* stream;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
93 volatile int control;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
94 volatile unsigned control_uint_arg;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
95 volatile double control_double_arg;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
96 volatile int control_res;
26847
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
97 volatile double stream_time_length;
33517
850a3272e10d Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents: 33512
diff changeset
98 volatile double stream_time_pos;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
99 } cache_vars_t;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
100
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
101 static int min_fill=0;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
102
31141
3b5e8cc5e128 Add code to wake up cache process when e.g. a seek is needed.
reimar
parents: 30731
diff changeset
103 static void cache_wakeup(stream_t *s)
3b5e8cc5e128 Add code to wake up cache process when e.g. a seek is needed.
reimar
parents: 30731
diff changeset
104 {
31146
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
105 #if FORKED_CACHE
31141
3b5e8cc5e128 Add code to wake up cache process when e.g. a seek is needed.
reimar
parents: 30731
diff changeset
106 // signal process to wake up immediately
31167
09e3134b649d Re-enable wakeup-on-signal for cache process.
reimar
parents: 31166
diff changeset
107 kill(s->cache_pid, SIGUSR1);
31141
3b5e8cc5e128 Add code to wake up cache process when e.g. a seek is needed.
reimar
parents: 30731
diff changeset
108 #endif
3b5e8cc5e128 Add code to wake up cache process when e.g. a seek is needed.
reimar
parents: 30731
diff changeset
109 }
3b5e8cc5e128 Add code to wake up cache process when e.g. a seek is needed.
reimar
parents: 30731
diff changeset
110
34373
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
111 static void cache_flush(cache_vars_t *s)
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
112 {
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
113 s->offset= // FIXME!?
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
114 s->min_filepos=s->max_filepos=s->read_filepos; // drop cache content :(
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
115 }
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
116
30557
74a6c2a3dcce stream: Mark functions not used outside of their files as static.
diego
parents: 30426
diff changeset
117 static int cache_read(cache_vars_t *s, unsigned char *buf, int size)
74a6c2a3dcce stream: Mark functions not used outside of their files as static.
diego
parents: 30426
diff changeset
118 {
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
119 int total=0;
31190
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
120 int sleep_count = 0;
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
121 int last_max = s->max_filepos;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
122 while(size>0){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
123 int pos,newb,len;
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
124
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
125 //printf("CACHE2_READ: 0x%X <= 0x%X <= 0x%X \n",s->min_filepos,s->read_filepos,s->max_filepos);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
126
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
127 if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
128 // eof?
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
129 if(s->eof) break;
31190
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
130 if (s->max_filepos == last_max) {
31193
f41fda4fe85f 100l, stream_check_for_interrupt argument is not in usec,
reimar
parents: 31190
diff changeset
131 if (sleep_count++ == 10)
33868
1714e25ded23 Another attempt to make message easier to understand.
reimar
parents: 33867
diff changeset
132 mp_msg(MSGT_CACHE, MSGL_WARN, "Cache empty, consider increasing -cache and/or -cache-min. [performance issue]\n");
31190
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
133 } else {
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
134 last_max = s->max_filepos;
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
135 sleep_count = 0;
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
136 }
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
137 // waiting for buffer fill...
31193
f41fda4fe85f 100l, stream_check_for_interrupt argument is not in usec,
reimar
parents: 31190
diff changeset
138 if (stream_check_interrupt(READ_SLEEP_TIME)) {
31190
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
139 s->eof = 1;
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
140 break;
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
141 }
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
142 continue; // try again...
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
143 }
31190
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
144 sleep_count = 0;
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
145
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
146 newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
147 if(newb<min_fill) min_fill=newb; // statistics...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
148
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
149 // printf("*** newb: %d bytes ***\n",newb);
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
150
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
151 pos=s->read_filepos - s->offset;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
152 if(pos<0) pos+=s->buffer_size; else
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
153 if(pos>=s->buffer_size) pos-=s->buffer_size;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
154
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
155 if(newb>s->buffer_size-pos) newb=s->buffer_size-pos; // handle wrap...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
156 if(newb>size) newb=size;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
157
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
158 // check:
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
159 if(s->read_filepos<s->min_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"Ehh. s->read_filepos<s->min_filepos !!! Report bug...\n");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
160
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
161 // len=write(mem,newb)
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
162 //printf("Buffer read: %d bytes\n",newb);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
163 memcpy(buf,&s->buffer[pos],newb);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
164 buf+=newb;
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
165 len=newb;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
166 // ...
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
167
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
168 s->read_filepos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
169 size-=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
170 total+=len;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
171
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
172 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
173 return total;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
174 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
175
30557
74a6c2a3dcce stream: Mark functions not used outside of their files as static.
diego
parents: 30426
diff changeset
176 static int cache_fill(cache_vars_t *s)
74a6c2a3dcce stream: Mark functions not used outside of their files as static.
diego
parents: 30426
diff changeset
177 {
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 7204
diff changeset
178 int back,back2,newb,space,len,pos;
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
179 off_t read=s->read_filepos;
32529
0624fa95a2aa Make the file protocol read up to 64 kB at once when the cache is used,
reimar
parents: 32472
diff changeset
180 int read_chunk;
33033
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
181 int wraparound_copy = 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
182
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
183 if(read<s->min_filepos || read>s->max_filepos){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
184 // seek...
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
185 mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%"PRIX64" \n",(int64_t)read);
31305
7ae56026b7ee Respect -cache-seek-min also for on-disk files to reduce issues with mov.
reimar
parents: 31195
diff changeset
186 // drop cache contents only if seeking backward or too much fwd.
7ae56026b7ee Respect -cache-seek-min also for on-disk files to reduce issues with mov.
reimar
parents: 31195
diff changeset
187 // This is also done for on-disk files, since it loses the backseek cache.
7ae56026b7ee Respect -cache-seek-min also for on-disk files to reduce issues with mov.
reimar
parents: 31195
diff changeset
188 // That in turn can cause major bandwidth increase and performance
7ae56026b7ee Respect -cache-seek-min also for on-disk files to reduce issues with mov.
reimar
parents: 31195
diff changeset
189 // issues with e.g. mov or badly interleaved files
7ae56026b7ee Respect -cache-seek-min also for on-disk files to reduce issues with mov.
reimar
parents: 31195
diff changeset
190 if(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
191 {
34373
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
192 cache_flush(s);
8938
fc21a94f98c6 do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents: 7862
diff changeset
193 if(s->stream->eof) stream_reset(s->stream);
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32468
diff changeset
194 stream_seek_internal(s->stream,read);
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
195 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
196 }
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
197 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
198
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
199 // calc number of back-bytes:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
200 back=read - s->min_filepos;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
201 if(back<0) back=0; // strange...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
202 if(back>s->back_size) back=s->back_size;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
203
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
204 // calc number of new bytes:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
205 newb=s->max_filepos - read;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
206 if(newb<0) newb=0; // strange...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
207
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
208 // calc free buffer space:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
209 space=s->buffer_size - (newb+back);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
210
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
211 // calc bufferpos:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
212 pos=s->max_filepos - s->offset;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
213 if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
214
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
215 if(space<s->fill_limit){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
216 // printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
217 return 0; // no fill...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
218 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
219
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
220 // printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
221
33033
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
222 // try to avoid wrap-around. If not possible due to sector size
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
223 // do an extra copy.
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
224 if(space>s->buffer_size-pos) {
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
225 if (s->buffer_size-pos >= s->sector_size) {
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
226 space=s->buffer_size-pos;
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
227 } else {
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
228 space = s->sector_size;
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
229 wraparound_copy = 1;
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
230 }
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
231 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
232
32468
0c7c4ed0b7eb Remove som irrelevant commented-out code.
reimar
parents: 32438
diff changeset
233 // limit one-time block size
32529
0624fa95a2aa Make the file protocol read up to 64 kB at once when the cache is used,
reimar
parents: 32472
diff changeset
234 read_chunk = s->stream->read_chunk;
0624fa95a2aa Make the file protocol read up to 64 kB at once when the cache is used,
reimar
parents: 32472
diff changeset
235 if (!read_chunk) read_chunk = 4*s->sector_size;
0624fa95a2aa Make the file protocol read up to 64 kB at once when the cache is used,
reimar
parents: 32472
diff changeset
236 space = FFMIN(space, read_chunk);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
237
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
238 #if 1
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
239 // back+newb+space <= buffer_size
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
240 back2=s->buffer_size-(space+newb); // max back size
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
241 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
242 #else
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
243 s->min_filepos=read-back; // avoid seeking-back to temp area...
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
244 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
245
33033
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
246 if (wraparound_copy) {
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
247 int to_copy;
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
248 len = stream_read_internal(s->stream, s->stream->buffer, space);
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
249 to_copy = FFMIN(len, s->buffer_size-pos);
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
250 memcpy(s->buffer + pos, s->stream->buffer, to_copy);
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
251 memcpy(s->buffer, s->stream->buffer + to_copy, len - to_copy);
1aed51b973fa Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents: 32731
diff changeset
252 } else
32472
5d1d67cf8718 Add internal read and seek function to avoid a useless memcpy when using
reimar
parents: 32468
diff changeset
253 len = stream_read_internal(s->stream, &s->buffer[pos], space);
31169
ac84149bbdaf Retry reading even if we hit eof before.
reimar
parents: 31167
diff changeset
254 s->eof= !len;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
255
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
256 s->max_filepos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
257 if(pos+len>=s->buffer_size){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
258 // wrap...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
259 s->offset+=s->buffer_size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
260 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
261
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
262 return len;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
263
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
264 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
265
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
266 static int cache_execute_control(cache_vars_t *s) {
33348
62ab329812c9 Avoid warnings about discarding volatile.
reimar
parents: 33033
diff changeset
267 double double_res;
62ab329812c9 Avoid warnings about discarding volatile.
reimar
parents: 33033
diff changeset
268 unsigned uint_res;
34373
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
269 int needs_flush = 0;
26847
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
270 static unsigned last;
30731
5a1ab9923c3a Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents: 30712
diff changeset
271 int quit = s->control == -2;
5a1ab9923c3a Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents: 30712
diff changeset
272 if (quit || !s->stream->control) {
26897
23c3741dc490 Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents: 26847
diff changeset
273 s->stream_time_length = 0;
33517
850a3272e10d Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents: 33512
diff changeset
274 s->stream_time_pos = MP_NOPTS_VALUE;
26897
23c3741dc490 Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents: 26847
diff changeset
275 s->control_res = STREAM_UNSUPPORTED;
23c3741dc490 Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents: 26847
diff changeset
276 s->control = -1;
30731
5a1ab9923c3a Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents: 30712
diff changeset
277 return !quit;
26897
23c3741dc490 Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents: 26847
diff changeset
278 }
26847
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
279 if (GetTimerMS() - last > 99) {
33517
850a3272e10d Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents: 33512
diff changeset
280 double len, pos;
26847
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
281 if (s->stream->control(s->stream, STREAM_CTRL_GET_TIME_LENGTH, &len) == STREAM_OK)
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
282 s->stream_time_length = len;
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
283 else
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
284 s->stream_time_length = 0;
33517
850a3272e10d Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents: 33512
diff changeset
285 if (s->stream->control(s->stream, STREAM_CTRL_GET_CURRENT_TIME, &pos) == STREAM_OK)
850a3272e10d Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents: 33512
diff changeset
286 s->stream_time_pos = pos;
850a3272e10d Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents: 33512
diff changeset
287 else
850a3272e10d Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents: 33512
diff changeset
288 s->stream_time_pos = MP_NOPTS_VALUE;
34283
3a4adac4e9a5 Make cache process detect when the main process disappeared and
reimar
parents: 33868
diff changeset
289 #if FORKED_CACHE
3a4adac4e9a5 Make cache process detect when the main process disappeared and
reimar
parents: 33868
diff changeset
290 // if parent PID changed, main process was killed -> exit
3a4adac4e9a5 Make cache process detect when the main process disappeared and
reimar
parents: 33868
diff changeset
291 if (s->ppid != getppid()) {
3a4adac4e9a5 Make cache process detect when the main process disappeared and
reimar
parents: 33868
diff changeset
292 mp_msg(MSGT_CACHE, MSGL_WARN, "Parent process disappeared, exiting cache process.\n");
3a4adac4e9a5 Make cache process detect when the main process disappeared and
reimar
parents: 33868
diff changeset
293 return 0;
3a4adac4e9a5 Make cache process detect when the main process disappeared and
reimar
parents: 33868
diff changeset
294 }
3a4adac4e9a5 Make cache process detect when the main process disappeared and
reimar
parents: 33868
diff changeset
295 #endif
26847
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
296 last = GetTimerMS();
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
297 }
30731
5a1ab9923c3a Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents: 30712
diff changeset
298 if (s->control == -1) return 1;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
299 switch (s->control) {
33360
c36ab8db37f6 100l, fix seek cache controls with cache enabled,
reimar
parents: 33348
diff changeset
300 case STREAM_CTRL_SEEK_TO_TIME:
34373
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
301 needs_flush = 1;
33360
c36ab8db37f6 100l, fix seek cache controls with cache enabled,
reimar
parents: 33348
diff changeset
302 double_res = s->control_double_arg;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
303 case STREAM_CTRL_GET_CURRENT_TIME:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
304 case STREAM_CTRL_GET_ASPECT_RATIO:
33348
62ab329812c9 Avoid warnings about discarding volatile.
reimar
parents: 33033
diff changeset
305 s->control_res = s->stream->control(s->stream, s->control, &double_res);
62ab329812c9 Avoid warnings about discarding volatile.
reimar
parents: 33033
diff changeset
306 s->control_double_arg = double_res;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
307 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
308 case STREAM_CTRL_SEEK_TO_CHAPTER:
33360
c36ab8db37f6 100l, fix seek cache controls with cache enabled,
reimar
parents: 33348
diff changeset
309 case STREAM_CTRL_SET_ANGLE:
34373
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
310 needs_flush = 1;
33360
c36ab8db37f6 100l, fix seek cache controls with cache enabled,
reimar
parents: 33348
diff changeset
311 uint_res = s->control_uint_arg;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
312 case STREAM_CTRL_GET_NUM_CHAPTERS:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
313 case STREAM_CTRL_GET_CURRENT_CHAPTER:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
314 case STREAM_CTRL_GET_NUM_ANGLES:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
315 case STREAM_CTRL_GET_ANGLE:
33348
62ab329812c9 Avoid warnings about discarding volatile.
reimar
parents: 33033
diff changeset
316 s->control_res = s->stream->control(s->stream, s->control, &uint_res);
62ab329812c9 Avoid warnings about discarding volatile.
reimar
parents: 33033
diff changeset
317 s->control_uint_arg = uint_res;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
318 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
319 default:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
320 s->control_res = STREAM_UNSUPPORTED;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
321 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
322 }
34373
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
323 if (needs_flush) {
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
324 s->read_filepos = s->stream->pos;
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
325 s->eof = s->stream->eof;
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
326 cache_flush(s);
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
327 }
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
328 s->control = -1;
30731
5a1ab9923c3a Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents: 30712
diff changeset
329 return 1;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
330 }
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
331
31147
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
332 static void *shared_alloc(int size) {
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
333 #if FORKED_CACHE
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
334 return shmem_alloc(size);
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
335 #else
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
336 return malloc(size);
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
337 #endif
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
338 }
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
339
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
340 static void shared_free(void *ptr, int size) {
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
341 #if FORKED_CACHE
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
342 shmem_free(ptr, size);
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
343 #else
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
344 free(ptr);
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
345 #endif
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
346 }
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
347
30359
44b8f698fd15 Make cache_init static, it is not used outside this file
reimar
parents: 30355
diff changeset
348 static cache_vars_t* cache_init(int size,int sector){
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
349 int num;
31147
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
350 cache_vars_t* s=shared_alloc(sizeof(cache_vars_t));
12899
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
351 if(s==NULL) return NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
352
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
353 memset(s,0,sizeof(cache_vars_t));
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
354 num=size/sector;
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
355 if(num < 16){
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
356 num = 16;
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
357 }//32kb min_size
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
358 s->buffer_size=num*sector;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
359 s->sector_size=sector;
31147
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
360 s->buffer=shared_alloc(s->buffer_size);
12899
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
361
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
362 if(s->buffer == NULL){
31147
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
363 shared_free(s, sizeof(cache_vars_t));
12899
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
364 return NULL;
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
365 }
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
366
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
367 s->fill_limit=8*sector;
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
368 s->back_size=s->buffer_size/2;
34283
3a4adac4e9a5 Make cache process detect when the main process disappeared and
reimar
parents: 33868
diff changeset
369 #if FORKED_CACHE
3a4adac4e9a5 Make cache process detect when the main process disappeared and
reimar
parents: 33868
diff changeset
370 s->ppid = getpid();
3a4adac4e9a5 Make cache process detect when the main process disappeared and
reimar
parents: 33868
diff changeset
371 #endif
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
372 return s;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
373 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
374
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
375 void cache_uninit(stream_t *s) {
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
376 cache_vars_t* c = s->cache_data;
30351
b985db55e78a Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents: 29888
diff changeset
377 if(s->cache_pid) {
31146
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
378 #if !FORKED_CACHE
30353
3c131287a33e Reindent.
reimar
parents: 30352
diff changeset
379 cache_do_control(s, -2, NULL);
26077
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
380 #else
30353
3c131287a33e Reindent.
reimar
parents: 30352
diff changeset
381 kill(s->cache_pid,SIGKILL);
3c131287a33e Reindent.
reimar
parents: 30352
diff changeset
382 waitpid(s->cache_pid,NULL,0);
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
383 #endif
30352
dff74677e2fd Zero freed pointers.
reimar
parents: 30351
diff changeset
384 s->cache_pid = 0;
30351
b985db55e78a Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents: 29888
diff changeset
385 }
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
386 if(!c) return;
31147
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
387 shared_free(c->buffer, c->buffer_size);
30354
1b2de14c5233 100l, shouldn't write to memory after freeing it.
reimar
parents: 30353
diff changeset
388 c->buffer = NULL;
30731
5a1ab9923c3a Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents: 30712
diff changeset
389 c->stream = NULL;
31147
97660f5d9aef Slightly reduce number of #ifs
reimar
parents: 31146
diff changeset
390 shared_free(s->cache_data, sizeof(cache_vars_t));
30352
dff74677e2fd Zero freed pointers.
reimar
parents: 30351
diff changeset
391 s->cache_data = NULL;
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
392 }
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
393
33617
c77bf171b354 cache2: Surround conditionally used functions by appropriate #ifdefs.
diego
parents: 33517
diff changeset
394 #if FORKED_CACHE
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
395 static void exit_sighandler(int x){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
396 // close stream
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
397 exit(0);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
398 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
399
31141
3b5e8cc5e128 Add code to wake up cache process when e.g. a seek is needed.
reimar
parents: 30731
diff changeset
400 static void dummy_sighandler(int x) {
3b5e8cc5e128 Add code to wake up cache process when e.g. a seek is needed.
reimar
parents: 30731
diff changeset
401 }
33617
c77bf171b354 cache2: Surround conditionally used functions by appropriate #ifdefs.
diego
parents: 33517
diff changeset
402 #endif
31141
3b5e8cc5e128 Add code to wake up cache process when e.g. a seek is needed.
reimar
parents: 30731
diff changeset
403
30360
c74a5f8ffab3 Change code to allow playing a stream even if enabling the cache failed
reimar
parents: 30359
diff changeset
404 /**
31144
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
405 * Main loop of the cache process or thread.
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
406 */
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
407 static void cache_mainloop(cache_vars_t *s) {
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
408 int sleep_count = 0;
31189
edfa98275e04 Fix cache process accidentally being killed by SIGUSR1.
reimar
parents: 31181
diff changeset
409 #if FORKED_CACHE
33835
8d3d721a0532 cache2: merge struct declaration and member assignment
diego
parents: 33823
diff changeset
410 struct sigaction sa = { .sa_handler = SIG_IGN };
31672
61eac0d05f20 Use sigaction() instead of signal(), the latter has a unavoidable
reimar
parents: 31311
diff changeset
411 sigaction(SIGUSR1, &sa, NULL);
31189
edfa98275e04 Fix cache process accidentally being killed by SIGUSR1.
reimar
parents: 31181
diff changeset
412 #endif
31144
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
413 do {
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
414 if (!cache_fill(s)) {
31167
09e3134b649d Re-enable wakeup-on-signal for cache process.
reimar
parents: 31166
diff changeset
415 #if FORKED_CACHE
09e3134b649d Re-enable wakeup-on-signal for cache process.
reimar
parents: 31166
diff changeset
416 // Let signal wake us up, we cannot leave this
09e3134b649d Re-enable wakeup-on-signal for cache process.
reimar
parents: 31166
diff changeset
417 // enabled since we do not handle EINTR in most places.
09e3134b649d Re-enable wakeup-on-signal for cache process.
reimar
parents: 31166
diff changeset
418 // This might need extra code to work on BSD.
31672
61eac0d05f20 Use sigaction() instead of signal(), the latter has a unavoidable
reimar
parents: 31311
diff changeset
419 sa.sa_handler = dummy_sighandler;
61eac0d05f20 Use sigaction() instead of signal(), the latter has a unavoidable
reimar
parents: 31311
diff changeset
420 sigaction(SIGUSR1, &sa, NULL);
31167
09e3134b649d Re-enable wakeup-on-signal for cache process.
reimar
parents: 31166
diff changeset
421 #endif
31144
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
422 if (sleep_count < INITIAL_FILL_USLEEP_COUNT) {
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
423 sleep_count++;
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
424 usec_sleep(INITIAL_FILL_USLEEP_TIME);
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
425 } else
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
426 usec_sleep(FILL_USLEEP_TIME); // idle
31167
09e3134b649d Re-enable wakeup-on-signal for cache process.
reimar
parents: 31166
diff changeset
427 #if FORKED_CACHE
31672
61eac0d05f20 Use sigaction() instead of signal(), the latter has a unavoidable
reimar
parents: 31311
diff changeset
428 sa.sa_handler = SIG_IGN;
61eac0d05f20 Use sigaction() instead of signal(), the latter has a unavoidable
reimar
parents: 31311
diff changeset
429 sigaction(SIGUSR1, &sa, NULL);
31167
09e3134b649d Re-enable wakeup-on-signal for cache process.
reimar
parents: 31166
diff changeset
430 #endif
31144
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
431 } else
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
432 sleep_count = 0;
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
433 } while (cache_execute_control(s));
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
434 }
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
435
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
436 /**
30360
c74a5f8ffab3 Change code to allow playing a stream even if enabling the cache failed
reimar
parents: 30359
diff changeset
437 * \return 1 on success, 0 if the function was interrupted and -1 on error
c74a5f8ffab3 Change code to allow playing a stream even if enabling the cache failed
reimar
parents: 30359
diff changeset
438 */
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
439 int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){
25445
959fca775f43 Fix stream_cache to use sector_size set in stream_t.
ulion
parents: 24697
diff changeset
440 int ss = stream->sector_size ? stream->sector_size : STREAM_BUFFER_SIZE;
30362
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
441 int res = -1;
5991
ddfae38afc28 cache lower limit 32kb
arpi
parents: 5931
diff changeset
442 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
443
29888
5c39c41f38e8 Deobfuscate the special hack to disable cache for live555.
reimar
parents: 29263
diff changeset
444 if (stream->flags & STREAM_NON_CACHEABLE) {
7204
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
445 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n");
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
446 return 1;
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
447 }
7006
c0b490505298 disable cache if stream->fd<0 (no regular file/pipe but some special thing)
arpi
parents: 5991
diff changeset
448
5991
ddfae38afc28 cache lower limit 32kb
arpi
parents: 5931
diff changeset
449 s=cache_init(size,ss);
30360
c74a5f8ffab3 Change code to allow playing a stream even if enabling the cache failed
reimar
parents: 30359
diff changeset
450 if(s == NULL) return -1;
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
451 stream->cache_data=s;
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
452 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
453 s->seek_limit=seek_limit;
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
454
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
455
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
456 //make sure that we won't wait from cache_fill
31181
e735964b5d56 Fix a bunch of typos in the stream cache code.
diego
parents: 31169
diff changeset
457 //more data than it is allowed 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
458 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
459 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
460 }
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
461 if (min > s->buffer_size - s->fill_limit) {
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
462 min = s->buffer_size - s->fill_limit;
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
463 }
31189
edfa98275e04 Fix cache process accidentally being killed by SIGUSR1.
reimar
parents: 31181
diff changeset
464 // to make sure we wait for the cache process/thread to be active
edfa98275e04 Fix cache process accidentally being killed by SIGUSR1.
reimar
parents: 31181
diff changeset
465 // before continuing
edfa98275e04 Fix cache process accidentally being killed by SIGUSR1.
reimar
parents: 31181
diff changeset
466 if (min <= 0)
edfa98275e04 Fix cache process accidentally being killed by SIGUSR1.
reimar
parents: 31181
diff changeset
467 min = 1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
468
31146
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
469 #if FORKED_CACHE
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
470 if((stream->cache_pid=fork())){
30351
b985db55e78a Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents: 29888
diff changeset
471 if ((pid_t)stream->cache_pid == -1)
b985db55e78a Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents: 29888
diff changeset
472 stream->cache_pid = 0;
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
473 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
474 {
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
475 stream_t* stream2=malloc(sizeof(stream_t));
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
476 memcpy(stream2,s->stream,sizeof(stream_t));
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
477 s->stream=stream2;
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
478 #if defined(__MINGW32__)
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
479 stream->cache_pid = _beginthread( ThreadProc, 0, s );
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
480 #elif defined(__OS2__)
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
481 stream->cache_pid = _beginthread( ThreadProc, NULL, 256 * 1024, s );
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
482 #else
27896
4c2232462353 100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents: 27894
diff changeset
483 {
4c2232462353 100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents: 27894
diff changeset
484 pthread_t tid;
4c2232462353 100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents: 27894
diff changeset
485 pthread_create(&tid, NULL, ThreadProc, s);
4c2232462353 100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents: 27894
diff changeset
486 stream->cache_pid = 1;
4c2232462353 100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents: 27894
diff changeset
487 }
26077
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
488 #endif
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
489 #endif
30351
b985db55e78a Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents: 29888
diff changeset
490 if (!stream->cache_pid) {
b985db55e78a Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents: 29888
diff changeset
491 mp_msg(MSGT_CACHE, MSGL_ERR,
b985db55e78a Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents: 29888
diff changeset
492 "Starting cache process/thread failed: %s.\n", strerror(errno));
30362
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
493 goto err_out;
30351
b985db55e78a Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents: 29888
diff changeset
494 }
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
495 // wait until cache is filled at least prefill_init %
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
496 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
497 (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
498 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
499 mp_msg(MSGT_CACHE,MSGL_STATUS,MSGTR_CacheFill,
3600
3094e7b6a15b pre-cache fixed
arpi
parents: 3562
diff changeset
500 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
501 (int64_t)s->max_filepos-s->read_filepos
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
502 );
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
503 if(s->eof) break; // file is smaller than prefill size
30362
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
504 if(stream_check_interrupt(PREFILL_SLEEP_TIME)) {
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
505 res = 0;
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
506 goto err_out;
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
507 }
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
508 }
16870
09ad0b5e6643 add a \n after whole cache fill.
ods15
parents: 16793
diff changeset
509 mp_msg(MSGT_CACHE,MSGL_STATUS,"\n");
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 3726
diff changeset
510 return 1; // parent exits
30362
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
511
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
512 err_out:
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
513 cache_uninit(stream);
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
514 return res;
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
515 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
516
31146
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
517 #if FORKED_CACHE
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
518 signal(SIGTERM,exit_sighandler); // kill
31144
c2d5a1f6360b Extract the cache main loop into a separate function.
reimar
parents: 31142
diff changeset
519 cache_mainloop(s);
30355
ca3e3df28fe2 Add an exit() to silence a gcc warning and ensure forked code will never
reimar
parents: 30354
diff changeset
520 // make sure forked code never leaves this function
ca3e3df28fe2 Add an exit() to silence a gcc warning and ensure forked code will never
reimar
parents: 30354
diff changeset
521 exit(0);
30712
75903ab49159 Restructure #ifs to be clearer, also ensures that we return from the thread
reimar
parents: 30691
diff changeset
522 #endif
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
523 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
524
31146
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
525 #if !FORKED_CACHE
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
526 #if defined(__MINGW32__) || defined(__OS2__)
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
527 static void ThreadProc( void *s ){
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
528 cache_mainloop(s);
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
529 _endthread();
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
530 }
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
531 #else
31145
47d2e52f61b4 Try reducing the #ifdef mess for the different cache variants.
reimar
parents: 31144
diff changeset
532 static void *ThreadProc( void *s ){
47d2e52f61b4 Try reducing the #ifdef mess for the different cache variants.
reimar
parents: 31144
diff changeset
533 cache_mainloop(s);
47d2e52f61b4 Try reducing the #ifdef mess for the different cache variants.
reimar
parents: 31144
diff changeset
534 return NULL;
47d2e52f61b4 Try reducing the #ifdef mess for the different cache variants.
reimar
parents: 31144
diff changeset
535 }
31146
78d11e186bfc Use an extra define to simplify ifdefs
reimar
parents: 31145
diff changeset
536 #endif
31145
47d2e52f61b4 Try reducing the #ifdef mess for the different cache variants.
reimar
parents: 31144
diff changeset
537 #endif
47d2e52f61b4 Try reducing the #ifdef mess for the different cache variants.
reimar
parents: 31144
diff changeset
538
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
539 int cache_stream_fill_buffer(stream_t *s){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
540 int len;
31835
73f85fc599e0 Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents: 31828
diff changeset
541 int sector_size;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
542 if(!s->cache_pid) return stream_fill_buffer(s);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
543
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
544 if(s->pos!=((cache_vars_t*)s->cache_data)->read_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"!!! read_filepos differs!!! report this bug...\n");
31835
73f85fc599e0 Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents: 31828
diff changeset
545 sector_size = ((cache_vars_t*)s->cache_data)->sector_size;
73f85fc599e0 Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents: 31828
diff changeset
546 if (sector_size > STREAM_MAX_SECTOR_SIZE) {
73f85fc599e0 Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents: 31828
diff changeset
547 mp_msg(MSGT_CACHE, MSGL_ERR, "Sector size %i larger than maximum %i\n", sector_size, STREAM_MAX_SECTOR_SIZE);
73f85fc599e0 Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents: 31828
diff changeset
548 sector_size = STREAM_MAX_SECTOR_SIZE;
73f85fc599e0 Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents: 31828
diff changeset
549 }
2327
2332ba356d03 print stats at read instead of fill
arpi
parents: 2324
diff changeset
550
31835
73f85fc599e0 Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents: 31828
diff changeset
551 len=cache_read(s->cache_data,s->buffer, sector_size);
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
552 //printf("cache_stream_fill_buffer->read -> %d\n",len);
2327
2332ba356d03 print stats at read instead of fill
arpi
parents: 2324
diff changeset
553
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
554 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
31169
ac84149bbdaf Retry reading even if we hit eof before.
reimar
parents: 31167
diff changeset
555 s->eof=0;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
556 s->buf_pos=0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
557 s->buf_len=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
558 s->pos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
559 // printf("[%d]",len);fflush(stdout);
32438
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32037
diff changeset
560 if (s->capture_file)
faefba58f413 Implement a basic capture feature, available through -capture.
diego
parents: 32037
diff changeset
561 stream_capture_do(s);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
562 return len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
563
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
564 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
565
32731
005b026b1231 Convert cache_fill_status into a function so we always get the latest state,
reimar
parents: 32728
diff changeset
566 int cache_fill_status(stream_t *s) {
005b026b1231 Convert cache_fill_status into a function so we always get the latest state,
reimar
parents: 32728
diff changeset
567 cache_vars_t *cv;
005b026b1231 Convert cache_fill_status into a function so we always get the latest state,
reimar
parents: 32728
diff changeset
568 if (!s || !s->cache_data)
005b026b1231 Convert cache_fill_status into a function so we always get the latest state,
reimar
parents: 32728
diff changeset
569 return -1;
005b026b1231 Convert cache_fill_status into a function so we always get the latest state,
reimar
parents: 32728
diff changeset
570 cv = s->cache_data;
005b026b1231 Convert cache_fill_status into a function so we always get the latest state,
reimar
parents: 32728
diff changeset
571 return (cv->max_filepos-cv->read_filepos)/(cv->buffer_size / 100);
005b026b1231 Convert cache_fill_status into a function so we always get the latest state,
reimar
parents: 32728
diff changeset
572 }
005b026b1231 Convert cache_fill_status into a function so we always get the latest state,
reimar
parents: 32728
diff changeset
573
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
574 int cache_stream_seek_long(stream_t *stream,off_t pos){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
575 cache_vars_t* s;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
576 off_t newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
577 if(!stream->cache_pid) return stream_seek_long(stream,pos);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
578
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
579 s=stream->cache_data;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
580 // s->seek_lock=1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
581
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
582 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
583
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
584 newpos=pos/s->sector_size; newpos*=s->sector_size; // align
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
585 stream->pos=s->read_filepos=newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
586 s->eof=0; // !!!!!!!
31141
3b5e8cc5e128 Add code to wake up cache process when e.g. a seek is needed.
reimar
parents: 30731
diff changeset
587 cache_wakeup(stream);
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
588
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
589 cache_stream_fill_buffer(stream);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
590
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
591 pos-=newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
592 if(pos>=0 && pos<=stream->buf_len){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
593 stream->buf_pos=pos; // byte position in sector
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
594 return 1;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
595 }
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
596
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
597 // stream->buf_pos=stream->buf_len=0;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
598 // return 1;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
599
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16152
diff changeset
600 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
601 return 0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
602 }
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
603
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
604 int cache_do_control(stream_t *stream, int cmd, void *arg) {
31190
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
605 int sleep_count = 0;
34373
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
606 int pos_change = 0;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
607 cache_vars_t* s = stream->cache_data;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
608 switch (cmd) {
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
609 case STREAM_CTRL_SEEK_TO_TIME:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
610 s->control_double_arg = *(double *)arg;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
611 s->control = cmd;
34373
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
612 pos_change = 1;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
613 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
614 case STREAM_CTRL_SEEK_TO_CHAPTER:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
615 case STREAM_CTRL_SET_ANGLE:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
616 s->control_uint_arg = *(unsigned *)arg;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
617 s->control = cmd;
34373
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
618 pos_change = 1;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
619 break;
33517
850a3272e10d Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents: 33512
diff changeset
620 // the core might call these every frame, so cache them...
26847
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
621 case STREAM_CTRL_GET_TIME_LENGTH:
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
622 *(double *)arg = s->stream_time_length;
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
623 return s->stream_time_length ? STREAM_OK : STREAM_UNSUPPORTED;
33517
850a3272e10d Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents: 33512
diff changeset
624 case STREAM_CTRL_GET_CURRENT_TIME:
850a3272e10d Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents: 33512
diff changeset
625 *(double *)arg = s->stream_time_pos;
850a3272e10d Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents: 33512
diff changeset
626 return s->stream_time_pos != MP_NOPTS_VALUE ? STREAM_OK : STREAM_UNSUPPORTED;
26924
ca50c4a72f68 100l, fix wrong order of cases in cache_do_control
reimar
parents: 26897
diff changeset
627 case STREAM_CTRL_GET_NUM_CHAPTERS:
ca50c4a72f68 100l, fix wrong order of cases in cache_do_control
reimar
parents: 26897
diff changeset
628 case STREAM_CTRL_GET_CURRENT_CHAPTER:
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
629 case STREAM_CTRL_GET_ASPECT_RATIO:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
630 case STREAM_CTRL_GET_NUM_ANGLES:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
631 case STREAM_CTRL_GET_ANGLE:
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
632 case -2:
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
633 s->control = cmd;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
634 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
635 default:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
636 return STREAM_UNSUPPORTED;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
637 }
31141
3b5e8cc5e128 Add code to wake up cache process when e.g. a seek is needed.
reimar
parents: 30731
diff changeset
638 cache_wakeup(stream);
31190
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
639 while (s->control != -1) {
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
640 if (sleep_count++ == 1000)
33867
76b818cbb359 Mark two warnings that usually only indicate a performance issue as such.
reimar
parents: 33835
diff changeset
641 mp_msg(MSGT_CACHE, MSGL_WARN, "Cache not responding! [performance issue]\n");
31190
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
642 if (stream_check_interrupt(CONTROL_SLEEP_TIME)) {
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
643 s->eof = 1;
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
644 return STREAM_UNSUPPORTED;
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
645 }
8432358f2d32 Improve handling of cache process/thread hanging/being killed.
reimar
parents: 31189
diff changeset
646 }
34373
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
647 // to avoid unnecessary differences with non-cache behaviour,
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
648 // do this also on failure.
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
649 if (pos_change) {
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
650 stream->pos = s->read_filepos;
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
651 stream->eof = s->eof;
7a4dbec9415b Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents: 34283
diff changeset
652 }
33714
5fda3578d1c5 Do not assign anything when a stream control returns an error.
reimar
parents: 33617
diff changeset
653 if (s->control_res != STREAM_OK)
5fda3578d1c5 Do not assign anything when a stream control returns an error.
reimar
parents: 33617
diff changeset
654 return s->control_res;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
655 switch (cmd) {
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
656 case STREAM_CTRL_GET_TIME_LENGTH:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
657 case STREAM_CTRL_GET_CURRENT_TIME:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
658 case STREAM_CTRL_GET_ASPECT_RATIO:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
659 *(double *)arg = s->control_double_arg;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
660 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
661 case STREAM_CTRL_GET_NUM_CHAPTERS:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
662 case STREAM_CTRL_GET_CURRENT_CHAPTER:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
663 case STREAM_CTRL_GET_NUM_ANGLES:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
664 case STREAM_CTRL_GET_ANGLE:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
665 *(unsigned *)arg = s->control_uint_arg;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
666 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
667 }
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
668 return s->control_res;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
669 }