- Minor tweaks to timestamp functions

- Change thread number output from decimal to hex in debug output macros
to match thread numbering in WinDbg.

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

diff --git a/branches/fab_cm_branch/core/complib/user/cl_timer.c b/branches/fab_cm_branch/core/complib/user/cl_timer.c
index cd059edf69a556fdb3f00d36bae39c72f7fee2e5..5c19cb84c5008019c4aa58bf4c3bad7dd8393377 100644 (file)
--- a/branches/fab_cm_branch/core/complib/user/cl_timer.c
+++ b/branches/fab_cm_branch/core/complib/user/cl_timer.c
@@ -144,7 +144,7 @@ cl_timer_stop(
 }\r
 \r
 \r
-#define SEC_TO_MICRO           1000000 // s to µs conversion\r
+#define SEC_TO_MICRO           1000000ULL      // s to µs conversion\r
 \r
 uint64_t\r
 cl_get_time_stamp( void )\r
@@ -157,7 +157,7 @@ cl_get_time_stamp( void )
        if( !QueryPerformanceCounter( &tick_count ) )\r
                return( 0 );\r
 \r
-       return( tick_count.QuadPart * SEC_TO_MICRO / frequency.QuadPart );\r
+       return( tick_count.QuadPart / (frequency.QuadPart / SEC_TO_MICRO) );\r
 }\r
 \r
 uint32_t\r

diff --git a/branches/fab_cm_branch/inc/kernel/complib/cl_timer_osd.h b/branches/fab_cm_branch/inc/kernel/complib/cl_timer_osd.h
index 2b3f702c0766653c35065e1f9fb1cec59a919c26..c7c51151be9845372b7efbb37cb2d90b85c875c9 100644 (file)
--- a/branches/fab_cm_branch/inc/kernel/complib/cl_timer_osd.h
+++ b/branches/fab_cm_branch/inc/kernel/complib/cl_timer_osd.h
@@ -58,9 +58,9 @@ extern "C"
 #endif\r
 \r
 /* 100ns to s conversion */\r
-#define HUNDREDNS_TO_SEC       10000000\r
+#define HUNDREDNS_TO_SEC       10000000ULL\r
 /* s to µs conversion */\r
-#define SEC_TO_MICRO           1000000\r
+#define SEC_TO_MICRO           1000000ULL\r
 \r
 CL_INLINE uint64_t CL_API\r
 cl_get_time_stamp( void )\r

diff --git a/branches/fab_cm_branch/inc/user/complib/cl_debug_osd.h b/branches/fab_cm_branch/inc/user/complib/cl_debug_osd.h
index 6d4cc328e56b9323c144a1cebebdee4a8b958c7f..3bf6208d7a824de52ccfdba2f86dc0892ddbdc6c 100644 (file)
--- a/branches/fab_cm_branch/inc/user/complib/cl_debug_osd.h
+++ b/branches/fab_cm_branch/inc/user/complib/cl_debug_osd.h
@@ -70,16 +70,16 @@
  * CL_TRACE_EXIT, and CL_EXIT macros.\r
  */\r
 #define _CL_DBG_ENTER  \\r
-       ("%d:%s%s%s() [\n", GetCurrentThreadId(), __MODULE__, __MOD_DELIMITER__, __FUNCTION__)\r
+       ("0x%x:%s%s%s() [\n", GetCurrentThreadId(), __MODULE__, __MOD_DELIMITER__, __FUNCTION__)\r
 \r
 #define _CL_DBG_EXIT   \\r
-       ("%d:%s%s%s() ]\n", GetCurrentThreadId(), __MODULE__, __MOD_DELIMITER__, __FUNCTION__)\r
+       ("0x%x:%s%s%s() ]\n", GetCurrentThreadId(), __MODULE__, __MOD_DELIMITER__, __FUNCTION__)\r
 \r
 #define _CL_DBG_INFO   \\r
-       ("%d:%s%s%s(): ", GetCurrentThreadId(), __MODULE__, __MOD_DELIMITER__, __FUNCTION__)\r
+       ("0x%x:%s%s%s(): ", GetCurrentThreadId(), __MODULE__, __MOD_DELIMITER__, __FUNCTION__)\r
 \r
 #define _CL_DBG_ERROR  \\r
-       ("%d:%s%s%s() !ERROR!: ", GetCurrentThreadId(), __MODULE__, __MOD_DELIMITER__, __FUNCTION__)\r
+       ("0x%x:%s%s%s() !ERROR!: ", GetCurrentThreadId(), __MODULE__, __MOD_DELIMITER__, __FUNCTION__)\r
 \r
 #define CL_CHK_STK\r
 \r