dougm 01/02/13 15:32:43
Modified: modules/aaa mod_auth_digest.c
modules/mappers mod_rewrite.c
server/mpm/beos beos.c
server/mpm/mpmt_pthread mpmt_pthread.c
server/mpm/perchild perchild.c
server/mpm/prefork prefork.c
server/mpm/spmt_os2 spmt_os2.c
server/mpm/winnt mpm_winnt.c
file_io/os2 readwrite.c
file_io/unix readwrite.c
file_io/win32 readwrite.c
include apr_lock.h
lib apr_pools.c
locks/beos locks.c
locks/os2 locks.c
locks/unix locks.c
locks/win32 locks.c
test testthread.c
Log:
doh. need a spellchekker for these rename scripts.
s/apr_lock_aquire/apr_lock_acquire/g;
Revision Changes Path
1.36 +3 -3 httpd-2.0/modules/aaa/mod_auth_digest.c
Index: mod_auth_digest.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mod_auth_digest.c 2001/02/11 00:09:39 1.35
+++ mod_auth_digest.c 2001/02/13 23:32:16 1.36
@@ -724,7 +724,7 @@
bucket = key % client_list->tbl_len;
entry = client_list->table[bucket];
- apr_lock_aquire(client_lock /*, MM_LOCK_RD */);
+ apr_lock_acquire(client_lock /*, MM_LOCK_RD */);
while(entry && key != entry->key) {
prev = entry;
@@ -801,7 +801,7 @@
bucket = key % client_list->tbl_len;
entry = client_list->table[bucket];
- apr_lock_aquire(client_lock /*, MM_LOCK_RW */);
+ apr_lock_acquire(client_lock /*, MM_LOCK_RW */);
/* try to allocate a new entry */
@@ -1056,7 +1056,7 @@
if (!opaque_cntr) return NULL;
- apr_lock_aquire(opaque_lock /*, MM_LOCK_RW */);
+ apr_lock_acquire(opaque_lock /*, MM_LOCK_RW */);
op = (*opaque_cntr)++;
apr_lock_release(opaque_lock);
1.70 +11 -11 httpd-2.0/modules/mappers/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- mod_rewrite.c 2001/02/11 01:09:02 1.69
+++ mod_rewrite.c 2001/02/13 23:32:18 1.70
@@ -186,7 +186,7 @@
static int proxy_available;
static const char *lockname;
-static apr_lock_t *rewrite_mapr_lock_aquire = NULL;
+static apr_lock_t *rewrite_mapr_lock_acquire = NULL;
static apr_lock_t *rewrite_log_lock = NULL;
/*
@@ -980,10 +980,10 @@
if (lockname != NULL && *(lockname) != '\0')
{
- rv = apr_lock_child_init (&rewrite_mapr_lock_aquire, lockname, p);
+ rv = apr_lock_child_init (&rewrite_mapr_lock_acquire, lockname, p);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
- "mod_rewrite: could not init
rewrite_mapr_lock_aquire "
+ "mod_rewrite: could not init
rewrite_mapr_lock_acquire "
"in child");
}
}
@@ -2899,8 +2899,8 @@
/* take the lock */
- if (rewrite_mapr_lock_aquire) {
- apr_lock_aquire(rewrite_mapr_lock_aquire);
+ if (rewrite_mapr_lock_acquire) {
+ apr_lock_acquire(rewrite_mapr_lock_acquire);
}
/* write out the request key */
@@ -2934,8 +2934,8 @@
buf[i] = '\0';
/* give the lock back */
- if (rewrite_mapr_lock_aquire) {
- apr_lock_release(rewrite_mapr_lock_aquire);
+ if (rewrite_mapr_lock_acquire) {
+ apr_lock_release(rewrite_mapr_lock_acquire);
}
if (strcasecmp(buf, "NULL") == 0) {
@@ -3186,7 +3186,7 @@
(unsigned long)(r->server), (unsigned long)r,
type, redir, level, str2);
- apr_lock_aquire(rewrite_log_lock);
+ apr_lock_acquire(rewrite_log_lock);
nbytes = strlen(str3);
apr_file_write(conf->rewritelogfp, str3, &nbytes);
apr_lock_release(rewrite_log_lock);
@@ -3236,7 +3236,7 @@
lockname = ap_server_root_relative(p, lockname);
/* create the lockfile */
- rc = apr_lock_create (&rewrite_mapr_lock_aquire, APR_MUTEX, APR_LOCKALL,
lockname, p);
+ rc = apr_lock_create (&rewrite_mapr_lock_acquire, APR_MUTEX,
APR_LOCKALL, lockname, p);
if (rc != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rc, s,
"mod_rewrite: Parent could not create RewriteLock "
@@ -3255,8 +3255,8 @@
}
/* destroy the rewritelock */
- apr_lock_destroy (rewrite_mapr_lock_aquire);
- rewrite_mapr_lock_aquire = NULL;
+ apr_lock_destroy (rewrite_mapr_lock_acquire);
+ rewrite_mapr_lock_acquire = NULL;
lockname = NULL;
return(0);
}
1.42 +3 -3 httpd-2.0/server/mpm/beos/beos.c
Index: beos.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- beos.c 2001/02/13 20:53:13 1.41
+++ beos.c 2001/02/13 23:32:21 1.42
@@ -344,7 +344,7 @@
apr_pool_create(&ptrans, tpool);
- apr_lock_aquire(worker_thread_count_mutex);
+ apr_lock_acquire(worker_thread_count_mutex);
worker_thread_count++;
apr_lock_release(worker_thread_count_mutex);
@@ -363,7 +363,7 @@
(void) ap_update_child_status(0, child_slot, SERVER_READY,
(request_rec*)NULL);
- apr_lock_aquire(accept_mutex);
+ apr_lock_acquire(accept_mutex);
while (!this_worker_should_exit) {
apr_int16_t event;
apr_status_t ret = apr_poll(pollset, &srv, -1);
@@ -433,7 +433,7 @@
ap_update_child_status(0, child_slot, SERVER_DEAD, (request_rec*)NULL);
- apr_lock_aquire(worker_thread_count_mutex);
+ apr_lock_acquire(worker_thread_count_mutex);
worker_thread_count--;
apr_lock_release(worker_thread_count_mutex);
1.149 +2 -2 httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c
Index: mpmt_pthread.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- mpmt_pthread.c 2001/02/12 18:47:51 1.148
+++ mpmt_pthread.c 2001/02/13 23:32:23 1.149
@@ -477,10 +477,10 @@
(void) ap_update_child_status(process_slot, thread_slot,
SERVER_READY,
(request_rec *) NULL);
- if ((rv = SAFE_ACCEPT(apr_lock_aquire(accept_mutex)))
+ if ((rv = SAFE_ACCEPT(apr_lock_acquire(accept_mutex)))
!= APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf,
- "apr_lock_aquire failed. Attempting to shutdown "
+ "apr_lock_acquire failed. Attempting to shutdown "
"process gracefully.");
workers_may_exit = 1;
}
1.47 +2 -2 httpd-2.0/server/mpm/perchild/perchild.c
Index: perchild.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/perchild.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- perchild.c 2001/02/13 03:49:06 1.46
+++ perchild.c 2001/02/13 23:32:24 1.47
@@ -596,10 +596,10 @@
pthread_mutex_unlock(&thread_accept_mutex);
break;
}
- if ((rv = SAFE_ACCEPT(apr_lock_aquire(process_accept_mutex)))
+ if ((rv = SAFE_ACCEPT(apr_lock_acquire(process_accept_mutex)))
!= APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf,
- "apr_lock_aquire failed. Attempting to shutdown "
+ "apr_lock_acquire failed. Attempting to shutdown "
"process gracefully.");
workers_may_exit = 1;
}
1.165 +1 -1 httpd-2.0/server/mpm/prefork/prefork.c
Index: prefork.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- prefork.c 2001/02/12 18:47:54 1.164
+++ prefork.c 2001/02/13 23:32:25 1.165
@@ -275,7 +275,7 @@
static void accept_mutex_on(void)
{
- apr_status_t rv = apr_lock_aquire(accept_lock);
+ apr_status_t rv = apr_lock_acquire(accept_lock);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_EMERG, rv, NULL, "couldn't grab the
accept mutex");
exit(APEXIT_CHILDFATAL);
1.85 +1 -1 httpd-2.0/server/mpm/spmt_os2/spmt_os2.c
Index: spmt_os2.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/spmt_os2/spmt_os2.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- spmt_os2.c 2001/02/12 18:47:57 1.84
+++ spmt_os2.c 2001/02/13 23:32:27 1.85
@@ -184,7 +184,7 @@
static void accept_mutex_on(void)
{
- apr_status_t rc = apr_lock_aquire(accept_mutex);
+ apr_status_t rc = apr_lock_acquire(accept_mutex);
if (rc != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_EMERG, rc, ap_server_conf,
1.140 +5 -5 httpd-2.0/server/mpm/winnt/mpm_winnt.c
Index: mpm_winnt.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- mpm_winnt.c 2001/02/13 22:11:13 1.139
+++ mpm_winnt.c 2001/02/13 23:32:28 1.140
@@ -651,7 +651,7 @@
new_job->next = NULL;
new_job->sock = sock;
- apr_lock_aquire(allowed_globals.jobmutex);
+ apr_lock_acquire(allowed_globals.jobmutex);
if (allowed_globals.jobtail != NULL)
allowed_globals.jobtail->next = new_job;
@@ -670,7 +670,7 @@
int sock;
acquire_semaphore(allowed_globals.jobsemaphore);
- apr_lock_aquire(allowed_globals.jobmutex);
+ apr_lock_acquire(allowed_globals.jobmutex);
if (shutdown_in_progress && !allowed_globals.jobhead) {
apr_lock_release(allowed_globals.jobmutex);
@@ -1089,7 +1089,7 @@
* but only if we are not in the process of shutting down
*/
if (!shutdown_in_progress) {
- apr_lock_aquire(allowed_globals.jobmutex);
+ apr_lock_acquire(allowed_globals.jobmutex);
context->lr->count--;
if (context->lr->count < 2) {
SetEvent(maintenance_event);
@@ -1284,7 +1284,7 @@
* start_mutex is used to ensure that only one child ever
* goes into the listen/accept loop at once.
*/
- status = apr_lock_aquire(start_mutex);
+ status = apr_lock_acquire(start_mutex);
if (status != APR_SUCCESS) {
ap_log_error(APLOG_MARK,APLOG_ERR, status, server_conf,
"Child %d: Failed to acquire the start_mutex. Process
will exit.", my_pid);
@@ -1389,7 +1389,7 @@
workers_may_exit = 1;
/* Unblock threads blocked on the completion port */
- apr_lock_aquire(allowed_globals.jobmutex);
+ apr_lock_acquire(allowed_globals.jobmutex);
while (g_blocked_threads > 0) {
ap_log_error(APLOG_MARK,APLOG_INFO, APR_SUCCESS, server_conf,
"Child %d: %d threads blocked on the completion
port", my_pid, g_blocked_threads);
1.39 +2 -2 apr/file_io/os2/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apr/file_io/os2/readwrite.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- readwrite.c 2001/02/08 07:44:34 1.38
+++ readwrite.c 2001/02/13 23:32:29 1.39
@@ -76,7 +76,7 @@
ULONG blocksize;
ULONG size = *nbytes;
- apr_lock_aquire(thefile->mutex);
+ apr_lock_acquire(thefile->mutex);
if (thefile->direction == 1) {
apr_file_flush(thefile);
@@ -152,7 +152,7 @@
int blocksize;
int size = *nbytes;
- apr_lock_aquire(thefile->mutex);
+ apr_lock_acquire(thefile->mutex);
if ( thefile->direction == 0 ) {
// Position file pointer for writing at the offset we are
logically reading from
1.66 +2 -2 apr/file_io/unix/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/readwrite.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- readwrite.c 2001/02/11 00:12:10 1.65
+++ readwrite.c 2001/02/13 23:32:30 1.66
@@ -118,7 +118,7 @@
apr_uint64_t size = *nbytes;
#if APR_HAS_THREADS
- apr_lock_aquire(thefile->thlock);
+ apr_lock_acquire(thefile->thlock);
#endif
if (thefile->direction == 1) {
@@ -216,7 +216,7 @@
int size = *nbytes;
#if APR_HAS_THREADS
- apr_lock_aquire(thefile->thlock);
+ apr_lock_acquire(thefile->thlock);
#endif
if ( thefile->direction == 0 ) {
1.54 +2 -2 apr/file_io/win32/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/readwrite.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- readwrite.c 2001/02/11 00:35:57 1.53
+++ readwrite.c 2001/02/13 23:32:31 1.54
@@ -176,7 +176,7 @@
apr_size_t blocksize;
apr_size_t size = *len;
- apr_lock_aquire(thefile->mutex);
+ apr_lock_acquire(thefile->mutex);
if (thefile->direction == 1) {
apr_file_flush(thefile);
@@ -232,7 +232,7 @@
int blocksize;
int size = *nbytes;
- apr_lock_aquire(thefile->mutex);
+ apr_lock_acquire(thefile->mutex);
if (thefile->direction == 0) {
// Position file pointer for writing at the offset we are
logically reading from
1.22 +2 -2 apr/include/apr_lock.h
Index: apr_lock.h
===================================================================
RCS file: /home/cvs/apr/include/apr_lock.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- apr_lock.h 2001/02/08 07:44:45 1.21
+++ apr_lock.h 2001/02/13 23:32:32 1.22
@@ -107,9 +107,9 @@
/**
* Lock a protected region.
* @param lock The lock to set.
- * @deffunc apr_status_t apr_lock_aquire(apr_lock_t *lock)
+ * @deffunc apr_status_t apr_lock_acquire(apr_lock_t *lock)
*/
-APR_DECLARE(apr_status_t) apr_lock_aquire(apr_lock_t *lock);
+APR_DECLARE(apr_status_t) apr_lock_acquire(apr_lock_t *lock);
/**
* Unlock a protected region.
1.86 +6 -6 apr/lib/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apr/lib/apr_pools.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- apr_pools.c 2001/02/08 07:44:49 1.85
+++ apr_pools.c 2001/02/13 23:32:34 1.86
@@ -329,7 +329,7 @@
#if APR_HAS_THREADS
if (alloc_mutex) {
- apr_lock_aquire(alloc_mutex);
+ apr_lock_acquire(alloc_mutex);
}
#endif
old_free_list = block_freelist;
@@ -474,7 +474,7 @@
#if APR_HAS_THREADS
if (alloc_mutex) {
- apr_lock_aquire(alloc_mutex);
+ apr_lock_acquire(alloc_mutex);
}
#endif
@@ -758,7 +758,7 @@
apr_clear_pool(a);
#if APR_HAS_THREADS
if (alloc_mutex) {
- apr_lock_aquire(alloc_mutex);
+ apr_lock_acquire(alloc_mutex);
}
#endif
@@ -963,7 +963,7 @@
#if APR_HAS_THREADS
if (alloc_mutex) {
- apr_lock_aquire(alloc_mutex);
+ apr_lock_acquire(alloc_mutex);
}
#endif
@@ -1087,7 +1087,7 @@
/* must try another blok */
#if APR_HAS_THREADS
- apr_lock_aquire(alloc_mutex);
+ apr_lock_acquire(alloc_mutex);
#endif
nblok = new_block(2 * cur_len, NULL);
#if APR_HAS_THREADS
@@ -1102,7 +1102,7 @@
if (ps->got_a_new_block) {
debug_fill(blok->h.first_avail, blok->h.endp - blok->h.first_avail);
#if APR_HAS_THREADS
- apr_lock_aquire(alloc_mutex);
+ apr_lock_acquire(alloc_mutex);
#endif
blok->h.next = block_freelist;
block_freelist = blok;
1.25 +1 -1 apr/locks/beos/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apr/locks/beos/locks.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- locks.c 2001/02/08 07:44:50 1.24
+++ locks.c 2001/02/13 23:32:35 1.25
@@ -86,7 +86,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_lock_aquire(apr_lock_t *lock)
+apr_status_t apr_lock_acquire(apr_lock_t *lock)
{
apr_status_t stat;
1.24 +1 -1 apr/locks/os2/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apr/locks/os2/locks.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- locks.c 2001/02/08 07:44:51 1.23
+++ locks.c 2001/02/13 23:32:37 1.24
@@ -133,7 +133,7 @@
-apr_status_t apr_lock_aquire(apr_lock_t *lock)
+apr_status_t apr_lock_acquire(apr_lock_t *lock)
{
ULONG rc;
1.45 +1 -1 apr/locks/unix/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apr/locks/unix/locks.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- locks.c 2001/02/08 07:44:51 1.44
+++ locks.c 2001/02/13 23:32:38 1.45
@@ -101,7 +101,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_lock_aquire(apr_lock_t *lock)
+apr_status_t apr_lock_acquire(apr_lock_t *lock)
{
apr_status_t stat;
#if APR_PROCESS_LOCK_IS_GLOBAL /* don't need intra lock for APR_LOCKALL */
1.35 +1 -1 apr/locks/win32/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apr/locks/win32/locks.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- locks.c 2001/02/08 07:44:52 1.34
+++ locks.c 2001/02/13 23:32:40 1.35
@@ -115,7 +115,7 @@
return APR_SUCCESS;
}
-APR_DECLARE(apr_status_t) apr_lock_aquire(apr_lock_t *lock)
+APR_DECLARE(apr_status_t) apr_lock_acquire(apr_lock_t *lock)
{
DWORD rv;
if (lock->scope == APR_INTRAPROCESS) {
1.15 +4 -4 apr/test/testthread.c
Index: testthread.c
===================================================================
RCS file: /home/cvs/apr/test/testthread.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- testthread.c 2001/02/08 07:45:08 1.14
+++ testthread.c 2001/02/13 23:32:41 1.15
@@ -77,7 +77,7 @@
{
int i;
for (i = 0; i < 10000; i++) {
- apr_lock_aquire(thread_lock);
+ apr_lock_acquire(thread_lock);
x++;
apr_lock_release(thread_lock);
}
@@ -88,7 +88,7 @@
{
int i;
for (i = 0; i < 10000; i++) {
- apr_lock_aquire(thread_lock);
+ apr_lock_acquire(thread_lock);
x++;
apr_lock_release(thread_lock);
}
@@ -99,7 +99,7 @@
{
int i;
for (i = 0; i < 10000; i++) {
- apr_lock_aquire(thread_lock);
+ apr_lock_acquire(thread_lock);
x++;
apr_lock_release(thread_lock);
}
@@ -110,7 +110,7 @@
{
int i;
for (i = 0; i < 10000; i++) {
- apr_lock_aquire(thread_lock);
+ apr_lock_acquire(thread_lock);
x++;
apr_lock_release(thread_lock);
}
