Merge pull request #670 from Point72/tkp/likely

Move to C++20 likely

Author: timkpaine

cpp/csp/adapters/kafka/KafkaConsumer.cpp

@@ -202,7 +202,7 @@ void KafkaConsumer::poll()
             //We tend to accumulate more cases over time of error states that leave the engine deadlocked on PushPull adapters.
             //This section is for cases where we get an error that is not topic specific, but is consumer specific, but we know its non-recoverable
             //if it gets too long, or we realize that ANY error here should stop the engine, we can just always make it stop
-            if( unlikely( msg -> err() == RdKafka::ERR_GROUP_AUTHORIZATION_FAILED ) )
+            if( msg -> err() == RdKafka::ERR_GROUP_AUTHORIZATION_FAILED ) [[unlikely]]
             {
                 m_mgr -> forceShutdown( RdKafka::err2str( msg -> err() ) + " error: " + msg -> errstr() );
                 continue;

cpp/csp/adapters/parquet/ParquetInputAdapterManager.cpp

@@ -203,7 +203,7 @@ void ParquetInputAdapterManager::stop()
 
 DateTime ParquetInputAdapterManager::processNextSimTimeSlice( DateTime time )
 {
-    if( unlikely( !m_reader || !m_reader -> hasData() ) )
+    if( !m_reader || !m_reader -> hasData() ) [[unlikely]]
     {
         return DateTime::NONE();
     }
@@ -223,7 +223,7 @@ DateTime ParquetInputAdapterManager::processNextSimTimeSlice( DateTime time )
         }
         nextDataTime = m_timestampColumnAdapter -> getCurValue<DateTime>();
     }
-    if( unlikely( nextDataTime.value().isNone() || ( !m_endTime.isNone() && ( m_endTime - m_time_shift ) < nextDataTime ) ) )
+    if( nextDataTime.value().isNone() || ( !m_endTime.isNone() && ( m_endTime - m_time_shift ) < nextDataTime ) ) [[unlikely]]
     {
         return DateTime::NONE();
     }
@@ -250,7 +250,7 @@ DateTime ParquetInputAdapterManager::processNextSimTimeSlice( DateTime time )
         nextDataTime = m_reader -> hasData() ? m_timestampColumnAdapter -> getCurValue<DateTime>() : DateTime::NONE();
     } while( !nextDataTime.value().isNone() && nextDataTime == data_reference_time );
 
-    if( unlikely( nextDataTime -> isNone() ) )
+    if( nextDataTime -> isNone() ) [[unlikely]]
     {
         return DateTime::NONE();
     }

cpp/csp/adapters/parquet/ParquetReader.cpp

@@ -224,12 +224,12 @@ bool SingleTableParquetReader::skipRow()
 
 bool SingleTableParquetReader::readNextRow()
 {
-    if( unlikely( m_curTable == nullptr ) )
+    if( m_curTable == nullptr ) [[unlikely]]
     {
         return false;
     }
 
-    if( unlikely( m_curTableNextRow >= m_curTable -> num_rows() ) )
+    if( m_curTableNextRow >= m_curTable -> num_rows() ) [[unlikely]]
     {
         if( !readNextRowGroup() )
         {
@@ -565,11 +565,11 @@ bool MultipleFileParquetReader::skipRow()
             ++successfulSkips;
         }
     }
-    if(unlikely(successfulSkips == 0))
+    if(successfulSkips == 0) [[unlikely]]
     {
         return false;
     }
-    if(unlikely(successfulSkips!=m_columnReaders.size()))
+    if(successfulSkips!=m_columnReaders.size()) [[unlikely]]
     {
         CSP_THROW(RuntimeException, "Input files are not alligned - some columns have more data than the others");
     }

cpp/csp/adapters/parquet/ParquetReader.h

@@ -173,7 +173,7 @@ class ParquetReader
     {
         for( int i = 0; i < nRows; ++i )
         {
-            if(unlikely(!skipRow()))
+            if(!skipRow()) [[unlikely]]
             {
                 return false;
             }

cpp/csp/adapters/parquet/ParquetReaderColumnAdapter.cpp

@@ -493,7 +493,7 @@ void ParquetStructAdapter::addSubscriber( ValueDispatcher::SubscriberType subscr
 
 void ParquetStructAdapter::dispatchValue( const utils::Symbol *symbol, bool isNull )
 {
-    if(unlikely(m_needsReset))
+    if(m_needsReset) [[unlikely]]
     {
         m_resetFunc();
         m_needsReset = false;

cpp/csp/adapters/parquet/ParquetWriter.cpp

@@ -186,7 +186,7 @@ void ParquetWriter::stop()
 
 void ParquetWriter::onEndCycle()
 {
-    if( likely( isFileOpen() ) )
+    if( isFileOpen() ) [[likely]]
     {
         // This must be defined outside of the "if" below, the datetime object must live till the end of cycle since
         // We pass all values by reference
@@ -266,7 +266,7 @@ void ParquetWriter::writeCurChunkToFile()
 {
     if( m_curChunkSize > 0 )
     {
-        if( unlikely( !isFileOpen() ) )
+        if( !isFileOpen() ) [[unlikely]]
         {
             if(m_curChunkSize != 0 )
             {

cpp/csp/core/CMakeLists.txt

@@ -8,7 +8,6 @@ set(CORE_PUBLIC_HEADERS
       FileUtils.h
       Generator.h
       Hash.h
-      Likely.h
       QueueWaiter.h
       Platform.h
       SRMWLockFreeQueue.h

cpp/csp/core/DynamicBitSet.h

@@ -1,7 +1,6 @@
 #ifndef _IN_CSP_CORE_DYNAMICBITSET_H
 #define _IN_CSP_CORE_DYNAMICBITSET_H
 
-#include <csp/core/Likely.h>
 #include <csp/core/Platform.h>
 #include <type_traits>
 
@@ -89,7 +88,7 @@ class DynamicBitSet
     index_type find_next( index_type value ) const
     {
         auto [ node, bit ] = locateValue( value );
-        if( likely( bit != _bits - 1 ) )
+        if( bit != _bits - 1 ) [[likely]]
         {
             node_type shifted = m_nodes[ node ] >> ( bit + 1 );
             if( shifted )
@@ -102,7 +101,7 @@ class DynamicBitSet
         }
         while( node < m_numNodes && !m_nodes[ node ] );
 
-        if( unlikely( node == m_numNodes ) )
+        if( node == m_numNodes ) [[unlikely]]
             return npos;
         else
             bit = ffs( m_nodes[ node ] ) - 1;
@@ -113,7 +112,7 @@ class DynamicBitSet
     index_type find_prev( index_type value ) const
     {
         auto [ node, bit ] = locateValue( value );
-        if( likely( bit != 0 ) )
+        if( bit != 0 ) [[likely]]
         {
             auto shifted = m_nodes[ node ] << ( _bits - bit );
             if( shifted )
@@ -126,7 +125,7 @@ class DynamicBitSet
         }
         while( node >= 0 && !( m_nodes[ node ] ) );
 
-        if( unlikely( node < 0 ) )
+        if( node < 0 ) [[unlikely]]
             return npos;
         else
             bit = _bits - clz( m_nodes[ node ] ) - 1;
@@ -141,7 +140,7 @@ class DynamicBitSet
         {
             node_type * old = m_nodes;
             m_nodes = new node_type[ newNodes ];
-            if( likely( m_numNodes > 0 ) )
+            if( m_numNodes > 0 ) [[likely]]
                 memcpy( m_nodes, old, m_numNodes * sizeof( node_type ) );
             memset( m_nodes + m_numNodes, 0, ( newNodes - m_numNodes ) * sizeof( node_type ) );
 

cpp/csp/core/Exception.h

@@ -4,7 +4,6 @@
 #include <exception>
 #include <sstream>
 #include <string.h>
-#include <csp/core/Likely.h>
 #include <csp/core/Platform.h>
 
 namespace csp
@@ -86,7 +85,7 @@ template<typename T>
 #define CSP_THROW( EX_TYPE, MSG )         do { std::stringstream desc; desc << MSG ;  csp::throw_exc(EX_TYPE( #EX_TYPE, desc.str(), __FILENAME__ , __FUNCTION__ , __LINE__  )); } while( 0 )
 #define CSP_THROW_EX( EX_TYPE, MSG, ... ) do { std::stringstream desc; desc << MSG ;  csp::throw_exc(EX_TYPE( #EX_TYPE, desc.str(), __FILENAME__ , __FUNCTION__ , __LINE__ , __VA_ARGS__ )); } while( 0 )
 
-#define CSP_TRUE_OR_THROW( EXPR, EXCEPTION_TYPE, MESSAGE ) do {if( unlikely(!((EXPR))) ) { CSP_THROW( EXCEPTION_TYPE, MESSAGE ); }} while(false)
+#define CSP_TRUE_OR_THROW( EXPR, EXCEPTION_TYPE, MESSAGE ) do {if( !((EXPR)) ) [[unlikely]] { CSP_THROW( EXCEPTION_TYPE, MESSAGE ); }} while(false)
 #define CSP_TRUE_OR_THROW_RUNTIME(EXPR, MESSAGE) CSP_TRUE_OR_THROW(EXPR, csp::RuntimeException, MESSAGE)
 #define CSP_NOT_IMPLEMENTED CSP_THROW(csp::NotImplemented, "");