Changeset 403 for trunk/src/core

Timestamp:

06/14/15 14:31:00 (10 years ago)

Author:

epyon

Message:

• got rid of exceptions
• assert enhancements
• lots of minor cleanup

File:

• trunk/src/core/library.cc (modified) (5 diffs)

trunk/src/core/library.cc

@@ -44 +44 @@
         {
                 m_handle = nullptr;
-                NV_THROW( library_error, "Can't load library!", name.data() );
+                NV_LOG_CRITICAL( "library \"", name, "\" : failed to load!" );
+                NV_ABORT( "Can't load library!" );
         }
 }
@@ -70 +71 @@
         return true;
     }
-    NV_LOG_NOTICE( "library : loading '", m_name, "'..." );
+    NV_LOG_NOTICE( "library \"", string_view( m_name ), "\" : loading..." );
 
         std::string name = m_name;
@@ -84 +85 @@
     if ( m_handle == NULL )
     {
-                NV_LOG_NOTICE( "library : '", name, "' failed to open." );
+                NV_LOG_NOTICE( "library \"", string_view( name ), "\" : failed to open!" );
                 return false;
     }
-    NV_LOG_NOTICE( "library : '", name, "' loaded." );
+    NV_LOG_NOTICE( "library \"", string_view( name ), "\" : loaded." );
         return true;
 }
@@ -96 +97 @@
     if ( !result )
     {
-        NV_THROW( library_error, "Can't find symbol " + std::string(symbol.data(),symbol.size()) + "!", m_name );
+                NV_LOG_CRITICAL( "library \"", string_view( m_name ), "\" : can't find symbol \"", symbol, "\"" );
+                NV_ABORT( "Library symbol load failed!" );
     }
         return result;
@@ -115 +117 @@
     if ( ! NV_LIB_CLOSE( m_handle ) )
     {
-        NV_LOG_ERROR( "library : can't close library '", m_name, "'!" );
+        NV_LOG_ERROR( "library \"", string_view( m_name ), "\" : can't close library!" );
     }
     m_handle = nullptr;