MonetDB: int128 - Merge with Jan2014 branch.

[Stefan Manegold]

Changeset: 80b5e9bbadb7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=80b5e9bbadb7
Modified Files:
        gdk/gdk_utils.c
        monetdb5/optimizer/opt_pipes.c
Branch: int128
Log Message:

Merge with Jan2014 branch.


diffs (32 lines):

diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1045,10 +1045,12 @@ GDKinit(opt *set, int setlen)
                        GDK_mmap_minsize = (size_t) strtoll(n[i].value, NULL, 
10);
                } else if (strcmp("gdk_mmap_pagesize", n[i].name) == 0) {
                        GDK_mmap_pagesize = (size_t) strtoll(n[i].value, NULL, 
10);
-                       for (i = 12; i < 20; i++)
-                               if (GDK_mmap_pagesize == ((size_t) 1 << i))
-                                       break;
-                       if (i == 20)
+                       if (GDK_mmap_pagesize < 1 << 12 ||
+                           GDK_mmap_pagesize > 1 << 20 ||
+                           /* x & (x - 1): turn off rightmost 1 bit;
+                            * i.e. if result is zero, x is power of
+                            * two */
+                           (GDK_mmap_pagesize & (GDK_mmap_pagesize - 1)) != 0)
                                GDKfatal("GDKinit: gdk_mmap_pagesize must be 
power of 2 between 2**12 and 2**20\n");
                }
        }
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -41,7 +41,7 @@
 
 #define MAXOPTPIPES 64
 
-struct PIPELINES {
+static struct PIPELINES {
        char *name;
        char *def;
        char *status;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list