FIX: make LEGACY_PLUGIN re-entrant. extern "C" strtok_r() put conditionally into libcommon. (e842d711) · Commits · Elphel / kicad-source-mirror

CMakeModules/PerformFeatureChecks.cmake

+1 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ macro(perform_feature_checks)
		check_symbol_exists(strcasecmp "strings.h" HAVE_STRCASECMP)
		check_symbol_exists(strncasecmp "string.h" HAVE_STRNCASECMP)
		check_symbol_exists(strncasecmp "strings.h" HAVE_STRNCASECMP)
		check_symbol_exists( strtok_r "string.h" HAVE_STRTOKR )

		# Some platforms define malloc and free in malloc.h instead of stdlib.h.
		check_symbol_exists(malloc "stdlib.h" MALLOC_IN_STDLIB_H)

CMakeModules/config.h.cmake

+2 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,8 @@

		#cmakedefine HAVE_STRNCASECMP

		#cmakedefine HAVE_STRTOKR // spelled odly to differ from wx's similar test

		// Handle platform differences in math.h
		#cmakedefine HAVE_MATH_H

common/CMakeLists.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -149,6 +149,10 @@ set(COMMON_SRCS
		zoom.cpp
		)

		if( NOT HAVE_STRTOKR )
		set( COMMON_SRCS ${COMMON_SRCS} strtok_r.c )
		endif()

		enable_language(C CXX ASM)
		set_source_files_properties(system/fcontext.s PROPERTIES COMPILE_FLAGS "-x assembler-with-cpp")

common/footprint_info.cpp

+58 −101

Original line number	Diff line number	Diff line
		@@ -53,9 +53,20 @@


		/*
		wxString ToHTML( const IO_ERROR** aList, int aCount )
		static wxString ToHTMLFragment( const IO_ERROR* aDerivative )
		{
		wxString msg = wxT( "<table>" );
		@todo

		1) change up IO_ERROR so it keeps linenumbers, source file name and
		error message in separate strings.

		2) Add a summarizing virtual member like
		virtual wxString What()
		to combine all portions of an IO_ERROR's text into a single wxString.

		3) Do same for PARSE_ERROR.

		4) Add a "reason or error category" to IO_ERROR and thereby also PARSE_ERROR?

		msg += "

		@@ -175,11 +186,6 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( wxArrayString& aFootprintLibNames )

		#else // yes USE_FP_LIB_TABLE, by all means:


		#if USE_WORKER_THREADS //---------------------------------------------------------------------

		#define USE_WORKER_THREADS 1 // 1:yes, 0:no. use worker threads to load libraries

		#define JOBZ 6 // no. libraries per worker thread. It takes about
		// a second to load a GITHUB library, so assigning
		// this no. libraries to each thread should give a little
		@@ -191,7 +197,6 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( wxArrayString& aFootprintLibNames )
		// in progress will still pile on for a bit. e.g. if 9 threads
		// expect 9 greater than this.


		void FOOTPRINT_LIST::loader_job( const wxString* aNicknameList, int aJobZ )
		{
		//DBG(printf( "%s: first:'%s' count:%d\n", __func__, (char) TO_UTF8( aNicknameList ), aJobZ );)
		@@ -225,7 +230,7 @@ void FOOTPRINT_LIST::loader_job( const wxString* aNicknameList, int aJobZ )
		}
		catch( const PARSE_ERROR& pe )
		{
		// push_back is not thread safe, use the lock the MUTEX.
		// m_errors.push_back is not thread safe, lock its MUTEX.
		MUTLOCK lock( m_errors_lock );

		++m_error_count; // modify only under lock
		@@ -244,7 +249,7 @@ void FOOTPRINT_LIST::loader_job( const wxString* aNicknameList, int aJobZ )
		// worker threads.
		catch( const std::exception& se )
		{
		// this is a round about way to do this, but who knows what THROW_IO_ERROR()
		// This is a round about way to do this, but who knows what THROW_IO_ERROR()
		// may be tricked out to do someday, keep it in the game.
		try
		{
		@@ -261,8 +266,6 @@ void FOOTPRINT_LIST::loader_job( const wxString* aNicknameList, int aJobZ )
		}
		}

		#endif // USE_WORKER_THREADS ---------------------------------------------------


		bool FOOTPRINT_LIST::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxString* aNickname )
		{
		@@ -275,14 +278,15 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxString* a
		m_errors.clear();
		m_list.clear();

		if( aNickname )
		// single footprint
		loader_job( aNickname, 1 );
		else
		{
		std::vector< wxString > nicknames;

		if( !aNickname )
		// do all of them
		nicknames = aTable->GetLogicalLibs();
		else
		// single footprint
		nicknames.push_back( *aNickname );

		#if USE_WORKER_THREADS

		@@ -309,7 +313,6 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxString* a
		jobz = nicknames.size() - i;

		// Only a little bit to do, I'll do it myself, on current thread.
		// This is the path for a single footprint also.
		loader_job( &nicknames[i], jobz );
		}
		else
		@@ -329,8 +332,12 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxString* a
		{
		threads[i].join();
		}
		#else
		loader_job( &nicknames[0], nicknames.size() );
		#endif

		m_list.sort();
		}

		// The result of this function can be a blend of successes and failures, whose
		// mix is given by the Count()s of the two lists. The return value indicates whether
		@@ -338,57 +345,7 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxString* a
		// false definitely means failure.

		return retv;

		#else

		bool retv = true;

		for( unsigned ii = 0; ii < nicknames.size(); ii++ )
		{
		const wxString& nickname = nicknames[ii];

		try
		{
		wxArrayString fpnames = aTable->FootprintEnumerate( nickname );

		for( unsigned i=0; i<fpnames.GetCount(); ++i )
		{
		std::auto_ptr<MODULE> m( aTable->FootprintLoad( nickname, fpnames[i] ) );

		// we're loading what we enumerated, all must be there.
		wxASSERT( m.get() );

		FOOTPRINT_INFO* fpinfo = new FOOTPRINT_INFO();

		fpinfo->SetNickname( nickname );

		fpinfo->m_Module = fpnames[i];
		fpinfo->m_padCount = m->GetPadCount( MODULE::DO_NOT_INCLUDE_NPTH );
		fpinfo->m_KeyWord = m->GetKeywords();
		fpinfo->m_Doc = m->GetDescription();

		AddItem( fpinfo );
		}
		}
		catch( const PARSE_ERROR& pe )
		{
		m_errors.push_back( new IO_ERROR( pe ) );
		retv = false;
		}
		catch( const IO_ERROR& ioe )
		{
		m_errors.push_back( new IO_ERROR( ioe ) );
		retv = false;
		}
		}

		m_list.sort();

		return retv;

		#endif
		}

		#endif // USE_FP_LIB_TABLE

include/kicad_string.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -164,4 +164,9 @@ wxString GetIllegalFileNameWxChars();
		*/
		bool ReplaceIllegalFileNameChars( std::string* aName );

		#ifndef HAVE_STRTOKR
		// common/strtok_r.c optionally:
		extern "C" char* strtok_r( char* str, const char* delim, char** nextp );
		#endif

		#endif // KICAD_STRING_H_

Admin message