smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

Don't cache peakfile reads, but still cache the generated peak data.

Browse source 
Clean up some other cruft.
This commit is contained in:
nick_m 2015-02-24 04:57:33 +11:00
parent 1990839728
commit eec505621a
2 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/ardour/ardour/audiosource.h
View file

@ -170,7 +170,6 @@ class LIBARDOUR_API AudioSource : virtual public Source,
mutable size_t _last_raw_map_length; mutable size_t _last_raw_map_length;
mutable bool _first_run; mutable bool _first_run;
mutable double _last_scale; mutable double _last_scale;
mutable boost::scoped_array<PeakData> staging;
mutable boost::scoped_array<PeakData> peak_cache; mutable boost::scoped_array<PeakData> peak_cache;
}; };

24
libs/ardour/audiosource.cc
View file

@ -392,7 +392,7 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t
if (scale == 1.0) { if (scale == 1.0) {
off_t first_peak_byte = (start / samples_per_file_peak) * sizeof (PeakData); off_t first_peak_byte = (start / samples_per_file_peak) * sizeof (PeakData);
ssize_t bytes_to_read = sizeof (PeakData)* npeaks; size_t bytes_to_read = sizeof (PeakData)* npeaks;
/* open, read, close */ /* open, read, close */
DEBUG_TRACE (DEBUG::Peaks, "DIRECT PEAKS\n"); DEBUG_TRACE (DEBUG::Peaks, "DIRECT PEAKS\n");
@ -400,27 +400,23 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t
uint32_t map_off = first_peak_byte; uint32_t map_off = first_peak_byte;
uint32_t read_map_off = map_off & ~(BUFSIZE - 1); uint32_t read_map_off = map_off & ~(BUFSIZE - 1);
uint32_t map_delta = map_off - read_map_off; uint32_t map_delta = map_off - read_map_off;
size_t raw_map_length = bytes_to_read;
size_t map_length = bytes_to_read + map_delta; size_t map_length = bytes_to_read + map_delta;
if (_first_run || (_last_map_off != map_off) || (_last_scale != samples_per_visual_peak) || (_last_raw_map_length < raw_map_length)) { if (_first_run || (_last_map_off != map_off) || (_last_scale != samples_per_visual_peak) || (_last_raw_map_length < bytes_to_read)) {
peak_cache.reset (new PeakData[npeaks]); peak_cache.reset (new PeakData[npeaks]);
staging.reset (new PeakData[npeaks]); boost::scoped_array<PeakData> staging (new PeakData[npeaks]);
//posix_fadvise (sfd, read_map_off, map_length, POSIX_FADV_WILLNEED);
char* addr = (char*) mmap (0, map_length, PROT_READ, MAP_PRIVATE, sfd, read_map_off); char* addr = (char*) mmap (0, map_length, PROT_READ, MAP_PRIVATE, sfd, read_map_off);
if (addr == MAP_FAILED) { if (addr == MAP_FAILED) {
cerr << "mmap error - could not map peak file to mem." << endl; error << _("map failed - could not mmap peakfile.") << endmsg;
return -1; return -1;
} }
memcpy ((void*)staging.get(), (void*)(addr + map_delta), raw_map_length); memcpy ((void*)peak_cache.get(), (void*)(addr + map_delta), bytes_to_read);
munmap (addr, map_length); munmap (addr, map_length);
memcpy ((void*)peak_cache.get(), (void*)staging.get(), bytes_to_read);
_last_map_off = map_off; _last_map_off = map_off;
_last_raw_map_length = raw_map_length; _last_raw_map_length = bytes_to_read;
_first_run = false; _first_run = false;
if (zero_fill) { if (zero_fill) {
@ -471,14 +467,12 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t
if (_first_run || (_last_map_off != map_off) || (_last_scale != samples_per_visual_peak) || (_last_raw_map_length < raw_map_length)) { if (_first_run || (_last_map_off != map_off) || (_last_scale != samples_per_visual_peak) || (_last_raw_map_length < raw_map_length)) {
peak_cache.reset (new PeakData[npeaks]); peak_cache.reset (new PeakData[npeaks]);
staging.reset (new PeakData[chunksize]); boost::scoped_array<PeakData> staging (new PeakData[chunksize]);
//posix_fadvise (sfd, read_map_off, map_length, POSIX_FADV_WILLNEED);
char* addr; char* addr;
addr = (char*) mmap (0, map_length, PROT_READ, MAP_PRIVATE, sfd, read_map_off); addr = (char*) mmap (0, map_length, PROT_READ, MAP_PRIVATE, sfd, read_map_off);
if (addr == MAP_FAILED) { if (addr == MAP_FAILED) {
cerr << "mmap error - could not map peak file to mem." << endl; error << _("map failed - could not mmap peakfile.") << endmsg;
return -1; return -1;
} }