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
=== modified file 'plugin/pbxt/src/filesys_xt.cc'
--- plugin/pbxt/src/filesys_xt.cc 2010-04-08 16:11:29 +0000
+++ plugin/pbxt/src/filesys_xt.cc 2010-04-26 17:24:25 +0000
@@ -1816,9 +1816,7 @@
1816 break;1816 break;
1817 case XT_FT_MEM_MAP: {1817 case XT_FT_MEM_MAP: {
1818 XTFileMemMapPtr mm = of->x.mf_memmap;1818 XTFileMemMapPtr mm = of->x.mf_memmap;
1819#ifndef XT_NO_ATOMICS
1820 xtThreadID thd_id = thread->t_id;1819 xtThreadID thd_id = thread->t_id;
1821#endif
18221820
1823 if (!of->mf_slock_count)1821 if (!of->mf_slock_count)
1824 FILE_MAP_READ_LOCK(&mm->mm_lock, thd_id);1822 FILE_MAP_READ_LOCK(&mm->mm_lock, thd_id);
@@ -2235,9 +2233,7 @@
2235 break;2233 break;
2236 case XT_FT_MEM_MAP: {2234 case XT_FT_MEM_MAP: {
2237 XTFileMemMapPtr mm = of->x.mf_memmap;2235 XTFileMemMapPtr mm = of->x.mf_memmap;
2238#ifndef XT_NO_ATOMICS
2239 xtThreadID thd_id = thread->t_id;2236 xtThreadID thd_id = thread->t_id;
2240#endif
22412237
2242 if (!of->mf_slock_count)2238 if (!of->mf_slock_count)
2243 FILE_MAP_READ_LOCK(&mm->mm_lock, thd_id);2239 FILE_MAP_READ_LOCK(&mm->mm_lock, thd_id);
@@ -2269,9 +2265,7 @@
2269 }2265 }
2270 case XT_FT_HEAP: {2266 case XT_FT_HEAP: {
2271 XTFileHeapPtr fh = of->x.of_heap;2267 XTFileHeapPtr fh = of->x.of_heap;
2272#ifndef XT_NO_ATOMICS
2273 xtThreadID thd_id = thread->t_id;2268 xtThreadID thd_id = thread->t_id;
2274#endif
22752269
2276 if (!of->mf_slock_count)2270 if (!of->mf_slock_count)
2277 FILE_MAP_READ_LOCK(&fh->fh_lock, thd_id);2271 FILE_MAP_READ_LOCK(&fh->fh_lock, thd_id);
22782272
=== modified file 'plugin/pbxt/src/filesys_xt.h'
--- plugin/pbxt/src/filesys_xt.h 2010-04-08 17:52:00 +0000
+++ plugin/pbxt/src/filesys_xt.h 2010-04-26 17:24:25 +0000
@@ -109,9 +109,9 @@
109#define FILE_MAP_LOCK_TYPE xt_rwlock_type109#define FILE_MAP_LOCK_TYPE xt_rwlock_type
110#define FILE_MAP_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)110#define FILE_MAP_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)
111#define FILE_MAP_FREE_LOCK(s, i) xt_free_rwlock(i) 111#define FILE_MAP_FREE_LOCK(s, i) xt_free_rwlock(i)
112#define FILE_MAP_READ_LOCK(i, o) xt_slock_rwlock_ns(i)112#define FILE_MAP_READ_LOCK(i, o) do { xt_slock_rwlock_ns(i); (void) (o); } while(0)
113#define FILE_MAP_WRITE_LOCK(i, o) xt_xlock_rwlock_ns(i)113#define FILE_MAP_WRITE_LOCK(i, o) do { xt_xlock_rwlock_ns(i); (void) (o); } while(0)
114#define FILE_MAP_UNLOCK(i, o) xt_unlock_rwlock_ns(i)114#define FILE_MAP_UNLOCK(i, o) do { xt_unlock_rwlock_ns(i); (void) (o); } while(0)
115#elif defined(FILE_MAP_USE_XSMUTEX)115#elif defined(FILE_MAP_USE_XSMUTEX)
116#define FILE_MAP_LOCK_TYPE XTMutexXSLockRec116#define FILE_MAP_LOCK_TYPE XTMutexXSLockRec
117#define FILE_MAP_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)117#define FILE_MAP_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)
@@ -140,10 +140,10 @@
140#if defined(RR_FLUSH_USE_PTHREAD_RW)140#if defined(RR_FLUSH_USE_PTHREAD_RW)
141#define RR_FLUSH_LOCK_TYPE xt_rwlock_type141#define RR_FLUSH_LOCK_TYPE xt_rwlock_type
142#define RR_FLUSH_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)142#define RR_FLUSH_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)
143#define RR_FLUSH_FREE_LOCK(s, i) xt_free_rwlock(i) 143#define RR_FLUSH_FREE_LOCK(s, i) xt_free_rwlock(i)
144#define RR_FLUSH_READ_LOCK(i, o) xt_slock_rwlock_ns(i)144#define RR_FLUSH_READ_LOCK(i, o) do { xt_slock_rwlock_ns(i); (void) (o); } while(0)
145#define RR_FLUSH_WRITE_LOCK(i, o) xt_xlock_rwlock_ns(i)145#define RR_FLUSH_WRITE_LOCK(i, o) do { xt_xlock_rwlock_ns(i); (void) (o); } while(0)
146#define RR_FLUSH_UNLOCK(i, o) xt_unlock_rwlock_ns(i)146#define RR_FLUSH_UNLOCK(i, o) do { xt_unlock_rwlock_ns(i); (void) (o); } while(0)
147#elif defined(RR_FLUSH_USE_XSMUTEX)147#elif defined(RR_FLUSH_USE_XSMUTEX)
148#define RR_FLUSH_LOCK_TYPE XTMutexXSLockRec148#define RR_FLUSH_LOCK_TYPE XTMutexXSLockRec
149#define RR_FLUSH_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)149#define RR_FLUSH_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)
150150
=== modified file 'plugin/pbxt/src/index_xt.h'
--- plugin/pbxt/src/index_xt.h 2010-04-14 16:29:40 +0000
+++ plugin/pbxt/src/index_xt.h 2010-04-26 17:24:25 +0000
@@ -372,9 +372,9 @@
372#define XT_INDEX_LOCK_TYPE xt_rwlock_type372#define XT_INDEX_LOCK_TYPE xt_rwlock_type
373#define XT_INDEX_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, &(i)->mi_rwlock)373#define XT_INDEX_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, &(i)->mi_rwlock)
374#define XT_INDEX_FREE_LOCK(s, i) xt_free_rwlock(&(i)->mi_rwlock) 374#define XT_INDEX_FREE_LOCK(s, i) xt_free_rwlock(&(i)->mi_rwlock)
375#define XT_INDEX_READ_LOCK(i, o) xt_slock_rwlock_ns(&(i)->mi_rwlock)375#define XT_INDEX_READ_LOCK(i, o) do { xt_slock_rwlock_ns(&(i)->mi_rwlock); (void) (o); } while(0)
376#define XT_INDEX_WRITE_LOCK(i, o) xt_xlock_rwlock_ns(&(i)->mi_rwlock)376#define XT_INDEX_WRITE_LOCK(i, o) do { xt_xlock_rwlock_ns(&(i)->mi_rwlock); (void) (o); } while(0)
377#define XT_INDEX_UNLOCK(i, o) xt_unlock_rwlock_ns(&(i)->mi_rwlock)377#define XT_INDEX_UNLOCK(i, o) do { xt_unlock_rwlock_ns(&(i)->mi_rwlock); (void) (o); } while(0)
378#define XT_INDEX_HAVE_XLOCK(i, o) TRUE378#define XT_INDEX_HAVE_XLOCK(i, o) TRUE
379#elif defined(XT_TAB_ROW_USE_XSMUTEX)379#elif defined(XT_TAB_ROW_USE_XSMUTEX)
380#define XT_INDEX_LOCK_TYPE XTMutexXSLockRec380#define XT_INDEX_LOCK_TYPE XTMutexXSLockRec
381381
=== modified file 'plugin/pbxt/src/tabcache_xt.h'
--- plugin/pbxt/src/tabcache_xt.h 2010-04-08 16:11:29 +0000
+++ plugin/pbxt/src/tabcache_xt.h 2010-04-26 17:24:25 +0000
@@ -167,9 +167,9 @@
167#define TAB_CAC_LOCK_TYPE xt_rwlock_type167#define TAB_CAC_LOCK_TYPE xt_rwlock_type
168#define TAB_CAC_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)168#define TAB_CAC_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)
169#define TAB_CAC_FREE_LOCK(s, i) xt_free_rwlock(i) 169#define TAB_CAC_FREE_LOCK(s, i) xt_free_rwlock(i)
170#define TAB_CAC_READ_LOCK(i, o) xt_slock_rwlock_ns(i)170#define TAB_CAC_READ_LOCK(i, o) do { xt_slock_rwlock_ns(i); (void) (o); } while(0)
171#define TAB_CAC_WRITE_LOCK(i, o) xt_xlock_rwlock_ns(i)171#define TAB_CAC_WRITE_LOCK(i, o) do { xt_xlock_rwlock_ns(i); (void) (o); } while(0)
172#define TAB_CAC_UNLOCK(i, o) xt_unlock_rwlock_ns(i)172#define TAB_CAC_UNLOCK(i, o) do { xt_unlock_rwlock_ns(i); (void) (o); } while(0)
173#elif defined(TAB_CAC_USE_XSMUTEX)173#elif defined(TAB_CAC_USE_XSMUTEX)
174#define TAB_CAC_LOCK_TYPE XTMutexXSLockRec174#define TAB_CAC_LOCK_TYPE XTMutexXSLockRec
175#define TAB_CAC_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)175#define TAB_CAC_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)
176176
=== modified file 'plugin/pbxt/src/table_xt.h'
--- plugin/pbxt/src/table_xt.h 2010-04-08 16:11:29 +0000
+++ plugin/pbxt/src/table_xt.h 2010-04-26 17:24:25 +0000
@@ -125,9 +125,9 @@
125#define XT_TAB_ROW_LOCK_TYPE xt_rwlock_type125#define XT_TAB_ROW_LOCK_TYPE xt_rwlock_type
126#define XT_TAB_ROW_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)126#define XT_TAB_ROW_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)
127#define XT_TAB_ROW_FREE_LOCK(s, i) xt_free_rwlock(i) 127#define XT_TAB_ROW_FREE_LOCK(s, i) xt_free_rwlock(i)
128#define XT_TAB_ROW_READ_LOCK(i, s) xt_slock_rwlock_ns(i)128#define XT_TAB_ROW_READ_LOCK(i, s) do { xt_slock_rwlock_ns(i); (void) (s); } while(0)
129#define XT_TAB_ROW_WRITE_LOCK(i, s) xt_xlock_rwlock_ns(i)129#define XT_TAB_ROW_WRITE_LOCK(i, s) do { xt_xlock_rwlock_ns(i); (void) (s); } while(0)
130#define XT_TAB_ROW_UNLOCK(i, s) xt_unlock_rwlock_ns(i)130#define XT_TAB_ROW_UNLOCK(i, s) do { xt_unlock_rwlock_ns(i); (void) (s); } while(0)
131#elif defined(XT_TAB_ROW_USE_XSMUTEX)131#elif defined(XT_TAB_ROW_USE_XSMUTEX)
132#define XT_TAB_ROW_LOCK_TYPE XTMutexXSLockRec132#define XT_TAB_ROW_LOCK_TYPE XTMutexXSLockRec
133#define XT_TAB_ROW_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)133#define XT_TAB_ROW_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)
134134
=== modified file 'plugin/pbxt/src/thread_xt.h'
--- plugin/pbxt/src/thread_xt.h 2010-04-14 16:29:40 +0000
+++ plugin/pbxt/src/thread_xt.h 2010-04-26 17:24:25 +0000
@@ -652,9 +652,9 @@
652#define THR_ARRAY_LOCK_TYPE xt_rwlock_type652#define THR_ARRAY_LOCK_TYPE xt_rwlock_type
653#define THR_ARRAY_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)653#define THR_ARRAY_INIT_LOCK(s, i) xt_init_rwlock_with_autoname(s, i)
654#define THR_ARRAY_FREE_LOCK(s, i) xt_free_rwlock(i) 654#define THR_ARRAY_FREE_LOCK(s, i) xt_free_rwlock(i)
655#define THR_ARRAY_READ_LOCK(i, o) xt_slock_rwlock_ns(i)655#define THR_ARRAY_READ_LOCK(i, o) do { xt_slock_rwlock_ns(i); (void) (o); } while(0)
656#define THR_ARRAY_WRITE_LOCK(i, o) xt_xlock_rwlock_ns(i)656#define THR_ARRAY_WRITE_LOCK(i, o) do { xt_xlock_rwlock_ns(i); (void) (o); } while(0)
657#define THR_ARRAY_UNLOCK(i, o) xt_unlock_rwlock_ns(i)657#define THR_ARRAY_UNLOCK(i, o) do { xt_unlock_rwlock_ns(i); (void) (o); } while(0)
658#elif defined(THR_ARRAY_USE_XSMUTEX)658#elif defined(THR_ARRAY_USE_XSMUTEX)
659#define THR_ARRAY_LOCK_TYPE XTMutexXSLockRec659#define THR_ARRAY_LOCK_TYPE XTMutexXSLockRec
660#define THR_ARRAY_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)660#define THR_ARRAY_INIT_LOCK(s, i) xt_xsmutex_init_with_autoname(s, i)