diff options
Diffstat (limited to 'otherlibs/bigarray/mmap_unix.c')
| -rw-r--r-- | otherlibs/bigarray/mmap_unix.c | 30 |
1 files changed, 15 insertions, 15 deletions
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 |