commit

diff --git a/meta b/meta
index 9cc19bea57bebf5a39ab7ee683cdd6b04382b6ea..7fde04824d4165396538834966d53c1c5f1367b0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,7 +1,6 @@
 Version: 1
-Previous: 222a90b530c8e8afcb22d329aa961bf8b898b1b3
+Previous: ed810051d20437a8769af5ab380195d6d9d598ce
 Head: 91b1fc555899408595f2be440a3295ed5594e93c
 Applied:
-  atomic: 91b1fc555899408595f2be440a3295ed5594e93c
 Unapplied:
 Hidden:

diff --git a/patches/atomic b/patches/atomic
deleted file mode 100644 (file)
index be781c0..0000000
--- a/patches/atomic
+++ /dev/null
@@ -1,166 +0,0 @@
-Bottom: 44cd90e52fd7bd946e34e9acdfcf1cef88293c9a
-Top:    1a872937b30cacadadaea61c2b4755a657134ac8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-25 10:26:22 -0700
-
-ibacm: support distros with older versions of gcc
-
-ibacm implements atomics using gcc intrinsics that were introduced
-in gcc 4.1.2.  If an older version of gcc is used to compile the
-code, an error results.  Check that the required atomic calls are
-supported, and if not, provide our own implementation.
-
-This fixes a build issue on RH 5.x.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/configure.in b/configure.in
-index 997c775..dfddeac 100644
---- a/configure.in
-+++ b/configure.in
-@@ -39,6 +39,16 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
-     AC_MSG_ERROR([<infiniband/umad.h> not found.  Is libibumad installed?]))\r
- fi\r
- \r
-+dnl Check for gcc atomic intrinsics\r
-+AC_MSG_CHECKING(compiler support for atomics)\r
-+AC_TRY_LINK([int i = 0;],\r
-+    [ return __sync_add_and_fetch(&i, 1) != __sync_sub_and_fetch(&i, 1); ],\r
-+    [ AC_MSG_RESULT(yes) ],\r
-+    [\r
-+        AC_MSG_RESULT(no)\r
-+        AC_DEFINE(DEFINE_ATOMICS, 1, [Set to 1 to implement atomics])\r
-+    ])\r
-+\r
- AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,\r
-     if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then\r
-         ac_cv_version_script=yes\r
-diff --git a/linux/osd.h b/linux/osd.h
-index 722e1b1..28c3647 100644
---- a/linux/osd.h
-+++ b/linux/osd.h
-@@ -65,9 +65,37 @@
- #endif\r
- #define ntohll(x) htonll(x)\r
- \r
-+#if DEFINE_ATOMICS\r
-+typedef struct { pthread_mutex_t mut; int val; } atomic_t;\r
-+static inline int atomic_inc(atomic_t *atomic)\r
-+{\r
-+      int v;\r
-+\r
-+      pthread_mutex_lock(&atomic->mut);\r
-+      v = ++(atomic->val);\r
-+      pthread_mutex_unlock(&atomic->mut);\r
-+      return v;\r
-+}\r
-+static inline int atomic_dec(atomic_t *atomic)\r
-+{\r
-+      int v;\r
-+\r
-+      pthread_mutex_lock(&atomic->mut);\r
-+      v = --(atomic->val);\r
-+      pthread_mutex_unlock(&atomic->mut);\r
-+      return v;\r
-+}\r
-+static inline void atomic_init(atomic_t *atomic)\r
-+{\r
-+      pthread_mutex_init(&atomic->mut, NULL);\r
-+      atomic->val = 0;\r
-+}\r
-+#else\r
- typedef struct { volatile int val; } atomic_t;\r
--#define atomic_inc(v) (__sync_fetch_and_add(&(v)->val, 1) + 1)\r
--#define atomic_dec(v) (__sync_fetch_and_sub(&(v)->val, 1) - 1)\r
-+#define atomic_inc(v) (__sync_add_and_fetch(&(v)->val, 1))\r
-+#define atomic_dec(v) (__sync_sub_and_fetch(&(v)->val, 1))\r
-+#define atomic_init(v) ((v)->val = 0)\r
-+#endif\r
- #define atomic_get(v) ((v)->val)\r
- #define atomic_set(v, s) ((v)->val = s)\r
- \r
-diff --git a/src/acm.c b/src/acm.c
-index 7c8b84b..820365c 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -27,6 +27,10 @@
-  * SOFTWARE.
-  */
- 
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
- #include <stdio.h>
- #include <stdarg.h>
- #include <string.h>
-@@ -268,6 +272,7 @@ acm_init_dest(struct acm_dest *dest, uint8_t addr_type, uint8_t *addr, size_t si
-       memcpy(dest->address, addr, size);
-       dest->addr_type = addr_type;
-       DListInit(&dest->req_queue);
-+      atomic_init(&dest->refcnt);
-       atomic_set(&dest->refcnt, 1);
-       lock_init(&dest->lock);
- }
-@@ -1560,6 +1565,7 @@ static void acm_init_server(void)
-               lock_init(&client[i].lock);
-               client[i].index = i;
-               client[i].sock = INVALID_SOCKET;
-+              atomic_init(&client[i].refcnt);
-       }
- }
- 
-@@ -2680,6 +2686,8 @@ int CDECL_FUNC main(int argc, char **argv)
-       acm_log(0, "Assistant to the InfiniBand Communication Manager\n");
-       acm_log_options();
- 
-+      atomic_init(&tid);
-+      atomic_init(&wait_cnt);
-       DListInit(&dev_list);
-       DListInit(&timeout_list);
-       event_init(&timeout_event);
-diff --git a/src/acme.c b/src/acme.c
-index 7428a57..e03679f 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -27,6 +27,10 @@
-  * SOFTWARE.
-  */
- 
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-diff --git a/src/libacm.c b/src/libacm.c
-index 32fd7e2..9d56cd2 100644
---- a/src/libacm.c
-+++ b/src/libacm.c
-@@ -27,6 +27,10 @@
-  * SOFTWARE.
-  */
- 
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
- #include <osd.h>
- #include "libacm.h"
- #include <infiniband/acm.h>
-diff --git a/windows/osd.h b/windows/osd.h
-index 10e5e18..9587c51 100644
---- a/windows/osd.h
-+++ b/windows/osd.h
-@@ -44,6 +44,7 @@ typedef struct { volatile LONG val; } atomic_t;
- #define atomic_dec(v) InterlockedDecrement(&(v)->val)\r
- #define atomic_get(v) ((v)->val)\r
- #define atomic_set(v, s) ((v)->val = s)\r
-+#define atomic_init(v) ((v)->val = 0)\r
- \r
- #define event_t          HANDLE\r
- #define event_init(e)    *(e) = CreateEvent(NULL, FALSE, FALSE, NULL)