1. Add cmake BUILD_PYTHON_MODULES option.

2. Rename log options getting functions.
3. py:
   - pcilib_init_py() - extract pcilib_py_add_script_dir()
   - pcilib_py_init_script() - extract view-specialized code to
     pcilib_py_get_transform_script_properties()
3. pcilib_open():
   - move pcilib_init_py() to previous position.
   - add extract pcilib_py_add_script_dir()
4. pcilib_script_s - change hash key. Now it is (const char*) and contains 
   script file name with extension
5. pcipywrap:
   - Add pcipywrap.h to remove swig generated file complile warnings
   - remove -includeall swig flag to prevent crash in multi-thread scripts
   - change set python expetion mechanic

6 files changed, 102 insertions, 55 deletions

diff --git a/pcilib/error.c b/pcilib/error.c
index 87380e7..a2e5a04 100644
--- a/pcilib/error.c
+++ b/pcilib/error.c
@@ -80,10 +80,10 @@ int pcilib_set_logger(pcilib_log_priority_t min_prio, pcilib_logger_t logger, vo
 pcilib_logger_t pcilib_get_logger() {
     return pcilib_logger;
 }
-pcilib_log_priority_t pcilib_get_logger_min_prio() {
+pcilib_log_priority_t pcilib_get_log_level() {
 	return pcilib_logger_min_prio;
 }
-void* pcilib_get_logger_argument() {
+void* pcilib_get_logger_context() {
 	return pcilib_logger_argument;
 }
 
diff --git a/pcilib/error.h b/pcilib/error.h
index 95774e9..051ecd8 100644
--- a/pcilib/error.h
+++ b/pcilib/error.h
@@ -48,12 +48,12 @@ pcilib_logger_t pcilib_get_logger();
 /**
  * Gets current logger min priority.
  */
-pcilib_log_priority_t pcilib_get_logger_min_prio();
+pcilib_log_priority_t pcilib_get_log_level();
 
 /**
  * Gets current logger argument.
  */
-void* pcilib_get_logger_argument();
+void* pcilib_get_logger_context();
 
 #ifdef __cplusplus
 }
diff --git a/pcilib/pci.c b/pcilib/pci.c
index 58ee4b0..2b7b97b 100644
--- a/pcilib/pci.c
+++ b/pcilib/pci.c
@@ -144,6 +144,13 @@ pcilib_t *pcilib_open(const char *device, const char *model) {
 	    pcilib_close(ctx);
 	    return NULL;
 	}
+	
+	err = pcilib_init_py(ctx);
+	if (err) {
+	    pcilib_error("Error (%i) initializing python subsystem", err);
+	    pcilib_close(ctx);
+	    return NULL;
+	}
 
 	ctx->alloc_reg = PCILIB_DEFAULT_REGISTER_SPACE;
 	ctx->alloc_views = PCILIB_DEFAULT_VIEW_SPACE;
@@ -185,9 +192,9 @@ pcilib_t *pcilib_open(const char *device, const char *model) {
 	if (!ctx->model)
 	    ctx->model = strdup(model?model:"pci");
 	    
-	err = pcilib_init_py(ctx);
+	err = pcilib_py_add_script_dir(ctx);
 	if (err) {
-	    pcilib_error("Error (%i) initializing python subsystem", err);
+	    pcilib_error("Error (%i) add script path to python path", err);
 	    pcilib_close(ctx);
 	    return NULL;
 	}
diff --git a/pcilib/py.c b/pcilib/py.c
index 038dba6..8f8040e 100644
--- a/pcilib/py.c
+++ b/pcilib/py.c
@@ -1,4 +1,6 @@
+#ifdef BUILD_PYTHON_MODULES
 #include <Python.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,11 +13,10 @@
 #include "py.h"
 #include "error.h"
 
+#ifdef BUILD_PYTHON_MODULES
 typedef struct pcilib_script_s {
-	char* name;
-    PyObject *module;	/**< PyModule object, contains script enviroment */
-	pcilib_access_mode_t mode;
-	
+	const char* name;
+    PyObject *module;	/**< PyModule object, contains script enviroment */	
 	UT_hash_handle hh;
 } pcilib_script_s;
 
@@ -25,8 +26,10 @@ struct pcilib_py_s {
     int py_initialized_inside; ///< Flag, shows that Py_Initialize has been called inside class
     struct pcilib_script_s *scripts;
 };
+#endif
 
 int pcilib_init_py(pcilib_t *ctx) {
+#ifdef BUILD_PYTHON_MODULES
     ctx->py = (pcilib_py_t*)malloc(sizeof(pcilib_py_t));
     if (!ctx->py) return PCILIB_ERROR_MEMORY;
 
@@ -53,6 +56,16 @@ int pcilib_init_py(pcilib_t *ctx) {
         return PCILIB_ERROR_FAILED;
 	
 	
+	
+	
+	ctx->py->scripts = NULL;
+#endif
+    return 0;
+}
+
+int pcilib_py_add_script_dir(pcilib_t *ctx)
+{
+#ifdef BUILD_PYTHON_MODULES
 	//create path string, where the model scripts should be
 	static int model_dir_added = 0;
 	if(!model_dir_added)
@@ -72,13 +85,12 @@ int pcilib_init_py(pcilib_t *ctx) {
 		free(model_path);
 		model_dir_added = 1;
 	}
-	
-	ctx->py->scripts = NULL;
-    return 0;
+#endif
+	return 0;
 }
 
 void pcilib_free_py(pcilib_t *ctx) {
-	
+#ifdef BUILD_PYTHON_MODULES
 	int py_initialized_inside = 0;
 	
     if (ctx->py) {		
@@ -92,6 +104,7 @@ void pcilib_free_py(pcilib_t *ctx) {
     
     if(py_initialized_inside)
 		Py_Finalize();
+#endif
 }
 
 /*
@@ -110,7 +123,7 @@ static int pcilib_py_realloc_string(pcilib_t *ctx, size_t required, size_t *size
     return 0;
 }
 */
-
+#ifdef BUILD_PYTHON_MODULES
 static char *pcilib_py_parse_string(pcilib_t *ctx, const char *codestr, pcilib_value_t *value) {
     int i;
     int err = 0;
@@ -216,8 +229,10 @@ static char *pcilib_py_parse_string(pcilib_t *ctx, const char *codestr, pcilib_v
 
     return dst;
 }
+#endif
 
 int pcilib_py_eval_string(pcilib_t *ctx, const char *codestr, pcilib_value_t *value) {
+#ifdef BUILD_PYTHON_MODULES
     PyGILState_STATE gstate;
     char *code;
     PyObject* obj;
@@ -239,10 +254,15 @@ int pcilib_py_eval_string(pcilib_t *ctx, const char *codestr, pcilib_value_t *va
 
     pcilib_debug(VIEWS, "Evaluating a Python string \'%s\' to %lf=\'%s\'", codestr, PyFloat_AsDouble(obj), code);
     return pcilib_set_value_from_float(ctx, value, PyFloat_AsDouble(obj));
+#else
+	pcilib_error("Current build not support python.");
+    return PCILIB_ERROR_NOTAVAILABLE;
+#endif
 }
 
 pcilib_py_object* pcilib_get_value_as_pyobject(pcilib_t* ctx, pcilib_value_t *val, int *ret)
-{	
+{
+#ifdef BUILD_PYTHON_MODULES	
 	int err;
 	
 	switch(val->type)
@@ -292,10 +312,16 @@ pcilib_py_object* pcilib_get_value_as_pyobject(pcilib_t* ctx, pcilib_value_t *va
             pcilib_error("Invalid register output type (unknown)");
 			return NULL;
 	}
+#else
+	pcilib_error("Current build not support python.");
+    if (ret) *ret = PCILIB_ERROR_NOTAVAILABLE;
+	return NULL;
+#endif
 }
 
 int pcilib_set_value_from_pyobject(pcilib_t* ctx, pcilib_value_t *val, pcilib_py_object* pyObjVal)
 {
+#ifdef BUILD_PYTHON_MODULES
 	PyObject* pyVal = pyObjVal;
 	int err;
 	
@@ -318,12 +344,18 @@ int pcilib_set_value_from_pyobject(pcilib_t* ctx, pcilib_value_t *val, pcilib_py
         return err;
         
     return 0;
+#else
+	pcilib_error("Current build not support python.");
+    return PCILIB_ERROR_NOTAVAILABLE;
+#endif
 }
 
-int pcilib_py_init_script(pcilib_t *ctx, char* module_name, pcilib_access_mode_t *mode)
-{	
+int pcilib_py_init_script(pcilib_t *ctx, const char* module_name)
+{
+#ifdef BUILD_PYTHON_MODULES
 	//extract module name from script name
-	char* py_module_name = strtok(module_name, ".");
+	char* py_module_name = strdup(module_name);
+	py_module_name = strtok(py_module_name, ".");
 	if(!py_module_name)
 	{
 		pcilib_error("Invalid script name specified in XML property (%s)."
@@ -336,26 +368,19 @@ int pcilib_py_init_script(pcilib_t *ctx, char* module_name, pcilib_access_mode_t
 	if(module)
 	{
 		pcilib_warning("Python module %s is already in hash. Skip init step", module_name);
-		mode[0] = module->mode;
 		return 0;
 	}
 	
-	//Initialize python module
-	if(!module_name)
-	{
-		pcilib_error("Invalid script name specified in XML property (NULL)");
-		return PCILIB_ERROR_INVALID_DATA;
-	}
-	
 	//import python script
 	PyObject* py_script_module = PyImport_ImportModule(py_module_name);
-	
 	if(!py_script_module)
 	{
 		printf("Error in import python module: ");
 		PyErr_Print();
+		free(py_module_name);
 		return PCILIB_ERROR_INVALID_DATA;
 	}
+	free(py_module_name);
 
 	//Initializing pcipywrap module if script use it
 	PyObject* dict = PyModule_GetDict(py_script_module);
@@ -380,45 +405,50 @@ int pcilib_py_init_script(pcilib_t *ctx, char* module_name, pcilib_access_mode_t
 	if (!module)
 		return PCILIB_ERROR_MEMORY;
 	module->module = py_script_module;
-	module->name = strdup(module_name);
-	if(!(module->name))
+	module->name = module_name;
+	HASH_ADD_STR( ctx->py->scripts, name, module);
+#endif
+	return 0;
+}
+
+int pcilib_py_get_transform_script_properties(pcilib_t *ctx, const char* module_name,
+pcilib_access_mode_t *mode)
+{
+#ifdef BUILD_PYTHON_MODULES
+	pcilib_script_s *module;
+	
+	HASH_FIND_STR(ctx->py->scripts, module_name, module);
+	if(!module)
 	{
-		free(module);
-		return PCILIB_ERROR_MEMORY;
+		pcilib_error("Failed to find script module (%s) in hash", module_name);
+		return PCILIB_ERROR_NOTFOUND;
 	}
-	sprintf(module->name, "%s", module_name);
-
 	
+	PyObject* dict = PyModule_GetDict(module->module);
 	//Setting correct mode
 	mode[0] = 0;
 	if(PyDict_Contains(dict, PyString_FromString("read_from_register")))
 		mode[0] |= PCILIB_ACCESS_R;	
 	if(PyDict_Contains(dict, PyString_FromString("write_to_register")))
-		mode[0] |= PCILIB_ACCESS_W;
-		
-	module->mode = mode[0];
-	HASH_ADD_STR( ctx->py->scripts, name, module);
-	
+		mode[0] |= PCILIB_ACCESS_W;	
 	return 0;
+#else
+	mode[0] = PCILIB_ACCESS_RW;
+	return 0;
+#endif
 }
 
-int pcilib_py_free_script(pcilib_t *ctx,char* module_name)
+int pcilib_py_free_script(pcilib_t *ctx, const char* module_name)
 {
+#ifdef BUILD_PYTHON_MODULES
 	pcilib_script_s *module;
 	HASH_FIND_STR(ctx->py->scripts, module_name, module);
 	
 	if(!module)
 	{
-		//For some reason it will crash if uncomment. printf same warning is ok
-		//pcilib_warning("Cant find Python module %s in hash. Seems it has already deleted.", module_name);
+		pcilib_warning("Cant find Python module %s in hash. Seems it has already deleted.", module_name);
 		return 0;
 	}
-	
-	if(module->name)
-	{
-		free(module->name);
-		module->name = NULL;
-	}
 		
 	if(module->module)
 	{
@@ -427,12 +457,14 @@ int pcilib_py_free_script(pcilib_t *ctx,char* module_name)
 	
 	HASH_DEL(ctx->py->scripts, module);
 	free(module);
+#endif
 	return 0;
 }
 
-int pcilib_script_run_func(pcilib_t *ctx, char* module_name,
+int pcilib_script_run_func(pcilib_t *ctx, const char* module_name,
                            const char* func_name,  pcilib_value_t *val)
-{	
+{
+#ifdef BUILD_PYTHON_MODULES
 	int err;
 	pcilib_script_s *module;
 	HASH_FIND_STR(ctx->py->scripts, module_name, module);
@@ -478,4 +510,8 @@ int pcilib_script_run_func(pcilib_t *ctx, char* module_name,
 		}
 	}
     return 0;
+#else
+	pcilib_error("Current build not support python.");
+    return PCILIB_ERROR_NOTAVAILABLE;
+#endif
 }
diff --git a/pcilib/py.h b/pcilib/py.h
index 9703706..04b4e8b 100644
--- a/pcilib/py.h
+++ b/pcilib/py.h
@@ -11,14 +11,19 @@ extern "C" {
 #endif
 
 int pcilib_init_py(pcilib_t *ctx);
+int pcilib_py_add_script_dir(pcilib_t *ctx);
 int pcilib_py_eval_string(pcilib_t *ctx, const char *codestr, pcilib_value_t *value);
 void pcilib_free_py(pcilib_t *ctx);
 
 
-int pcilib_py_init_script(pcilib_t *ctx, char* module_name, pcilib_access_mode_t *mode);
-int pcilib_py_free_script(pcilib_t *ctx,char* module_name);
-int pcilib_script_run_func(pcilib_t *ctx, char* module_name,
+int pcilib_py_init_script(pcilib_t *ctx, const char* module_name);
+int pcilib_py_free_script(pcilib_t *ctx, const char* module_name);
+int pcilib_script_run_func(pcilib_t *ctx, const char* module_name,
                            const char* func_name,  pcilib_value_t *val);
+                           
+int pcilib_py_get_transform_script_properties(pcilib_t *ctx,
+                                              const char* module_name,
+                                              pcilib_access_mode_t *mode);
 
 /*!
  * \brief Converts pcilib_value_t to PyObject.
diff --git a/pcilib/xml.c b/pcilib/xml.c
index adca34e..35721aa 100644
--- a/pcilib/xml.c
+++ b/pcilib/xml.c
@@ -600,8 +600,7 @@ static int pcilib_xml_create_transform_view(pcilib_t *ctx, xmlXPathContextPtr xp
             desc.write_to_reg = value;
             if ((value)&&(*value)) mode |= PCILIB_ACCESS_W;
         } else if (!strcasecmp(name, "script")) {
-			desc.module = strdup(value);
-			sprintf(desc.module, "%s", value);
+			desc.module = value;
 			break;
         }
     }