Changeset 403 for trunk/src

Timestamp:

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

Author:

epyon

Message:

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

Location:

trunk/src

Files:

• core/library.cc (modified) (5 diffs)
• gfx/texture_font.cc (modified) (4 diffs)
• gl/gl_context.cc (modified) (3 diffs)
• gl/gl_device.cc (modified) (2 diffs)
• lua/lua_state.cc (modified) (6 diffs)
• stl/assert.cc (modified) (1 diff)

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;

trunk/src/gfx/texture_font.cc

@@ -11 +11 @@
 
 using namespace nv;
+
+#define NV_CHECK_FREETYPE_ERROR( error, ... ) \
+if ( error != 0 ) { \
+        NV_LOG_CRITICAL( "freetype : ", __VA_ARGS__ ); \
+        NV_ABORT( "freetype : freetype library error!" ); \
+}
 
 texture_glyph::texture_glyph()
@@ -45 +51 @@
          
         error = FT_Init_FreeType( (FT_Library*)(&m_rlibrary) );
-        if ( error ) NV_THROW( std::runtime_error, "FT_Error" );
+        NV_CHECK_FREETYPE_ERROR( error, "error on FT_Init_FreeType, code - ", error );
 
         error = FT_New_Face( (FT_Library)(m_rlibrary), filename, 0, (FT_Face*)(&m_rface) );
-        if ( error ) NV_THROW( std::runtime_error, "FT_Error" );
+        NV_CHECK_FREETYPE_ERROR( error, "error on FT_New_Face, code - ", error );
 
         error = FT_Set_Char_Size( (FT_Face)(m_rface), (int)(size*64), 0, 72*64, 72 ); 
-        if ( error ) NV_THROW( std::runtime_error, "FT_Error" );
+        NV_CHECK_FREETYPE_ERROR( error, "error on FT_Set_Char_Size, code - ", error );
 
     FT_Set_Transform( (FT_Face)(m_rface), &matrix, NULL );
@@ -123 +129 @@
                 FT_UInt glyph_index = FT_Get_Char_Index( face, c ); 
                 FT_Error error = FT_Load_Glyph( face, glyph_index, flags ); 
-                if ( error )
-                {
-                        NV_LOG_ERROR( "FT_Error while loading glyphs, error: ", error, " code: ", c );
-                        NV_THROW( std::runtime_error, "FT_Error while loading glyphs" );
-                }
+                NV_CHECK_FREETYPE_ERROR( error, "error on FT_Load_Glyph, gylph '", c ,"' code - ", error );
 
                 FT_GlyphSlot slot   = face->glyph;
@@ -141 +143 @@
                 if ( r.pos.x < 0 ) 
                 {
-                        NV_LOG_ERROR( "Atlas full while loading glyphs, r.pos.x: ", r.pos.x, " code: ", c );
-                        NV_THROW( std::runtime_error, "Atlas full while loading glyphs" );
+                        NV_LOG_CRITICAL( "texture_font : atlas full while loading glyphs, gylph '", c, "' r.pos.x = ", r.pos.x );
+                        NV_ABORT( "texture_font : atlas full while loading gylphs!" );
                 }
                 if (depth == 4)

trunk/src/gl/gl_context.cc

@@ -379 +379 @@
 void gl_context::set_viewport( const ivec4& viewport )
 {
-        if ( viewport.z < 0 || viewport.w < 0 )
-        {
-                NV_THROW( logic_error, "viewport width and height must be greater than zero!");
-        }
-
+        NV_ASSERT_ALWAYS( viewport.z > 0 && viewport.w > 0, "viewport dimensions must be greater than zero!" );
         m_viewport = viewport;
         glViewport( viewport.x, viewport.y, viewport.z, viewport.w );
@@ -456 +452 @@
         }
 
-        if ( scissor.dim.x < 0 || scissor.dim.y < 0 )
-        {
-                NV_THROW( logic_error, "scissor_test.rect width and height must be greater than zero!" );
-        }
 
         if ( scissor.enabled )
         {
+                NV_ASSERT_ALWAYS( scissor.dim.x > 0 && scissor.dim.y > 0, "scissor_test.rect dimension equal to zero!" );
+
                 if ( m_render_state.scissor_test.dim != scissor.dim || m_render_state.scissor_test.pos != scissor.pos )
                 {
@@ -514 +508 @@
 void gl_context::apply_depth_range( const depth_range& range )
 {
-        if ( range.near < 0.0 || range.near > 1.0 )
-        {
-                NV_THROW( logic_error, "render_state.depth_range.near must be between zero and one!");
-        }
-        if ( range.far < 0.0 || range.far > 1.0 )
-        {
-                NV_THROW( logic_error, "render_state.depth_range.far must be between zero and one!");
-        }
+        NV_ASSERT_ALWAYS( range.near >= 0.0 && range.near <= 1.0, "render_state.depth_range.near must be between zero and one!" );
+        NV_ASSERT_ALWAYS( range.far  >= 0.0 && range.far  <= 1.0, "render_state.depth_range.far must be between zero and one!" );
 
         if ((m_render_state.depth_range.far  != range.far) ||

trunk/src/gl/gl_device.cc

@@ -238 +238 @@
                 if ( fatal )
                 {
-                        NV_LOG_ERROR( "Uniform '", name, "' not found in program!" );
-                        NV_THROW( runtime_error, ( "Uniform '"+name+"' not found!" ) );
+                        NV_LOG_CRITICAL( "gl_device : uniform '", string_view( name ), "' not found in program!" );
+                        NV_ABORT( "gl_device : uniform not found!" );
                 }
         }
@@ -257 +257 @@
                 if ( fatal )
                 {
-                        NV_LOG_ERROR( "Attribute '", name, "' not found in program!" );
-                        NV_THROW( runtime_error, ( "Attribute '"+ name + "' not found!" ) );
+                        NV_LOG_CRITICAL( "gl_device : attribute '", string_view( name ), "' not found in program!" );
+                        NV_ABORT( "gl_device : attribute not found!" );
                 }
         }

trunk/src/lua/lua_state.cc

@@ -15 +15 @@
 
 // stack_guard
+
+#define NV_LUA_ABORT( func, ... ) \
+        NV_LOG_CRITICAL( "lua::" func " : ", __VA_ARGS__ ) \
+        NV_ABORT( "lua::" func " : critical error!" )
+
 
 lua::stack_guard::stack_guard( lua::state* aL )
@@ -424 +429 @@
         if ( lua_isnil( m_state, -1 ) )
         {
-                NV_THROW( runtime_error, lua_name.to_string() + " type not registered!" );
+                NV_LUA_ABORT( "state::register_object", lua_name, " type not registered!" );
         }
         deep_pointer_copy( -1, o );
@@ -436 +441 @@
         if ( lua_isnil( m_state, -1 ) )
         {
-                NV_THROW( runtime_error, storage.to_string() + " storage not registered!" );
+                NV_LUA_ABORT( "state::register_proto", "\"", storage, "\" storage not registered!" );
         }
         lua_getfield( m_state, -1, id.data() );
         if ( lua_isnil( m_state, -1 ) )
         {
-                NV_THROW( runtime_error, id.to_string() + " not found in " + storage.to_string() + " storage!" );
+                NV_LUA_ABORT( "state::register_proto", "\"", id, "\" not found in \"", storage, "\"!" );
         }
         return lua::ref( luaL_ref( m_state, LUA_REGISTRYINDEX ) );
@@ -452 +457 @@
         if ( lua_isnil( m_state, -1 ) )
         {
-                NV_THROW( runtime_error, lua_name.to_string() + " type not registered!" );
+                NV_LUA_ABORT( "state::register_native_object_method", "\"", lua_name, "\" type not registered!" );
         }
         lua_pushcfunction( m_state, f );
@@ -502 +507 @@
         if ( has_functions || has_metatable )
         {
-                lua_pushstring( m_state, "__ptr" );
+                lua_pushliteral( m_state, "__ptr" );
                 lua_pushlightuserdata( m_state, obj );
                 lua_rawset( m_state, -3 );
@@ -569 +574 @@
         if ( lua_isnil( m_state, -1 ) )
         {
-                NV_THROW( runtime_error, name.to_string() + " type not registered!" );
+                NV_LUA_ABORT( "state::register_singleton", "\"", name, "\" type not registered!" );
         }
         deep_pointer_copy( -1, o );

trunk/src/stl/assert.cc

@@ -9 +9 @@
 #include "nv/base/assert.hh"
 #undef NV_BASE_COMMON_HH
+#include "nv/core/logging.hh"
 
+extern "C" {
 #if NV_COMPILER == NV_MSVC
+        NV_NORETURN void __cdecl exit( _In_ int _Code );
+#else
+        void exit( int status_code ) NV_NORETURN;
+#endif
+}
 
-#       if NV_DEBUG
-
+#if NV_DEBUG
+#       if NV_COMPILER == NV_MSVC
 extern "C" {
         void __cdecl _wassert( const wchar_t * _Message, const wchar_t *_File, unsigned _Line );
 }
 
-void nv_internal_assert( const wchar_t * message, const wchar_t* file, unsigned line )
+void nv::detail::assert_fail( const wchar_t * message, const wchar_t* file, unsigned line )
 {
         _wassert( message, file, line );
 }
-#       else  
-        void nv_internal_assert( const wchar_t *, const wchar_t*, unsigned ) {}
-#       endif  // NV_DEBUG
-#else // NV_COMPILER
-
-#       if NV_DEBUG
+#       else // NV_COMPILER
 #       if NV_COMPILER == NV_CLANG
 extern "C" {
-        extern void __assert(const char *, const char *, unsigned int, const char *)
-                __attribute__ ((__noreturn__));
+        extern void __assert(const char *, const char *, unsigned int, const char *) NV_NORETURN;
 }
+#define NV_ASSERT_IMPL __assert
 #       else
 extern "C" {
-        extern void __assert_fail(const char *, const char *, unsigned int, const char *)
-                __attribute__ ((__noreturn__));
+        extern void __assert_fail(const char *, const char *, unsigned int, const char *) NV_NORETURN;
 }
+#define NV_ASSERT_IMPL __assert_fail
 #       endif
-__attribute__( ( __noreturn__ ) ) void nv_internal_assert( const char * assertion, const char * file, unsigned int line, const char * function )
+NV_NORETURN void nv::detail::assert_fail( const char * assertion, const char * file, unsigned int line, const char * function )
 {
-#       if NV_COMPILER == NV_CLANG
-        __assert(assertion, file, line, function );
-#       else
-        __assert_fail(assertion, file, line, function );
-#       endif
-}
-#       else
-void nv_internal_assert( const char * , const char * , unsigned int , const char * )
-{
+        NV_ASSERT_IMPL (assertion, file, line, function );
 }
 #       endif
 
-#endif // NV_COMPILER
+#endif // NV_DEBUG
 
+NV_NORETURN void nv::detail::abort( const char * msg, const char * file, unsigned int line, const char * function )
+{
+        NV_LOG_CRITICAL( "Abort called : ", msg );
+        NV_LOG_CRITICAL( "  in ", file, ":", line, " (", function, ")" );
+        NV_LOG_CRITICAL( "Aborting..." );
+        exit( 1 );
+}
+
+NV_NORETURN void nv::detail::assert_abort( const char * msg, const char * file, unsigned int line, const char * function )
+{
+        NV_LOG_CRITICAL( "Assertion failed: (", msg, ")" );
+        NV_LOG_CRITICAL( "  in ", file, ":", line, " (", function, ")" );
+        NV_LOG_CRITICAL( "Aborting..." );
+        exit( 1 );
+}