Skip to content

CLN: remove unused file opening and mmap code from parsers.pyx #40431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2021
Merged

CLN: remove unused file opening and mmap code from parsers.pyx #40431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions pandas/_libs/parsers.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,21 +284,10 @@ cdef extern from "parser/tokenizer.h":


cdef extern from "parser/io.h":
void *new_mmap(char *fname)
int del_mmap(void *src)
void* buffer_mmap_bytes(void *source, size_t nbytes,
size_t *bytes_read, int *status)

void *new_file_source(char *fname, size_t buffer_size) except NULL

void *new_rd_source(object obj) except NULL

int del_file_source(void *src)
int del_rd_source(void *src)

void* buffer_file_bytes(void *source, size_t nbytes,
size_t *bytes_read, int *status)

void* buffer_rd_bytes(void *source, size_t nbytes,
size_t *bytes_read, int *status, const char *encoding_errors)

Expand Down
208 changes: 0 additions & 208 deletions pandas/_libs/src/parser/io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,83 +9,10 @@ The full license is in the LICENSE file, distributed with this software.

#include "io.h"

#include <sys/stat.h>
#include <fcntl.h>

#ifndef O_BINARY
#define O_BINARY 0
#endif // O_BINARY

#ifdef _WIN32
#define USE_WIN_UTF16
#include <Windows.h>
#endif

/*
On-disk FILE, uncompressed
*/

void *new_file_source(char *fname, size_t buffer_size) {
file_source *fs = (file_source *)malloc(sizeof(file_source));
if (fs == NULL) {
PyErr_NoMemory();
return NULL;
}

#ifdef USE_WIN_UTF16
// Fix gh-15086 properly - convert UTF8 to UTF16 that Windows widechar API
// accepts. This is needed because UTF8 might _not_ be convertible to MBCS
// for some conditions, as MBCS is locale-dependent, and not all unicode
// symbols can be expressed in it.
{
wchar_t* wname = NULL;
int required = MultiByteToWideChar(CP_UTF8, 0, fname, -1, NULL, 0);
if (required == 0) {
free(fs);
PyErr_SetFromWindowsErr(0);
return NULL;
}
wname = (wchar_t*)malloc(required * sizeof(wchar_t));
if (wname == NULL) {
free(fs);
PyErr_NoMemory();
return NULL;
}
if (MultiByteToWideChar(CP_UTF8, 0, fname, -1, wname, required) <
required) {
free(wname);
free(fs);
PyErr_SetFromWindowsErr(0);
return NULL;
}
fs->fd = _wopen(wname, O_RDONLY | O_BINARY);
free(wname);
}
#else
fs->fd = open(fname, O_RDONLY | O_BINARY);
#endif
if (fs->fd == -1) {
free(fs);
PyErr_SetFromErrnoWithFilename(PyExc_OSError, fname);
return NULL;
}

// Only allocate this heap memory if we are not memory-mapping the file
fs->buffer = (char *)malloc((buffer_size + 1) * sizeof(char));

if (fs->buffer == NULL) {
close(fs->fd);
free(fs);
PyErr_NoMemory();
return NULL;
}

memset(fs->buffer, '\0', buffer_size + 1);
fs->size = buffer_size;

return (void *)fs;
}

void *new_rd_source(PyObject *obj) {
rd_source *rds = (rd_source *)malloc(sizeof(rd_source));

Expand All @@ -108,17 +35,6 @@ void *new_rd_source(PyObject *obj) {

*/

int del_file_source(void *ptr) {
file_source *fs = ptr;
if (fs == NULL) return 0;

free(fs->buffer);
close(fs->fd);
free(fs);

return 0;
}

int del_rd_source(void *rds) {
Py_XDECREF(RDS(rds)->obj);
Py_XDECREF(RDS(rds)->buffer);
Expand All @@ -133,35 +49,6 @@ int del_rd_source(void *rds) {

*/

void *buffer_file_bytes(void *source, size_t nbytes, size_t *bytes_read,
int *status) {
file_source *fs = FS(source);
ssize_t rv;

if (nbytes > fs->size) {
nbytes = fs->size;
}

rv = read(fs->fd, fs->buffer, nbytes);
switch (rv) {
case -1:
*status = CALLING_READ_FAILED;
*bytes_read = 0;
return NULL;
case 0:
*status = REACHED_EOF;
*bytes_read = 0;
return NULL;
default:
*status = 0;
*bytes_read = rv;
fs->buffer[rv] = '\0';
break;
}

return (void *)fs->buffer;
}

void *buffer_rd_bytes(void *source, size_t nbytes, size_t *bytes_read,
int *status, const char *encoding_errors) {
PyGILState_STATE state;
Expand Down Expand Up @@ -218,98 +105,3 @@ void *buffer_rd_bytes(void *source, size_t nbytes, size_t *bytes_read,

return retval;
}

#ifdef HAVE_MMAP

#include <sys/mman.h>

void *new_mmap(char *fname) {
memory_map *mm;
struct stat stat;
size_t filesize;

mm = (memory_map *)malloc(sizeof(memory_map));
if (mm == NULL) {
return NULL;
}
mm->fd = open(fname, O_RDONLY | O_BINARY);
if (mm->fd == -1) {
free(mm);
return NULL;
}

if (fstat(mm->fd, &stat) == -1) {
close(mm->fd);
free(mm);
return NULL;
}
filesize = stat.st_size; /* XXX This might be 32 bits. */

mm->memmap = mmap(NULL, filesize, PROT_READ, MAP_SHARED, mm->fd, 0);
if (mm->memmap == MAP_FAILED) {
close(mm->fd);
free(mm);
return NULL;
}

mm->size = (off_t)filesize;
mm->position = 0;

return mm;
}

int del_mmap(void *ptr) {
memory_map *mm = ptr;

if (mm == NULL) return 0;

munmap(mm->memmap, mm->size);
close(mm->fd);
free(mm);

return 0;
}

void *buffer_mmap_bytes(void *source, size_t nbytes, size_t *bytes_read,
int *status) {
void *retval;
memory_map *src = source;
size_t remaining = src->size - src->position;

if (remaining == 0) {
*bytes_read = 0;
*status = REACHED_EOF;
return NULL;
}

if (nbytes > remaining) {
nbytes = remaining;
}

retval = src->memmap + src->position;

/* advance position in mmap data structure */
src->position += nbytes;

*bytes_read = nbytes;
*status = 0;

return retval;
}

#else

/* kludgy */

void *new_mmap(char *fname) { return NULL; }

int del_mmap(void *src) { return 0; }

/* don't use this! */

void *buffer_mmap_bytes(void *source, size_t nbytes, size_t *bytes_read,
int *status) {
return NULL;
}

#endif // HAVE_MMAP
35 changes: 0 additions & 35 deletions pandas/_libs/src/parser/io.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,37 +14,8 @@ The full license is in the LICENSE file, distributed with this software.
#include <Python.h>
#include "tokenizer.h"

typedef struct _file_source {
/* The file being read. */
int fd;

char *buffer;
size_t size;
} file_source;

#define FS(source) ((file_source *)source)

#if !defined(_WIN32) && !defined(HAVE_MMAP)
#define HAVE_MMAP
#endif // HAVE_MMAP

typedef struct _memory_map {
int fd;

/* Size of the file, in bytes. */
char *memmap;
size_t size;

size_t position;
} memory_map;

void *new_mmap(char *fname);

int del_mmap(void *src);

void *buffer_mmap_bytes(void *source, size_t nbytes, size_t *bytes_read,
int *status);

typedef struct _rd_source {
PyObject *obj;
PyObject *buffer;
Expand All @@ -53,16 +24,10 @@ typedef struct _rd_source {

#define RDS(source) ((rd_source *)source)

void *new_file_source(char *fname, size_t buffer_size);

void *new_rd_source(PyObject *obj);

int del_file_source(void *src);
int del_rd_source(void *src);

void *buffer_file_bytes(void *source, size_t nbytes, size_t *bytes_read,
int *status);

void *buffer_rd_bytes(void *source, size_t nbytes, size_t *bytes_read,
int *status, const char *encoding_errors);

Expand Down