Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #13488 -- No longer generate unhandled exceptions that may occu…

…r when destructors of global GEOS I/O objects are called on process termination.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 553adfa6d12487ea24e1a6812851cd0a6fe810a3 1 parent b8a8066
@jbronn jbronn authored
Showing with 9 additions and 13 deletions.
  1. +9 −13 django/contrib/gis/geos/prototypes/threadsafe.py
View
22 django/contrib/gis/geos/prototypes/threadsafe.py
@@ -20,18 +20,6 @@ class GEOSContext(threading.local):
thread_context = GEOSContext()
-def call_geos_threaded(cfunc, args):
- """
- This module-level routine calls the specified GEOS C thread-safe
- function with the context for this current thread.
- """
- # If a context handle does not exist for this thread, initialize one.
- if not thread_context.handle:
- thread_context.handle = GEOSContextHandle()
- # Call the threaded GEOS routine with pointer of the context handle
- # as the first argument.
- return cfunc(thread_context.handle.ptr, *args)
-
class GEOSFunc(object):
"""
Class that serves as a wrapper for GEOS C Functions, and will
@@ -43,6 +31,9 @@ def __init__(self, func_name):
# take an additional context handle parameter.
self.cfunc = getattr(lgeos, func_name + '_r')
self.threaded = True
+ # Create a reference here to thread_context so it's not
+ # garbage-collected before an attempt to call this object.
+ self.thread_context = thread_context
except AttributeError:
# Otherwise, use usual function.
self.cfunc = getattr(lgeos, func_name)
@@ -50,7 +41,12 @@ def __init__(self, func_name):
def __call__(self, *args):
if self.threaded:
- return call_geos_threaded(self.cfunc, args)
+ # If a context handle does not exist for this thread, initialize one.
+ if not self.thread_context.handle:
+ self.thread_context.handle = GEOSContextHandle()
+ # Call the threaded GEOS routine with pointer of the context handle
+ # as the first argument.
+ return self.cfunc(self.thread_context.handle.ptr, *args)
else:
return self.cfunc(*args)
Please sign in to comment.
Something went wrong with that request. Please try again.