Integrate last part of Python code from Vasiliy Chernov

5 files changed, 46 insertions, 8 deletions

diff --git a/pywrap/pcilib.py b/pywrap/pcilib.py
index f4976bf..a72c79b 100644
--- a/pywrap/pcilib.py
+++ b/pywrap/pcilib.py
@@ -28,6 +28,8 @@ class pcilib(pcipywrap):
          curr_script['name'] = script
          if 'description' in dir(s.__scipts[script]):
             curr_script['description'] = s.__scipts[script].description
+         if 'run' in dir(s.__scipts[script]):
+            curr_script['valid'] = True
          scripts.append(curr_script)
       return scripts
       
diff --git a/pywrap/pcipywrap.c b/pywrap/pcipywrap.c
index cb99ce2..7431604 100644
--- a/pywrap/pcipywrap.c
+++ b/pywrap/pcipywrap.c
@@ -552,10 +552,10 @@ void pcipywrap_unlock_global(pcipywrap *self)
     return;
 }
 
-PyObject* pcipywrap_lock(pcipywrap *self, const char *lock_id)
+PyObject* lock(pcipywrap *self, const char *lock_id, pcilib_lock_flags_t flags)
 {
     pcilib_lock_t* lock = pcilib_get_lock(self->ctx,
-                                          PCILIB_LOCK_FLAG_PERSISTENT,
+                                          flags,
                                           lock_id);
     if(!lock)
     {
@@ -574,10 +574,21 @@ PyObject* pcipywrap_lock(pcipywrap *self, const char *lock_id)
     return PyLong_FromLong((long)1);
 }
 
-PyObject* pcipywrap_try_lock(pcipywrap *self, const char *lock_id)
+PyObject* pcipywrap_lock(pcipywrap *self, const char *lock_id)
+{
+   return lock(self, lock_id, PCILIB_LOCK_FLAGS_DEFAULT);
+}
+
+PyObject* pcipywrap_lock_persistent(pcipywrap *self, const char *lock_id)
+{
+   return lock(self, lock_id, PCILIB_LOCK_FLAG_PERSISTENT);
+}
+
+
+PyObject* try_lock(pcipywrap *self, const char *lock_id, pcilib_lock_flags_t flags)
 {
     pcilib_lock_t* lock = pcilib_get_lock(self->ctx,
-                                          PCILIB_LOCK_FLAG_PERSISTENT,
+                                          flags,
                                           lock_id);
     if(!lock)
     {
@@ -595,10 +606,20 @@ PyObject* pcipywrap_try_lock(pcipywrap *self, const char *lock_id)
     return PyLong_FromLong((long)1);
 }
 
-PyObject* pcipywrap_unlock(pcipywrap *self, const char *lock_id)
+PyObject* pcipywrap_try_lock(pcipywrap *self, const char *lock_id)
+{
+   return try_lock(self, lock_id, PCILIB_LOCK_FLAGS_DEFAULT);
+}
+
+PyObject* pcipywrap_try_lock_persistent(pcipywrap *self, const char *lock_id)
+{
+   return try_lock(self, lock_id, PCILIB_LOCK_FLAG_PERSISTENT);
+}
+
+PyObject* unlock(pcipywrap *self, const char *lock_id, pcilib_lock_flags_t flags)
 {
     pcilib_lock_t* lock = pcilib_get_lock(self->ctx,
-                                          PCILIB_LOCK_FLAG_PERSISTENT,
+                                          flags,
                                           lock_id);
     if(!lock)
     {
@@ -610,4 +631,14 @@ PyObject* pcipywrap_unlock(pcipywrap *self, const char *lock_id)
     return PyLong_FromLong((long)1);
 }
 
+PyObject* pcipywrap_unlock(pcipywrap *self, const char *lock_id)
+{
+   return unlock(self, lock_id, PCILIB_LOCK_FLAGS_DEFAULT);
+}
+
+PyObject* pcipywrap_unlock_persistent(pcipywrap *self, const char *lock_id)
+{
+   return unlock(self, lock_id, PCILIB_LOCK_FLAG_PERSISTENT);
+}
+
 
diff --git a/pywrap/pcipywrap.h b/pywrap/pcipywrap.h
index 1b71a56..1992e07 100644
--- a/pywrap/pcipywrap.h
+++ b/pywrap/pcipywrap.h
@@ -79,8 +79,10 @@ void pcipywrap_unlock_global(pcipywrap *self);
  * \return 1, serialized to PyObject or NULL with exeption text, if failed.
  */
 PyObject* pcipywrap_lock(pcipywrap *self, const char *lock_id);
-
+PyObject* pcipywrap_lock_persistent(pcipywrap *self, const char *lock_id);
 PyObject* pcipywrap_try_lock(pcipywrap *self, const char *lock_id);
+PyObject* pcipywrap_try_lock_persistent(pcipywrap *self, const char *lock_id);
 PyObject* pcipywrap_unlock(pcipywrap *self, const char *lock_id);
+PyObject* pcipywrap_unlock_persistent(pcipywrap *self, const char *lock_id);
 
 #endif /* PCIPYWRAP_H */
diff --git a/pywrap/pcipywrap.i b/pywrap/pcipywrap.i
index 5ee1bd1..b8f5bdb 100644
--- a/pywrap/pcipywrap.i
+++ b/pywrap/pcipywrap.i
@@ -27,7 +27,10 @@ typedef struct {
 		void unlock_global();
 		
 		PyObject* lock(const char *lock_id);
+		PyObject* lock_persistent(const char *lock_id);
 		PyObject* try_lock(const char *lock_id);
+		PyObject* try_lock_persistent(const char *lock_id);
 		PyObject* unlock(const char *lock_id);
+		PyObject* unlock_persistent(const char *lock_id);
 	}
 } pcipywrap;
diff --git a/pywrap/test_pcilib.py b/pywrap/test_pcilib.py
index 398d975..74eee4a 100644
--- a/pywrap/test_pcilib.py
+++ b/pywrap/test_pcilib.py
@@ -82,7 +82,7 @@ class test_pcilib():
    def testMemoryLeak(self):
       try:
          while(1):
-            val = long(random.randint(0, 8096))
+            val = random.randint(0, 8096)
             self.pcilib = pcilib.pcilib(self.device, self.model)
             print(self.pcilib.get_property_list(self.branch))
             print(self.pcilib.get_register_info(self.register))