Merge lp:~thisfred/u1db/fix-nogil-cython-issues into lp:u1db

[Eric Casteleijn]

Fixed the issues with the new version of Cython in Quantal.

This should fix the issues with the new version of Cython in Quantal. Please confirm.

[dobey (dobey)]

Seems to successfully cythonify the code on quantal with this.

review: Approve

=== modified file 'u1db/tests/c_backend_wrapper.pyx'
--- u1db/tests/c_backend_wrapper.pyx	2012-07-19 19:50:58 +0000
+++ u1db/tests/c_backend_wrapper.pyx	2012-07-25 11:20:31 +0000
@@ -710,11 +710,13 @@
         cdef int st_gen = 0, source_gen = 0, status
         cdef char *trans_id = NULL
         cdef char *st_trans_id = NULL
+        cdef char *c_source_replica_uid = NULL
 
         self._check()
         assert self._st.get_sync_info != NULL, "get_sync_info is NULL?"
+        c_source_replica_uid = source_replica_uid
         with nogil:
-            status = self._st.get_sync_info(self._st, source_replica_uid,
+            status = self._st.get_sync_info(self._st, c_source_replica_uid,
                 &st_replica_uid, &st_gen, &st_trans_id, &source_gen, &trans_id)
         handle_status("get_sync_info", status)
         res_trans_id = None
@@ -731,12 +733,19 @@
 
     def record_sync_info(self, source_replica_uid, source_gen, source_trans_id):
         cdef int status
+        cdef int c_source_gen
+        cdef char *c_source_replica_uid = NULL
+        cdef char *c_source_trans_id = NULL
 
         self._check()
         assert self._st.record_sync_info != NULL, "record_sync_info is NULL?"
+        c_source_replica_uid = source_replica_uid
+        c_source_gen = source_gen
+        c_source_trans_id = source_trans_id
         with nogil:
-            status = self._st.record_sync_info(self._st, source_replica_uid,
-                                               source_gen, source_trans_id)
+            status = self._st.record_sync_info(
+                self._st, c_source_replica_uid, c_source_gen,
+                c_source_trans_id)
         handle_status("record_sync_info", status)
 
     def _get_sync_exchange(self, source_replica_uid, source_gen):
@@ -804,6 +813,7 @@
         cdef int *generations = NULL
         cdef const_char_ptr *trans_ids = NULL
         cdef char *target_trans_id = NULL
+        cdef char *c_source_replica_uid = NULL
         cdef int i, count, status, target_gen
 
         self._check()
@@ -828,9 +838,10 @@
             target_gen = last_known_generation
             if last_known_trans_id is not None:
                 target_trans_id = last_known_trans_id
+            c_source_replica_uid = source_replica_uid
             with nogil:
                 status = self._st.sync_exchange(
-                    self._st, source_replica_uid, count, docs, generations,
+                    self._st, c_source_replica_uid, count, docs, generations,
                     trans_ids, &target_gen, &target_trans_id,
                     <void *>return_doc_cb, return_doc_cb_wrapper)
             handle_status("sync_exchange", status)