You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2016/01/27 23:13:14 UTC
[1/3] trafficserver git commit: TS-3645: Fix ProxyStateGet()
management API.
Repository: trafficserver
Updated Branches:
refs/heads/master ed6cfbad1 -> f8ce9e97f
TS-3645: Fix ProxyStateGet() management API.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f8ce9e97
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f8ce9e97
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f8ce9e97
Branch: refs/heads/master
Commit: f8ce9e97f610b97bac76412176d1e673fa415541
Parents: e605ec9
Author: Wayne Jensen <wj...@ciphercloud.com>
Authored: Wed Jan 27 13:44:02 2016 -0800
Committer: James Peach <jp...@apache.org>
Committed: Wed Jan 27 14:13:01 2016 -0800
----------------------------------------------------------------------
mgmt/api/CoreAPIRemote.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f8ce9e97/mgmt/api/CoreAPIRemote.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CoreAPIRemote.cc b/mgmt/api/CoreAPIRemote.cc
index 8622945..3d79b43 100644
--- a/mgmt/api/CoreAPIRemote.cc
+++ b/mgmt/api/CoreAPIRemote.cc
@@ -343,7 +343,7 @@ ProxyStateSet(TSProxyStateT state, TSCacheClearT clear)
MgmtMarshallInt pclear = clear;
ret = MGMTAPI_SEND_MESSAGE(main_socket_fd, PROXY_STATE_SET, &optype, &pstate, &pclear);
- return (ret == TS_ERR_OKAY) ? parse_generic_response(PROXY_STATE_GET, main_socket_fd) : ret;
+ return (ret == TS_ERR_OKAY) ? parse_generic_response(PROXY_STATE_SET, main_socket_fd) : ret;
}
TSMgmtError
[2/3] trafficserver git commit: Remove unused InkPool code.
Posted by jp...@apache.org.
Remove unused InkPool code.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e605ec9b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e605ec9b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e605ec9b
Branch: refs/heads/master
Commit: e605ec9b47c18013d4b8b456dfd1768e77a51786
Parents: 7043ab6
Author: James Peach <jp...@apache.org>
Authored: Wed Jan 27 13:43:18 2016 -0800
Committer: James Peach <jp...@apache.org>
Committed: Wed Jan 27 14:13:01 2016 -0800
----------------------------------------------------------------------
lib/ts/InkPool.h | 101 ------------------------------------------------
lib/ts/Makefile.am | 1 -
2 files changed, 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e605ec9b/lib/ts/InkPool.h
----------------------------------------------------------------------
diff --git a/lib/ts/InkPool.h b/lib/ts/InkPool.h
deleted file mode 100644
index 51a9d5e..0000000
--- a/lib/ts/InkPool.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/** @file
-
- A brief file description
-
- @section license License
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-#ifndef __INK_POOL_H_INCLUDED__
-#define __INK_POOL_H_INCLUDED__
-
-//
-// Template of a static size pool of objects.
-//
-//
-template <class C> class InkStaticPool
-{
-public:
- InkStaticPool(int size) : sz1(size + 1), head(0), tail(0) { pool = new C *[sz1]; }
-
- virtual ~InkStaticPool()
- {
- cleanUp();
- delete[] pool;
- }
-
- C *get();
- bool put(C *newObj);
- void
- put_or_delete(C *newObj)
- {
- if (!put(newObj))
- delete newObj;
- }
-
-protected:
- void cleanUp(void);
-
-private:
- const int sz1;
- int head;
- int tail;
- C **pool;
-};
-
-template <class C>
-inline C *
-InkStaticPool<C>::get()
-{
- if (head != tail) {
- C *res = pool[head++];
- head %= sz1;
- return (res);
- }
- return (NULL);
-}
-
-template <class C>
-inline bool
-InkStaticPool<C>::put(C *newObj)
-{
- if (newObj == NULL)
- return (false); // cannot put NULL pointer
-
- int newTail = (tail + 1) % sz1;
- bool res = (newTail != head);
- if (res) {
- pool[tail] = newObj;
- tail = newTail;
- }
- return (res);
-}
-
-template <class C>
-inline void
-InkStaticPool<C>::cleanUp(void)
-{
- while (true) {
- C *tp = get();
- if (tp == NULL)
- break;
- delete tp;
- }
-}
-
-#endif // #ifndef __INK_POOL_H_INCLUDED__
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e605ec9b/lib/ts/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am
index aabb916..2e4fd2f 100644
--- a/lib/ts/Makefile.am
+++ b/lib/ts/Makefile.am
@@ -70,7 +70,6 @@ libtsutil_la_SOURCES = \
I_Layout.h \
I_Version.h \
InkErrno.h \
- InkPool.h \
IntrusiveDList.h \
IpMap.cc \
IpMap.h \
[3/3] trafficserver git commit: Remove unused InkPool_r.h
Posted by jp...@apache.org.
Remove unused InkPool_r.h
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7043ab6d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7043ab6d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7043ab6d
Branch: refs/heads/master
Commit: 7043ab6d99cd136e73ccad1aaa22892918b051ec
Parents: ed6cfba
Author: James Peach <jp...@apache.org>
Authored: Wed Jan 27 12:44:14 2016 -0800
Committer: James Peach <jp...@apache.org>
Committed: Wed Jan 27 14:13:01 2016 -0800
----------------------------------------------------------------------
proxy/InkPool_r.h | 73 --------------------------------------------------
1 file changed, 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7043ab6d/proxy/InkPool_r.h
----------------------------------------------------------------------
diff --git a/proxy/InkPool_r.h b/proxy/InkPool_r.h
deleted file mode 100644
index 262355c..0000000
--- a/proxy/InkPool_r.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/** @file
-
- A brief file description
-
- @section license License
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-#ifndef __INK_POOL_R_H_INCLUDED__
-#define __INK_POOL_R_H_INCLUDED__
-
-#include "ts/InkPool.h"
-#include "P_EventSystem.h"
-
-template <class C> class InkStaticPool_r : public InkStaticPool<C>
-{
-public:
- InkStaticPool_r(int size) : InkStaticPool<C>(size) { mutex = new_ProxyMutex(); }
-
- virtual ~InkStaticPool_r()
- {
- SCOPED_MUTEX_LOCK(lock, mutex, this_ethread());
- cleanUp();
- }
-
- C *
- get()
- {
- SCOPED_MUTEX_LOCK(lock, mutex, this_ethread());
- return (InkStaticPool<C>::get());
- }
-
- bool
- put(C *newObj)
- {
- SCOPED_MUTEX_LOCK(lock, mutex, this_ethread());
- return (InkStaticPool<C>::put(newObj));
- }
-
- void
- put_or_delete(C *newObj)
- {
- if (!this->put(newObj))
- delete newObj;
- }
-
- ProxyMutex *
- getMutex()
- {
- return (mutex);
- }
-
-protected:
- Ptr<ProxyMutex> mutex;
-};
-
-
-#endif // #ifndef __INK_POOL_R_H_INCLUDED__