@ -17,147 +17,403 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
# include "mllistcache.hpp" # include "mllistcache.hpp"
# include "vlc_diffutil.h"
const MLListCache : : ItemType * MLListCache : : get ( size_t index ) const namespace {
//callbacks for the diff algorithm to access the data
uint32_t cacheDataLength ( const void * data )
{ {
assert ( m_total_count > = 0 & & index < static_cast < size_t > ( m_total_count ) ) ; auto list = static_cast < const std : : vector < MLListCache : : ItemType > * > ( data ) ;
if ( index < m_offset | | index > = m_offset + m_list . size ( ) ) assert ( list ) ;
return nullptr ; return list - > size ( ) ;
}
bool cacheDataCompare ( const void * dataOld , uint32_t oldIndex , const void * dataNew , uint32_t newIndex )
{
auto listOld = static_cast < const std : : vector < MLListCache : : ItemType > * > ( dataOld ) ;
auto listNew = static_cast < const std : : vector < MLListCache : : ItemType > * > ( dataNew ) ;
assert ( listOld ) ;
assert ( listNew ) ;
assert ( oldIndex < listOld - > size ( ) ) ;
assert ( newIndex < listNew - > size ( ) ) ;
return listOld - > at ( oldIndex ) - > getId ( ) = = listNew - > at ( newIndex ) - > getId ( ) ;
}
return & m_list [ index - m_offset ] ;
} }
const MLListCache : : ItemType * MLListCache : : find ( const std : : function < bool ( const MLListCache : : ItemType & ) > & & f , int * index ) const MLListCache : : MLListCache ( MediaLib * medialib , std : : unique_ptr < ListCacheLoader < MLListCache : : ItemType > > & & loader , size_t chunkSize )
: m_medialib ( medialib )
, m_loader ( loader . release ( ) )
, m_chunkSize ( chunkSize )
{ {
if ( m_total_count < = 0 ) assert ( medialib ) ;
return nullptr ; }
for ( auto iter = std : : begin ( m_list ) ; iter ! = std : : end ( m_list ) ; + + iter ) const MLListCache : : ItemType * MLListCache : : get ( size_t index ) const
{
//the view may access the model while we're updating it
//everything before m_partialIndex is updated in the new model,
//everything after m_partialIndex is still valid in the old model
if ( unlikely ( m_oldData ) )
{ {
if ( f ( * iter ) ) if ( m_cachedData )
{
if ( index > = m_partialLoadedCount )
return nullptr ;
else if ( index > = m_partialIndex )
return & m_oldData - > list . at ( index - m_partialIndex + m_partialX ) ;
else
return & m_cachedData - > list . at ( index ) ;
}
else
{ {
if ( index ) if ( index > = m_oldData - > loadedCount )
* index = m_offset + std : : distance ( std : : begin ( m_list ) , iter ) ; return nullptr ;
return & ( * iter ) ; return & m_oldData - > list . at ( index ) ;
} }
} }
return nullptr ; if ( ! m_cachedData )
return nullptr ;
if ( index + 1 > m_cachedData - > loadedCount )
return nullptr ;
return & m_cachedData - > list . at ( index ) ;
}
const MLListCache : : ItemType * MLListCache : : find ( const std : : function < bool ( const MLListCache : : ItemType & ) > & & f , int * index ) const
{
if ( ! m_cachedData | | m_cachedData - > totalCount = = 0 )
return nullptr ;
auto it = std : : find_if ( m_cachedData - > list . cbegin ( ) , m_cachedData - > list . cend ( ) , f ) ;
if ( it = = m_cachedData - > list . cend ( ) )
return nullptr ;
if ( index )
* index = std : : distance ( m_cachedData - > list . cbegin ( ) , it ) ;
return & ( * it ) ;
} }
int MLListCache : : updateItem ( std : : unique_ptr < MLItem > & & newItem ) int MLListCache : : updateItem ( std : : unique_ptr < MLItem > & & newItem )
{ {
//we can't update an item locally while the model has pending updates
//no worry, we'll receive the update once the actual model notifies us
if ( m_oldData )
return - 1 ;
MLItemId mlid = newItem - > getId ( ) ; MLItemId mlid = newItem - > getId ( ) ;
auto it = std : : find_if ( m_list . begin ( ) , m_list . end ( ) , [ mlid ] ( const ItemType & item ) { //this may be inneficient to look at every items, maybe we can have a hashmap to access the items by id
auto it = std : : find_if ( m_cachedData - > list . begin ( ) , m_cachedData - > list . end ( ) , [ mlid ] ( const ItemType & item ) {
return ( item - > getId ( ) = = mlid ) ; return ( item - > getId ( ) = = mlid ) ;
} ) ; } ) ;
//item not found
//item not found
if ( it = = m_list . end ( ) ) if ( it = = m_cachedData - > list . end ( ) )
return - 1 ; return - 1 ;
int pos = m_offset + std : : distance ( m_list . begin ( ) , it ) ; int pos = std : : distance ( m_cachedData - > list . begin ( ) , it ) ;
* it = std : : move ( newItem ) ; * it = std : : move ( newItem ) ;
emit localDataChanged ( pos , pos ) ;
return pos ; return pos ;
} }
int MLListCache : : deleteItem ( const MLItemId & mlid ) int MLListCache : : deleteItem ( const MLItemId & mlid )
{ {
auto it = std : : find_if ( m_list . begin ( ) , m_list . end ( ) , [ mlid ] ( const ItemType & item ) { //we can't update an item locally while the model has pending updates
//no worry, we'll receive the update once the actual model notifies us
if ( m_oldData )
return - 1 ;
auto it = std : : find_if ( m_cachedData - > list . begin ( ) , m_cachedData - > list . end ( ) , [ mlid ] ( const ItemType & item ) {
return ( item - > getId ( ) = = mlid ) ; return ( item - > getId ( ) = = mlid ) ;
} ) ; } ) ;
//item not found
//item not found
if ( it = = m_list . end ( ) ) if ( it = = m_cachedData - > list . end ( ) )
return - 1 ; return - 1 ;
int pos = m_offset + std : : distance ( m_list . begin ( ) , it ) ;
m_list . erase ( it , it ) ; int pos = std : : distance ( m_cachedData - > list . begin ( ) , it ) ;
m_total_count - = 1 ;
emit beginRemoveRows ( pos , pos ) ;
m_cachedData - > list . erase ( it , it + 1 ) ;
size_t delta = m_cachedData - > loadedCount - m_cachedData - > list . size ( ) ;
m_cachedData - > loadedCount - = delta ;
m_cachedData - > totalCount - = delta ;
emit endRemoveRows ( ) ;
emit localSizeChanged ( m_cachedData - > totalCount ) ;
return pos ; return pos ;
} }
ssize_t MLListCache : : count ( ) const ssize_t MLListCache : : count ( ) const
{ {
return m_total_count ; if ( ! m_cachedData )
return - 1 ;
return m_cachedData - > totalCount ;
} }
void MLListCache : : initCount ( ) void MLListCache : : initCount ( )
{ {
assert ( ! m_countRequested ) ; assert ( ! m_cachedData ) ;
asyncCount ( ) ; asyncCountAndLoad ( ) ;
} }
void MLListCache : : refer ( size_t index ) void MLListCache : : refer ( size_t index )
{ {
if ( m_total_count = = - 1 | | index > = static_cast < size_t > ( m_total_count ) ) //m_maxReferedIndex is in terms of number of item, not the index
{ index + + ;
/*
* The request is incompatible with the total count of the list . if ( ! m_cachedData )
*
* Either the count is not retrieved yet , or the content has changed in
* the loader source .
*/
return ; return ;
if ( index > m_cachedData - > totalCount )
return ;
/* index is already in the list */
if ( index < = m_cachedData - > loadedCount )
return ;
if ( index > m_maxReferedIndex )
{
m_maxReferedIndex = index ;
if ( ! m_appendTask & & ! m_countTask )
{
if ( m_cachedData )
asyncFetchMore ( ) ;
else
asyncCountAndLoad ( ) ;
}
}
}
void MLListCache : : invalidate ( )
{
if ( m_cachedData )
{
if ( m_cachedData & & ! m_oldData )
{
m_oldData = std : : move ( m_cachedData ) ;
m_partialX = 0 ;
}
else
m_cachedData . reset ( ) ;
}
if ( m_appendTask )
{
m_medialib - > cancelMLTask ( this , m_appendTask ) ;
m_appendTask = 0 ;
}
if ( m_countTask )
{
m_needReload = true ;
}
else
{
asyncCountAndLoad ( ) ;
}
}
void MLListCache : : partialUpdate ( )
{
//compare the model the user have and the updated model
//and notify for changes
vlc_diffutil_callback_t diffOp = {
cacheDataLength ,
cacheDataLength ,
cacheDataCompare
} ;
diffutil_snake_t * snake = vlc_diffutil_build_snake ( & diffOp , & m_oldData - > list , & m_cachedData - > list ) ;
vlc_diffutil_changelist_t * changes = vlc_diffutil_build_change_list (
snake , & diffOp , & m_oldData - > list , & m_cachedData - > list ,
VLC_DIFFUTIL_RESULT_AGGREGATE ) ;
m_partialIndex = 0 ;
m_partialLoadedCount = m_oldData - > loadedCount ;
size_t partialTotalCount = m_oldData - > totalCount ;
for ( size_t i = 0 ; i < changes - > size ; i + + )
{
vlc_diffutil_change_t & op = changes - > data [ i ] ;
switch ( op . type )
{
case VLC_DIFFUTIL_OP_IGNORE :
break ;
case VLC_DIFFUTIL_OP_INSERT :
m_partialX = op . op . insert . x ;
m_partialIndex = op . op . insert . index ;
emit beginInsertRows ( op . op . insert . index , op . op . insert . index + op . count - 1 ) ;
m_partialIndex + = op . count ;
m_partialLoadedCount + = op . count ;
partialTotalCount + = op . count ;
emit endInsertRows ( ) ;
emit localSizeChanged ( partialTotalCount ) ;
break ;
case VLC_DIFFUTIL_OP_REMOVE :
m_partialX = op . op . remove . x ;
m_partialIndex = op . op . remove . index + op . count - 1 ;
emit beginRemoveRows ( op . op . remove . index , op . op . remove . index + op . count - 1 ) ;
m_partialLoadedCount - = op . count ;
m_partialX + = op . count ;
m_partialIndex = op . op . remove . index + 1 ;
partialTotalCount - = op . count ;
emit endRemoveRows ( ) ;
emit localSizeChanged ( partialTotalCount ) ;
break ;
case VLC_DIFFUTIL_OP_MOVE :
emit beginMoveRows ( op . op . move . from , op . op . move . from + op . count - 1 , op . op . move . to ) ;
//TODO
emit endMoveRows ( ) ;
break ;
}
} }
vlc_diffutil_free_change_list ( changes ) ;
vlc_diffutil_free_snake ( snake ) ;
//ditch old model
m_oldData . reset ( ) ;
/* index outside the known portion of the list */ //if we have change outside our cache
if ( ! m_lastRangeRequested . contains ( index ) ) //just notify for addition/removal at a the end of the list
if ( partialTotalCount ! = m_cachedData - > totalCount )
{ {
/* FIXME bad heuristic if the interval of visible items crosses a cache
if ( partialTotalCount > m_cachedData - > totalCount )
* page boundary */ {
size_t offset = index - index % m_chunkSize ; emit beginRemoveRows ( m_cachedData - > totalCount - 1 , partialTotalCount - 1 ) ;
size_t count = qMin ( m_total_count - offset , m_chunkSize ) ; emit endRemoveRows ( ) ;
asyncLoad ( offset , count ) ; emit localSizeChanged ( m_cachedData - > totalCount ) ;
}
else
{
emit beginInsertRows ( partialTotalCount - 1 , m_cachedData - > totalCount - 1 ) ;
emit endInsertRows ( ) ;
emit localSizeChanged ( m_cachedData - > totalCount ) ;
}
} }
} }
void MLListCache : : asyncCount ( ) void MLListCache : : asyncCountAndLoad ( )
{ {
assert ( ! m_countTask ) ; if ( m_countTask )
m_medialib - > cancelMLTask ( this , m_countTask ) ;
size_t count = std : : max ( m_maxReferedIndex , m_chunkSize ) ;
m_countRequested = true ;
struct Ctx { struct Ctx {
ssize_t totalCount ; size_t totalCount ;
std : : vector < ItemType > list ;
} ; } ;
m_medialib - > runOnMLThread < Ctx > ( this ,
m_countTask = m_medialib - > runOnMLThread < Ctx > ( this ,
//ML thread
//ML thread
[ loader = m_loader ] ( vlc_medialibrary_t * ml , Ctx & ctx ) [ loader = m_loader , count = count ] ( vlc_medialibrary_t * ml , Ctx & ctx )
{ {
ctx . list = loader - > load ( ml , 0 , count ) ;
ctx . totalCount = loader - > count ( ml ) ; ctx . totalCount = loader - > count ( ml ) ;
} , } ,
//UI thread
//UI thread
[ this ] ( quint64 , Ctx & ctx ) { [ this ] ( quint64 taskId , Ctx & ctx )
m_total_count = ctx . totalCount ; {
if ( m_countTask ! = taskId )
return ;
//quite unlikley but model may change between count and load
if ( unlikely ( ctx . list . size ( ) > ctx . totalCount ) )
{
ctx . totalCount = ctx . list . size ( ) ;
m_needReload = true ;
}
m_cachedData = std : : make_unique < CacheData > ( std : : move ( ctx . list ) , ctx . totalCount ) ;
if ( m_oldData )
{
partialUpdate ( ) ;
}
else
{
if ( m_cachedData - > totalCount > 0 )
{
//no previous data, we insert everything
emit beginInsertRows ( 0 , m_cachedData - > totalCount - 1 ) ;
emit endInsertRows ( ) ;
emit localSizeChanged ( m_cachedData - > totalCount ) ;
}
}
m_countTask = 0 ; m_countTask = 0 ;
emit localSizeChanged ( m_total_count ) ; if ( m_needReload )
{
m_needReload = false ;
m_oldData = std : : move ( m_cachedData ) ;
m_partialX = 0 ;
asyncCountAndLoad ( ) ;
}
else if ( m_maxReferedIndex < m_cachedData - > loadedCount )
{
m_maxReferedIndex = m_cachedData - > loadedCount ;
}
else if ( m_maxReferedIndex > m_cachedData - > loadedCount
& & m_maxReferedIndex < = m_cachedData - > totalCount )
{
asyncFetchMore ( ) ;
}
} }
) ; ) ;
} }
void MLListCache : : asyncLoad ( size_t offset , size_t count ) void MLListCache : : asyncFetchMore ( )
{ {
if ( m_loadTask ) if ( m_maxReferedIndex < = m_cachedData - > loadedCount )
m_medialib - > cancelMLTask ( this , m_loadTask ) ; return ;
assert ( m_cachedData ) ;
if ( m_appendTask )
m_medialib - > cancelMLTask ( this , m_appendTask ) ;
m_maxReferedIndex = std : : min ( m_cachedData - > totalCount , m_maxReferedIndex ) ;
size_t count = ( ( m_maxReferedIndex - m_cachedData - > loadedCount ) / m_chunkSize + 1 ) * m_chunkSize ;
m_lastRangeRequested = { offset , count } ;
struct Ctx { struct Ctx {
std : : vector < ItemType > list ; std : : vector < ItemType > list ;
} ; } ;
m_loadTask = m_medialib - > runOnMLThread < Ctx > ( this , m_appen dTask = m_medialib - > runOnMLThread < Ctx > ( this ,
//ML thread
//ML thread
[ loader = m_loader , offset , count ] [ loader = m_loader , offset = m_cachedData - > loadedCount , count ]
( vlc_medialibrary_t * ml , Ctx & ctx ) ( vlc_medialibrary_t * ml , Ctx & ctx )
{ {
ctx . list = loader - > load ( ml , offset , count ) ; ctx . list = loader - > load ( ml , offset , count ) ;
} , } ,
//UI thread
//UI thread
[ this , offset ] ( quint64 , Ctx & ctx ) [ this ] ( quint64 taskId , Ctx & ctx )
{ {
m_loadTask = 0 ; if ( taskId ! = m_appendTask )
return ;
assert ( m_cachedData ) ;
int updatedCount = ctx . list . size ( ) ;
if ( updatedCount > = 0 )
{
int updatedOffset = m_cachedData - > loadedCount ;
std : : move ( ctx . list . begin ( ) , ctx . list . end ( ) , std : : back_inserter ( m_cachedData - > list ) ) ;
m_cachedData - > loadedCount + = updatedCount ;
emit localDataChanged ( updatedOffset , updatedOffset + updatedCount - 1 ) ;
}
m_offset = offset ; m_appendTask = 0 ;
m_list = std : : move ( ctx . list ) ; if ( m_maxReferedIndex > m_cachedData - > loadedCount )
if ( m_list . size ( ) ) {
emit localDataChanged ( offset , m_list . size ( ) ) ; asyncFetchMore ( ) ;
}
} }
) ; ) ;
} }
Pierre Lamot
4 years ago
Jean-Baptiste Kempf