Skip to content

Improve float parsing performance #94

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
lelit merged 1 commit into from
Jan 14, 2018
Merged

Improve float parsing performance #94

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
34 changes: 27 additions & 7 deletions rapidjson.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,30 @@ static PyObject* validator_call(PyObject* self, PyObject* args, PyObject* kwargs
static void validator_dealloc(PyObject* self);
static PyObject* validator_new(PyTypeObject* type, PyObject* args, PyObject* kwargs);

/*
* Adapted from CPython's 'float_from_string_inner'
*/
static PyObject *
float_from_string(const char *s, Py_ssize_t len)
{
double x;
const char *end;

/* We don't care about overflow or underflow. If the platform
* supports them, infinities and signed zeroes (on underflow) are
* fine. */
x = PyOS_string_to_double(s, (char **)&end, NULL);
if (end != s + len) {
return NULL;
}
else if (x == -1.0 && PyErr_Occurred()) {
return NULL;
}
else {
return PyFloat_FromDouble(x);
}
}


///////////////////////////////////////////////////
// Stream wrapper around Python file-like object //
Expand Down Expand Up @@ -812,19 +836,15 @@ struct PyHandler {
}

if (isFloat) {
PyObject* pystr = PyUnicode_FromStringAndSize(str, length);

if (pystr == NULL) {
return false;
}

if (numberMode & NM_DECIMAL) {
PyObject* pystr = PyUnicode_FromStringAndSize(str, length);
value = PyObject_CallFunctionObjArgs(decimal_type, pystr, NULL);
Py_DECREF(pystr);
} else {
value = PyFloat_FromString(pystr);
value = float_from_string(str, length);
}

Py_DECREF(pystr);
} else {
std::string zstr(str, length);

Expand Down