From 6f87ec95e59e85bf759bbac4c843f7ab38968c12 Mon Sep 17 00:00:00 2001
From: Christian Kern <christian.kern@siemens.com>
Date: Thu, 5 Nov 2015 15:45:49 +0100
Subject: [PATCH] Replace custom spinlock in dataflow with global one.

---
 dataflow_cpp/include/embb/dataflow/internal/in.h       |  4 ++--
 dataflow_cpp/include/embb/dataflow/internal/spinlock.h | 65 -----------------------------------------------------------------
 2 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 dataflow_cpp/include/embb/dataflow/internal/spinlock.h

diff --git a/dataflow_cpp/include/embb/dataflow/internal/in.h b/dataflow_cpp/include/embb/dataflow/internal/in.h
index 71034cb..60b4024 100644
--- a/dataflow_cpp/include/embb/dataflow/internal/in.h
+++ b/dataflow_cpp/include/embb/dataflow/internal/in.h
@@ -29,7 +29,7 @@
 
 #if EMBB_DATAFLOW_TRACE_SIGNAL_HISTORY
 #include <vector>
-#include <embb/dataflow/internal/spinlock.h>
+#include <embb/base/mutex.h>
 #endif
 
 #include <embb/dataflow/internal/signal.h>
@@ -80,7 +80,7 @@ class In {
   ClockListener * listener_;
   bool connected_;
 #if EMBB_DATAFLOW_TRACE_SIGNAL_HISTORY
-  SpinLock lock_;
+  embb::base::Spinlock lock_;
   std::vector<SignalType> history_;
 #endif
 
diff --git a/dataflow_cpp/include/embb/dataflow/internal/spinlock.h b/dataflow_cpp/include/embb/dataflow/internal/spinlock.h
deleted file mode 100644
index bc28910..0000000
--- a/dataflow_cpp/include/embb/dataflow/internal/spinlock.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2014-2015, Siemens AG. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef EMBB_DATAFLOW_INTERNAL_SPINLOCK_H_
-#define EMBB_DATAFLOW_INTERNAL_SPINLOCK_H_
-
-#include <embb/base/atomic.h>
-
-namespace embb {
-namespace dataflow {
-namespace internal {
-
-class SpinLock {
- public:
-  SpinLock() : lock_(0) {}
-  void Lock() {
-    int expected = 0;
-    while (!lock_.CompareAndSwap(expected, 1)) {
-      expected = 0;
-    }
-  }
-  bool TryLock(int spins = 0) {
-    int expected = 0;
-    while (spins > 0 && !lock_.CompareAndSwap(expected, 1)) {
-      expected = 0;
-      spins--;
-    }
-    return spins > 0;
-  }
-  void Unlock() {
-    lock_ = 0;
-  }
-
- private:
-  embb::base::Atomic<int> lock_;
-};
-
-} // namespace internal
-} // namespace dataflow
-} // namespace embb
-
-#endif // EMBB_DATAFLOW_INTERNAL_SPINLOCK_H_
--
libgit2 0.26.0