Allow cl_timer_stop to be called from timer callback thread.

git-svn-id: svn://openib.tc.cornell.edu/gen1@59 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/core/complib/user/cl_timer.c b/trunk/core/complib/user/cl_timer.c
index 5c19cb84c5008019c4aa58bf4c3bad7dd8393377..9df169f494116bde5126667ea2e68f6fce338096 100644 (file)
--- a/trunk/core/complib/user/cl_timer.c
+++ b/trunk/core/complib/user/cl_timer.c
@@ -44,8 +44,11 @@ __timer_callback(
        UNUSED_PARAM( timer_signalled );\r
 \r
        p_timer->timeout_time = 0;\r
+       p_timer->thread_id = GetCurrentThreadId();\r
 \r
        (p_timer->pfn_callback)( (void*)p_timer->context );\r
+\r
+       p_timer->thread_id = 0;\r
 }\r
 \r
 \r
@@ -55,6 +58,7 @@ cl_timer_construct(
 {\r
        p_timer->h_timer = NULL;\r
        p_timer->timeout_time = 0;\r
+       p_timer->thread_id = 0;\r
 }\r
 \r
 \r
@@ -134,7 +138,7 @@ cl_timer_stop(
 {\r
        CL_ASSERT( p_timer );\r
 \r
-       if( p_timer->h_timer )\r
+       if( p_timer->h_timer && p_timer->thread_id != GetCurrentThreadId() )\r
        {\r
                /* Make sure we block until the timer is cancelled. */\r
                DeleteTimerQueueTimer( NULL, p_timer->h_timer, INVALID_HANDLE_VALUE );\r

diff --git a/trunk/inc/user/complib/cl_timer_osd.h b/trunk/inc/user/complib/cl_timer_osd.h
index f68004d60b32740232d0da7cf4420838bf90a5f3..0a023ba60992bd11b5058f95ab61ba01aad87bdd 100644 (file)
--- a/trunk/inc/user/complib/cl_timer_osd.h
+++ b/trunk/inc/user/complib/cl_timer_osd.h
@@ -46,6 +46,7 @@ typedef struct _cl_timer
        cl_pfn_timer_callback_t pfn_callback;\r
        const void                              *context;\r
        uint64_t                                timeout_time;\r
+       DWORD                                   thread_id;\r
 \r
 } cl_timer_t;\r
 \r