summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Typo caught by Yann, thanks!wrowe2017-06-011-1/+1
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1797297 13f79535-47bb-0310-9956-ffa450edef68
* Partially revert 1738806 (r1733775, r1738791 from trunk), preservewrowe2017-06-015-17/+24
| | | | | | | | | apr_os_proc_mutex_get_ex|_put_ex, but fall back to the supported APR_LOCK_DEFAULT git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1797267 13f79535-47bb-0310-9956-ffa450edef68
* Post-tagniq2017-05-312-2/+5
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1797056 13f79535-47bb-0310-9956-ffa450edef68
* Pre-tagniq2017-05-312-1/+2
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1797053 13f79535-47bb-0310-9956-ffa450edef68
* Build: export build files find_apr.m4 and apr_common.m4niq2017-05-312-0/+5
| | | | | | | Patch by Jacob Champion git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1797051 13f79535-47bb-0310-9956-ffa450edef68
* Merge 1775071 from 1.5.x branch (r1775069 from trunk)wrowe2017-05-241-21/+21
| | | | | | | | | | proc_mutex_pthread: simplify (shorten) methods' names by removing the second/double proc_ (consistently with other mechanisms). Resolves earlier TODO from r1795957 git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1796073 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1733684 (r930508, r1667900, r1667901, r1667903, r1667962, r1669077, ↵wrowe2017-05-2430-1312/+137
| | | | | | | | | | | | r1671292, r1732582 from trunk), was; locks: introduce apr_{thread,proc,global}_mutex_timedlock(). (and many many more commit log entries, see r1733684 for details) git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1796072 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1790047 (r1790045 from trunk), waswrowe2017-05-242-9/+6
| | | | | | | | | Follow up to r1667900: don't fail test{proc,global}mutex if APR_LOCK_DEFAULT_TIMED is not implemented (e.g. MacOS). git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1796071 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1792956, 1792964, 1792962 (r1792961, r1792963 on trunk), was;wrowe2017-05-242-9/+0
| | | | | | | | | | | | | | pthread_mutex_timedlock is broken on Solaris 10. It can block without timeout in case of EDEADLK. On Solaris 8 it does not exist, on Solaris 11 it is fixed. For Solaris 10 no patch is available. Silence compiler warning "defined but not used" git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1796066 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1761280 (r1761279 from trunk), was;wrowe2017-05-233-4/+4
| | | | | | | | locks/netware: follow up to r1667962 and r1667900: fix typos (compile errors). git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795959 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1775072 (r1775069 from trunk), wrowe2017-05-231-26/+27
| | | | | | | | | | | | CRITICAL TODO: once unwound, apply r1775071 for the same fix sans timedlock Was; proc_mutex_pthread: simplify (shorten) methods' names by removing the second/double proc_ (consistently with other mechanisms). git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795957 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1778111 (r1774973 from trunk); waswrowe2017-05-231-4/+0
| | | | | | | | | | Not all pthread implementations have mutex_timedlock(), like Solaris 8, so proc_mutex_proc_pthread_timedacquire() can return APR_ENOTIMPL. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795956 13f79535-47bb-0310-9956-ffa450edef68
* Revert r1790105;wrowe2017-05-234-83/+70
| | | | | | | | | Add in our own pthread_mutex_timedlock impl for those OSs, like osx/macos that don't have it. Be a bit more generous in the test git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795952 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1790112 (r1790111 on trunk)wrowe2017-05-231-4/+0
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795951 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1790159, 1790156, 1790155wrowe2017-05-233-193/+59
| | | | | | | | | | | | userland change... the timedacquire stuff format onlt and the rest of the timedacquires git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795949 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1790301; waswrowe2017-05-231-4/+22
| | | | | | | | semtimedop() takes a delta time, so accept what is given as the "time remaining" git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795947 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1790305;wrowe2017-05-231-1/+1
| | | | | | | | Make clear this is a delta timeout git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795946 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1790474 (r1790296, r1790302, r1790303, r1790304, r1790330, r1790331, ↵wrowe2017-05-235-470/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r1790436, r1790439, r1790444, r1790446 from trunk), was: Follow up to r1667900: semtimedop() should be passed a relative timeout rather then absolute. semtimedop() takes a delta time, so accept what is given as the "time remaining" rr1790301 Use our "portable" versions Make clear this is a delta timeout locks: when pthread_mutex_timedlock() isn't available, fall back to an implementation based on pthread_cond_timedwait() when possible. Avoid a compiler warning by using system's errno. locks: follow up to r1790330. When no native timedlock is available, fall back to a common/generic spin sleep proc_mutex_spinsleep_timedacquire() based on the configured APR_USE_*_SERIALIZE trylock. Otherwise, choose the best timedlock mechanism in the following order: 1. PTHREAD if HAVE_PTHREAD_MUTEX_ROBUST && (HAVE_PTHREAD_MUTEX_TIMEDLOCK || HAVE_PTHREAD_CONDATTR_SETPSHARED) 2. SYSV if HAVE_SEMTIMEDOP 3. POSIX if HAVE_SEM_TIMEDWAIT 4. The one of APR_USE_*_SERIALIZE, hence possibly non-robust and/or spinning with the same robustness as the underlying apr_proc_mutex_trylock() call. apr_proc_mutex_timedlock() won't return ENOTIMPL anymore. locks: follow up to r1790330 and r1790436. unix/misc.c is not needed anymore since we use apr_proc_mutex_trylock() directly. locks: follow up to r1790330. No functional change, more helpers/macros to help identify struct proc_pthread_mutex_t members. locks: follow up to r1790330. Don't try to access proc_pthread_mutex_t's condvar if the mutex was _put[_ex]() and not _create()d, this is a real pthread_mutex_t. Submitted by: ylavic, jim, jim, jim, ylavic, ylavic, ylavic, ylavic, ylavic, ylavic git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795945 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1791719 (r1791718 from trunk), was;wrowe2017-05-231-9/+5
| | | | | | | | | | | locks: follow up to r1790446. Since proc_pthread_mutex_cond_locked() macro is also used as an lvalue, don't define it as a conditional and put the condition where needed in the code. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795942 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1790490 (r1790488 from trunk), was;wrowe2017-05-2318-130/+203
| | | | | | | | | | | | | | locks: follow up to r1667900. Axe the 'absolute' argument of apr_{thread,proc,global}_mutex_timedlock() which was confusing, hence 'timeout' is always relative now. It still makes sense (to me) to handle a negative timeout as INFINITE, a nul one as IMMEDIATE, and a positive one as an upper bound timeout (like most if not all of the underlying system calls...). git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795940 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1790527 (r1790521, r1790523 from trunk), was;wrowe2017-05-2315-20/+20
| | | | | | | | | | | | | | locks: follow up to r1790488. Make it clear in the type that it's a relative/interval time. locks: follow up to r1790488 and r1790521: likewise for the apr_proc_mutex_unix_lock_methods_t's timedacquired method. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795939 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1790570 (r1790569 from trunk), was;wrowe2017-05-232-4/+4
| | | | | | | | locks: follow up to r1790488, r1790521 and r1790523: likewise for the tests. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795938 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1790633 (r1790632 from trunk), was;wrowe2017-05-2312-64/+109
| | | | | | | | | | apr_{thread,proc,global}_timedlock() with negative timeout is now equivalent to apr_{thread,proc,global}_trylock(), i.e. immediate attempt to acquire the lock (but returning APR_TIMEUP if busy). git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795937 13f79535-47bb-0310-9956-ffa450edef68
* Revert 1791729 (r1791728 from trunk): Was;wrowe2017-05-231-6/+5
| | | | | | | | | | | locks: follow up to r1790436. Fix proc_mutex_pthread_acquire_ex() for the APR_USE_PROC_PTHREAD_MUTEX_COND case which shouldn't use undefined pthread_cond_timedwait(). git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795935 13f79535-47bb-0310-9956-ffa450edef68
* Revert r1791932wrowe2017-05-238-25/+0
| | | | | | | | | | | | | Was: Make timedlocks a configuration option. After first Mac then Solaris biting us, timedlocks look high-risk, so a config option and a corresponding rlease note offer a workaround to any users who get bitten. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795934 13f79535-47bb-0310-9956-ffa450edef68
* Revert r1794259 (r1792621, r1792622, r1792625 from trunk)wrowe2017-05-231-45/+38
| | | | | | | | | | | | | | | | | | | locks: unix: provide a macro helper for a pattern used several times. No functional change. locks: unix: timedlock: better handling of spurious wakeups that may be inherent to some native/OS condvar implementation. locks: unix: follow up to r1792622. Indent block previously preserved (for easier review), no functional change. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795933 13f79535-47bb-0310-9956-ffa450edef68
* Based on dev@apr poll on shipping experimental/not-readywrowe2017-05-222-5/+4
| | | | | | | | | features, revert 'default-disabled' change from r1792560, and build timedlocks where resolved as available by default. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1795828 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1792621, r1792622, r1792625 from trunk:ylavic2017-05-071-38/+45
| | | | | | | | | | | | | | | | | | locks: unix: provide a macro helper for a pattern used several times. No functional change. locks: unix: timedlock: better handling of spurious wakeups that may be inherent to some native/OS condvar implementation. locks: unix: follow up to r1792622. Indent block previously preserved (for easier review), no functional change. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1794259 13f79535-47bb-0310-9956-ffa450edef68
* Silence compiler warning "defined but not used".rjung2017-04-271-0/+4
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1792965 13f79535-47bb-0310-9956-ffa450edef68
* Remove unintended change from r1792961.rjung2017-04-271-1/+0
| | | | | | | Backport of r1792963 from trunk. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1792964 13f79535-47bb-0310-9956-ffa450edef68
* pthread_mutex_timedlock is broken on Solaris 10.rjung2017-04-271-0/+6
| | | | | | | | | | | It can block without timeout in case of EDEADLK. On Solaris 8 it does not exist, on Solaris 11 it is fixed. For Solaris 10 no patch is available. Backport of r1792961 from trunk. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1792962 13f79535-47bb-0310-9956-ffa450edef68
* add missing optiongsmith2017-04-261-0/+3
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1792754 13f79535-47bb-0310-9956-ffa450edef68
* Default to NOT enabling timedlocks.niq2017-04-252-4/+5
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1792560 13f79535-47bb-0310-9956-ffa450edef68
* Make timedlocks a configuration option.niq2017-04-198-0/+25
| | | | | | | | | After first Mac then Solaris biting us, timedlocks look high-risk, so a config option and a corresponding rlease note offer a workaround to any users who get bitten. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1791932 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1791728 from trunk:ylavic2017-04-171-5/+6
| | | | | | | | | | | locks: follow up to r1790436. Fix proc_mutex_pthread_acquire_ex() for the APR_USE_PROC_PTHREAD_MUTEX_COND case which shouldn't use undefined pthread_cond_timedwait(). git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1791729 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1791718 from trunk:ylavic2017-04-171-5/+9
| | | | | | | | | | | locks: follow up to r1790446. Since proc_pthread_mutex_cond_locked() macro is also used as an lvalue, don't define it as a conditional and put the condition where needed in the code. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1791719 13f79535-47bb-0310-9956-ffa450edef68
* Update config.guess and config.sub fromrjung2017-04-162-7/+19
| | | | | | | | | http://git.savannah.gnu.org/cgit/config.git. Backport of r1791598 from trunk. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1791599 13f79535-47bb-0310-9956-ffa450edef68
* post-tagniq2017-04-152-2/+5
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1791512 13f79535-47bb-0310-9956-ffa450edef68
* Pre-tagniq2017-04-152-4/+4
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1791510 13f79535-47bb-0310-9956-ffa450edef68
* add special include for applink.c since it's been gsmith2017-04-121-1/+1
| | | | | | | moved in the openssl source and may be needed. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1791191 13f79535-47bb-0310-9956-ffa450edef68
* Set perms correctly on file copy where destination existsniq2017-04-111-0/+1
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1791030 13f79535-47bb-0310-9956-ffa450edef68
* We may need to modify .dsw files for apr 1.6gsmith2017-04-111-1/+33
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1791005 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1790632 from trunk:ylavic2017-04-0712-109/+64
| | | | | | | | | | apr_{thread,proc,global}_timedlock() with negative timeout is now equivalent to apr_{thread,proc,global}_trylock(), i.e. immediate attempt to acquire the lock (but returning APR_TIMEUP if busy). git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1790633 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1790569 from trunk:ylavic2017-04-072-4/+4
| | | | | | | | locks: follow up to r1790488, r1790521 and r1790523: likewise for the tests. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1790570 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1790521, r1790523 from trunk:ylavic2017-04-0715-20/+20
| | | | | | | | | | | | | | locks: follow up to r1790488. Make it clear in the type that it's a relative/interval time. locks: follow up to r1790488 and r1790521: likewise for the apr_proc_mutex_unix_lock_methods_t's timedacquired method. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1790527 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1790488 from trunk:ylavic2017-04-0718-203/+130
| | | | | | | | | | | | | | | locks: follow up to r1667900. Axe the 'absolute' argument of apr_{thread,proc,global}_mutex_timedlock() which was confusing, hence 'timeout' is always relative now. It still makes sense (to me) to handle a negative timeout as INFINITE, a nul one as IMMEDIATE, and a positive one as an upper bound timeout (like most if not all of the underlying system calls...). git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1790490 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1790296, r1790302, r1790303, r1790304, r1790330, r1790331, r1790436, ↵ylavic2017-04-065-301/+470
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r1790439, r1790444, r1790446 from trunk: Follow up to r1667900: semtimedop() should be passed a relative timeout rather then absolute. semtimedop() takes a delta time, so accept what is given as the "time remaining" rr1790301 Use our "portable" versions Make clear this is a delta timeout locks: when pthread_mutex_timedlock() isn't available, fall back to an implementation based on pthread_cond_timedwait() when possible. Avoid a compiler warning by using system's errno. locks: follow up to r1790330. When no native timedlock is available, fall back to a common/generic spin sleep proc_mutex_spinsleep_timedacquire() based on the configured APR_USE_*_SERIALIZE trylock. Otherwise, choose the best timedlock mechanism in the following order: 1. PTHREAD if HAVE_PTHREAD_MUTEX_ROBUST && (HAVE_PTHREAD_MUTEX_TIMEDLOCK || HAVE_PTHREAD_CONDATTR_SETPSHARED) 2. SYSV if HAVE_SEMTIMEDOP 3. POSIX if HAVE_SEM_TIMEDWAIT 4. The one of APR_USE_*_SERIALIZE, hence possibly non-robust and/or spinning with the same robustness as the underlying apr_proc_mutex_trylock() call. apr_proc_mutex_timedlock() won't return ENOTIMPL anymore. locks: follow up to r1790330 and r1790436. unix/misc.c is not needed anymore since we use apr_proc_mutex_trylock() directly. locks: follow up to r1790330. No functional change, more helpers/macros to help identify struct proc_pthread_mutex_t members. locks: follow up to r1790330. Don't try to access proc_pthread_mutex_t's condvar if the mutex was _put[_ex]() and not _create()d, this is a real pthread_mutex_t. Submitted by: ylavic, jim, jim, jim, ylavic, ylavic, ylavic, ylavic, ylavic, ylavic git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1790474 13f79535-47bb-0310-9956-ffa450edef68
* Make clear this is a delta timeoutjim2017-04-051-1/+1
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1790305 13f79535-47bb-0310-9956-ffa450edef68
* semtimedop() takes a delta time, so accept what is given asjim2017-04-051-22/+4
| | | | | | the "time remaining" git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1790301 13f79535-47bb-0310-9956-ffa450edef68
* Merged r1790200 from trunk to avoid using fdatasync() on macOS.brane2017-04-052-0/+7
| | | | git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1790207 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status