Changeset: 77c6388a71f8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=77c6388a71f8
Removed Files:
monetdb5/tests/BugReports/Tests/no.037.patch
monetdb5/tests/BugReports/Tests/no.050.patch
monetdb5/tests/BugReports/Tests/no.062.patch
monetdb5/tests/BugReports/Tests/no.125.patch
monetdb5/tests/suite_01/Tests/test_00.patch
monetdb5/tests/suite_01/Tests/test_15.patch
monetdb5/tests/suite_01/Tests/test_30.patch
monetdb5/tests/suite_01/Tests/test_60.patch
Modified Files:
gdk/gdk.h
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_utils.c
Branch: default
Log Message:
Merge with default
diffs (181 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2199,7 +2199,7 @@ gdk_export BAT *BAThashjoin(BAT *l, BAT
#define GDK_HISTO_MAX_BIT ((int) (sizeof(size_t)<<3))
/* we prefer to use vm_alloc routines on size > GDKmmap */
-gdk_export void *GDKmmap(char *path, int mode, off_t off, size_t len);
+gdk_export void *GDKmmap(const char *path, int mode, off_t off, size_t len);
gdk_export size_t GDK_mem_bigsize; /* size after which we use anonymous VM
rather than malloc */
gdk_export size_t GDK_mem_maxsize; /* max allowed size of committed memory
*/
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -363,7 +363,7 @@ MT_heapcur(void)
}
void *
-MT_mmap(char *path, int mode, off_t off, size_t len)
+MT_mmap(const char *path, int mode, off_t off, size_t len)
{
int fd = open(path, O_CREAT | ((mode & MMAP_WRITE) ? O_RDWR :
O_RDONLY), MONETDB_MODE);
void *ret = (void *) -1L;
@@ -513,7 +513,7 @@ MT_heapcur(void)
needs to be unmapped separately in the end. */
void *
-MT_mmap(char *path, int mode, off_t off, size_t len)
+MT_mmap(const char *path, int mode, off_t off, size_t len)
{
DWORD mode0 = FILE_READ_ATTRIBUTES | FILE_READ_DATA;
DWORD mode1 = FILE_SHARE_READ | FILE_SHARE_WRITE;
diff --git a/gdk/gdk_posix.h b/gdk/gdk_posix.h
--- a/gdk/gdk_posix.h
+++ b/gdk/gdk_posix.h
@@ -192,7 +192,7 @@ gdk_export char *MT_heapcur(void);
gdk_export size_t MT_getrss(void);
-gdk_export void *MT_mmap(char *path, int mode, off_t off, size_t len);
+gdk_export void *MT_mmap(const char *path, int mode, off_t off, size_t len);
gdk_export int MT_munmap(void *p, size_t len);
gdk_export int MT_path_absolute(const char *path);
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1027,7 +1027,7 @@ GDKstrdup(const char *s)
* allocations affect only the logical VM resources.
*/
void *
-GDKmmap(char *path, int mode, off_t off, size_t len)
+GDKmmap(const char *path, int mode, off_t off, size_t len)
{
void *ret = MT_mmap(path, mode, off, len);
diff --git a/monetdb5/tests/BugReports/Tests/no.037.patch
b/monetdb5/tests/BugReports/Tests/no.037.patch
deleted file mode 100755
--- a/monetdb5/tests/BugReports/Tests/no.037.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# this file should be run after a M2m compile
-echo "patch no.037.mal"
-echo "mil.line(\"mem.print();\");"
-echo "mem:= mil.take(\"mem\");"
-echo "ba_a := print(mem);"
-echo "reason: non existing object"
-ex - no.037.mal <<!EOF
-/mem:= mil.take/,/ba_a := print/d
-w no.037.mal
-f
-q
-!EOF
diff --git a/monetdb5/tests/BugReports/Tests/no.050.patch
b/monetdb5/tests/BugReports/Tests/no.050.patch
deleted file mode 100755
--- a/monetdb5/tests/BugReports/Tests/no.050.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-# this file should be run after a M2m compile
-echo "patch no.050.mal"
-echo "lines removed:"
-grep index no.050.mal
-echo "reason: accbuild not used"
-ex - no.050.mal <<!EOF
-g/index/d
-w no.050.mal
-q
-!EOF
diff --git a/monetdb5/tests/BugReports/Tests/no.062.patch
b/monetdb5/tests/BugReports/Tests/no.062.patch
deleted file mode 100755
--- a/monetdb5/tests/BugReports/Tests/no.062.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-# this file should be run after a M2m compile
-echo "patch no.062.mal"
-echo "reason: remove ambiguous code"
-ex - no.062.mal <<!EOF
-g/1-1/s//1 - 1/
-g/^!/d
-w no.062.mal
-q
-!EOF
diff --git a/monetdb5/tests/BugReports/Tests/no.125.patch
b/monetdb5/tests/BugReports/Tests/no.125.patch
deleted file mode 100755
--- a/monetdb5/tests/BugReports/Tests/no.125.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-# this file should be run after a M2m compile
-echo "patch no.125.mal"
-echo "reason: type the take command"
-ex - no.125.mal <<!EOF
-g/:= mil.take/s//:dbl&/
-w no.125.mal
-f
-q
-!EOF
diff --git a/monetdb5/tests/suite_01/Tests/test_00.patch
b/monetdb5/tests/suite_01/Tests/test_00.patch
deleted file mode 100755
--- a/monetdb5/tests/suite_01/Tests/test_00.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# this file should be run after a M2m compile
-echo "patch test_00"
-echo "test dropped"
-echo "reason: it uses 4.4 catalogues"
-ex - test_00.mal <<!EOF
-1,$d
-a
-print("test dropped: it uses 4.4. catalogues");
-.
-w test_00.mal
-q
-!EOF
diff --git a/monetdb5/tests/suite_01/Tests/test_15.patch
b/monetdb5/tests/suite_01/Tests/test_15.patch
deleted file mode 100755
--- a/monetdb5/tests/suite_01/Tests/test_15.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-# this file should be run after a M2m compile
-echo "patch test_15"
-echo "reason: mapped io() -> ioStatistics()"
-ex - test_15.mal <<!EOF
-g/io()/s//ioStatistics()/
-w test_15.mal
-q
-!EOF
diff --git a/monetdb5/tests/suite_01/Tests/test_30.patch
b/monetdb5/tests/suite_01/Tests/test_30.patch
deleted file mode 100755
--- a/monetdb5/tests/suite_01/Tests/test_30.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# this file should be run after a M2m compile
-echo "patch test_30"
-echo "test dropped"
-echo "reason: it uses 4.4 catalogues"
-ex - test_30.mal <<!EOF
-1,$d
-a
-print("test dropped: it uses 4.4. catalogues");
-.
-w test_30.mal
-q
-!EOF
diff --git a/monetdb5/tests/suite_01/Tests/test_60.patch
b/monetdb5/tests/suite_01/Tests/test_60.patch
deleted file mode 100755
--- a/monetdb5/tests/suite_01/Tests/test_60.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# this file should be run after a M2m compile
-echo "patch test_60"
-echo "test dropped"
-echo "reason: it uses 4.4 catalogues"
-ex - test_60.mal <<!EOF
-1,$d
-a
-print("test dropped: it uses 4.4. catalogues");
-.
-w test_60.mal
-q
-!EOF
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
