summaryrefslogtreecommitdiffstats
path: root/otherlibs/bigarray
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>2008-01-04 15:01:48 +0000
committerXavier Leroy <xavier.leroy@inria.fr>2008-01-04 15:01:48 +0000
commit1844666bc80c2c13e00c724995cb85ba13837778 (patch)
tree5dba889943bbca487126d35e3dc8f23b3b2e264e /otherlibs/bigarray
parentbd7fc99c4381f7494ea1433afdf87d4e52650685 (diff)
PR#4457: no need to limit each bigarray dimension to 2^31.
Name space depollution. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8754 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/bigarray')
-rw-r--r--otherlibs/bigarray/Makefile.nt2
-rw-r--r--otherlibs/bigarray/mmap_unix.c30
-rw-r--r--otherlibs/bigarray/mmap_win32.c16
3 files changed, 24 insertions, 24 deletions
diff --git a/otherlibs/bigarray/Makefile.nt b/otherlibs/bigarray/Makefile.nt
index 119eaea55..78f3fc6b6 100644
--- a/otherlibs/bigarray/Makefile.nt
+++ b/otherlibs/bigarray/Makefile.nt
@@ -14,7 +14,7 @@
# $Id$
LIBNAME=bigarray
-EXTRACFLAGS=-I../win32unix -DIN_OCAML_BIGARRAY
+EXTRACFLAGS=-I../win32unix -DIN_OCAML_BIGARRAY -DCAML_NAME_SPACE
EXTRACAMLFLAGS=-I ../win32unix
COBJS=bigarray_stubs.$(O) mmap_win32.$(O)
CAMLOBJS=bigarray.cmo
diff --git a/otherlibs/bigarray/mmap_unix.c b/otherlibs/bigarray/mmap_unix.c
index 0acef2004..5cfb63571 100644
--- a/otherlibs/bigarray/mmap_unix.c
+++ b/otherlibs/bigarray/mmap_unix.c
@@ -43,7 +43,7 @@ CAMLprim value caml_ba_map_file(value vfd, value vkind, value vlayout,
{
int fd, flags, major_dim, shared;
intnat num_dims, i;
- intnat dim[MAX_NUM_DIMS];
+ intnat dim[CAML_BA_MAX_NUM_DIMS];
file_offset currpos, startpos, file_size, data_size;
uintnat array_size, page, delta;
char c;
@@ -53,44 +53,44 @@ CAMLprim value caml_ba_map_file(value vfd, value vkind, value vlayout,
flags = Int_val(vkind) | Int_val(vlayout);
startpos = File_offset_val(vstart);
num_dims = Wosize_val(vdim);
- major_dim = flags & BIGARRAY_FORTRAN_LAYOUT ? num_dims - 1 : 0;
+ major_dim = flags & CAML_BA_FORTRAN_LAYOUT ? num_dims - 1 : 0;
/* Extract dimensions from Caml array */
num_dims = Wosize_val(vdim);
- if (num_dims < 1 || num_dims > MAX_NUM_DIMS)
- invalid_argument("Bigarray.mmap: bad number of dimensions");
+ if (num_dims < 1 || num_dims > CAML_BA_MAX_NUM_DIMS)
+ caml_invalid_argument("Bigarray.mmap: bad number of dimensions");
for (i = 0; i < num_dims; i++) {
dim[i] = Long_val(Field(vdim, i));
if (dim[i] == -1 && i == major_dim) continue;
- if (dim[i] < 0 || dim[i] > 0x7FFFFFFFL)
- invalid_argument("Bigarray.create: negative dimension");
+ if (dim[i] < 0)
+ caml_invalid_argument("Bigarray.create: negative dimension");
}
/* Determine file size */
currpos = lseek(fd, 0, SEEK_CUR);
- if (currpos == -1) sys_error(NO_ARG);
+ if (currpos == -1) caml_sys_error(NO_ARG);
file_size = lseek(fd, 0, SEEK_END);
- if (file_size == -1) sys_error(NO_ARG);
+ if (file_size == -1) caml_sys_error(NO_ARG);
/* Determine array size in bytes (or size of array without the major
dimension if that dimension wasn't specified) */
- array_size = bigarray_element_size[flags & BIGARRAY_KIND_MASK];
+ array_size = caml_ba_element_size[flags & CAML_BA_KIND_MASK];
for (i = 0; i < num_dims; i++)
if (dim[i] != -1) array_size *= dim[i];
/* Check if the major dimension is unknown */
if (dim[major_dim] == -1) {
/* Determine major dimension from file size */
if (file_size < startpos)
- failwith("Bigarray.mmap: file position exceeds file size");
+ caml_failwith("Bigarray.mmap: file position exceeds file size");
data_size = file_size - startpos;
dim[major_dim] = (uintnat) (data_size / array_size);
array_size = dim[major_dim] * array_size;
if (array_size != data_size)
- failwith("Bigarray.mmap: file size doesn't match array dimensions");
+ caml_failwith("Bigarray.mmap: file size doesn't match array dimensions");
} else {
/* Check that file is large enough, and grow it otherwise */
if (file_size < startpos + array_size) {
if (lseek(fd, startpos + array_size - 1, SEEK_SET) == -1)
- sys_error(NO_ARG);
+ caml_sys_error(NO_ARG);
c = 0;
- if (write(fd, &c, 1) != 1) sys_error(NO_ARG);
+ if (write(fd, &c, 1) != 1) caml_sys_error(NO_ARG);
}
}
/* Restore original file position */
@@ -102,10 +102,10 @@ CAMLprim value caml_ba_map_file(value vfd, value vkind, value vlayout,
shared = Bool_val(vshared) ? MAP_SHARED : MAP_PRIVATE;
addr = mmap(NULL, array_size + delta, PROT_READ | PROT_WRITE,
shared, fd, startpos - delta);
- if (addr == (void *) MAP_FAILED) sys_error(NO_ARG);
+ if (addr == (void *) MAP_FAILED) caml_sys_error(NO_ARG);
addr = (void *) ((uintnat) addr + delta);
/* Build and return the Caml bigarray */
- return alloc_bigarray(flags | BIGARRAY_MAPPED_FILE, num_dims, addr, dim);
+ return caml_ba_alloc(flags | CAML_BA_MAPPED_FILE, num_dims, addr, dim);
}
#else
diff --git a/otherlibs/bigarray/mmap_win32.c b/otherlibs/bigarray/mmap_win32.c
index fc48c7f5f..2fdfa84eb 100644
--- a/otherlibs/bigarray/mmap_win32.c
+++ b/otherlibs/bigarray/mmap_win32.c
@@ -65,12 +65,12 @@ CAMLprim value caml_ba_map_file(value vfd, value vkind, value vlayout,
/* Extract dimensions from Caml array */
num_dims = Wosize_val(vdim);
if (num_dims < 1 || num_dims > MAX_NUM_DIMS)
- invalid_argument("Bigarray.mmap: bad number of dimensions");
+ caml_invalid_argument("Bigarray.mmap: bad number of dimensions");
for (i = 0; i < num_dims; i++) {
dim[i] = Long_val(Field(vdim, i));
if (dim[i] == -1 && i == major_dim) continue;
- if (dim[i] < 0 || dim[i] > 0x7FFFFFFFL)
- invalid_argument("Bigarray.create: negative dimension");
+ if (dim[i] < 0)
+ caml_invalid_argument("Bigarray.create: negative dimension");
}
/* Determine file size */
currpos = caml_ba_set_file_pointer(fd, 0, FILE_CURRENT);
@@ -79,19 +79,19 @@ CAMLprim value caml_ba_map_file(value vfd, value vkind, value vlayout,
if (file_size == -1) caml_ba_sys_error();
/* Determine array size in bytes (or size of array without the major
dimension if that dimension wasn't specified) */
- array_size = bigarray_element_size[flags & BIGARRAY_KIND_MASK];
+ array_size = caml_ba_element_size[flags & BIGARRAY_KIND_MASK];
for (i = 0; i < num_dims; i++)
if (dim[i] != -1) array_size *= dim[i];
/* Check if the first/last dimension is unknown */
if (dim[major_dim] == -1) {
/* Determine first/last dimension from file size */
if (file_size < startpos)
- failwith("Bigarray.mmap: file position exceeds file size");
+ caml_failwith("Bigarray.mmap: file position exceeds file size");
data_size = file_size - startpos;
dim[major_dim] = (uintnat) (data_size / array_size);
array_size = dim[major_dim] * array_size;
if (array_size != data_size)
- failwith("Bigarray.mmap: file size doesn't match array dimensions");
+ caml_failwith("Bigarray.mmap: file size doesn't match array dimensions");
}
/* Restore original file position */
caml_ba_set_file_pointer(fd, currpos, FILE_BEGIN);
@@ -118,7 +118,7 @@ CAMLprim value caml_ba_map_file(value vfd, value vkind, value vlayout,
/* Close the file mapping */
CloseHandle(fmap);
/* Build and return the Caml bigarray */
- return alloc_bigarray(flags | BIGARRAY_MAPPED_FILE, num_dims, addr, dim);
+ return caml_ba_alloc(flags | BIGARRAY_MAPPED_FILE, num_dims, addr, dim);
}
CAMLprim value caml_ba_map_file_bytecode(value * argv, int argn)
@@ -151,5 +151,5 @@ static void caml_ba_sys_error(void)
sizeof(buffer),
NULL))
sprintf(buffer, "Unknown error %ld\n", errnum);
- raise_sys_error(copy_string(buffer));
+ caml_raise_sys_error(caml_copy_string(buffer));
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-03-19 00:21:57 +0000