Author: zwoop
Date: Fri Dec 30 18:31:26 2011
New Revision: 1225886
URL: http://svn.apache.org/viewvc?rev=1225886&view=rev
Log:
TS-999 Deprecate TSUrlDestroy(), it is a no-op. Just make sure to release the
buffers as usual.
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/example/cache_scan/cache_scan.cc
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/InkAPITest.cc
trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
Modified: trafficserver/traffic/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1225886&r1=1225885&r2=1225886&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Fri Dec 30 18:31:26 2011
@@ -1,5 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.2
+ *) [TS-999] Deprecate TSUrlDestroy(), it's a no-op. Just make sure
+ to release the marshal buffers as normal.
+
*) [TS-245] Add TSStringPercentEncode(), TSUrlPercentEncode(), and
TSStringPercentDecode().
Modified: trafficserver/traffic/trunk/example/cache_scan/cache_scan.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/cache_scan/cache_scan.cc?rev=1225886&r1=1225885&r2=1225886&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/cache_scan/cache_scan.cc (original)
+++ trafficserver/traffic/trunk/example/cache_scan/cache_scan.cc Fri Dec 30
18:31:26 2011
@@ -449,12 +449,10 @@ setup_request(TSCont contp, TSHttpTxn tx
TSCacheKeyDigestFromUrlSet(cstate->key_to_delete, urlLoc) !=
TS_SUCCESS) {
TSError("CacheKeyDigestFromUrlSet failed");
TSfree(cstate);
- TSUrlDestroy(urlBuf, urlLoc);
TSHandleMLocRelease(urlBuf, NULL, urlLoc);
TSCacheKeyDestroy(cstate->key_to_delete);
goto Ldone;
}
- TSUrlDestroy(urlBuf, urlLoc);
TSHandleMLocRelease(urlBuf, NULL, urlLoc);
}
}
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1225886&r1=1225885&r2=1225886&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Fri Dec 30 18:31:26 2011
@@ -1946,15 +1946,7 @@ TSUrlCreate(TSMBuffer bufp, TSMLoc *locp
TSReturnCode
TSUrlDestroy(TSMBuffer bufp, TSMLoc url_loc)
{
- sdk_assert(sdk_sanity_check_mbuffer(bufp) == TS_SUCCESS);
- sdk_assert(sdk_sanity_check_url_handle(url_loc) == TS_SUCCESS);
-
- if (isWriteable(bufp)) {
- // No more objects counts in heap or deallocation so do nothing!
- // FIX ME - Did this free the MBuffer in Pete's old system?
- return TS_SUCCESS;
- }
- return TS_ERROR;
+ return TS_SUCCESS;
}
TSReturnCode
Modified: trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=1225886&r1=1225885&r2=1225886&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITest.cc Fri Dec 30 18:31:26 2011
@@ -2631,7 +2631,6 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpHo
// SDK_API_TSUrl
//
// Unit Test for API: TSUrlCreate
-// TSUrlDestroy
// TSUrlSchemeGet
// TSUrlSchemeSet
// TSUrlUserGet
@@ -2776,7 +2775,6 @@ REGRESSION_TEST(SDK_API_TSUrl) (Regressi
int tmp_len;
bool test_passed_create = false;
- bool test_passed_destroy = false;
bool test_passed_scheme = false;
bool test_passed_user = false;
bool test_passed_password = false;
@@ -3057,21 +3055,11 @@ REGRESSION_TEST(SDK_API_TSUrl) (Regressi
}
}
-
- if ((TSUrlDestroy(bufp1, url_loc1) == TS_ERROR) &&
- (TSUrlDestroy(bufp2, url_loc2) == TS_ERROR) &&
- (TSUrlDestroy(bufp3, url_loc3) == TS_ERROR)) {
- SDK_RPRINT(test, "TSUrlCreate", "TestCase1&2", TC_PASS, "ok");
- SDK_RPRINT(test, "TSUrlDestroy", "TestCase1|2|3", TC_FAIL, "Returns
TS_ERROR");
- } else {
- SDK_RPRINT(test, "TSUrlCreate", "TestCase1&2", TC_PASS, "ok");
- SDK_RPRINT(test, "TSUrlDestroy", "TestCase1&2&3", TC_PASS, "ok");
- TSHandleMLocRelease(bufp1, TS_NULL_MLOC, url_loc1);
- TSHandleMLocRelease(bufp2, TS_NULL_MLOC, url_loc2);
- TSHandleMLocRelease(bufp3, TS_NULL_MLOC, url_loc3);
- test_passed_create = true;
- test_passed_destroy = true;
- }
+ SDK_RPRINT(test, "TSUrlCreate", "TestCase1&2", TC_PASS, "ok");
+ TSHandleMLocRelease(bufp1, TS_NULL_MLOC, url_loc1);
+ TSHandleMLocRelease(bufp2, TS_NULL_MLOC, url_loc2);
+ TSHandleMLocRelease(bufp3, TS_NULL_MLOC, url_loc3);
+ test_passed_create = true;
print_results:
TSfree(url_expected_string);
@@ -3094,7 +3082,6 @@ print_results:
TSMBufferDestroy(bufp3);
}
if ((test_passed_create == false) ||
- (test_passed_destroy == false) ||
(test_passed_scheme == false) ||
(test_passed_user == false) ||
(test_passed_password == false) ||
@@ -3113,7 +3100,6 @@ print_results:
/*** Debugging the test itself....
(test_passed_create == false)?printf("test_passed_create is
false\n"):printf("");
(test_passed_destroy == false)?printf("test_passed_destroy is
false\n"):printf("");
- (test_passed_scheme == false)?printf("test_passed_scheme is
false\n"):printf("");
(test_passed_user == false)?printf("test_passed_user is
false\n"):printf("");
(test_passed_password == false)?printf("test_passed_password is
false\n"):printf("");
(test_passed_host == false)?printf("test_passed_host is
false\n"):printf("");
@@ -5388,10 +5374,7 @@ REGRESSION_TEST(SDK_API_TSUrlParse) (Reg
*pstatus = REGRESSION_TEST_PASSED;
}
- TSUrlDestroy(bufp, url_loc);
-
TSHandleMLocRelease(bufp, TS_NULL_MLOC, url_loc);
-
TSMBufferDestroy(bufp);
return;
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=1225886&r1=1225885&r2=1225886&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts.h.in (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts.h.in Fri Dec 30 18:31:26 2011
@@ -1195,7 +1195,9 @@ extern "C"
@param offset location of the URL to be destroyed.
*/
- tsapi TSReturnCode TSUrlDestroy(TSMBuffer bufp, TSMLoc offset);
+ /** @deprecated There is no reason to destroy the URL, just release
+ the marshal buffers. */
+ tsapi TS_DEPRECATED TSReturnCode TSUrlDestroy(TSMBuffer bufp, TSMLoc offset);
/**
Copies the URL located at src_url within src_bufp to a URL
