haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Performance fixes for the place footprint list all dialog. 

Smartens the cache freshness checking, and adds checksums of
constituent-directory last-mod-dates to the footprint info
list.

Also inserts the dataPtrs into the list at the same time as
the text to keep wxWidgets from measuring the width of the
text twice (yes, really).  And converts the list to default-
column widths in case the wxWidgets patch is present to
greatly speed list creation (by not measuring all that text).

On my machine drops the first-load time from 4s to 2.5s and
the subsequent-load times from 2.5s to < 1s.  With the
wxWidgets patch subsequent-loads become near-instantaneous.
This commit is contained in:
Jeff Young 2018-02-05 20:55:00 +00:00 committed by Wayne Stambaugh
parent a7cdd94212
commit 916f79d5a1
8 changed files with 88 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
common/displlst.cpp
View File

@ -33,6 +33,15 @@
#include <kicad_string.h>
#include <dialog_helpers.h>
// wxWidgets spends *far* too long calcuating column widths (most of it, believe it or
// not, in repeatedly creating/destorying a wxDC to do the measurement in).
// Use default column widths instead. (Note that these will be scaled down proportionally
// to fit the available space when the dialog is instantiated.)
static int DEFAULT_COL_WIDTHS[] = { 400, 200 };
EDA_LIST_DIALOG::EDA_LIST_DIALOG( EDA_DRAW_FRAME* aParent, const wxString& aTitle,
const wxArrayString& aItemHeaders,
const std::vector<wxArrayString>& aItemList,
@ -64,19 +73,11 @@ EDA_LIST_DIALOG::EDA_LIST_DIALOG( EDA_DRAW_FRAME* aParent, const wxString& aTitl
}
void EDA_LIST_DIALOG::initDialog( const wxArrayString& aItemHeaders,
const wxString& aSelection)
void EDA_LIST_DIALOG::initDialog( const wxArrayString& aItemHeaders, const wxString& aSelection)
{
for( unsigned i = 0; i < aItemHeaders.Count(); i++ )
{
wxListItem column;
column.SetId( i );
column.SetText( aItemHeaders.Item( i ) );
m_listBox->InsertColumn( i, column );
}
m_listBox->InsertColumn( i, aItemHeaders.Item( i ),
wxLIST_FORMAT_LEFT, DEFAULT_COL_WIDTHS[ i ] );
InsertItems( *m_itemsListCp, 0 );
@ -86,15 +87,6 @@ void EDA_LIST_DIALOG::initDialog( const wxArrayString& aItemHeaders,
m_staticTextMsg->Show( false );
}
for( unsigned col = 0; col < aItemHeaders.Count(); ++col )
{
m_listBox->SetColumnWidth( col, wxLIST_AUTOSIZE );
int columnwidth = m_listBox->GetColumnWidth( col );
m_listBox->SetColumnWidth( col, wxLIST_AUTOSIZE_USEHEADER );
int headerwidth = m_listBox->GetColumnWidth( col );
m_listBox->SetColumnWidth( col, std::max( columnwidth, headerwidth ) );
}
if( !!aSelection )
{
for( unsigned row = 0; row < m_itemsListCp->size(); ++row )
@ -177,18 +169,25 @@ void EDA_LIST_DIALOG::InsertItems( const std::vector< wxArrayString >& itemList,
{
wxASSERT( (int) itemList[row].GetCount() == m_listBox->GetColumnCount() );
long itemIndex = 0;
for( unsigned col = 0; col < itemList[row].GetCount(); col++ )
{
wxListItem info;
info.m_itemId = row + position;
info.m_col = col;
info.m_text = itemList[row].Item( col );
info.m_width = DEFAULT_COL_WIDTHS[ col ];
info.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_WIDTH;
if( col == 0 )
{
itemIndex = m_listBox->InsertItem( row+position, itemList[row].Item( col ) );
m_listBox->SetItemPtrData( itemIndex, wxUIntPtr( &itemList[row].Item( col ) ) );
info.m_data = wxUIntPtr( &itemList[row].Item( col ) );
info.m_mask |= wxLIST_MASK_DATA;
m_listBox->InsertItem( info );
}
else
{
m_listBox->SetItem( itemIndex, col, itemList[row].Item( col ) );
m_listBox->SetItem( info );
}
}
}

22
common/fp_lib_table.cpp
View File

@ -235,6 +235,28 @@ void FP_LIB_TABLE::Format( OUTPUTFORMATTER* aOutput, int aIndentLevel ) const
}
long long FP_LIB_TABLE::GenLastModifiedChecksum( const wxString* aNickname )
{
if( aNickname )
{
const FP_LIB_TABLE_ROW* row = FindRow( *aNickname );
wxASSERT( (PLUGIN*) row->plugin );
return row->plugin->GetLibModificationTime( *aNickname ).GetValue().GetValue();
}
long long hash = 0;
for( wxString const& nickname : GetLogicalLibs() )
{
const FP_LIB_TABLE_ROW* row = FindRow( nickname );
wxASSERT( (PLUGIN*) row->plugin );
hash += row->plugin->GetLibModificationTime( nickname ).GetValue().GetValue();
}
return hash;
}
void FP_LIB_TABLE::FootprintEnumerate( wxArrayString& aFootprintNames, const wxString& aNickname )
{
const FP_LIB_TABLE_ROW* row = FindRow( aNickname );

6
include/fp_lib_table.h
View File

@ -151,6 +151,12 @@ public:
*/
void FootprintEnumerate( wxArrayString& aFootprintNames, const wxString& aNickname );
/**
* Generate a checksum of the last-mod-date of \a aNickname's directory, or a checksum
* of all the libraries' directories if \a aNickname is NULL.
*/
long long GenLastModifiedChecksum( const wxString* aNickname );
/**
* Function PrefetchLib
* If possible, prefetches the specified library (e.g. performing downloads). Does not parse.

9
pcbnew/footprint_info_impl.cpp
View File

@ -123,11 +123,18 @@ void FOOTPRINT_LIST_IMPL::loader_job()
bool FOOTPRINT_LIST_IMPL::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxString* aNickname )
{
if( aTable->GenLastModifiedChecksum( aNickname ) == m_libraries_last_mod_checksum )
return true;
FOOTPRINT_ASYNC_LOADER loader;
loader.SetList( this );
loader.Start( aTable, aNickname );
return loader.Join();
bool retval = loader.Join();
m_libraries_last_mod_checksum = aTable->GenLastModifiedChecksum( aNickname );
return retval;
}

1
pcbnew/footprint_info_impl.h
View File

@ -62,6 +62,7 @@ class FOOTPRINT_LIST_IMPL : public FOOTPRINT_LIST
SYNC_QUEUE<wxString> m_queue_out;
std::atomic_bool m_first_to_finish;
std::atomic_size_t m_count_finished;
long long m_libraries_last_mod_checksum;
/**
* Call aFunc, pushing any IO_ERRORs and std::exceptions it throws onto m_errors.

10
pcbnew/io_mgr.h
View File

@ -28,6 +28,7 @@
#include <richio.h>
#include <map>
#include <functional>
#include <wx/time.h>
class BOARD;
class PLUGIN;
@ -352,6 +353,15 @@ public:
virtual void FootprintEnumerate( wxArrayString& aFootprintNames, const wxString& aLibraryPath,
const PROPERTIES* aProperties = NULL );
/**
* Return the footprint lib last-mod-time, if available.
*/
virtual wxDateTime GetLibModificationTime( const wxString& aLibraryPath ) const
{
// Default implementation.
return wxDateTime::Now(); // If we don't know then we must assume the worst.
}
/**
* Function PrefetchLib
* If possible, prefetches the specified library (e.g. performing downloads). Does not parse.

66
pcbnew/kicad_plugin.cpp
View File

@ -200,6 +200,7 @@ public:
FP_CACHE::FP_CACHE( PCB_IO* aOwner, const wxString& aLibraryPath )
: m_mod_time( 0.0 )
{
m_owner = aOwner;
m_lib_path.SetPath( aLibraryPath );
@ -208,6 +209,9 @@ FP_CACHE::FP_CACHE( PCB_IO* aOwner, const wxString& aLibraryPath )
wxDateTime FP_CACHE::GetLibModificationTime() const
{
if( !m_lib_path.DirExists() )
return wxDateTime::Now();
return m_lib_path.GetModificationTime();
}
@ -368,57 +372,7 @@ bool FP_CACHE::IsPath( const wxString& aPath ) const
bool FP_CACHE::IsModified( const wxString& aLibPath, const wxString& aFootprintName ) const
{
// The library is modified if the library path got deleted or changed.
if( !m_lib_path.DirExists() || !IsPath( aLibPath ) )
return true;
wxLogTrace( traceFootprintLibrary, wxT( "File '%s', m_mod_time %s-%s, file mod time: %s-%s." ),
GetChars( m_lib_path.GetPath() ),
GetChars( m_mod_time.FormatDate() ), GetChars( m_mod_time.FormatTime() ),
GetChars( m_lib_path.GetModificationTime().FormatDate() ),
GetChars( m_lib_path.GetModificationTime().FormatTime() ) );
// If a file is added to or remove from the library path, the cache needs reloaded.
if( m_mod_time != m_lib_path.GetModificationTime() )
return true;
// If no footprint was specified, check every file modification time against the time
// it was loaded.
if( aFootprintName.IsEmpty() )
{
for( MODULE_CITER it = m_modules.begin(); it != m_modules.end(); ++it )
{
wxFileName fn = m_lib_path;
fn.SetName( it->second->GetFileName().GetName() );
fn.SetExt( KiCadFootprintFileExtension );
if( !fn.FileExists() )
{
wxLogTrace( traceFootprintLibrary,
wxT( "Footprint cache file '%s' does not exist." ),
fn.GetFullPath().GetData() );
return true;
}
if( it->second->IsModified() )
{
wxLogTrace( traceFootprintLibrary,
wxT( "Footprint cache file '%s' has been modified." ),
fn.GetFullPath().GetData() );
return true;
}
}
}
else
{
MODULE_CITER it = m_modules.find( aFootprintName );
if( it == m_modules.end() || it->second->IsModified() )
return true;
}
return false;
return GetLibModificationTime() > m_mod_time;
}
@ -2150,6 +2104,16 @@ void PCB_IO::FootprintDelete( const wxString& aLibraryPath, const wxString& aFoo
}
wxDateTime PCB_IO::GetLibModificationTime( const wxString& aLibraryPath ) const
{
if( !m_cache )
return wxDateTime::Now(); // force a load
return m_cache->GetLibModificationTime();
}
void PCB_IO::FootprintLibCreate( const wxString& aLibraryPath, const PROPERTIES* aProperties )
{
if( wxDir::Exists( aLibraryPath ) )

2
pcbnew/kicad_plugin.h
View File

@ -130,6 +130,8 @@ public:
void FootprintDelete( const wxString& aLibraryPath, const wxString& aFootprintName,
const PROPERTIES* aProperties = NULL ) override;
wxDateTime GetLibModificationTime( const wxString& aLibraryPath ) const override;
void FootprintLibCreate( const wxString& aLibraryPath, const PROPERTIES* aProperties = NULL) override;
bool FootprintLibDelete( const wxString& aLibraryPath, const PROPERTIES* aProperties = NULL ) override;