Changeset: 8fc87508453d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8fc87508453d
Branch: default
Log Message:
merged
diffs (38 lines):
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -525,15 +525,9 @@ extern size_t GDK_mmap_pagesize; /* mmap
#define GDKswapLock(x) GDKbatLock[(x)&BBP_BATMASK].swap
-#if ATOMIC_LLONG_LOCK_FREE == 2
-#define HEAPREMOVE ((ATOMIC_BASE_TYPE) 1 << 63)
-#define DELAYEDREMOVE ((ATOMIC_BASE_TYPE) 1 << 62)
-#define HEAPREFS (((ATOMIC_BASE_TYPE) 1 << 62) - 1)
-#else
-#define HEAPREMOVE ((ATOMIC_BASE_TYPE) 1 << 31)
-#define DELAYEDREMOVE ((ATOMIC_BASE_TYPE) 1 << 30)
-#define HEAPREFS (((ATOMIC_BASE_TYPE) 1 << 30) - 1)
-#endif
+#define HEAPREMOVE ((ATOMIC_BASE_TYPE) 1 << (sizeof(ATOMIC_BASE_TYPE) * 8
- 1))
+#define DELAYEDREMOVE ((ATOMIC_BASE_TYPE) 1 << (sizeof(ATOMIC_BASE_TYPE) * 8
- 2))
+#define HEAPREFS (((ATOMIC_BASE_TYPE) 1 << (sizeof(ATOMIC_BASE_TYPE) * 8
- 2)) - 1)
/* when the number of updates to a BAT is less than 1 in this number, we
* keep the unique_est property */
diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h
--- a/sql/storage/sql_storage.h
+++ b/sql/storage/sql_storage.h
@@ -474,11 +474,7 @@ extern sql_table *globaltmp_instantiate(
#define NR_TABLE_LOCKS 64
#define NR_COLUMN_LOCKS 512
-#if ATOMIC_LLONG_LOCK_FREE == 2
-#define TRANSACTION_ID_BASE (1ULL<<63)
-#else
-#define TRANSACTION_ID_BASE (1UL<<31)
-#endif
+#define TRANSACTION_ID_BASE (1ULL<<(sizeof(ATOMIC_BASE_TYPE) * 8 - 1))
typedef struct sqlstore {
int catalog_version; /* software version of the catalog */
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
