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 2011/04/26 12:06:36 UTC
svn commit: r1096711 - in /trafficserver/traffic/trunk/proxy: InkAPI.cc
api/ts/experimental.h api/ts/ts.h.in
Author: zwoop
Date: Tue Apr 26 10:06:36 2011
New Revision: 1096711
URL: http://svn.apache.org/viewvc?rev=1096711&view=rev
Log:
TS-753 Some more cleanup in InkAPI, move a few experimental APIs to ts.h
Modified:
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/api/ts/experimental.h
trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1096711&r1=1096710&r2=1096711&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Tue Apr 26 10:06:36 2011
@@ -4701,10 +4701,6 @@ TSHttpTxnCacheLookupUrlGet(TSHttpTxn txn
HttpSM *sm = (HttpSM *) txnp;
URL u, *l_url;
- if (sm == NULL)
- return TS_ERROR;
-
- sdk_sanity_check_mbuffer(bufp);
u.m_heap = ((HdrHeapSDKHandle *) bufp)->m_heap;
u.m_url_impl = (URLImpl *) obj;
if (!u.valid())
@@ -4729,7 +4725,6 @@ TSHttpTxnCachedUrlSet(TSHttpTxn txnp, TS
HttpSM *sm = (HttpSM *) txnp;
URL u, *s_url;
- sdk_sanity_check_mbuffer(bufp);
u.m_heap = ((HdrHeapSDKHandle *) bufp)->m_heap;
u.m_url_impl = (URLImpl *) obj;
if (!u.valid())
@@ -5076,9 +5071,7 @@ TSHttpTxnTransformRespGet(TSHttpTxn txnp
if (hptr->valid()) {
*(reinterpret_cast<HTTPHdr**>(bufp)) = hptr;
*obj = reinterpret_cast<TSMLoc>(hptr->m_http);
- sdk_sanity_check_mbuffer(*bufp);
-
- return TS_SUCCESS;
+ return sdk_sanity_check_mbuffer(*bufp);
}
return TS_ERROR;
@@ -6855,9 +6848,8 @@ TSICPCachedReqGet(TSCont contp, TSMBuffe
*(reinterpret_cast<HdrHeapSDKHandle**>(bufp)) = *handle;
*obj = reinterpret_cast<TSMLoc>(cached_hdr->m_http);
- sdk_sanity_check_mbuffer(*bufp);
- return TS_SUCCESS;
+ return sdk_sanity_check_mbuffer(*bufp);
}
TSReturnCode
@@ -6870,9 +6862,6 @@ TSICPCachedRespGet(TSCont contp, TSMBuff
ICPPeerReadCont *sm = (ICPPeerReadCont *) contp;
HTTPInfo *cached_obj;
- if (sm == NULL)
- return TS_ERROR;
-
cached_obj = sm->_object_read;
if (cached_obj == NULL || !cached_obj->valid())
return TS_ERROR;
@@ -6892,9 +6881,8 @@ TSICPCachedRespGet(TSCont contp, TSMBuff
*(reinterpret_cast<HdrHeapSDKHandle**>(bufp)) = *handle;
*obj = reinterpret_cast<TSMLoc>(cached_hdr->m_http);
- sdk_sanity_check_mbuffer(*bufp);
- return TS_SUCCESS;
+ return sdk_sanity_check_mbuffer(*bufp);
}
TSReturnCode
@@ -7003,8 +6991,7 @@ TSFetchPageRespGet(TSHttpTxn txnp, TSMBu
if (hptr->valid()) {
*(reinterpret_cast<HTTPHdr**>(bufp)) = hptr;
*obj = reinterpret_cast<TSMLoc>(hptr->m_http);
- if (sdk_sanity_check_mbuffer(*bufp) == TS_SUCCESS)
- return TS_SUCCESS;
+ return sdk_sanity_check_mbuffer(*bufp);
}
return TS_ERROR;
Modified: trafficserver/traffic/trunk/proxy/api/ts/experimental.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/experimental.h?rev=1096711&r1=1096710&r2=1096711&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/experimental.h (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/experimental.h Tue Apr 26 10:06:36 2011
@@ -190,12 +190,6 @@ extern "C"
/* ===== ICP ===== */
tsapi void TSHttpIcpDynamicSet(int value);
- /* ===== Http Transactions ===== */
- tsapi TSReturnCode TSHttpTxnCachedRespModifiableGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *offset);
- tsapi TSReturnCode TSHttpTxnCacheLookupStatusSet(TSHttpTxn txnp, int cachelookup);
- tsapi TSReturnCode TSHttpTxnCacheLookupUrlGet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj);
- tsapi TSReturnCode TSHttpTxnCachedUrlSet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj);
-
/****************************************************************************
* TSHttpTxnCacheLookupCountGet
* Return: TS_SUCESS/TS_ERROR
Modified: trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts.h.in?rev=1096711&r1=1096710&r2=1096711&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts.h.in (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts.h.in Tue Apr 26 10:06:36 2011
@@ -2894,6 +2894,12 @@ extern "C"
tsapi int TSHttpCurrentCacheConnectionsGet(void);
tsapi int TSHttpCurrentServerConnectionsGet(void);
+ /* ===== Http Transactions ===== */
+ tsapi TSReturnCode TSHttpTxnCachedRespModifiableGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *offset);
+ tsapi TSReturnCode TSHttpTxnCacheLookupStatusSet(TSHttpTxn txnp, int cachelookup);
+ tsapi TSReturnCode TSHttpTxnCacheLookupUrlGet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj);
+ tsapi TSReturnCode TSHttpTxnCachedUrlSet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */