Added support for MS VC++ 2015

[libcds.git] / cds / compiler / feature_tsan.h

diff --git a/cds/compiler/feature_tsan.h b/cds/compiler/feature_tsan.h
index 926876adc8741ebbe19800ddded0d50487116b47..ba5e3ef1606d568b51b0a78c9b87fa0f5c5c3907 100644 (file)
--- a/cds/compiler/feature_tsan.h
+++ b/cds/compiler/feature_tsan.h
@@ -6,41 +6,53 @@
 // Thread Sanitizer annotations.
 // From https://groups.google.com/d/msg/thread-sanitizer/SsrHB7FTnTk/mNTGNLQj-9cJ
 
+//@cond
+
 #ifdef CDS_THREAD_SANITIZER_ENABLED
-#   define CDS_TSAN_ANNOTATE_HAPPENS_BEFORE(addr)   AnnotateHappensBefore(__FILE__, __LINE__, (void*)(addr))\r
-#   define CDS_TSAN_ANNOTATE_HAPPENS_AFTER(addr)    AnnotateHappensAfter(__FILE__, __LINE__, (void*)(addr))\r
-\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_READS_BEGIN     AnnotateIgnoreReadsBegin(__FILE__, __LINE__)\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_READS_END       AnnotateIgnoreReadsEnd(__FILE__, __LINE__)\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_WRITES_BEGIN    AnnotateIgnoreWritesBegin(__FILE__, __LINE__)\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_WRITES_END      AnnotateIgnoreWritesEnd(__FILE__, __LINE__)\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_RW_BEGIN        \\r
-                                                    CDS_TSAN_ANNOTATE_IGNORE_READS_BEGIN; \\r
-                                                    CDS_TSAN_ANNOTATE_IGNORE_WRITES_BEGIN\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_RW_END          \\r
-                                                    CDS_TSAN_ANNOTATE_IGNORE_WRITES_END;\\r
-                                                    CDS_TSAN_ANNOTATE_IGNORE_READS_END\r
-\r
-    // provided by TSan\r
-    extern "C" {\r
-        void AnnotateHappensBefore(const char *f, int l, void *addr);\r
-        void AnnotateHappensAfter(const char *f, int l, void *addr);\r
-\r
-        void AnnotateIgnoreReadsBegin(const char *f, int l);\r
-        void AnnotateIgnoreReadsEnd(const char *f, int l);\r
-        void AnnotateIgnoreWritesBegin(const char *f, int l);\r
-        void AnnotateIgnoreWritesEnd(const char *f, int l);\r
-    }\r
-#else\r
-#   define CDS_TSAN_ANNOTATE_HAPPENS_BEFORE(addr)\r
+#   define CDS_TSAN_ANNOTATE_HAPPENS_BEFORE(addr)   AnnotateHappensBefore(__FILE__, __LINE__, reinterpret_cast<void*>(addr))
+#   define CDS_TSAN_ANNOTATE_HAPPENS_AFTER(addr)    AnnotateHappensAfter(__FILE__, __LINE__, reinterpret_cast<void*>(addr))
+
+#   define CDS_TSAN_ANNOTATE_IGNORE_READS_BEGIN     AnnotateIgnoreReadsBegin(__FILE__, __LINE__)
+#   define CDS_TSAN_ANNOTATE_IGNORE_READS_END       AnnotateIgnoreReadsEnd(__FILE__, __LINE__)
+#   define CDS_TSAN_ANNOTATE_IGNORE_WRITES_BEGIN    AnnotateIgnoreWritesBegin(__FILE__, __LINE__)
+#   define CDS_TSAN_ANNOTATE_IGNORE_WRITES_END      AnnotateIgnoreWritesEnd(__FILE__, __LINE__)
+#   define CDS_TSAN_ANNOTATE_IGNORE_RW_BEGIN        \
+                                                    CDS_TSAN_ANNOTATE_IGNORE_READS_BEGIN; \
+                                                    CDS_TSAN_ANNOTATE_IGNORE_WRITES_BEGIN
+#   define CDS_TSAN_ANNOTATE_IGNORE_RW_END          \
+                                                    CDS_TSAN_ANNOTATE_IGNORE_WRITES_END;\
+                                                    CDS_TSAN_ANNOTATE_IGNORE_READS_END
+#   define CDS_TSAN_ANNOTATE_NEW_MEMORY( addr, sz ) AnnotateNewMemory( (char *) __FILE__, __LINE__, reinterpret_cast<void *>(addr), sz )
+
+    // provided by TSan
+    extern "C" {
+        void AnnotateHappensBefore(const char *f, int l, void *addr);
+        void AnnotateHappensAfter(const char *f, int l, void *addr);
+
+        void AnnotateIgnoreReadsBegin(const char *f, int l);
+        void AnnotateIgnoreReadsEnd(const char *f, int l);
+        void AnnotateIgnoreWritesBegin(const char *f, int l);
+        void AnnotateIgnoreWritesEnd(const char *f, int l);
+
+        void AnnotateNewMemory(char *f, int l, void * mem, size_t size);
+
+    }
+
+#else // CDS_THREAD_SANITIZER_ENABLED
+
+#   define CDS_TSAN_ANNOTATE_HAPPENS_BEFORE(addr)
 #   define CDS_TSAN_ANNOTATE_HAPPENS_AFTER(addr)
 
-#   define CDS_TSAN_ANNOTATE_IGNORE_READS_BEGIN\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_READS_END\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_WRITES_BEGIN\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_WRITES_END\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_RW_BEGIN\r
-#   define CDS_TSAN_ANNOTATE_IGNORE_RW_END\r
+#   define CDS_TSAN_ANNOTATE_IGNORE_READS_BEGIN
+#   define CDS_TSAN_ANNOTATE_IGNORE_READS_END
+#   define CDS_TSAN_ANNOTATE_IGNORE_WRITES_BEGIN
+#   define CDS_TSAN_ANNOTATE_IGNORE_WRITES_END
+#   define CDS_TSAN_ANNOTATE_IGNORE_RW_BEGIN
+#   define CDS_TSAN_ANNOTATE_IGNORE_RW_END
+
+#   define CDS_TSAN_ANNOTATE_NEW_MEMORY( addr, sz )
+
 #endif
 
+//@endcond
 #endif  // #ifndef CDSLIB_COMPILER_FEATURE_TSAN_H