From 91f0dd08e563b44a39971d720b5c554d9b85b9d6 Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Sun, 2 Aug 2015 11:41:29 -0400 Subject: [PATCH] Fixed thread safety issue in Python binding --- src/bindings/python/openalpr.py | 34 +++++++++++++++++------------- src/bindings/python/openalprpy.cpp | 33 ++++++++++++----------------- 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/src/bindings/python/openalpr.py b/src/bindings/python/openalpr.py index 3cb8883..2f63650 100644 --- a/src/bindings/python/openalpr.py +++ b/src/bindings/python/openalpr.py @@ -9,52 +9,56 @@ class Alpr(): if platform.system().lower().find("windows") != -1: self._openalprpy_lib = ctypes.cdll.LoadLibrary("openalprpy.dll") else: - self._openalprpy_lib = ctypes.cdll.LoadLibrary("libopenalprpy.so") + self._openalprpy_lib = ctypes.cdll.LoadLibrary("/storage/projects/alpr/src/build/Debug/libopenalprpy.so") self._initialize_func = self._openalprpy_lib.initialize + self._initialize_func.restype = ctypes.c_void_p self._initialize_func.argtypes = [ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p] self._dispose_func = self._openalprpy_lib.dispose + self._dispose_func.argtypes = [ctypes.c_void_p] self._is_loaded_func = self._openalprpy_lib.isLoaded + self._is_loaded_func.argtypes = [ctypes.c_void_p] self._is_loaded_func.restype = ctypes.c_bool self._recognize_file_func = self._openalprpy_lib.recognizeFile self._recognize_file_func.restype = ctypes.c_void_p - self._recognize_file_func.argtypes = [ctypes.c_char_p] + self._recognize_file_func.argtypes = [ctypes.c_void_p, ctypes.c_char_p] self._recognize_array_func = self._openalprpy_lib.recognizeArray self._recognize_array_func.restype = ctypes.c_void_p - self._recognize_array_func.argtypes = [ctypes.POINTER(ctypes.c_ubyte), ctypes.c_uint] + self._recognize_array_func.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_ubyte), ctypes.c_uint] self._free_json_mem_func = self._openalprpy_lib.freeJsonMem self._set_default_region_func = self._openalprpy_lib.setDefaultRegion - self._set_default_region_func.argtypes = [ctypes.c_char_p] + self._set_default_region_func.argtypes = [ctypes.c_void_p, ctypes.c_char_p] self._set_detect_region_func = self._openalprpy_lib.setDetectRegion - self._set_detect_region_func.argtypes = [ctypes.c_bool] + self._set_detect_region_func.argtypes = [ctypes.c_void_p, ctypes.c_bool] self._set_top_n_func = self._openalprpy_lib.setTopN - self._set_top_n_func.argtypes = [ctypes.c_int] + self._set_top_n_func.argtypes = [ctypes.c_void_p, ctypes.c_int] self._get_version_func = self._openalprpy_lib.getVersion + self._get_version_func.argtypes = [ctypes.c_void_p] self._get_version_func.restype = ctypes.c_void_p - self._initialize_func(country, config_file, runtime_dir) + self.alpr_pointer = self._initialize_func(country, config_file, runtime_dir) def unload(self): - self._openalprpy_lib.dispose() + self._openalprpy_lib.dispose(self.alpr_pointer) def is_loaded(self): - return self._is_loaded_func() + return self._is_loaded_func(self.alpr_pointer) def recognize_file(self, file_path): - ptr = self._recognize_file_func(file_path) + ptr = self._recognize_file_func(self.alpr_pointer, file_path) json_data = ctypes.cast(ptr, ctypes.c_char_p).value response_obj = json.loads(json_data) self._free_json_mem_func(ctypes.c_void_p(ptr)) @@ -64,7 +68,7 @@ class Alpr(): def recognize_array(self, byte_array): pb = ctypes.cast(byte_array, ctypes.POINTER(ctypes.c_ubyte)) - ptr = self._recognize_array_func(pb, len(byte_array)) + ptr = self._recognize_array_func(self.alpr_pointer, pb, len(byte_array)) json_data = ctypes.cast(ptr, ctypes.c_char_p).value response_obj = json.loads(json_data) self._free_json_mem_func(ctypes.c_void_p(ptr)) @@ -73,19 +77,19 @@ class Alpr(): def get_version(self): - ptr = self._get_version_func() + ptr = self._get_version_func(self.alpr_pointer) version_number = ctypes.cast(ptr, ctypes.c_char_p).value self._free_json_mem_func(ctypes.c_void_p(ptr)) return version_number def set_top_n(self, topn): - self._set_top_n_func(topn) + self._set_top_n_func(self.alpr_pointer, topn) def set_default_region(self, region): - self._set_default_region_func(region) + self._set_default_region_func(self.alpr_pointer, region) def set_detect_region(self, enabled): - self._set_detect_region_func(enabled) + self._set_detect_region_func(self.alpr_pointer, enabled) diff --git a/src/bindings/python/openalprpy.cpp b/src/bindings/python/openalprpy.cpp index a2ca3f6..331df29 100644 --- a/src/bindings/python/openalprpy.cpp +++ b/src/bindings/python/openalprpy.cpp @@ -16,10 +16,8 @@ extern "C" { using namespace alpr; - bool initialized = false; - static Alpr* nativeAlpr; - OPENALPR_EXPORT void initialize(char* ccountry, char* cconfigFile, char* cruntimeDir) + OPENALPR_EXPORT Alpr* initialize(char* ccountry, char* cconfigFile, char* cruntimeDir) { //printf("Initialize"); @@ -29,35 +27,29 @@ extern "C" { std::string runtimeDir(cruntimeDir); //std::cout << country << std::endl << configFile << std::endl << runtimeDir << std::endl; - nativeAlpr = new alpr::Alpr(country, configFile, runtimeDir); + Alpr* nativeAlpr = new alpr::Alpr(country, configFile, runtimeDir); - initialized = true; - return; + return nativeAlpr; } - OPENALPR_EXPORT void dispose() + OPENALPR_EXPORT void dispose(Alpr* nativeAlpr) { - //printf("Dispose"); - initialized = false; delete nativeAlpr; } - OPENALPR_EXPORT bool isLoaded() + OPENALPR_EXPORT bool isLoaded(Alpr* nativeAlpr) { //printf("IS LOADED"); - if (!initialized) - return false; - return nativeAlpr->isLoaded(); } - OPENALPR_EXPORT char* recognizeFile(char* cimageFile) + OPENALPR_EXPORT char* recognizeFile(Alpr* nativeAlpr, char* cimageFile) { //printf("Recognize file"); @@ -83,12 +75,13 @@ extern "C" { } - OPENALPR_EXPORT char* recognizeArray(unsigned char* buf, int len) + OPENALPR_EXPORT char* recognizeArray(Alpr* nativeAlpr, unsigned char* buf, int len) { //printf("Recognize byte array"); //printf("buffer pointer: %p\n", buf); //printf("buffer length: %d\n", len); - + + //std::cout << "Using instance: " << nativeAlpr << std::endl; std::vector cvec(buf, buf+len); @@ -103,7 +96,7 @@ extern "C" { return membuffer; } - OPENALPR_EXPORT void setDefaultRegion(char* cdefault_region) + OPENALPR_EXPORT void setDefaultRegion(Alpr* nativeAlpr, char* cdefault_region) { // Convert strings from java to C++ and release resources std::string default_region(cdefault_region); @@ -111,17 +104,17 @@ extern "C" { nativeAlpr->setDefaultRegion(default_region); } - OPENALPR_EXPORT void setDetectRegion(bool detect_region) + OPENALPR_EXPORT void setDetectRegion(Alpr* nativeAlpr, bool detect_region) { nativeAlpr->setDetectRegion(detect_region); } - OPENALPR_EXPORT void setTopN(int top_n) + OPENALPR_EXPORT void setTopN(Alpr* nativeAlpr, int top_n) { nativeAlpr->setTopN(top_n); } - OPENALPR_EXPORT char* getVersion() + OPENALPR_EXPORT char* getVersion(Alpr* nativeAlpr) { std::string version = nativeAlpr->getVersion();