Remove support for recursive CL_INIT/CL_DEINIT calls.

Added clearing gp_mem_tracker pointer after destruction.

Signed-off-by: Fab Tillier (ftillier@silverstorm.com)
git-svn-id: svn://openib.tc.cornell.edu/gen1@72 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/core/complib/cl_memory.c b/trunk/core/complib/cl_memory.c
index 3ed52f018b70c0d3c839683bd847a9941d702475..671509c4dbe087522d2c98e0c6ec0c722b0b1373 100644 (file)
--- a/trunk/core/complib/cl_memory.c
+++ b/trunk/core/complib/cl_memory.c
@@ -42,11 +42,9 @@
 \r
 \r
 #include "cl_memtrack.h"\r
-#include <complib/cl_atomic.h>\r
 \r
 \r
 cl_mem_tracker_t               *gp_mem_tracker = NULL;\r
-atomic32_t                             g_mem_trk_ref = 0;\r
 \r
 \r
 /*\r
@@ -75,10 +73,7 @@ __cl_mem_track_start( void )
        cl_status_t                     status;\r
 \r
        if( gp_mem_tracker )\r
-       {\r
-               cl_atomic_inc( &g_mem_trk_ref );\r
                return;\r
-       }\r
 \r
        /* Allocate the memory tracker object. */\r
        gp_mem_tracker = (cl_mem_tracker_t*)\r
@@ -100,8 +95,6 @@ __cl_mem_track_start( void )
                return;\r
        }\r
 \r
-       cl_atomic_inc( &g_mem_trk_ref );\r
-\r
        cl_msg_out( "\n\n\n*** Memory tracker object address = %p ***\n\n\n",\r
                gp_mem_tracker );\r
 }\r
@@ -119,9 +112,6 @@ __cl_mem_track_stop( void )
        if( !gp_mem_tracker )\r
                return;\r
 \r
-       if( cl_atomic_dec( &g_mem_trk_ref ) )\r
-               return;\r
-\r
        if( cl_qmap_count( &gp_mem_tracker->alloc_map ) )\r
        {\r
                /* There are still items in the list.  Print them out. */\r
@@ -151,6 +141,7 @@ __cl_mem_track_stop( void )
 \r
        /* Free the memory allocated for the memory tracker object. */\r
        __cl_free_priv( gp_mem_tracker );\r
+       gp_mem_tracker = NULL;\r
 }\r
 \r
 \r

diff --git a/trunk/core/complib/cl_obj.c b/trunk/core/complib/cl_obj.c
index 74483421e51a3e1da983cb1725a236f78782027e..d07c8f9110918bad59e5ca3fc55ee03227710129 100644 (file)
--- a/trunk/core/complib/cl_obj.c
+++ b/trunk/core/complib/cl_obj.c
@@ -43,7 +43,6 @@
 \r
 /* The global object manager. */\r
 cl_obj_mgr_t                           *gp_obj_mgr = NULL;\r
-atomic32_t                                     g_cl_obj_ref = 0;\r
 \r
 \r
 \r
@@ -58,10 +57,7 @@ cl_obj_mgr_create()
 \r
        /* See if the object manager has already been created. */\r
        if( gp_obj_mgr )\r
-       {\r
-               cl_atomic_inc( &g_cl_obj_ref );\r
                return CL_SUCCESS;\r
-       }\r
 \r
        /* Allocate the object manager. */\r
        gp_obj_mgr = cl_zalloc( sizeof( cl_obj_mgr_t ) );\r
@@ -74,8 +70,6 @@ cl_obj_mgr_create()
        cl_async_proc_construct( &gp_obj_mgr->async_proc_mgr );\r
        cl_qpool_construct( &gp_obj_mgr->rel_pool );\r
 \r
-       cl_atomic_inc( &g_cl_obj_ref );\r
-\r
        /* Initialize the spinlock. */\r
        status = cl_spinlock_init( &gp_obj_mgr->lock );\r
        if( status != CL_SUCCESS )\r
@@ -116,10 +110,6 @@ cl_obj_mgr_destroy()
        if( !gp_obj_mgr )\r
                return;\r
 \r
-       /* See if this is the last call. */\r
-       if( cl_atomic_dec( &g_cl_obj_ref ) )\r
-               return;\r
-\r
        /* Verify that all object's have been destroyed. */\r
        for( p_list_item = cl_qlist_head( &gp_obj_mgr->obj_list );\r
                 p_list_item != cl_qlist_end( &gp_obj_mgr->obj_list );\r