refresh (create temporary patch)

diff --git a/meta b/meta
index 1f8175dda10a4d73af55d3dd561d73569fbec33a..dfad6d314707e1562d402dd53834afcdc0a82016 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 6698a30f94c23cb77d250d18345deb02eefef507
-Head: e69294e4ca7fb71f62ca32fc9f0ab385813cfe58
+Previous: ee30fe5ba87986586d9ca37dc81903f748408e98
+Head: bb33098ac80751921e3ee56270b6ae11a7bccdd8
 Applied:
   rs-locking: e69294e4ca7fb71f62ca32fc9f0ab385813cfe58
+  refresh-temp: bb33098ac80751921e3ee56270b6ae11a7bccdd8
 Unapplied:
   comp_locks: b89aab130b4619806557e11e6b9c10964f00743f
   preload: 5dfe7abc07064485c5100e04e5412279244c2bc3

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..cf5cf6f
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,56 @@
+Bottom: b2e4cd7d670a626fa22b05cff6a1dccc973e9f0d
+Top:    3fcdf48082614bb29c44242534cfeecb47e07114
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-05-10 10:42:21 -0700
+
+Refresh of rs-locking
+
+---
+
+diff --git a/configure.in b/configure.in
+index 238ee59..fa90fcb 100644
+--- a/configure.in
++++ b/configure.in
+@@ -48,6 +48,16 @@ AC_CHECK_MEMBER(struct ibv_path_record.service_id, [],
+     AC_DEFINE(DEFINE_PATH_RECORD, 1, [adding path record definition]),
+     [#include <infiniband/sa.h>])
+ 
++dnl Check for gcc atomic intrinsics
++AC_MSG_CHECKING(compiler support for atomics)
++AC_TRY_LINK([int i = 0;],
++    [ return __sync_add_and_fetch(&i, 1) != __sync_sub_and_fetch(&i, 1); ],
++    [ AC_MSG_RESULT(yes) ],
++    [
++        AC_MSG_RESULT(no)
++        AC_DEFINE(DEFINE_ATOMICS, 1, [Set to 1 to implement atomics])
++    ])
++
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ if test "$disable_libcheck" != "yes"; then
+diff --git a/src/cma.h b/src/cma.h
+index f28020e..7703fe8 100644
+--- a/src/cma.h
++++ b/src/cma.h
+@@ -72,6 +72,13 @@ static inline uint64_t ntohll(uint64_t x) { return x; }
+ /*
+  * Fast synchronization for low contention locking.
+  */
++#if DEFINE_ATOMICS
++#define fastlock_t pthread_mutex_t
++#define fastlock_init(lock) pthread_mutex_init(lock, NULL)
++#define fastlock_destroy(lock) pthread_mutex_destroy(lock)
++#define fastlock_acquire(lock) pthread_mutex_lock(lock)
++#define fastlock_release(lock) pthread_mutex_unlock(lock)
++#else
+ typedef struct {
+       sem_t sem;
+       volatile int cnt;
+@@ -95,6 +102,7 @@ static inline void fastlock_release(fastlock_t *lock)
+       if (__sync_sub_and_fetch(&lock->cnt, 1) > 0)
+               sem_post(&lock->sem);
+ }
++#endif /* DEFINE_ATOMICS */
+ 
+ int ucma_complete(struct rdma_cm_id *id);
+ static inline int ERR(int err)