Drizzle

Merge lp:~paul-mccullagh/drizzle/bug-fix-567402 into lp:~drizzle-trunk/drizzle/development

  1. bug-fix-567402
  2. Merge into development
Proposed by Paul McCullagh
Status: Merged
Merged at revision: not available
Proposed branch: lp:~paul-mccullagh/drizzle/bug-fix-567402
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 133 lines (+19/-25)
6 files modified
plugin/pbxt/src/filesys_xt.cc (+0/-6)
plugin/pbxt/src/filesys_xt.h (+7/-7)
plugin/pbxt/src/index_xt.h (+3/-3)
plugin/pbxt/src/tabcache_xt.h (+3/-3)
plugin/pbxt/src/table_xt.h (+3/-3)
plugin/pbxt/src/thread_xt.h (+3/-3)
To merge this branch: bzr merge lp:~paul-mccullagh/drizzle/bug-fix-567402
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+24140@code.launchpad.net

Description of the change

This change fixes warnings that occur when PBXT is build without atomic ops. This should fix bug #567402: pbxt doesn't build on debian ppc 32bit.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugin/pbxt/src/filesys_xt.cc'
2--- plugin/pbxt/src/filesys_xt.cc 2010-04-08 16:11:29 +0000
3+++ plugin/pbxt/src/filesys_xt.cc 2010-04-26 17:24:25 +0000
4@@ -1816,9 +1816,7 @@
5 break;
6 case XT_FT_MEM_MAP: {
7 XTFileMemMapPtr mm = of->x.mf_memmap;
8-#ifndef XT_NO_ATOMICS
9 xtThreadID thd_id = thread->t_id;
10-#endif
11
12 if (!of->mf_slock_count)
13 FILE_MAP_READ_LOCK(&mm->mm_lock, thd_id);
14@@ -2235,9 +2233,7 @@
15 break;
16 case XT_FT_MEM_MAP: {
17 XTFileMemMapPtr mm = of->x.mf_memmap;
18-#ifndef XT_NO_ATOMICS
19 xtThreadID thd_id = thread->t_id;
20-#endif
21
22 if (!of->mf_slock_count)
23 FILE_MAP_READ_LOCK(&mm->mm_lock, thd_id);
24@@ -2269,9 +2265,7 @@
25 }
26 case XT_FT_HEAP: {
27 XTFileHeapPtr fh = of->x.of_heap;
28-#ifndef XT_NO_ATOMICS
29 xtThreadID thd_id = thread->t_id;
30-#endif
31
32 if (!of->mf_slock_count)
33 FILE_MAP_READ_LOCK(&fh->fh_lock, thd_id);
34
35=== modified file 'plugin/pbxt/src/filesys_xt.h'
36--- plugin/pbxt/src/filesys_xt.h 2010-04-08 17:52:00 +0000
37+++ plugin/pbxt/src/filesys_xt.h 2010-04-26 17:24:25 +0000
38@@ -109,9 +109,9 @@
39 #define FILE_MAP_LOCK_TYPE xt_rwlock_type
40 #define FILE_MAP_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)
41 #define FILE_MAP_FREE_LOCK(s, i) xt_free_rwlock(i)
42-#define FILE_MAP_READ_LOCK(i, o) xt_slock_rwlock_ns(i)
43-#define FILE_MAP_WRITE_LOCK(i, o) xt_xlock_rwlock_ns(i)
44-#define FILE_MAP_UNLOCK(i, o) xt_unlock_rwlock_ns(i)
45+#define FILE_MAP_READ_LOCK(i, o) do { xt_slock_rwlock_ns(i); (void) (o); } while(0)
46+#define FILE_MAP_WRITE_LOCK(i, o) do { xt_xlock_rwlock_ns(i); (void) (o); } while(0)
47+#define FILE_MAP_UNLOCK(i, o) do { xt_unlock_rwlock_ns(i); (void) (o); } while(0)
48 #elif defined(FILE_MAP_USE_XSMUTEX)
49 #define FILE_MAP_LOCK_TYPE XTMutexXSLockRec
50 #define FILE_MAP_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)
51@@ -140,10 +140,10 @@
52 #if defined(RR_FLUSH_USE_PTHREAD_RW)
53 #define RR_FLUSH_LOCK_TYPE xt_rwlock_type
54 #define RR_FLUSH_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)
55-#define RR_FLUSH_FREE_LOCK(s, i) xt_free_rwlock(i)
56-#define RR_FLUSH_READ_LOCK(i, o) xt_slock_rwlock_ns(i)
57-#define RR_FLUSH_WRITE_LOCK(i, o) xt_xlock_rwlock_ns(i)
58-#define RR_FLUSH_UNLOCK(i, o) xt_unlock_rwlock_ns(i)
59+#define RR_FLUSH_FREE_LOCK(s, i) xt_free_rwlock(i)
60+#define RR_FLUSH_READ_LOCK(i, o) do { xt_slock_rwlock_ns(i); (void) (o); } while(0)
61+#define RR_FLUSH_WRITE_LOCK(i, o) do { xt_xlock_rwlock_ns(i); (void) (o); } while(0)
62+#define RR_FLUSH_UNLOCK(i, o) do { xt_unlock_rwlock_ns(i); (void) (o); } while(0)
63 #elif defined(RR_FLUSH_USE_XSMUTEX)
64 #define RR_FLUSH_LOCK_TYPE XTMutexXSLockRec
65 #define RR_FLUSH_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)
66
67=== modified file 'plugin/pbxt/src/index_xt.h'
68--- plugin/pbxt/src/index_xt.h 2010-04-14 16:29:40 +0000
69+++ plugin/pbxt/src/index_xt.h 2010-04-26 17:24:25 +0000
70@@ -372,9 +372,9 @@
71 #define XT_INDEX_LOCK_TYPE xt_rwlock_type
72 #define XT_INDEX_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, &(i)->mi_rwlock)
73 #define XT_INDEX_FREE_LOCK(s, i) xt_free_rwlock(&(i)->mi_rwlock)
74-#define XT_INDEX_READ_LOCK(i, o) xt_slock_rwlock_ns(&(i)->mi_rwlock)
75-#define XT_INDEX_WRITE_LOCK(i, o) xt_xlock_rwlock_ns(&(i)->mi_rwlock)
76-#define XT_INDEX_UNLOCK(i, o) xt_unlock_rwlock_ns(&(i)->mi_rwlock)
77+#define XT_INDEX_READ_LOCK(i, o) do { xt_slock_rwlock_ns(&(i)->mi_rwlock); (void) (o); } while(0)
78+#define XT_INDEX_WRITE_LOCK(i, o) do { xt_xlock_rwlock_ns(&(i)->mi_rwlock); (void) (o); } while(0)
79+#define XT_INDEX_UNLOCK(i, o) do { xt_unlock_rwlock_ns(&(i)->mi_rwlock); (void) (o); } while(0)
80 #define XT_INDEX_HAVE_XLOCK(i, o) TRUE
81 #elif defined(XT_TAB_ROW_USE_XSMUTEX)
82 #define XT_INDEX_LOCK_TYPE XTMutexXSLockRec
83
84=== modified file 'plugin/pbxt/src/tabcache_xt.h'
85--- plugin/pbxt/src/tabcache_xt.h 2010-04-08 16:11:29 +0000
86+++ plugin/pbxt/src/tabcache_xt.h 2010-04-26 17:24:25 +0000
87@@ -167,9 +167,9 @@
88 #define TAB_CAC_LOCK_TYPE xt_rwlock_type
89 #define TAB_CAC_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)
90 #define TAB_CAC_FREE_LOCK(s, i) xt_free_rwlock(i)
91-#define TAB_CAC_READ_LOCK(i, o) xt_slock_rwlock_ns(i)
92-#define TAB_CAC_WRITE_LOCK(i, o) xt_xlock_rwlock_ns(i)
93-#define TAB_CAC_UNLOCK(i, o) xt_unlock_rwlock_ns(i)
94+#define TAB_CAC_READ_LOCK(i, o) do { xt_slock_rwlock_ns(i); (void) (o); } while(0)
95+#define TAB_CAC_WRITE_LOCK(i, o) do { xt_xlock_rwlock_ns(i); (void) (o); } while(0)
96+#define TAB_CAC_UNLOCK(i, o) do { xt_unlock_rwlock_ns(i); (void) (o); } while(0)
97 #elif defined(TAB_CAC_USE_XSMUTEX)
98 #define TAB_CAC_LOCK_TYPE XTMutexXSLockRec
99 #define TAB_CAC_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)
100
101=== modified file 'plugin/pbxt/src/table_xt.h'
102--- plugin/pbxt/src/table_xt.h 2010-04-08 16:11:29 +0000
103+++ plugin/pbxt/src/table_xt.h 2010-04-26 17:24:25 +0000
104@@ -125,9 +125,9 @@
105 #define XT_TAB_ROW_LOCK_TYPE xt_rwlock_type
106 #define XT_TAB_ROW_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)
107 #define XT_TAB_ROW_FREE_LOCK(s, i) xt_free_rwlock(i)
108-#define XT_TAB_ROW_READ_LOCK(i, s) xt_slock_rwlock_ns(i)
109-#define XT_TAB_ROW_WRITE_LOCK(i, s) xt_xlock_rwlock_ns(i)
110-#define XT_TAB_ROW_UNLOCK(i, s) xt_unlock_rwlock_ns(i)
111+#define XT_TAB_ROW_READ_LOCK(i, s) do { xt_slock_rwlock_ns(i); (void) (s); } while(0)
112+#define XT_TAB_ROW_WRITE_LOCK(i, s) do { xt_xlock_rwlock_ns(i); (void) (s); } while(0)
113+#define XT_TAB_ROW_UNLOCK(i, s) do { xt_unlock_rwlock_ns(i); (void) (s); } while(0)
114 #elif defined(XT_TAB_ROW_USE_XSMUTEX)
115 #define XT_TAB_ROW_LOCK_TYPE XTMutexXSLockRec
116 #define XT_TAB_ROW_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)
117
118=== modified file 'plugin/pbxt/src/thread_xt.h'
119--- plugin/pbxt/src/thread_xt.h 2010-04-14 16:29:40 +0000
120+++ plugin/pbxt/src/thread_xt.h 2010-04-26 17:24:25 +0000
121@@ -652,9 +652,9 @@
122 #define THR_ARRAY_LOCK_TYPE xt_rwlock_type
123 #define THR_ARRAY_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)
124 #define THR_ARRAY_FREE_LOCK(s, i) xt_free_rwlock(i)
125-#define THR_ARRAY_READ_LOCK(i, o) xt_slock_rwlock_ns(i)
126-#define THR_ARRAY_WRITE_LOCK(i, o) xt_xlock_rwlock_ns(i)
127-#define THR_ARRAY_UNLOCK(i, o) xt_unlock_rwlock_ns(i)
128+#define THR_ARRAY_READ_LOCK(i, o) do { xt_slock_rwlock_ns(i); (void) (o); } while(0)
129+#define THR_ARRAY_WRITE_LOCK(i, o) do { xt_xlock_rwlock_ns(i); (void) (o); } while(0)
130+#define THR_ARRAY_UNLOCK(i, o) do { xt_unlock_rwlock_ns(i); (void) (o); } while(0)
131 #elif defined(THR_ARRAY_USE_XSMUTEX)
132 #define THR_ARRAY_LOCK_TYPE XTMutexXSLockRec
133 #define THR_ARRAY_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)