You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2016/12/19 12:06:08 UTC
svn commit: r1775072 - in /apr/apr/branches/1.6.x: ./ locks/unix/proc_mutex.c
Author: ylavic
Date: Mon Dec 19 12:06:08 2016
New Revision: 1775072
URL: http://svn.apache.org/viewvc?rev=1775072&view=rev
Log:
Merge r1775069 from trunk:
proc_mutex_pthread: simplify (shorten) methods' names by removing
the second/double proc_ (consistently with other mechanisms).
Modified:
apr/apr/branches/1.6.x/ (props changed)
apr/apr/branches/1.6.x/locks/unix/proc_mutex.c
Propchange: apr/apr/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 12:06:08 2016
@@ -1,4 +1,4 @@
/apr/apr/branches/1.4.x:1003369,1101301
-/apr/apr/trunk:733052,739635,741862,741866-741867,741869,741871,745763-745764,746310,747990,748080,748361,748371,748565,748888,748902,748988,749810,760443,767895,775683,782838,783398,783958,784633,784773,788588,789050,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,832904,835607,888669,892028,892159,892435,892909,896382,896653,899905,901088,902077,902090,908427,910419,910597,917819,917837-917838,923311,923320,925965,929796,930508,931973,932585,951771,960665,960671,979891,983618,989450,990435,1003338,1044440,1044447,1055657,1072165,1078845,1081462,1081495,1083038,1083242,1084662,1086695,1088023,1089031,1089129,1089438,1099348,1103310,1183683,1183685-1183686,1183688,1183693,1183698,1213382,1235047,1236970,1237078,1237507,1240472,1340286,1340288,1340470,1341193,1341196,1343233,1343243,1367050,1368819,1370494,1372018,1372022,1372093,1372849,1376957,1384764,1389077,1400200,1402868,1405985,1406690,1420106,1420109,1425356,1428809,143
8940,1438957-1438959,1442903,1449568,1456418,1459994,1460179-1460180,1460241,1460399,1460405,1462738,1462813,1470186,1470348,1475509,1478905,1480067,1481262,1481265,1484271,1487796,1489517,1496407,1502804,1510354,1516261,1523384,1523479,1523484,1523505,1523521,1523604,1523613,1523615,1523844-1523845,1523853,1524014,1524031,1528797,1528809,1529488,1529495,1529515,1529521,1529668,1530786,1530800,1530988,1531554,1531768,1531884,1532022,1533104,1533111,1533979,1535027,1535157,1536744,1538171,1539374,1539389,1539455,1539603,1541054,1541061,1541486,1541655,1541666,1541744,1542601,1542779,1543033,1543056,1548575,1550907,1551650,1551659,1558905,1559382,1559873,1559975,1561040,1561260,1561265,1561321,1561347,1561356,1561361,1561394,1561555,1571894,1575509,1578420,1587045,1587063,1587543,1587545,1588878,1588937,1593611,1593614-1593615,1593680,1594684,1594708,1595549,1597797,1597803,1604590,1604596,1604598,1605104,1610854,1611023,1611107,1611110,1611117,1611120,1611125,1611184,1611193,1611466,
1611515,1611517,1625173,1626564,1634615,1642159,1648830,1664406,1664447,1664451,1664471,1664769-1664770,1664775,1664904,1664911,1664958,1666341,1666411,1666458,1666611,1667420-1667421,1667423,1667900-1667901,1667903,1667914-1667916,1667962,1669077,1671292,1671329,1671356,1671386,1671389,1671513-1671514,1671957,1672354,1672366,1672495,1672575,1675644,1675656,1675668,1676013,1685929,1696140,1696767,1722547,1722557,1726928,1727020,1727160,1727175,1727199,1728957,1732582,1733451,1733594,1733694,1733706,1733708,1733775,1734816,1736552,1738791,1738925,1750374,1755709,1755740,1755746,1755758,1755954,1761279,1762326
+/apr/apr/trunk:733052,739635,741862,741866-741867,741869,741871,745763-745764,746310,747990,748080,748361,748371,748565,748888,748902,748988,749810,760443,767895,775683,782838,783398,783958,784633,784773,788588,789050,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,832904,835607,888669,892028,892159,892435,892909,896382,896653,899905,901088,902077,902090,908427,910419,910597,917819,917837-917838,923311,923320,925965,929796,930508,931973,932585,951771,960665,960671,979891,983618,989450,990435,1003338,1044440,1044447,1055657,1072165,1078845,1081462,1081495,1083038,1083242,1084662,1086695,1088023,1089031,1089129,1089438,1099348,1103310,1183683,1183685-1183686,1183688,1183693,1183698,1213382,1235047,1236970,1237078,1237507,1240472,1340286,1340288,1340470,1341193,1341196,1343233,1343243,1367050,1368819,1370494,1372018,1372022,1372093,1372849,1376957,1384764,1389077,1400200,1402868,1405985,1406690,1420106,1420109,1425356,1428809,143
8940,1438957-1438959,1442903,1449568,1456418,1459994,1460179-1460180,1460241,1460399,1460405,1462738,1462813,1470186,1470348,1475509,1478905,1480067,1481262,1481265,1484271,1487796,1489517,1496407,1502804,1510354,1516261,1523384,1523479,1523484,1523505,1523521,1523604,1523613,1523615,1523844-1523845,1523853,1524014,1524031,1528797,1528809,1529488,1529495,1529515,1529521,1529668,1530786,1530800,1530988,1531554,1531768,1531884,1532022,1533104,1533111,1533979,1535027,1535157,1536744,1538171,1539374,1539389,1539455,1539603,1541054,1541061,1541486,1541655,1541666,1541744,1542601,1542779,1543033,1543056,1548575,1550907,1551650,1551659,1558905,1559382,1559873,1559975,1561040,1561260,1561265,1561321,1561347,1561356,1561361,1561394,1561555,1571894,1575509,1578420,1587045,1587063,1587543,1587545,1588878,1588937,1593611,1593614-1593615,1593680,1594684,1594708,1595549,1597797,1597803,1604590,1604596,1604598,1605104,1610854,1611023,1611107,1611110,1611117,1611120,1611125,1611184,1611193,1611466,
1611515,1611517,1625173,1626564,1634615,1642159,1648830,1664406,1664447,1664451,1664471,1664769-1664770,1664775,1664904,1664911,1664958,1666341,1666411,1666458,1666611,1667420-1667421,1667423,1667900-1667901,1667903,1667914-1667916,1667962,1669077,1671292,1671329,1671356,1671386,1671389,1671513-1671514,1671957,1672354,1672366,1672495,1672575,1675644,1675656,1675668,1676013,1685929,1696140,1696767,1722547,1722557,1726928,1727020,1727160,1727175,1727199,1728957,1732582,1733451,1733594,1733694,1733706,1733708,1733775,1734816,1736552,1738791,1738925,1750374,1755709,1755740,1755746,1755758,1755954,1761279,1762326,1775069
/apr/apr/trunk/test/testnames.c:1460405
/httpd/httpd/trunk:1604590
Modified: apr/apr/branches/1.6.x/locks/unix/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/locks/unix/proc_mutex.c?rev=1775072&r1=1775071&r2=1775072&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/locks/unix/proc_mutex.c (original)
+++ apr/apr/branches/1.6.x/locks/unix/proc_mutex.c Mon Dec 19 12:06:08 2016
@@ -485,7 +485,7 @@ static apr_status_t proc_pthread_mutex_u
return APR_SUCCESS;
}
-static apr_status_t proc_mutex_proc_pthread_cleanup(void *mutex_)
+static apr_status_t proc_mutex_pthread_cleanup(void *mutex_)
{
apr_proc_mutex_t *mutex=mutex_;
apr_status_t rv;
@@ -502,8 +502,8 @@ static apr_status_t proc_mutex_proc_pthr
return APR_SUCCESS;
}
-static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
- const char *fname)
+static apr_status_t proc_mutex_pthread_create(apr_proc_mutex_t *new_mutex,
+ const char *fname)
{
apr_status_t rv;
int fd;
@@ -532,14 +532,14 @@ static apr_status_t proc_mutex_proc_pthr
#ifdef HAVE_ZOS_PTHREADS
rv = errno;
#endif
- proc_mutex_proc_pthread_cleanup(new_mutex);
+ proc_mutex_pthread_cleanup(new_mutex);
return rv;
}
if ((rv = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED))) {
#ifdef HAVE_ZOS_PTHREADS
rv = errno;
#endif
- proc_mutex_proc_pthread_cleanup(new_mutex);
+ proc_mutex_pthread_cleanup(new_mutex);
pthread_mutexattr_destroy(&mattr);
return rv;
}
@@ -550,7 +550,7 @@ static apr_status_t proc_mutex_proc_pthr
#ifdef HAVE_ZOS_PTHREADS
rv = errno;
#endif
- proc_mutex_proc_pthread_cleanup(new_mutex);
+ proc_mutex_pthread_cleanup(new_mutex);
pthread_mutexattr_destroy(&mattr);
return rv;
}
@@ -558,7 +558,7 @@ static apr_status_t proc_mutex_proc_pthr
#ifdef HAVE_ZOS_PTHREADS
rv = errno;
#endif
- proc_mutex_proc_pthread_cleanup(new_mutex);
+ proc_mutex_pthread_cleanup(new_mutex);
pthread_mutexattr_destroy(&mattr);
return rv;
}
@@ -568,7 +568,7 @@ static apr_status_t proc_mutex_proc_pthr
#ifdef HAVE_ZOS_PTHREADS
rv = errno;
#endif
- proc_mutex_proc_pthread_cleanup(new_mutex);
+ proc_mutex_pthread_cleanup(new_mutex);
pthread_mutexattr_destroy(&mattr);
return rv;
}
@@ -580,7 +580,7 @@ static apr_status_t proc_mutex_proc_pthr
#ifdef HAVE_ZOS_PTHREADS
rv = errno;
#endif
- proc_mutex_proc_pthread_cleanup(new_mutex);
+ proc_mutex_pthread_cleanup(new_mutex);
return rv;
}
@@ -591,9 +591,9 @@ static apr_status_t proc_mutex_proc_pthr
return APR_SUCCESS;
}
-static apr_status_t proc_mutex_proc_pthread_child_init(apr_proc_mutex_t **mutex,
- apr_pool_t *pool,
- const char *fname)
+static apr_status_t proc_mutex_pthread_child_init(apr_proc_mutex_t **mutex,
+ apr_pool_t *pool,
+ const char *fname)
{
(*mutex)->curr_locked = 0;
if (proc_pthread_mutex_inc(*mutex)) {
@@ -603,7 +603,7 @@ static apr_status_t proc_mutex_proc_pthr
return APR_SUCCESS;
}
-static apr_status_t proc_mutex_proc_pthread_acquire(apr_proc_mutex_t *mutex)
+static apr_status_t proc_mutex_pthread_acquire(apr_proc_mutex_t *mutex)
{
apr_status_t rv;
@@ -625,7 +625,7 @@ static apr_status_t proc_mutex_proc_pthr
return APR_SUCCESS;
}
-static apr_status_t proc_mutex_proc_pthread_tryacquire(apr_proc_mutex_t *mutex)
+static apr_status_t proc_mutex_pthread_tryacquire(apr_proc_mutex_t *mutex)
{
apr_status_t rv;
@@ -650,13 +650,12 @@ static apr_status_t proc_mutex_proc_pthr
return APR_SUCCESS;
}
-static apr_status_t
-proc_mutex_proc_pthread_timedacquire(apr_proc_mutex_t *mutex,
- apr_time_t timeout,
- int absolute)
+static apr_status_t proc_mutex_pthread_timedacquire(apr_proc_mutex_t *mutex,
+ apr_time_t timeout,
+ int absolute)
{
if (timeout < 0) {
- return proc_mutex_proc_pthread_acquire(mutex);
+ return proc_mutex_pthread_acquire(mutex);
}
else {
apr_status_t rv;
@@ -691,7 +690,7 @@ proc_mutex_proc_pthread_timedacquire(apr
return APR_SUCCESS;
}
-static apr_status_t proc_mutex_proc_pthread_release(apr_proc_mutex_t *mutex)
+static apr_status_t proc_mutex_pthread_release(apr_proc_mutex_t *mutex)
{
apr_status_t rv;
@@ -708,13 +707,13 @@ static apr_status_t proc_mutex_proc_pthr
static const apr_proc_mutex_unix_lock_methods_t mutex_proc_pthread_methods =
{
APR_PROCESS_LOCK_MECH_IS_GLOBAL,
- proc_mutex_proc_pthread_create,
- proc_mutex_proc_pthread_acquire,
- proc_mutex_proc_pthread_tryacquire,
- proc_mutex_proc_pthread_timedacquire,
- proc_mutex_proc_pthread_release,
- proc_mutex_proc_pthread_cleanup,
- proc_mutex_proc_pthread_child_init,
+ proc_mutex_pthread_create,
+ proc_mutex_pthread_acquire,
+ proc_mutex_pthread_tryacquire,
+ proc_mutex_pthread_timedacquire,
+ proc_mutex_pthread_release,
+ proc_mutex_pthread_cleanup,
+ proc_mutex_pthread_child_init,
proc_mutex_no_perms_set,
APR_LOCK_PROC_PTHREAD,
"pthread"