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

Reduce KIID size from 20 to 16 bytes. 

Removes separate legacy timestamp value.
This commit is contained in:
Alex Shvartzkop 2024-06-20 13:59:15 +03:00
parent f5be388acd
commit b143ffb797
3 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
common/kiid.cpp
View File

@ -73,8 +73,6 @@ KIID& NilUuid()
KIID::KIID() KIID::KIID()
{ {
m_cached_timestamp = 0;
#if BOOST_VERSION >= 106700 #if BOOST_VERSION >= 106700
try try
{ {
@ -102,16 +100,14 @@ KIID::KIID()
KIID::KIID( int null ) : KIID::KIID( int null ) :
m_uuid( nilGenerator() ), m_uuid( nilGenerator() )
m_cached_timestamp( 0 )
{ {
wxASSERT( null == 0 ); wxASSERT( null == 0 );
} }
KIID::KIID( const std::string& aString ) : KIID::KIID( const std::string& aString ) :
m_uuid(), m_uuid()
m_cached_timestamp( 0 )
{ {
if( aString.length() == 8 if( aString.length() == 8
&& std::all_of( aString.begin(), aString.end(), && std::all_of( aString.begin(), aString.end(),
@ -128,17 +124,12 @@ KIID::KIID( const std::string& aString ) :
std::string octet = aString.substr( i * 2, 2 ); std::string octet = aString.substr( i * 2, 2 );
m_uuid.data[i + 12] = strtol( octet.data(), nullptr, 16 ); m_uuid.data[i + 12] = strtol( octet.data(), nullptr, 16 );
} }
m_cached_timestamp = strtol( aString.c_str(), nullptr, 16 );
} }
else else
{ {
try try
{ {
m_uuid = stringGenerator( aString ); m_uuid = stringGenerator( aString );
if( IsLegacyTimestamp() )
m_cached_timestamp = strtol( aString.substr( 28 ).c_str(), nullptr, 16 );
} }
catch( ... ) catch( ... )
{ {
@ -206,18 +197,10 @@ bool KIID::SniffTest( const wxString& aCandidate )
KIID::KIID( timestamp_t aTimestamp ) KIID::KIID( timestamp_t aTimestamp )
{ {
m_cached_timestamp = aTimestamp; m_uuid.data[12] = static_cast<uint8_t>( aTimestamp >> 24 );
m_uuid.data[13] = static_cast<uint8_t>( aTimestamp >> 16 );
// A legacy-timestamp-based UUID has only the last 4 octets filled in. m_uuid.data[14] = static_cast<uint8_t>( aTimestamp >> 8 );
// Convert them individually to avoid stepping in the little-endian/big-endian m_uuid.data[15] = static_cast<uint8_t>( aTimestamp );
// doo-doo.
wxString str = AsLegacyTimestampString();
for( int i = 0; i < 4; ++i )
{
wxString octet = str.substr( i * 2, 2 );
m_uuid.data[i + 12] = strtol( octet.data(), nullptr, 16 );
}
} }
@ -229,7 +212,14 @@ bool KIID::IsLegacyTimestamp() const
timestamp_t KIID::AsLegacyTimestamp() const timestamp_t KIID::AsLegacyTimestamp() const
{ {
return m_cached_timestamp; timestamp_t ret = 0;
ret |= m_uuid.data[12] << 24;
ret |= m_uuid.data[13] << 16;
ret |= m_uuid.data[14] << 8;
ret |= m_uuid.data[15];
return ret;
} }
@ -250,7 +240,6 @@ size_t KIID::Hash() const
void KIID::Clone( const KIID& aUUID ) void KIID::Clone( const KIID& aUUID )
{ {
m_uuid = aUUID.m_uuid; m_uuid = aUUID.m_uuid;
m_cached_timestamp = aUUID.m_cached_timestamp;
} }
@ -277,7 +266,6 @@ void KIID::ConvertTimestampToUuid()
if( !IsLegacyTimestamp() ) if( !IsLegacyTimestamp() )
return; return;
m_cached_timestamp = 0;
m_uuid = randomGenerator(); m_uuid = randomGenerator();
} }

2
include/kiid.h
View File

@ -126,8 +126,6 @@ public:
private: private:
boost::uuids::uuid m_uuid; boost::uuids::uuid m_uuid;
timestamp_t m_cached_timestamp;
}; };

26
qa/tests/common/test_kiid.cpp
View File

@ -19,6 +19,7 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <kiid.h> #include <kiid.h>
#include <wx/string.h>
BOOST_AUTO_TEST_SUITE( Kiid ) BOOST_AUTO_TEST_SUITE( Kiid )
@ -70,4 +71,29 @@ BOOST_AUTO_TEST_CASE( KiidPathTest )
} }
BOOST_AUTO_TEST_CASE( LegacyTimestamp )
{
timestamp_t ts_a = 0xAABBCCDD;
timestamp_t ts_b = 0x00000012;
wxString str_a( wxS( "AABBCCDD" ) );
wxString str_b( wxS( "00000012" ) );
KIID a( ts_a );
KIID b( ts_b );
BOOST_CHECK( a.AsLegacyTimestamp() == ts_a );
BOOST_CHECK( a.AsLegacyTimestampString() == str_a );
BOOST_CHECK( b.AsLegacyTimestamp() == ts_b );
BOOST_CHECK( b.AsLegacyTimestampString() == str_b );
BOOST_CHECK( KIID( str_a ).AsLegacyTimestamp() == ts_a );
BOOST_CHECK( KIID( str_b ).AsLegacyTimestamp() == ts_b );
BOOST_CHECK( KIID( str_a ).AsLegacyTimestampString() == str_a );
BOOST_CHECK( KIID( str_b ).AsLegacyTimestampString() == str_b );
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()