From 003076d156fe754d72cbf040da21c488611b605c Mon Sep 17 00:00:00 2001
From: Cameron Eure <turbinater@gmail.com>
Date: Mon, 8 Oct 2012 10:55:21 -0700
Subject: [PATCH] - Improved error handline - Added murmur3.hash128(), returns
 tuple(int, int, int, int) - Ability to set seed with 3rd parameter, falls
 back to len(value) when not used.

---
 module.cpp | 83 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 76 insertions(+), 7 deletions(-)

diff --git a/module.cpp b/module.cpp
index 7ec6f87..ba74eca 100644
--- a/module.cpp
+++ b/module.cpp
@@ -5,24 +5,93 @@ static PyObject* hash32(PyObject *self, PyObject *args)
 {
     char *value = NULL;
     int len = 0;
+    int32_t args_len = 0;
     uint32_t seed = 0;
-
-    if (!PyArg_ParseTuple(args, "s#I", &value, &len, &seed))
-        return NULL;
-
     uint32_t h = 0;
-    MurmurHash3_x86_32(value, len, seed, &h);
+    PyObject *result;
 
-    return PyInt_FromLong(h);
+    args_len = (int32_t)PyTuple_Size(args);
+    if (args_len == 3) {
+        if (!PyArg_ParseTuple(args, "sII", &value, &len, &seed)) {
+            return NULL;
+        }
+    } else {
+        if (!PyArg_ParseTuple(args, "sI", &value, &len)) {
+            return NULL;
+        }
+        
+        seed = len;
+    }
+
+    MurmurHash3_x86_32(value, len, seed, &h);
+    result = PyLong_FromUnsignedLong(h);
+    if (!result) {
+        PyErr_SetString(PyExc_MemoryError, "PyLong_FromUnsignedLong() returned NULL.");
+    }
+
+    return result;
+}
+
+static PyObject *hash128(PyObject *self, PyObject *args)
+{
+    char *value = NULL;
+    int len = 0;
+    int i;
+    int32_t args_len = 0;
+    uint32_t seed = 0;
+    uint32_t out[4] = {0, 0, 0, 0};
+    PyObject *result;
+    PyObject *tmp[4];
+
+    args_len = (int32_t)PyTuple_Size(args);
+    if (args_len == 3) {
+        if (!PyArg_ParseTuple(args, "sII", &value, &len, &seed)) {
+            return NULL;
+        }
+    } else {
+        if (!PyArg_ParseTuple(args, "sI", &value, &len)) {
+            return NULL;
+        }
+        
+        seed = len;
+    }
+    
+    MurmurHash3_x86_128(value, len, seed, &out);
+    
+    result = PyTuple_New(4);
+    if (!result) {
+        PyErr_SetString(PyExc_MemoryError, "PyTuple_New() returned NULL.");
+        return NULL;
+    }
+    
+    /* TODO: Does result and tmp[] need to be Py_DECREF()'d on error? */
+    for (i = 0; i < 4; i++) {
+        tmp[i] = PyLong_FromUnsignedLong(out[i]);
+        if (!tmp[i]) {
+            //Py_DECREF(result);
+            PyErr_SetString(PyExc_MemoryError, "PyLong_FromUnsignedLong() returned NULL.");
+            return NULL;
+        }
+    
+        PyTuple_SetItem(result, i, tmp[i]);
+    }
+    
+    return result;
 }
 
 static PyMethodDef methods[] = {
-    {"hash32", hash32, METH_VARARGS, "Calculate Murmur3 32-bit unsigned hash value."},
+    {"hash32", hash32, METH_VARARGS,
+        "Calculate Murmur3 32-bit unsigned hash value. "
+        "Parameters: <str>, <len>, [seed]"},
+    {"hash128", hash128, METH_VARARGS,
+        "Calculate Murmur3 128-bit hash. Returns tuple. "
+        "Parameters: <str>, <len>, [seed]"},
     {NULL, NULL, 0, NULL}
 };
 
 PyMODINIT_FUNC
 initmurmur3(void)
 {
+    Py_Initialize();
     (void) Py_InitModule("murmur3", methods);
 }