Now building a single module called _perf which contains all the performance enhancements, which increases loadtimes, less is more

Author: Byron

_delta_apply.c

@@ -879,25 +879,3 @@ static PyObject* connect_deltas(PyObject *self, PyObject *dstreams)
 	return (PyObject*)dcl;
 }
 
-static PyMethodDef py_fun[] = {
-	{ "connect_deltas", (PyCFunction)connect_deltas, METH_O, "TODO" },
-	{ NULL, NULL, 0, NULL }
-};
-
-#ifndef PyMODINIT_FUNC	/* declarations for DLL import/export */
-#define PyMODINIT_FUNC void
-#endif
-PyMODINIT_FUNC init_delta_apply(void)
-{
-	PyObject *m;
-
-	if (PyType_Ready(&DeltaChunkListType) < 0)
-		return;
-	
-	m = Py_InitModule3("_delta_apply", py_fun, NULL);
-	if (m == NULL)
-		return;
-	
-	Py_INCREF(&DeltaChunkListType);
-	PyModule_AddObject(m, "DeltaChunkList", (PyObject *)&DeltaChunkListType);
-}

_fun.c

@@ -1,4 +1,5 @@
 #include <Python.h>
+#include "_delta_apply.c"
 
 static PyObject *PackIndexFile_sha_to_index(PyObject *self, PyObject *args)
 {
@@ -80,21 +81,26 @@ static PyObject *PackIndexFile_sha_to_index(PyObject *self, PyObject *args)
 	Py_RETURN_NONE;
 }
 
-
 static PyMethodDef py_fun[] = {
 	{ "PackIndexFile_sha_to_index", (PyCFunction)PackIndexFile_sha_to_index, METH_VARARGS, "TODO" },
+	{ "connect_deltas", (PyCFunction)connect_deltas, METH_O, "TODO" },
 	{ NULL, NULL, 0, NULL }
 };
 
 #ifndef PyMODINIT_FUNC	/* declarations for DLL import/export */
 #define PyMODINIT_FUNC void
 #endif
-PyMODINIT_FUNC init_fun(void)
+PyMODINIT_FUNC init_perf(void)
 {
 	PyObject *m;
 
-	m = Py_InitModule3("_fun", py_fun, NULL);
+	if (PyType_Ready(&DeltaChunkListType) < 0)
+		return;
+	
+	m = Py_InitModule3("_perf", py_fun, NULL);
 	if (m == NULL)
 		return;
 
+	Py_INCREF(&DeltaChunkListType);
+	PyModule_AddObject(m, "DeltaChunkList", (PyObject *)&DeltaChunkListType);
 }

fun.py

@@ -654,6 +654,6 @@ def is_equal_canonical_sha(canonical_length, match, sha1):
 
 try:
 	# raise ImportError; # DEBUG
-	from _delta_apply import connect_deltas
+	from _perf import connect_deltas
 except ImportError:
 	pass

pack.py

@@ -24,7 +24,7 @@
 				)
 
 try:
-	from _fun import PackIndexFile_sha_to_index
+	from _perf import PackIndexFile_sha_to_index
 except ImportError:
 	pass
 # END try c module

setup.py

@@ -77,10 +77,7 @@ def get_data_files(self):
       package_data={'gitdb' : ['AUTHORS', 'README'], 
 					  'gitdb.test' : ['fixtures/packs/*', 'fixtures/objects/7b/*']},
       package_dir = {'gitdb':''},
-      ext_modules=[
-      				Extension('gitdb._fun', ['_fun.c']),
-      				Extension('gitdb._delta_apply', ['_delta_apply.c'])
-      				],
+      ext_modules=[Extension('gitdb._perf', ['_fun.c'])],
       license = "BSD License",
       requires=('async (>=0.6.1)',),
       install_requires='async >= 0.6.1',