Changeset 350 for trunk/nv/core/handle.hh

Timestamp:

02/04/15 16:37:00 (10 years ago)

Author:

epyon

Message:

• massive untracked updates

File:

• trunk/nv/core/handle.hh (modified) (3 diffs)

trunk/nv/core/handle.hh

@@ -84 +84 @@
                         value_type i = get_free_entry();
                         m_entries[i].counter++;
+                        NV_ASSERT( m_entries[i].counter != 0, "Out of handles!" );
                         m_entries[i].next_free = USED;
                         return hop::create( i, m_entries[i].counter );
@@ -90 +91 @@
                 void free_handle( handle h )
                 {
-                        m_entries[h.index()].next_free = NONE;
-                        if ( m_last_free == -1 )
+                        value_type index = h.index();
+                        typedef handle_operator<HANDLE> hop;
+                        NV_ASSERT( m_entries[index].next_free == USED, "Unused handle freed!" );
+                        NV_ASSERT( m_entries[index].counter == hop::get_counter( h ), "Handle corruption!" );
+                        m_entries[index].next_free = NONE;
+                        if ( m_last_free == NONE )
                         {
-                                m_first_free = m_last_free = h.index();
+                                m_first_free = m_last_free = index;
                                 return;
                         }
-                        m_entries[(unsigned)m_last_free].next_free = h.index();
-                        m_last_free = h.index();
+                        m_entries[(unsigned)m_last_free].next_free = index;
+                        m_last_free = index;
                 }
 
@@ -120 +125 @@
                 value_type get_free_entry()
                 {
-                        if ( m_first_free != -1 )
+                        if ( m_first_free != NONE )
                         {
                                 value_type result = (value_type)m_first_free;
                                 m_first_free = m_entries[result].next_free;
                                 m_entries[result].next_free = USED;
-                                if ( m_first_free == -1 ) m_last_free = -1;
+                                if ( m_first_free == NONE ) m_last_free = NONE;
                                 return result;
                         }