X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Flock.h;h=dd79c40b7f277890da31ccd9da15f7eed7b1df4c;hb=537b17ef954b68d09b6f559dc05672cf7acfbe7c;hp=c60ff4146122d7bfa868e0ef8897967d7a6bdb30;hpb=1927da29ccbe1d4cc8e59ccfa197eb41c257814f;p=vpp.git

diff --git a/src/vppinfra/lock.h b/src/vppinfra/lock.h
index c60ff414612..dd79c40b7f2 100644
--- a/src/vppinfra/lock.h
+++ b/src/vppinfra/lock.h
@@ -18,13 +18,37 @@
 
 #include <vppinfra/clib.h>
 
+#if __x86_64__
+#define CLIB_PAUSE() __builtin_ia32_pause ()
+#else
+#define CLIB_PAUSE()
+#endif
+
+#if CLIB_DEBUG > 1
+#define CLIB_LOCK_DBG(_p)				\
+do {							\
+    (*_p)->frame_address = __builtin_frame_address (0);	\
+    (*_p)->pid = getpid ();				\
+    (*_p)->thread_index = os_get_thread_index ();	\
+} while (0)
+#define CLIB_LOCK_DBG_CLEAR(_p)				\
+do {							\
+    (*_p)->frame_address = 0;				\
+    (*_p)->pid = 0;					\
+    (*_p)->thread_index = 0;				\
+} while (0)
+#else
+#define CLIB_LOCK_DBG(_p)
+#define CLIB_LOCK_DBG_CLEAR(_p)
+#endif
+
 typedef struct
 {
   CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
   u32 lock;
 #if CLIB_DEBUG > 0
   pid_t pid;
-  uword cpu_index;
+  uword thread_index;
   void *frame_address;
 #endif
 } *clib_spinlock_t;
@@ -50,15 +74,8 @@ static_always_inline void
 clib_spinlock_lock (clib_spinlock_t * p)
 {
   while (__sync_lock_test_and_set (&(*p)->lock, 1))
-#if __x86_64__
-    __builtin_ia32_pause ()
-#endif
-      ;
-#if CLIB_DEBUG > 0
-  (*p)->frame_address = __builtin_frame_address (0);
-  (*p)->pid = getpid ();
-  (*p)->cpu_index = os_get_cpu_number ();
-#endif
+    CLIB_PAUSE ();
+  CLIB_LOCK_DBG (p);
 }
 
 static_always_inline void
@@ -71,12 +88,10 @@ clib_spinlock_lock_if_init (clib_spinlock_t * p)
 static_always_inline void
 clib_spinlock_unlock (clib_spinlock_t * p)
 {
+  CLIB_LOCK_DBG_CLEAR (p);
+  /* Make sure all writes are complete before releasing the lock */
+  CLIB_MEMORY_BARRIER ();
   (*p)->lock = 0;
-#if CLIB_DEBUG > 0
-  (*p)->frame_address = 0;
-  (*p)->pid = 0;
-  (*p)->cpu_index = 0;
-#endif
 }
 
 static_always_inline void
@@ -86,6 +101,94 @@ clib_spinlock_unlock_if_init (clib_spinlock_t * p)
     clib_spinlock_unlock (p);
 }
 
+/*
+ * Readers-Writer Lock
+ */
+
+typedef struct clib_rw_lock_
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  volatile u32 n_readers;
+  volatile u32 n_readers_lock;
+  volatile u32 writer_lock;
+#if CLIB_DEBUG > 0
+  pid_t pid;
+  uword thread_index;
+  void *frame_address;
+#endif
+} *clib_rwlock_t;
+
+always_inline void
+clib_rwlock_init (clib_rwlock_t * p)
+{
+  *p = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
+  memset ((void *) *p, 0, CLIB_CACHE_LINE_BYTES);
+}
+
+always_inline void
+clib_rwlock_free (clib_rwlock_t * p)
+{
+  if (*p)
+    {
+      clib_mem_free ((void *) *p);
+      *p = 0;
+    }
+}
+
+always_inline void
+clib_rwlock_reader_lock (clib_rwlock_t * p)
+{
+  while (__sync_lock_test_and_set (&(*p)->n_readers_lock, 1))
+    CLIB_PAUSE ();
+
+  (*p)->n_readers += 1;
+  if ((*p)->n_readers == 1)
+    {
+      while (__sync_lock_test_and_set (&(*p)->writer_lock, 1))
+	CLIB_PAUSE ();
+    }
+  CLIB_MEMORY_BARRIER ();
+  (*p)->n_readers_lock = 0;
+
+  CLIB_LOCK_DBG (p);
+}
+
+always_inline void
+clib_rwlock_reader_unlock (clib_rwlock_t * p)
+{
+  ASSERT ((*p)->n_readers > 0);
+  CLIB_LOCK_DBG_CLEAR (p);
+
+  while (__sync_lock_test_and_set (&(*p)->n_readers_lock, 1))
+    CLIB_PAUSE ();
+
+  (*p)->n_readers -= 1;
+  if ((*p)->n_readers == 0)
+    {
+      CLIB_MEMORY_BARRIER ();
+      (*p)->writer_lock = 0;
+    }
+
+  CLIB_MEMORY_BARRIER ();
+  (*p)->n_readers_lock = 0;
+}
+
+always_inline void
+clib_rwlock_writer_lock (clib_rwlock_t * p)
+{
+  while (__sync_lock_test_and_set (&(*p)->writer_lock, 1))
+    CLIB_PAUSE ();
+  CLIB_LOCK_DBG (p);
+}
+
+always_inline void
+clib_rwlock_writer_unlock (clib_rwlock_t * p)
+{
+  CLIB_LOCK_DBG_CLEAR (p);
+  CLIB_MEMORY_BARRIER ();
+  (*p)->writer_lock = 0;
+}
+
 #endif
 
 /*