Changeset 399 for trunk/src/core

Timestamp:

06/13/15 11:47:09 (10 years ago)

Author:

epyon

Message:

• naming cleanup
• string_ref -> string_view (compatible with C++17 standard!)
• *_ref and const_*_ref, renamed to _ref and _view for consistency

Location:

trunk/src/core

Files:

• library.cc (modified) (6 diffs)
• logger.cc (modified) (5 diffs)
• profiler.cc (modified) (5 diffs)

trunk/src/core/library.cc

@@ -41 +41 @@
 }
 
-void library::open( string_ref name )
+void library::open( string_view name )
 {
         m_name.assign( name.data(), name.size() );
@@ -51 +51 @@
 }
 
-bool nv::library::try_open( string_ref name )
+bool nv::library::try_open( string_view name )
 {
         m_name.assign( name.data(), name.size() );
@@ -62 +62 @@
 }
 
-string_ref library::get_name() const
+string_view library::get_name() const
 {
-    return string_ref( m_name );
+    return string_view( m_name );
 }
 
@@ -76 +76 @@
 
         std::string name = m_name;
-        string_ref ext( NV_LIB_EXT );
+        string_view ext( NV_LIB_EXT );
 
         if ( name.length() < ext.length() || name.substr( name.length() - ext.length(), ext.length() ) != ext )
@@ -94 +94 @@
 }
 
-void* library::get( string_ref symbol )
+void* library::get( string_view symbol )
 {
         void* result = (void*) NV_LIB_GET( (NV_LIB_HANDLE) m_handle, symbol.data() );
@@ -104 +104 @@
 }
 
-void* nv::library::try_get( string_ref symbol )
+void* nv::library::try_get( string_view symbol )
 {
         return (void*) NV_LIB_GET( (NV_LIB_HANDLE) m_handle, symbol.data() );

trunk/src/core/logger.cc

@@ -85 +85 @@
 
 // log function
-void logger::log( log_level level, const string_ref& message )
+void logger::log( log_level level, const string_view& message )
 {
         for ( auto& sink_info : m_log_sinks )
@@ -141 +141 @@
 
 // console logging
-void log_console_sink::log( log_level level, const string_ref& message )
+void log_console_sink::log( log_level level, const string_view& message )
 {
         char stamp[16];
@@ -177 +177 @@
 
 // handle logging
-void log_handle_sink::log( log_level level, const string_ref& message )
+void log_handle_sink::log( log_level level, const string_view& message )
 {
         char stamp[16];
@@ -204 +204 @@
 }
 
-nv::log_file_sink::log_file_sink( const string_ref& file_name, bool flush_always /*= true */ )
+nv::log_file_sink::log_file_sink( const string_view& file_name, bool flush_always /*= true */ )
         : log_handle_sink( nullptr, flush_always )
 {
@@ -257 +257 @@
 }
 
-string_ref nv::log_sink::level_name( log_level level ) const
+string_view nv::log_sink::level_name( log_level level ) const
 {
         return NV_LOG_LEVEL_NAME( level );
 }
 
-string_ref nv::log_sink::padded_level_name( log_level level ) const
-{
-        return string_ref( NV_LOG_LEVEL_NAME_PAD( level ), 8 );
-}
-
+string_view nv::log_sink::padded_level_name( log_level level ) const
+{
+        return string_view( NV_LOG_LEVEL_NAME_PAD( level ), 8 );
+}
+

trunk/src/core/profiler.cc

@@ -30 +30 @@
 }
 
-void profiler::start_profile( const string_ref& tag )
+void profiler::start_profile( const string_view& tag )
 {
         if ( tag != m_current->m_tag )
@@ -47 +47 @@
 }
 
-profiler::node::node( const string_ref& tag, node* parent )
+profiler::node::node( const string_view& tag, node* parent )
         : m_tag( tag.to_string() )
         , m_parent( parent )
@@ -58 +58 @@
 }
 
-profiler::node* profiler::node::request_child( const string_ref& tag )
+profiler::node* profiler::node::request_child( const string_view& tag )
 {
         std::string stag( tag.to_string() );
@@ -110 +110 @@
         char buffer[128];
         snprintf( buffer, 128, "%-23s %6s %6s %9s %6s", "TAG", "%PARNT", "CALLS", "TOTAL(ms)", "AVG(ms)" );
-        NV_LOG_INFO( string_ref( buffer, nvstrlen( buffer ) ) );
+        NV_LOG_INFO( string_view( buffer, nvstrlen( buffer ) ) );
         log_node_children( 0, m_root );
         NV_LOG_INFO( "-- PROFILER REPORT END ---------------------------------" );
@@ -131 +131 @@
                         snprintf( buffer + indent, 128 - indent, "%*.*s %6.2f %6d %9.2f %6.2f", indent - 23, 23 - indent,
                                 c->m_tag.c_str(), pparent, calls, total_ms, avg_ms );
-                        NV_LOG_INFO( string_ref( buffer, nvstrlen( buffer ) ) );
+                        NV_LOG_INFO( string_view( buffer, nvstrlen( buffer ) ) );
                         if ( c->m_children.size() > 0 )
                         {