hg-stable: comparison contrib/python-zstandard/c-ext/compressionparams.c

equal deleted inserted replaced

-:5b60464efbde
+:c32454d69b85
 	unsigned PY_LONG_LONG sourceSize = 0;
 	Py_ssize_t dictSize = 0;
 	ZSTD_compressionParameters params;
 	CompressionParametersObject* result;
-	if (!PyArg_ParseTuple(args, "i|Kn", &compressionLevel, &sourceSize, &dictSize)) {
+	if (!PyArg_ParseTuple(args, "i|Kn:get_compression_parameters",
+		&compressionLevel, &sourceSize, &dictSize)) {
 		return NULL;
 	}
 	params = ZSTD_getCParams(compressionLevel, sourceSize, dictSize);
 	result->strategy = params.strategy;
 	return result;
 }
-PyObject* estimate_compression_context_size(PyObject* self, PyObject* args) {
+static int CompressionParameters_init(CompressionParametersObject* self, PyObject* args, PyObject* kwargs) {
-	CompressionParametersObject* params;
+	static char* kwlist[] = {
-	ZSTD_compressionParameters zparams;
+		"window_log",
-	PyObject* result;
+		"chain_log",
+		"hash_log",
-	if (!PyArg_ParseTuple(args, "O!", &CompressionParametersType, &params)) {
+		"search_log",
-		return NULL;
+		"search_length",
-	}
+		"target_length",
+		"strategy",
-	ztopy_compression_parameters(params, &zparams);
+		NULL
-	result = PyLong_FromSize_t(ZSTD_estimateCCtxSize(zparams));
+	};
-	return result;
-}
-PyDoc_STRVAR(CompressionParameters__doc__,
-"CompressionParameters: low-level control over zstd compression");
-static PyObject* CompressionParameters_new(PyTypeObject* subtype, PyObject* args, PyObject* kwargs) {
-	CompressionParametersObject* self;
 	unsigned windowLog;
 	unsigned chainLog;
 	unsigned hashLog;
 	unsigned searchLog;
 	unsigned searchLength;
 	unsigned targetLength;
 	unsigned strategy;
-	if (!PyArg_ParseTuple(args, "IIIIIII", &windowLog, &chainLog, &hashLog, &searchLog,
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "IIIIIII:CompressionParameters",
-		&searchLength, &targetLength, &strategy)) {
+		kwlist, &windowLog, &chainLog, &hashLog, &searchLog, &searchLength,
-		return NULL;
+		&targetLength, &strategy)) {
+		return -1;
 	}
 	if (windowLog < ZSTD_WINDOWLOG_MIN || windowLog > ZSTD_WINDOWLOG_MAX) {
 		PyErr_SetString(PyExc_ValueError, "invalid window log value");
-		return NULL;
+		return -1;
 	}
 	if (chainLog < ZSTD_CHAINLOG_MIN || chainLog > ZSTD_CHAINLOG_MAX) {
 		PyErr_SetString(PyExc_ValueError, "invalid chain log value");
-		return NULL;
+		return -1;
 	}
 	if (hashLog < ZSTD_HASHLOG_MIN || hashLog > ZSTD_HASHLOG_MAX) {
 		PyErr_SetString(PyExc_ValueError, "invalid hash log value");
-		return NULL;
+		return -1;
 	}
 	if (searchLog < ZSTD_SEARCHLOG_MIN || searchLog > ZSTD_SEARCHLOG_MAX) {
 		PyErr_SetString(PyExc_ValueError, "invalid search log value");
-		return NULL;
+		return -1;
 	}
 	if (searchLength < ZSTD_SEARCHLENGTH_MIN || searchLength > ZSTD_SEARCHLENGTH_MAX) {
 		PyErr_SetString(PyExc_ValueError, "invalid search length value");
-		return NULL;
+		return -1;
 	}
 	if (targetLength < ZSTD_TARGETLENGTH_MIN || targetLength > ZSTD_TARGETLENGTH_MAX) {
 		PyErr_SetString(PyExc_ValueError, "invalid target length value");
-		return NULL;
+		return -1;
 	}
 	if (strategy < ZSTD_fast || strategy > ZSTD_btopt) {
 		PyErr_SetString(PyExc_ValueError, "invalid strategy value");
-		return NULL;
+		return -1;
-	}
-	self = (CompressionParametersObject*)subtype->tp_alloc(subtype, 1);
-	if (!self) {
-		return NULL;
 	}
 	self->windowLog = windowLog;
 	self->chainLog = chainLog;
 	self->hashLog = hashLog;
 	self->searchLog = searchLog;
 	self->searchLength = searchLength;
 	self->targetLength = targetLength;
 	self->strategy = strategy;
-	return (PyObject*)self;
+	return 0;
 }
+PyObject* estimate_compression_context_size(PyObject* self, PyObject* args) {
+	CompressionParametersObject* params;
+	ZSTD_compressionParameters zparams;
+	PyObject* result;
+	if (!PyArg_ParseTuple(args, "O!:estimate_compression_context_size",
+		&CompressionParametersType, &params)) {
+		return NULL;
+	}
+	ztopy_compression_parameters(params, &zparams);
+	result = PyLong_FromSize_t(ZSTD_estimateCCtxSize(zparams));
+	return result;
+}
+PyDoc_STRVAR(CompressionParameters__doc__,
+"CompressionParameters: low-level control over zstd compression");
 static void CompressionParameters_dealloc(PyObject* self) {
 	PyObject_Del(self);
 }
-static Py_ssize_t CompressionParameters_length(PyObject* self) {
+static PyMemberDef CompressionParameters_members[] = {
-	return 7;
+	{ "window_log", T_UINT,
-}
+	  offsetof(CompressionParametersObject, windowLog), READONLY,
+	  "window log" },
-static PyObject* CompressionParameters_item(PyObject* o, Py_ssize_t i) {
+	{ "chain_log", T_UINT,
-	CompressionParametersObject* self = (CompressionParametersObject*)o;
+	  offsetof(CompressionParametersObject, chainLog), READONLY,
+	  "chain log" },
-	switch (i) {
+	{ "hash_log", T_UINT,
-	case 0:
+	  offsetof(CompressionParametersObject, hashLog), READONLY,
-		return PyLong_FromLong(self->windowLog);
+	  "hash log" },
-	case 1:
+	{ "search_log", T_UINT,
-		return PyLong_FromLong(self->chainLog);
+	  offsetof(CompressionParametersObject, searchLog), READONLY,
-	case 2:
+	  "search log" },
-		return PyLong_FromLong(self->hashLog);
+	{ "search_length", T_UINT,
-	case 3:
+	  offsetof(CompressionParametersObject, searchLength), READONLY,
-		return PyLong_FromLong(self->searchLog);
+	  "search length" },
-	case 4:
+	{ "target_length", T_UINT,
-		return PyLong_FromLong(self->searchLength);
+	  offsetof(CompressionParametersObject, targetLength), READONLY,
-	case 5:
+	  "target length" },
-		return PyLong_FromLong(self->targetLength);
+	{ "strategy", T_INT,
-	case 6:
+	  offsetof(CompressionParametersObject, strategy), READONLY,
-		return PyLong_FromLong(self->strategy);
+	  "strategy" },
-	default:
+	{ NULL }
-		PyErr_SetString(PyExc_IndexError, "index out of range");
-		return NULL;
-	}
-}
-static PySequenceMethods CompressionParameters_sq = {
-	CompressionParameters_length, /* sq_length */
-	0,							  /* sq_concat */
-	0,                            /* sq_repeat */
-	CompressionParameters_item,   /* sq_item */
-	0,                            /* sq_ass_item */
-	0,                            /* sq_contains */
-	0,                            /* sq_inplace_concat */
-	0                             /* sq_inplace_repeat */
 };
 PyTypeObject CompressionParametersType = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	"CompressionParameters", /* tp_name */
 	0,                         /* tp_getattr */
 	0,                         /* tp_setattr */
 	0,                         /* tp_compare */
 	0,                         /* tp_repr */
 	0,                         /* tp_as_number */
-	&CompressionParameters_sq, /* tp_as_sequence */
+	0,                         /* tp_as_sequence */
 	0,                         /* tp_as_mapping */
 	0,                         /* tp_hash  */
 	0,                         /* tp_call */
 	0,                         /* tp_str */
 	0,                         /* tp_getattro */
 	0,                         /* tp_setattro */
 	0,                         /* tp_as_buffer */
-	Py_TPFLAGS_DEFAULT,        /* tp_flags */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
 	CompressionParameters__doc__, /* tp_doc */
 	0,                         /* tp_traverse */
 	0,                         /* tp_clear */
 	0,                         /* tp_richcompare */
 	0,                         /* tp_weaklistoffset */
 	0,                         /* tp_iter */
 	0,                         /* tp_iternext */
 	0,                         /* tp_methods */
-	0,                         /* tp_members */
+	CompressionParameters_members, /* tp_members */
 	0,                         /* tp_getset */
 	0,                         /* tp_base */
 	0,                         /* tp_dict */
 	0,                         /* tp_descr_get */
 	0,                         /* tp_descr_set */
 	0,                         /* tp_dictoffset */
-	0,                         /* tp_init */
+	(initproc)CompressionParameters_init, /* tp_init */
 	0,                         /* tp_alloc */
-	CompressionParameters_new, /* tp_new */
+	PyType_GenericNew,         /* tp_new */
 };
 void compressionparams_module_init(PyObject* mod) {
 	Py_TYPE(&CompressionParametersType) = &PyType_Type;
 	if (PyType_Ready(&CompressionParametersType) < 0) {

changeset 30924	c32454d69b85
parent 30507	d7a05d8351d0
child 31799	e0dc40530c5a