#include <Python.h>
#include <structmember.h>
+#include <stddef.h>
#if (PY_VERSION_HEX < 0x02050000)
typedef int Py_ssize_t;
#include "stdarg.h"
static PyObject *py_fec_error;
-static PyObject *py_raise_fec_error (const char *format, ...);
static char fec__doc__[] = "\
FEC - Forward Error Correction \n\
";
-/* NOTE: if the complete expansion of the args (by vsprintf) exceeds 1024 then memory will be invalidly overwritten. */
-static PyObject *
-py_raise_fec_error(const char *format, ...) {
- char exceptionMsg[1024];
- va_list ap;
-
- va_start (ap, format);
- vsprintf (exceptionMsg, format, ap); /* Make sure that this can't exceed 1024 chars! */
- va_end (ap);
- exceptionMsg[1023]='\0';
- PyErr_SetString (py_fec_error, exceptionMsg);
- return NULL;
-}
-
static char Encoder__doc__[] = "\
Hold static encoder state (an in-memory table for matrix multiplication), and k and m parameters, and provide {encode()} method.\n\n\
@param k: the number of packets required for reconstruction \n\
PyObject_HEAD
/* expose these */
- short kk;
- short mm;
+ unsigned short kk;
+ unsigned short mm;
/* internal */
fec_t* fec_matrix;
NULL
};
int ink, inm;
- if (!PyArg_ParseTupleAndKeywords(args, kwdict, "ii", kwlist, &ink, &inm))
+ if (!PyArg_ParseTupleAndKeywords(args, kwdict, "ii:Encoder.__init__", kwlist, &ink, &inm))
return -1;
if (ink < 1) {
- py_raise_fec_error("Precondition violation: first argument is required to be greater than or equal to 1, but it was %d", self->kk);
+ PyErr_Format(py_fec_error, "Precondition violation: first argument is required to be greater than or equal to 1, but it was %d", ink);
return -1;
}
if (inm < 1) {
- py_raise_fec_error("Precondition violation: second argument is required to be greater than or equal to 1, but it was %d", self->mm);
+ PyErr_Format(py_fec_error, "Precondition violation: second argument is required to be greater than or equal to 1, but it was %d", inm);
return -1;
}
if (inm > 256) {
- py_raise_fec_error("Precondition violation: second argument is required to be less than or equal to 256, but it was %d", self->mm);
+ PyErr_Format(py_fec_error, "Precondition violation: second argument is required to be less than or equal to 256, but it was %d", inm);
return -1;
}
if (ink > inm) {
- py_raise_fec_error("Precondition violation: first argument is required to be less than or equal to the second argument, but they were %d and %d respectively", ink, inm);
+ PyErr_Format(py_fec_error, "Precondition violation: first argument is required to be less than or equal to the second argument, but they were %d and %d respectively", ink, inm);
return -1;
}
- self->kk = (short)ink;
- self->mm = (short)inm;
+ self->kk = (unsigned short)ink;
+ self->mm = (unsigned short)inm;
self->fec_matrix = fec_new(self->kk, self->mm);
return 0;
Py_ssize_t sz, oldsz = 0;
unsigned char check_block_index = 0; /* index into the check_blocks_produced and (parallel) pystrs_produced arrays */
- if (!PyArg_ParseTuple(args, "O|O", &inblocks, &desired_blocks_nums))
+ if (!PyArg_ParseTuple(args, "O|O:Encoder.encode", &inblocks, &desired_blocks_nums))
return NULL;
for (i=0; i<self->mm - self->kk; i++)
fast_desired_blocks_nums_items = PySequence_Fast_ITEMS(fast_desired_blocks_nums);
for (i=0; i<num_desired_blocks; i++) {
if (!PyInt_Check(fast_desired_blocks_nums_items[i])) {
- py_raise_fec_error("Precondition violation: second argument is required to contain int.");
+ PyErr_Format(py_fec_error, "Precondition violation: second argument is required to contain int.");
goto err;
}
c_desired_blocks_nums[i] = PyInt_AsLong(fast_desired_blocks_nums_items[i]);
goto err;
if (PySequence_Fast_GET_SIZE(fastinblocks) != self->kk) {
- py_raise_fec_error("Precondition violation: Wrong length -- first argument (the sequence of input blocks) is required to contain exactly k blocks. len(first): %d, k: %d", PySequence_Fast_GET_SIZE(fastinblocks), self->kk);
+ PyErr_Format(py_fec_error, "Precondition violation: Wrong length -- first argument (the sequence of input blocks) is required to contain exactly k blocks. len(first): %Zu, k: %d", PySequence_Fast_GET_SIZE(fastinblocks), self->kk);
goto err;
}
for (i=0; i<self->kk; i++) {
if (!PyObject_CheckReadBuffer(fastinblocksitems[i])) {
- py_raise_fec_error("Precondition violation: %u'th item is required to offer the single-segment read character buffer protocol, but it does not.", i);
+ PyErr_Format(py_fec_error, "Precondition violation: %u'th item is required to offer the single-segment read character buffer protocol, but it does not.", i);
goto err;
}
if (PyObject_AsReadBuffer(fastinblocksitems[i], (const void**)&(incblocks[i]), &sz))
goto err;
if (oldsz != 0 && oldsz != sz) {
- py_raise_fec_error("Precondition violation: Input blocks are required to be all the same length. length of one block was: %Zu, length of another block was: %Zu", oldsz, sz);
+ PyErr_Format(py_fec_error, "Precondition violation: Input blocks are required to be all the same length. length of one block was: %Zu, length of another block was: %Zu", oldsz, sz);
goto err;
}
oldsz = sz;
static void
Encoder_dealloc(Encoder * self) {
- fec_free(self->fec_matrix);
+ if (self->fec_matrix)
+ fec_free(self->fec_matrix);
self->ob_type->tp_free((PyObject*)self);
}
PyObject_HEAD
/* expose these */
- short kk;
- short mm;
+ unsigned short kk;
+ unsigned short mm;
/* internal */
fec_t* fec_matrix;
};
int ink, inm;
- if (!PyArg_ParseTupleAndKeywords(args, kwdict, "ii", kwlist, &ink, &inm))
+ if (!PyArg_ParseTupleAndKeywords(args, kwdict, "ii:Decoder.__init__", kwlist, &ink, &inm))
return -1;
if (ink < 1) {
- py_raise_fec_error("Precondition violation: first argument is required to be greater than or equal to 1, but it was %d", self->kk);
+ PyErr_Format(py_fec_error, "Precondition violation: first argument is required to be greater than or equal to 1, but it was %d", ink);
return -1;
}
if (inm < 1) {
- py_raise_fec_error("Precondition violation: second argument is required to be greater than or equal to 1, but it was %d", self->mm);
+ PyErr_Format(py_fec_error, "Precondition violation: second argument is required to be greater than or equal to 1, but it was %d", inm);
return -1;
}
if (inm > 256) {
- py_raise_fec_error("Precondition violation: second argument is required to be less than or equal to 256, but it was %d", self->mm);
+ PyErr_Format(py_fec_error, "Precondition violation: second argument is required to be less than or equal to 256, but it was %d", inm);
return -1;
}
if (ink > inm) {
- py_raise_fec_error("Precondition violation: first argument is required to be less than or equal to the second argument, but they were %d and %d respectively", ink, inm);
+ PyErr_Format(py_fec_error, "Precondition violation: first argument is required to be less than or equal to the second argument, but they were %d and %d respectively", ink, inm);
return -1;
}
- self->kk = (short)ink;
- self->mm = (short)inm;
+ self->kk = (unsigned short)ink;
+ self->mm = (unsigned short)inm;
self->fec_matrix = fec_new(self->kk, self->mm);
return 0;
long tmpl;
unsigned nextrecoveredix=0;
- if (!PyArg_ParseTuple(args, "OO", &blocks, &blocknums))
+ if (!PyArg_ParseTuple(args, "OO:Decoder.decode", &blocks, &blocknums))
return NULL;
for (i=0; i<self->kk; i++)
goto err;
if (PySequence_Fast_GET_SIZE(fastblocks) != self->kk) {
- py_raise_fec_error("Precondition violation: Wrong length -- first argument is required to contain exactly k blocks. len(first): %d, k: %d", PySequence_Fast_GET_SIZE(fastblocks), self->kk);
+ PyErr_Format(py_fec_error, "Precondition violation: Wrong length -- first argument is required to contain exactly k blocks. len(first): %Zu, k: %d", PySequence_Fast_GET_SIZE(fastblocks), self->kk);
goto err;
}
if (PySequence_Fast_GET_SIZE(fastblocknums) != self->kk) {
- py_raise_fec_error("Precondition violation: Wrong length -- blocknums is required to contain exactly k blocks. len(blocknums): %d, k: %d", PySequence_Fast_GET_SIZE(fastblocknums), self->kk);
+ PyErr_Format(py_fec_error, "Precondition violation: Wrong length -- blocknums is required to contain exactly k blocks. len(blocknums): %Zu, k: %d", PySequence_Fast_GET_SIZE(fastblocknums), self->kk);
goto err;
}
for (i=0; i<self->kk; i++) {
if (!PyInt_Check(fastblocknumsitems[i])) {
- py_raise_fec_error("Precondition violation: second argument is required to contain int.");
+ PyErr_Format(py_fec_error, "Precondition violation: second argument is required to contain int.");
goto err;
}
tmpl = PyInt_AsLong(fastblocknumsitems[i]);
if (tmpl < 0 || tmpl > 255) {
- py_raise_fec_error("Precondition violation: block nums can't be less than zero or greater than 255. %ld\n", tmpl);
+ PyErr_Format(py_fec_error, "Precondition violation: block nums can't be less than zero or greater than 255. %ld\n", tmpl);
goto err;
}
cblocknums[i] = (unsigned)tmpl;
needtorecover+=1;
if (!PyObject_CheckReadBuffer(fastblocksitems[i])) {
- py_raise_fec_error("Precondition violation: %u'th item is required to offer the single-segment read character buffer protocol, but it does not.\n", i);
+ PyErr_Format(py_fec_error, "Precondition violation: %u'th item is required to offer the single-segment read character buffer protocol, but it does not.\n", i);
goto err;
}
if (PyObject_AsReadBuffer(fastblocksitems[i], (const void**)&(cblocks[i]), &sz))
goto err;
if (oldsz != 0 && oldsz != sz) {
- py_raise_fec_error("Precondition violation: Input blocks are required to be all the same length. length of one block was: %Zu, length of another block was: %Zu\n", oldsz, sz);
+ PyErr_Format(py_fec_error, "Precondition violation: Input blocks are required to be all the same length. length of one block was: %Zu, length of another block was: %Zu\n", oldsz, sz);
goto err;
}
oldsz = sz;
}
- /* move src packets into position */
+ /* Move src packets into position. At the end of this loop we want the i'th
+ element of the arrays to be the block with block number i, if that block
+ is among our inputs. */
for (i=0; i<self->kk;) {
if (cblocknums[i] >= self->kk || cblocknums[i] == i)
i++;
static void
Decoder_dealloc(Decoder * self) {
- fec_free(self->fec_matrix);
+ if (self->fec_matrix)
+ fec_free(self->fec_matrix);
self->ob_type->tp_free((PyObject*)self);
}
Decoder_new, /* tp_new */
};
-static PyMethodDef fec_methods[] = {
+void
+_hexwrite(unsigned char*s, size_t l) {
+ for (size_t i = 0; i < l; i++)
+ printf("%.2x", s[i]);
+}
+
+
+PyObject*
+test_from_agl(PyObject* self, PyObject* args) {
+ unsigned char b0c[8], b1c[8];
+ unsigned char b0[8], b1[8], b2[8], b3[8], b4[8];
+ memset(b0, 1, 8);
+ memset(b1, 2, 8);
+ memset(b2, 3, 8);
+ const unsigned char *blocks[3] = {b0, b1, b2};
+ unsigned char *outblocks[2] = {b3, b4};
+ unsigned block_nums[] = {3, 4};
+
+ /*printf("_from_c before encoding:\n");
+ printf("b0: "); _hexwrite(b0, 8); printf(", ");
+ printf("b1: "); _hexwrite(b1, 8); printf(", ");
+ printf("b2: "); _hexwrite(b2, 8); printf(", ");
+ printf("\n");*/
+
+ fec_t *const fec = fec_new(3, 5);
+ fec_encode(fec, blocks, outblocks, block_nums, 2, 8);
+
+ /*printf("after encoding:\n");
+ printf("b3: "); _hexwrite(b3, 8); printf(", ");
+ printf("b4: "); _hexwrite(b4, 8); printf(", ");
+ printf("\n");*/
+
+ memcpy(b0c, b0, 8); memcpy(b1c, b1, 8);
+
+ const unsigned char *inpkts[] = {b3, b4, b2};
+ unsigned char *outpkts[] = {b0, b1};
+ unsigned indexes[] = {3, 4, 2};
+
+ fec_decode(fec, inpkts, outpkts, indexes, 8);
+
+ /*printf("after decoding:\n");
+ printf("b0: "); _hexwrite(b0, 8); printf(", ");
+ printf("b1: "); _hexwrite(b1, 8);
+ printf("\n");*/
+
+ if ((memcmp(b0, b0c,8) == 0) && (memcmp(b1, b1c,8) == 0))
+ Py_RETURN_TRUE;
+ else
+ Py_RETURN_FALSE;
+}
+
+static PyMethodDef fec_functions[] = {
+ {"test_from_agl", test_from_agl, METH_NOARGS, NULL},
{NULL}
};
if (PyType_Ready(&Decoder_type) < 0)
return;
- module = Py_InitModule3("_fec", fec_methods, fec__doc__);
+ module = Py_InitModule3("_fec", fec_functions, fec__doc__);
if (module == NULL)
return;
}
/**
- * zfec -- fast forward error correction library with Python interface
- *
- * Copyright (C) 2007 Allmydata, Inc.
- * Author: Zooko Wilcox-O'Hearn
- *
- * This file is part of zfec.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version, with the added permission that, if you become obligated
- * to release a derived work under this licence (as per section 2.b), you may
- * delay the fulfillment of this obligation for up to 12 months. See the file
- * COPYING for details.
- *
- * If you would like to inquire about a commercial relationship with Allmydata,
- * Inc., please contact partnerships@allmydata.com and visit
- * http://allmydata.com/.
- */
-
-/**
- * based on fecmodule.c by the Mnet Project, especially Myers Carpenter and
- * Hauke Johannknecht
+ * originally inspired by fecmodule.c by the Mnet Project, especially Myers
+ * Carpenter and Hauke Johannknecht
*/
-
projects / tahoe-lafs / zfec.git / blobdiff