diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2016-03-04 19:30:43 +0100 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2016-03-04 19:30:43 +0100 |
| commit | c8b64cf87a3ff10abac92835c07b1dd76319f185 (patch) | |
| tree | 0a86fd68612ab35cccec3567015c60633cb526f8 /pywrap/pcipywrap.c | |
| parent | c38706b3c8bbaec638cc49745fd71dfb14df37e5 (diff) | |
| parent | 327b71b05b60a03e56fad618b51fbccd06c3776d (diff) | |
| download | pcitool-c8b64cf87a3ff10abac92835c07b1dd76319f185.tar.gz pcitool-c8b64cf87a3ff10abac92835c07b1dd76319f185.tar.bz2 pcitool-c8b64cf87a3ff10abac92835c07b1dd76319f185.tar.xz pcitool-c8b64cf87a3ff10abac92835c07b1dd76319f185.zip | |
Integrate last part of Python code from Vasiliy Chernov
Diffstat (limited to 'pywrap/pcipywrap.c')
| -rw-r--r-- | pywrap/pcipywrap.c | 43 |
1 files changed, 37 insertions, 6 deletions
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); +} + |