diff options
author | Werner Koch <wk@gnupg.org> | 2014-08-25 16:33:09 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2014-08-25 16:37:46 +0200 |
commit | fc651665010056e6184e8514e5c5436427d7052d (patch) | |
tree | 08156e7155986a560c06812748090d64bc654017 /src/w32-lock.c | |
parent | 98781deb0b1787fd7eaabee27ef6a06d37195267 (diff) | |
download | libgpg-error-fc651665010056e6184e8514e5c5436427d7052d.tar.gz |
Replace locking code in estream functions.
* src/posix-lock.c: Add weak program for pthread_mutex_trylock.
(_gpgrt_lock_trylock): New.
* src/w32-lock.c (_gpgrt_lock_init): Add missing return statement.
(_gpgrt_lock_trylock): New.
* src/visibility.c (gpgrt_set_syscall_clamp): New.
(gpgrt_lock_trylock): New.
(gpgrt_vsnprintf): Fix symbol name.
* src/init.c (DllMain): Mark unused arg.
* src/estream.c: Replace npth mutexes by our own locks. Replace yeild
macro by _gpgrt_yield.
(pre_syscall_func, post_syscall_func): New.
(do_deinit): Clear both new vars.
(es_func_fd_read, es_func_fd_write): Call pre and post syscall
functions instead of the former SYSCALL macros.
(es_func_w32_read, es_func_w32_write): Ditto.
(es_func_fd_seek, es_func_w32_seek, es_func_fp_read)
(es_func_fp_write, es_func_fp_seek, es_func_fp_destroy): Bracket
syscalls with the pre- and post-syscall fucntions.
(do_npth_read, do_npth_write): Remove.
(_gpgrt_es_init): Remove call to mutex init. It is now statically
initialized.
(_gpgrt_set_syscall_clamp): New.
(es_create): Destroy stream lock on error.
(do_close): Destroy stream lock.
Diffstat (limited to 'src/w32-lock.c')
-rw-r--r-- | src/w32-lock.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/w32-lock.c b/src/w32-lock.c index 3aac1ae..8c086f9 100644 --- a/src/w32-lock.c +++ b/src/w32-lock.c @@ -72,6 +72,7 @@ _gpgrt_lock_init (gpgrt_lock_t *lockhd) InitializeCriticalSection (&lock->csec); lock->initdone = 1; + return 0; } @@ -106,6 +107,30 @@ _gpgrt_lock_lock (gpgrt_lock_t *lockhd) gpg_err_code_t +_gpgrt_lock_trylock (gpgrt_lock_t *lockhd) +{ + _gpgrt_lock_t *lock = get_lock_object (lockhd); + + if (!lock->initdone) + { + if (!InterlockedIncrement (&lock->started)) + { + gpgrt_lock_init (lockhd); + } + else + { + while (!lock->initdone) + Sleep (0); + } + } + + if (!TryEnterCriticalSection (&lock->csec)) + return GPG_ERR_EBUSY; + return 0; +} + + +gpg_err_code_t _gpgrt_lock_unlock (gpgrt_lock_t *lockhd) { _gpgrt_lock_t *lock = get_lock_object (lockhd); |