refresh (create temporary patch)

diff --git a/meta b/meta
index cbdee9e04e77a68101b46e5bf9f0b6359a3b8b95..454e29b699fb213c93f3e2e3af38294039595f86 100644 (file)
--- a/meta
+++ b/meta
@@ -1,7 +1,8 @@
 Version: 1
-Previous: ea24141542a2bc64edc5fe3ddb03107fd82bde91
-Head: 74e8392c2c62d9b7f090cb1d305163286e8a9bcd
+Previous: dde8257f944ccec4678807001a248aff9d175da7
+Head: e4566b7e59303ba3f52ec3d8474074aeccb75c8e
 Applied:
   atomic: 74e8392c2c62d9b7f090cb1d305163286e8a9bcd
+  refresh-temp: e4566b7e59303ba3f52ec3d8474074aeccb75c8e
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..5effe11
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,109 @@
+Bottom: 44cd90e52fd7bd946e34e9acdfcf1cef88293c9a
+Top:    9c72d3a49ab622631098c8bb005b82d2410ba704
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-08-25 11:25:35 -0700
+
+Refresh of atomic
+
+---
+
+diff --git a/configure.in b/configure.in
+old mode 100644
+new mode 100755
+index 997c775..192289a
+--- a/configure.in
++++ b/configure.in
+@@ -39,6 +39,12 @@ 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_TRY_LINK(\r
++    [int i = 0;\r
++     return __sync_add_and_fetch(&i, 1) == __sync_sub_and_fetch(&i, 1) + 1;],\r
++    [], AC_DEFINE(DEFINE_ATOMICS, 1, [defining atomics]))\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
+old mode 100644
+new mode 100755
+index 722e1b1..9a167a7
+--- a/linux/osd.h
++++ b/linux/osd.h
+@@ -65,9 +65,27 @@
+ #endif\r
+ #define ntohll(x) htonll(x)\r
+ \r
++#if DEFINE_ATOMICS\r
++typedef struct { pthread_mutex_t mut; int val; } atomic_t;\r
++#define atomic_inc(v) { \\r
++      int v;\r
++      pthread_mutex_lock(&(v)->mut); \\r
++      v = ++val; \\r
++      pthread_mutex_unlock(&(v)->mut); \\r
++      return v; }\r
++#define atomic_dec(v) { \\r
++      int v;\r
++      pthread_mutex_lock(&(v)->mut); \\r
++      v = --val; \\r
++      pthread_mutex_unlock(&(v)->mut); \\r
++      return v; }\r
++#define atomic_init(v) { pthread_mutex_init(&(v)->mut, NULL); (v)->val = 0); }\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
+old mode 100644
+new mode 100755
+index 7c8b84b..56fbb01
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -268,6 +268,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 +1561,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 +2682,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/windows/osd.h b/windows/osd.h
+old mode 100644
+new mode 100755
+index 10e5e18..9587c51
+--- 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)