You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/01/31 01:04:24 UTC
[1/2] git commit: TS-2538 Cleanup of ProcessMutex (unused) and
InkMutex (dupe of ink_mutex)
Updated Branches:
refs/heads/master 4b6f7ae87 -> 2089e76a4
TS-2538 Cleanup of ProcessMutex (unused) and InkMutex (dupe of ink_mutex)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/556b53a4
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/556b53a4
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/556b53a4
Branch: refs/heads/master
Commit: 556b53a491f541dfe666f7b954b135e2f6446d3f
Parents: 4b6f7ae
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Jan 28 15:39:09 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jan 30 16:38:51 2014 -0700
----------------------------------------------------------------------
lib/ts/ink_atomic.h | 2 +-
lib/ts/ink_mutex.cc | 42 +---------------------------------
lib/ts/ink_mutex.h | 14 +-----------
lib/ts/ink_queue_ext.h | 2 +-
proxy/http/HttpProxyServerMain.cc | 2 +-
5 files changed, 5 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/556b53a4/lib/ts/ink_atomic.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_atomic.h b/lib/ts/ink_atomic.h
index fc8a9f3..47fb65b 100644
--- a/lib/ts/ink_atomic.h
+++ b/lib/ts/ink_atomic.h
@@ -171,7 +171,7 @@ ink_atomic_decrement(volatile Type * mem, Amount count) {
// Special hacks for ARM 32-bit
#if defined(__arm__) && (SIZEOF_VOIDP == 4)
-extern ProcessMutex __global_death;
+extern ink_mutex __global_death;
template<>
inline int64_t
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/556b53a4/lib/ts/ink_mutex.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_mutex.cc b/lib/ts/ink_mutex.cc
index e9ba5b0..9036f55 100644
--- a/lib/ts/ink_mutex.cc
+++ b/lib/ts/ink_mutex.cc
@@ -29,44 +29,4 @@
x_pthread_mutexattr_t _g_mattr;
-ProcessMutex __global_death = PTHREAD_MUTEX_INITIALIZER;
-ProcessMutex *gobal_death_mutex = &__global_death;
-
-void
-ink_ProcessMutex_destroy(ProcessMutex * m)
-{
- pthread_mutex_destroy(m);
-}
-
-void
-ink_ProcessMutex_acquire(ProcessMutex * m)
-{
- if (pthread_mutex_lock(m) != 0) {
- abort();
- }
-}
-
-void
-ink_ProcessMutex_release(ProcessMutex * m)
-{
- if (pthread_mutex_unlock(m) != 0) {
- abort();
- }
-}
-
-int
-ink_ProcessMutex_try_acquire(ProcessMutex * m)
-{
- return pthread_mutex_trylock(m) == 0;
-}
-
-void
-ink_ProcessMutex_print(FILE * out, ProcessMutex * m)
-{
- (void) out;
- (void) m;
- if(m == gobal_death_mutex)
- fprintf(out, "Global ProcessMutex\n");
- else
- fprintf(out, "ProcessMutex\n");
-}
+ink_mutex __global_death = PTHREAD_MUTEX_INITIALIZER;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/556b53a4/lib/ts/ink_mutex.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_mutex.h b/lib/ts/ink_mutex.h
index 3e3c810..326d6bb 100644
--- a/lib/ts/ink_mutex.h
+++ b/lib/ts/ink_mutex.h
@@ -40,9 +40,7 @@
#include <pthread.h>
#include <stdlib.h>
-typedef pthread_mutex_t ProcessMutex;
-typedef ProcessMutex ink_mutex;
-typedef ProcessMutex InkMutex;
+typedef pthread_mutex_t ink_mutex;
// just a wrapper so that the constructor gets executed
// before the first call to ink_mutex_init();
@@ -115,16 +113,6 @@ ink_mutex_try_acquire(ink_mutex * m)
#endif /* #if defined(POSIX_THREAD) */
-
-/* process mutex */
-
-void ink_ProcessMutex_destroy(ProcessMutex *);
-void ink_ProcessMutex_acquire(ProcessMutex *);
-void ink_ProcessMutex_release(ProcessMutex *);
-int ink_ProcessMutex_try_acquire(ProcessMutex *);
-void ink_ProcessMutex_print(FILE * out, ProcessMutex *);
-
-
struct ink_scoped_mutex
{
explicit ink_scoped_mutex(ink_mutex& m) : mtx(m) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/556b53a4/lib/ts/ink_queue_ext.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_queue_ext.h b/lib/ts/ink_queue_ext.h
index 3a80260..22ee6c4 100644
--- a/lib/ts/ink_queue_ext.h
+++ b/lib/ts/ink_queue_ext.h
@@ -126,7 +126,7 @@ extern "C"
uint32_t nr_thread_cache;
InkThreadCache *pThreadCache;
- InkMutex lock;
+ ink_mutex lock;
} InkFreeList, *PInkFreeList;
/* reclaimable freelist API */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/556b53a4/proxy/http/HttpProxyServerMain.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc
index ad02779..7c9b49d 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -40,7 +40,7 @@ HttpAccept *plugin_http_accept = NULL;
HttpAccept *plugin_http_transparent_accept = 0;
static SLL<SSLNextProtocolAccept> ssl_plugin_acceptors;
-static ProcessMutex ssl_plugin_mutex = PTHREAD_MUTEX_INITIALIZER;
+static ink_mutex ssl_plugin_mutex = PTHREAD_MUTEX_INITIALIZER;
bool
ssl_register_protocol(const char * protocol, Continuation * contp)
[2/2] git commit: Added TS-2538 to CHANGES.
Posted by zw...@apache.org.
Added TS-2538 to CHANGES.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2089e76a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2089e76a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2089e76a
Branch: refs/heads/master
Commit: 2089e76a46c2ef0acadf9c4ed77ed4d44720e4d9
Parents: 556b53a
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Jan 30 16:39:56 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jan 30 16:39:56 2014 -0700
----------------------------------------------------------------------
CHANGES | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2089e76a/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 33ba8ee..2be803f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.2.0
+ *) [TS-2538] Cleanup of ProcessMutex (unused) and InkMutex (dupe of
+ ink_mutex). We now use ink_mutex consistently.
+
*) [TS-2544] conf_remap plugin: allow for multiple configuration files.
*) [TS-2530] Check for loopback interfaces when computing the local address.